Le Fri, Apr 25, 2025 at 03:45:16PM +0300, Ovidiu Panait a écrit :
> Add IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG) checks before the
> fallback counter updates to make sure the code is not included when
> debugfs statistics support is not enabled.
>
> Also, drop the existing ifdef guards, since 'struct sun8i_ce_alg_template'
> is always defined, even with CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG disabled.
>
> Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@xxxxxxxxx>
> ---
> .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 46 ++++++++++++-------
> 1 file changed, 30 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
> index f03a8fa7bfa2..433cd18f0b5b 100644
> --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
> +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
> @@ -34,22 +34,30 @@ static int sun8i_ce_cipher_need_fallback(struct skcipher_request *areq)
>
> if (sg_nents_for_len(areq->src, areq->cryptlen) > MAX_SG ||
> sg_nents_for_len(areq->dst, areq->cryptlen) > MAX_SG) {
> - algt->stat_fb_maxsg++;
> + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG))
> + algt->stat_fb_maxsg++;
> +
> return true;
> }
>
> if (areq->cryptlen < crypto_skcipher_ivsize(tfm)) {
> - algt->stat_fb_leniv++;
> + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG))
> + algt->stat_fb_leniv++;
> +
> return true;
> }
>
> if (areq->cryptlen == 0) {
> - algt->stat_fb_len0++;
> + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG))
> + algt->stat_fb_len0++;
> +
> return true;
> }
>
> if (areq->cryptlen % 16) {
> - algt->stat_fb_mod16++;
> + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG))
> + algt->stat_fb_mod16++;
> +
> return true;
> }
>
> @@ -57,12 +65,16 @@ static int sun8i_ce_cipher_need_fallback(struct skcipher_request *areq)
> sg = areq->src;
> while (sg) {
> if (!IS_ALIGNED(sg->offset, sizeof(u32))) {
> - algt->stat_fb_srcali++;
> + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG))
> + algt->stat_fb_srcali++;
> +
> return true;
> }
> todo = min(len, sg->length);
> if (todo % 4) {
> - algt->stat_fb_srclen++;
> + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG))
> + algt->stat_fb_srclen++;
> +
> return true;
> }
> len -= todo;
> @@ -73,12 +85,16 @@ static int sun8i_ce_cipher_need_fallback(struct skcipher_request *areq)
> sg = areq->dst;
> while (sg) {
> if (!IS_ALIGNED(sg->offset, sizeof(u32))) {
> - algt->stat_fb_dstali++;
> + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG))
> + algt->stat_fb_dstali++;
> +
> return true;
> }
> todo = min(len, sg->length);
> if (todo % 4) {
> - algt->stat_fb_dstlen++;
> + if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG))
> + algt->stat_fb_dstlen++;
> +
> return true;
> }
> len -= todo;
> @@ -101,9 +117,7 @@ static int sun8i_ce_cipher_fallback(struct skcipher_request *areq)
> algt = container_of(alg, struct sun8i_ce_alg_template,
> alg.skcipher.base);
>
> -#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
> algt->stat_fb++;
> -#endif
Hello
You put IS_ENABLED everywhere, but here you remove it, why ?
I think you forgot it.
Thanks
Regards
