From: Eric Biggers <ebiggers@kernel.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Linux Crypto Mailing List <linux-crypto@vger.kernel.org>
Subject: Re: [PATCH 2/10] crypto: aead - Count error stats differently
Date: Wed, 15 Feb 2023 21:45:13 -0800 [thread overview]
Message-ID: <Y+3C6f/W4fHtVgnM@sol.localdomain> (raw)
In-Reply-To: <E1pSE2H-00BVkZ-8X@formenos.hmeau.com>
A couple more comments:
On Wed, Feb 15, 2023 at 05:25:09PM +0800, Herbert Xu wrote:
> +static int crypto_aead_report_stat(struct sk_buff *skb, struct crypto_alg *alg)
> + __maybe_unused;
> +static int crypto_aead_report_stat(struct sk_buff *skb, struct crypto_alg *alg)
This could be just:
static int __maybe_unused
crypto_aead_report_stat(struct sk_buff *skb, struct crypto_alg *alg)
> +{
> + struct aead_alg *aead = container_of(alg, struct aead_alg, base);
> + struct crypto_istat_aead *istat = aead_get_stat(aead);
> + struct crypto_stat_aead raead;
> +
> + memset(&raead, 0, sizeof(raead));
> +
> + strscpy(raead.type, "aead", sizeof(raead.type));
> +
> + raead.stat_encrypt_cnt = atomic64_read(&istat->encrypt_cnt);
> + raead.stat_encrypt_tlen = atomic64_read(&istat->encrypt_tlen);
> + raead.stat_decrypt_cnt = atomic64_read(&istat->decrypt_cnt);
> + raead.stat_decrypt_tlen = atomic64_read(&istat->decrypt_tlen);
> + raead.stat_err_cnt = atomic64_read(&istat->err_cnt);
> +
> + return nla_put(skb, CRYPTOCFGA_STAT_AEAD, sizeof(raead), &raead);
> +}
But actually it might be better to keep #ifdef-ing this whole function out when
!CONFIG_CRYPTO_STATS, since in that case it contains an unconditional null
pointer dereference. Yes, it's not executed, but it might be confusing.
> static int aead_prepare_alg(struct aead_alg *alg)
> {
> + struct crypto_istat_aead *istat = aead_get_stat(alg);
> struct crypto_alg *base = &alg->base;
>
> if (max3(alg->maxauthsize, alg->ivsize, alg->chunksize) >
> @@ -232,6 +292,9 @@ static int aead_prepare_alg(struct aead_alg *alg)
> base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;
> base->cra_flags |= CRYPTO_ALG_TYPE_AEAD;
>
> + if (IS_ENABLED(CONFIG_CRYPTO_STATS))
> + memset(istat, 0, sizeof(*istat));
> +
Above is another place that can just do 'if (istat)'.
- Eric
next prev parent reply other threads:[~2023-02-16 5:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 9:24 [PATCH 0/10] crypto: api - Restructure stats code Herbert Xu
2023-02-15 9:25 ` [PATCH 1/10] crypto: algapi - Move stat reporting into algapi Herbert Xu
2023-02-15 9:25 ` [PATCH 2/10] crypto: aead - Count error stats differently Herbert Xu
2023-02-16 5:35 ` Eric Biggers
2023-02-16 5:58 ` Herbert Xu
2023-02-16 5:45 ` Eric Biggers [this message]
2023-02-16 6:00 ` Herbert Xu
2023-02-16 6:31 ` Eric Biggers
2023-02-16 8:34 ` Herbert Xu
2023-02-15 9:25 ` [PATCH 3/10] crypto: akcipher " Herbert Xu
2023-02-15 9:25 ` [PATCH 4/10] crypto: hash " Herbert Xu
2023-02-16 5:58 ` Eric Biggers
2023-02-16 6:02 ` Herbert Xu
2023-02-16 6:14 ` Eric Biggers
2023-02-16 8:09 ` Herbert Xu
2023-02-15 9:25 ` [PATCH 5/10] crypto: acomp " Herbert Xu
2023-02-15 9:25 ` [PATCH 6/10] crypto: kpp " Herbert Xu
2023-02-15 9:25 ` [PATCH 7/10] crypto: skcipher " Herbert Xu
2023-02-15 9:25 ` [PATCH 8/10] crypto: rng " Herbert Xu
2023-02-16 5:46 ` Eric Biggers
2023-02-16 5:56 ` Herbert Xu
2023-02-16 6:01 ` Eric Biggers
2023-02-15 9:25 ` [PATCH 9/10] crypto: api - Move MODULE_ALIAS_CRYPTO to algapi.h Herbert Xu
2023-02-16 5:17 ` Eric Biggers
2023-02-16 5:18 ` Herbert Xu
2023-02-15 9:25 ` [PATCH 10/10] crypto: api - Check CRYPTO_USER instead of NET for report Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y+3C6f/W4fHtVgnM@sol.localdomain \
--to=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox