Commit aff388f7 authored May 02, 2022 by Corentin Labbe Committed by Herbert Xu May 13, 2022

crypto: sun8i-ce - rework debugging



The "Fallback for xxx" message is annoying, remove it and store the
information in the debugfs.
Let's add more precise fallback stats and display it better.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 6b8309fa

drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c

+35 −8

Original line number	Diff line number	Diff line
		@@ -25,27 +25,54 @@ static int sun8i_ce_cipher_need_fallback(struct skcipher_request *areq)
		{
		struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
		struct scatterlist *sg;
		struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
		struct sun8i_ce_alg_template *algt;

		algt = container_of(alg, struct sun8i_ce_alg_template, alg.skcipher);

		if (sg_nents_for_len(areq->src, areq->cryptlen) > MAX_SG \|\|
		sg_nents_for_len(areq->dst, areq->cryptlen) > MAX_SG)
		sg_nents_for_len(areq->dst, areq->cryptlen) > MAX_SG) {
		algt->stat_fb_maxsg++;
		return true;
		}

		if (areq->cryptlen < crypto_skcipher_ivsize(tfm)) {
		algt->stat_fb_leniv++;
		return true;
		}

		if (areq->cryptlen < crypto_skcipher_ivsize(tfm))
		if (areq->cryptlen == 0) {
		algt->stat_fb_len0++;
		return true;
		}

		if (areq->cryptlen == 0 \|\| areq->cryptlen % 16)
		if (areq->cryptlen % 16) {
		algt->stat_fb_mod16++;
		return true;
		}

		sg = areq->src;
		while (sg) {
		if (sg->length % 4 \|\| !IS_ALIGNED(sg->offset, sizeof(u32)))
		if (!IS_ALIGNED(sg->offset, sizeof(u32))) {
		algt->stat_fb_srcali++;
		return true;
		}
		if (sg->length % 4) {
		algt->stat_fb_srclen++;
		return true;
		}
		sg = sg_next(sg);
		}
		sg = areq->dst;
		while (sg) {
		if (sg->length % 4 \|\| !IS_ALIGNED(sg->offset, sizeof(u32)))
		if (!IS_ALIGNED(sg->offset, sizeof(u32))) {
		algt->stat_fb_dstali++;
		return true;
		}
		if (sg->length % 4) {
		algt->stat_fb_dstlen++;
		return true;
		}
		sg = sg_next(sg);
		}
		return false;
		@@ -384,9 +411,9 @@ int sun8i_ce_cipher_init(struct crypto_tfm *tfm)
		sktfm->reqsize = sizeof(struct sun8i_cipher_req_ctx) +
		crypto_skcipher_reqsize(op->fallback_tfm);

		dev_info(op->ce->dev, "Fallback for %s is %s\n",
		crypto_tfm_alg_driver_name(&sktfm->base),
		crypto_tfm_alg_driver_name(crypto_skcipher_tfm(op->fallback_tfm)));
		memcpy(algt->fbname,
		crypto_tfm_alg_driver_name(crypto_skcipher_tfm(op->fallback_tfm)),
		CRYPTO_MAX_ALG_NAME);

		op->enginectx.op.do_one_request = sun8i_ce_cipher_run;
		op->enginectx.op.prepare_request = sun8i_ce_cipher_prepare;

drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c

+31 −3

Original line number	Diff line number	Diff line
		@@ -595,19 +595,47 @@ static int sun8i_ce_debugfs_show(struct seq_file seq, void v)
		continue;
		switch (ce_algs[i].type) {
		case CRYPTO_ALG_TYPE_SKCIPHER:
		seq_printf(seq, "%s %s %lu %lu\n",
		seq_printf(seq, "%s %s reqs=%lu fallback=%lu\n",
		ce_algs[i].alg.skcipher.base.cra_driver_name,
		ce_algs[i].alg.skcipher.base.cra_name,
		ce_algs[i].stat_req, ce_algs[i].stat_fb);
		seq_printf(seq, "\tLast fallback is: %s\n",
		ce_algs[i].fbname);
		seq_printf(seq, "\tFallback due to 0 length: %lu\n",
		ce_algs[i].stat_fb_len0);
		seq_printf(seq, "\tFallback due to length !mod16: %lu\n",
		ce_algs[i].stat_fb_mod16);
		seq_printf(seq, "\tFallback due to length < IV: %lu\n",
		ce_algs[i].stat_fb_leniv);
		seq_printf(seq, "\tFallback due to source alignment: %lu\n",
		ce_algs[i].stat_fb_srcali);
		seq_printf(seq, "\tFallback due to dest alignment: %lu\n",
		ce_algs[i].stat_fb_dstali);
		seq_printf(seq, "\tFallback due to source length: %lu\n",
		ce_algs[i].stat_fb_srclen);
		seq_printf(seq, "\tFallback due to dest length: %lu\n",
		ce_algs[i].stat_fb_dstlen);
		seq_printf(seq, "\tFallback due to SG numbers: %lu\n",
		ce_algs[i].stat_fb_maxsg);
		break;
		case CRYPTO_ALG_TYPE_AHASH:
		seq_printf(seq, "%s %s %lu %lu\n",
		seq_printf(seq, "%s %s reqs=%lu fallback=%lu\n",
		ce_algs[i].alg.hash.halg.base.cra_driver_name,
		ce_algs[i].alg.hash.halg.base.cra_name,
		ce_algs[i].stat_req, ce_algs[i].stat_fb);
		seq_printf(seq, "\tLast fallback is: %s\n",
		ce_algs[i].fbname);
		seq_printf(seq, "\tFallback due to 0 length: %lu\n",
		ce_algs[i].stat_fb_len0);
		seq_printf(seq, "\tFallback due to length: %lu\n",
		ce_algs[i].stat_fb_srclen);
		seq_printf(seq, "\tFallback due to alignment: %lu\n",
		ce_algs[i].stat_fb_srcali);
		seq_printf(seq, "\tFallback due to SG numbers: %lu\n",
		ce_algs[i].stat_fb_maxsg);
		break;
		case CRYPTO_ALG_TYPE_RNG:
		seq_printf(seq, "%s %s %lu %lu\n",
		seq_printf(seq, "%s %s reqs=%lu bytes=%lu\n",
		ce_algs[i].alg.rng.base.cra_driver_name,
		ce_algs[i].alg.rng.base.cra_name,
		ce_algs[i].stat_req, ce_algs[i].stat_bytes);

drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c

+21 −6

Original line number	Diff line number	Diff line
		@@ -50,9 +50,9 @@ int sun8i_ce_hash_crainit(struct crypto_tfm *tfm)
		sizeof(struct sun8i_ce_hash_reqctx) +
		crypto_ahash_reqsize(op->fallback_tfm));

		dev_info(op->ce->dev, "Fallback for %s is %s\n",
		crypto_tfm_alg_driver_name(tfm),
		crypto_tfm_alg_driver_name(&op->fallback_tfm->base));
		memcpy(algt->fbname, crypto_tfm_alg_driver_name(&op->fallback_tfm->base),
		CRYPTO_MAX_ALG_NAME);

		err = pm_runtime_get_sync(op->ce->dev);
		if (err < 0)
		goto error_pm;
		@@ -199,17 +199,32 @@ static int sun8i_ce_hash_digest_fb(struct ahash_request *areq)

		static bool sun8i_ce_hash_need_fallback(struct ahash_request *areq)
		{
		struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
		struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
		struct sun8i_ce_alg_template *algt;
		struct scatterlist *sg;

		if (areq->nbytes == 0)
		algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash);

		if (areq->nbytes == 0) {
		algt->stat_fb_len0++;
		return true;
		}
		/* we need to reserve one SG for padding one */
		if (sg_nents_for_len(areq->src, areq->nbytes) > MAX_SG - 1)
		if (sg_nents_for_len(areq->src, areq->nbytes) > MAX_SG - 1) {
		algt->stat_fb_maxsg++;
		return true;
		}
		sg = areq->src;
		while (sg) {
		if (sg->length % 4 \|\| !IS_ALIGNED(sg->offset, sizeof(u32)))
		if (sg->length % 4) {
		algt->stat_fb_srclen++;
		return true;
		}
		if (!IS_ALIGNED(sg->offset, sizeof(u32))) {
		algt->stat_fb_srcali++;
		return true;
		}
		sg = sg_next(sg);
		}
		return false;

drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h

+9 −2

Original line number	Diff line number	Diff line
		@@ -333,11 +333,18 @@ struct sun8i_ce_alg_template {
		struct ahash_alg hash;
		struct rng_alg rng;
		} alg;
		#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
		unsigned long stat_req;
		unsigned long stat_fb;
		unsigned long stat_bytes;
		#endif
		unsigned long stat_fb_maxsg;
		unsigned long stat_fb_leniv;
		unsigned long stat_fb_len0;
		unsigned long stat_fb_mod16;
		unsigned long stat_fb_srcali;
		unsigned long stat_fb_srclen;
		unsigned long stat_fb_dstali;
		unsigned long stat_fb_dstlen;
		char fbname[CRYPTO_MAX_ALG_NAME];
		};

		int sun8i_ce_enqueue(struct crypto_async_request *areq, u32 type);