From: Corentin Labbe <clabbe@baylibre.com>
To: davem@davemloft.net, ebiggers@kernel.org,
herbert@gondor.apana.org.au, nhorman@tuxdriver.com
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH v5 11/11] crypto: crypto_user_stat: Add crypto_stats_init
Date: Thu, 29 Nov 2018 14:42:26 +0000 [thread overview]
Message-ID: <1543502546-23870-12-git-send-email-clabbe@baylibre.com> (raw)
In-Reply-To: <1543502546-23870-1-git-send-email-clabbe@baylibre.com>
This patch add the crypto_stats_init() function.
This will permit to remove some ifdef from __crypto_register_alg().
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
crypto/algapi.c | 10 +++++++---
include/linux/crypto.h | 3 +++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/crypto/algapi.c b/crypto/algapi.c
index c0d4f9ef6b0f..8b65ada33e5d 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -258,9 +258,7 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
list_add(&alg->cra_list, &crypto_alg_list);
list_add(&larval->alg.cra_list, &crypto_alg_list);
-#ifdef CONFIG_CRYPTO_STATS
- memset(&alg->stats, 0, sizeof(alg->stats));
-#endif
+ crypto_stats_init(alg);
out:
return larval;
@@ -1073,6 +1071,12 @@ int crypto_type_has_alg(const char *name, const struct crypto_type *frontend,
EXPORT_SYMBOL_GPL(crypto_type_has_alg);
#ifdef CONFIG_CRYPTO_STATS
+void crypto_stats_init(struct crypto_alg *alg)
+{
+ memset(&alg->stats, 0, sizeof(alg->stats));
+}
+EXPORT_SYMBOL_GPL(crypto_stats_init);
+
void crypto_stats_get(struct crypto_alg *alg)
{
crypto_alg_get(alg);
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index a2967c1a08b1..9850b41e38ae 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -614,6 +614,7 @@ struct crypto_alg {
} CRYPTO_MINALIGN_ATTR;
#ifdef CONFIG_CRYPTO_STATS
+void crypto_stats_init(struct crypto_alg *alg);
void crypto_stats_get(struct crypto_alg *alg);
void crypto_stats_ablkcipher_encrypt(unsigned int nbytes, int ret, struct crypto_alg *alg);
void crypto_stats_ablkcipher_decrypt(unsigned int nbytes, int ret, struct crypto_alg *alg);
@@ -635,6 +636,8 @@ void crypto_stats_rng_generate(struct crypto_alg *alg, unsigned int dlen, int re
void crypto_stats_skcipher_encrypt(unsigned int cryptlen, int ret, struct crypto_alg *alg);
void crypto_stats_skcipher_decrypt(unsigned int cryptlen, int ret, struct crypto_alg *alg);
#else
+static inline void crypto_stats_init(struct crypto_alg *alg)
+{}
static inline void crypto_stats_get(struct crypto_alg *alg)
{}
static inline void crypto_stats_ablkcipher_encrypt(unsigned int nbytes, int ret, struct crypto_alg *alg)
--
2.18.1
next prev parent reply other threads:[~2018-11-29 14:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-29 14:42 [PATCH v5 00/11] crypto: crypto_user_stat: misc enhancement Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 01/11] crypto: crypto_user_stat: made crypto_user_stat optional Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 02/11] crypto: CRYPTO_STATS should depend on CRYPTO_USER Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 03/11] crypto: crypto_user_stat: convert all stats from u32 to u64 Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 04/11] crypto: crypto_user_stat: split user space crypto stat structures Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 05/11] crypto: tool: getstat: convert user space example to the new crypto_user_stat uapi Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 06/11] crypto: crypto_user_stat: fix use_after_free of struct xxx_request Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 07/11] crypto: crypto_user_stat: Fix invalid stat reporting Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 08/11] crypto: crypto_user_stat: remove intermediate variable Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 09/11] crypto: crypto_user_stat: Split stats in multiple structures Corentin Labbe
2018-11-29 14:42 ` [PATCH v5 10/11] crypto: crypto_user_stat: rename err_cnt parameter Corentin Labbe
2018-11-29 14:42 ` Corentin Labbe [this message]
2018-11-29 18:16 ` [PATCH v5 00/11] crypto: crypto_user_stat: misc enhancement Eric Biggers
2018-12-01 8:46 ` Herbert Xu
2018-12-07 5:50 ` Herbert Xu
2018-12-07 6:18 ` 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=1543502546-23870-12-git-send-email-clabbe@baylibre.com \
--to=clabbe@baylibre.com \
--cc=davem@davemloft.net \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
/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;
as well as URLs for NNTP newsgroup(s).