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 v4 08/11] crypto: crypto_user_stat: remove intermediate variable
Date: Fri, 23 Nov 2018 12:02:18 +0000 [thread overview]
Message-ID: <1542974541-23024-9-git-send-email-clabbe@baylibre.com> (raw)
In-Reply-To: <1542974541-23024-1-git-send-email-clabbe@baylibre.com>
The use of the v64 intermediate variable is useless, and removing it
bring to much readable code.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
crypto/crypto_user_stat.c | 132 ++++++++++++--------------------------
1 file changed, 41 insertions(+), 91 deletions(-)
diff --git a/crypto/crypto_user_stat.c b/crypto/crypto_user_stat.c
index 838123758423..7b668c659122 100644
--- a/crypto/crypto_user_stat.c
+++ b/crypto/crypto_user_stat.c
@@ -34,22 +34,16 @@ struct crypto_dump_info {
static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_aead raead;
- u64 v64;
memset(&raead, 0, sizeof(raead));
strscpy(raead.type, "aead", sizeof(raead.type));
- v64 = atomic64_read(&alg->encrypt_cnt);
- raead.stat_encrypt_cnt = v64;
- v64 = atomic64_read(&alg->encrypt_tlen);
- raead.stat_encrypt_tlen = v64;
- v64 = atomic64_read(&alg->decrypt_cnt);
- raead.stat_decrypt_cnt = v64;
- v64 = atomic64_read(&alg->decrypt_tlen);
- raead.stat_decrypt_tlen = v64;
- v64 = atomic64_read(&alg->aead_err_cnt);
- raead.stat_aead_err_cnt = v64;
+ raead.stat_encrypt_cnt = atomic64_read(&alg->encrypt_cnt);
+ raead.stat_encrypt_tlen = atomic64_read(&alg->encrypt_tlen);
+ raead.stat_decrypt_cnt = atomic64_read(&alg->decrypt_cnt);
+ raead.stat_decrypt_tlen = atomic64_read(&alg->decrypt_tlen);
+ raead.stat_aead_err_cnt = atomic64_read(&alg->aead_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_AEAD, sizeof(raead), &raead);
}
@@ -57,22 +51,16 @@ static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg)
static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_cipher rcipher;
- u64 v64;
memset(&rcipher, 0, sizeof(rcipher));
strscpy(rcipher.type, "cipher", sizeof(rcipher.type));
- v64 = atomic64_read(&alg->encrypt_cnt);
- rcipher.stat_encrypt_cnt = v64;
- v64 = atomic64_read(&alg->encrypt_tlen);
- rcipher.stat_encrypt_tlen = v64;
- v64 = atomic64_read(&alg->decrypt_cnt);
- rcipher.stat_decrypt_cnt = v64;
- v64 = atomic64_read(&alg->decrypt_tlen);
- rcipher.stat_decrypt_tlen = v64;
- v64 = atomic64_read(&alg->cipher_err_cnt);
- rcipher.stat_cipher_err_cnt = v64;
+ rcipher.stat_encrypt_cnt = atomic64_read(&alg->encrypt_cnt);
+ rcipher.stat_encrypt_tlen = atomic64_read(&alg->encrypt_tlen);
+ rcipher.stat_decrypt_cnt = atomic64_read(&alg->decrypt_cnt);
+ rcipher.stat_decrypt_tlen = atomic64_read(&alg->decrypt_tlen);
+ rcipher.stat_cipher_err_cnt = atomic64_read(&alg->cipher_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_CIPHER, sizeof(rcipher), &rcipher);
}
@@ -80,21 +68,15 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_compress rcomp;
- u64 v64;
memset(&rcomp, 0, sizeof(rcomp));
strscpy(rcomp.type, "compression", sizeof(rcomp.type));
- v64 = atomic64_read(&alg->compress_cnt);
- rcomp.stat_compress_cnt = v64;
- v64 = atomic64_read(&alg->compress_tlen);
- rcomp.stat_compress_tlen = v64;
- v64 = atomic64_read(&alg->decompress_cnt);
- rcomp.stat_decompress_cnt = v64;
- v64 = atomic64_read(&alg->decompress_tlen);
- rcomp.stat_decompress_tlen = v64;
- v64 = atomic64_read(&alg->compress_err_cnt);
- rcomp.stat_compress_err_cnt = v64;
+ rcomp.stat_compress_cnt = atomic64_read(&alg->compress_cnt);
+ rcomp.stat_compress_tlen = atomic64_read(&alg->compress_tlen);
+ rcomp.stat_decompress_cnt = atomic64_read(&alg->decompress_cnt);
+ rcomp.stat_decompress_tlen = atomic64_read(&alg->decompress_tlen);
+ rcomp.stat_compress_err_cnt = atomic64_read(&alg->compress_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_COMPRESS, sizeof(rcomp), &rcomp);
}
@@ -102,21 +84,15 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_compress racomp;
- u64 v64;
memset(&racomp, 0, sizeof(racomp));
strscpy(racomp.type, "acomp", sizeof(racomp.type));
- v64 = atomic64_read(&alg->compress_cnt);
- racomp.stat_compress_cnt = v64;
- v64 = atomic64_read(&alg->compress_tlen);
- racomp.stat_compress_tlen = v64;
- v64 = atomic64_read(&alg->decompress_cnt);
- racomp.stat_decompress_cnt = v64;
- v64 = atomic64_read(&alg->decompress_tlen);
- racomp.stat_decompress_tlen = v64;
- v64 = atomic64_read(&alg->compress_err_cnt);
- racomp.stat_compress_err_cnt = v64;
+ racomp.stat_compress_cnt = atomic64_read(&alg->compress_cnt);
+ racomp.stat_compress_tlen = atomic64_read(&alg->compress_tlen);
+ racomp.stat_decompress_cnt = atomic64_read(&alg->decompress_cnt);
+ racomp.stat_decompress_tlen = atomic64_read(&alg->decompress_tlen);
+ racomp.stat_compress_err_cnt = atomic64_read(&alg->compress_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_ACOMP, sizeof(racomp), &racomp);
}
@@ -124,25 +100,17 @@ static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_akcipher rakcipher;
- u64 v64;
memset(&rakcipher, 0, sizeof(rakcipher));
strscpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
- v64 = atomic64_read(&alg->encrypt_cnt);
- rakcipher.stat_encrypt_cnt = v64;
- v64 = atomic64_read(&alg->encrypt_tlen);
- rakcipher.stat_encrypt_tlen = v64;
- v64 = atomic64_read(&alg->decrypt_cnt);
- rakcipher.stat_decrypt_cnt = v64;
- v64 = atomic64_read(&alg->decrypt_tlen);
- rakcipher.stat_decrypt_tlen = v64;
- v64 = atomic64_read(&alg->sign_cnt);
- rakcipher.stat_sign_cnt = v64;
- v64 = atomic64_read(&alg->verify_cnt);
- rakcipher.stat_verify_cnt = v64;
- v64 = atomic64_read(&alg->akcipher_err_cnt);
- rakcipher.stat_akcipher_err_cnt = v64;
+ rakcipher.stat_encrypt_cnt = atomic64_read(&alg->encrypt_cnt);
+ rakcipher.stat_encrypt_tlen = atomic64_read(&alg->encrypt_tlen);
+ rakcipher.stat_decrypt_cnt = atomic64_read(&alg->decrypt_cnt);
+ rakcipher.stat_decrypt_tlen = atomic64_read(&alg->decrypt_tlen);
+ rakcipher.stat_sign_cnt = atomic64_read(&alg->sign_cnt);
+ rakcipher.stat_verify_cnt = atomic64_read(&alg->verify_cnt);
+ rakcipher.stat_akcipher_err_cnt = atomic64_read(&alg->akcipher_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_AKCIPHER,
sizeof(rakcipher), &rakcipher);
@@ -151,20 +119,15 @@ static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_kpp rkpp;
- u64 v;
memset(&rkpp, 0, sizeof(rkpp));
strscpy(rkpp.type, "kpp", sizeof(rkpp.type));
- v = atomic64_read(&alg->setsecret_cnt);
- rkpp.stat_setsecret_cnt = v;
- v = atomic64_read(&alg->generate_public_key_cnt);
- rkpp.stat_generate_public_key_cnt = v;
- v = atomic64_read(&alg->compute_shared_secret_cnt);
- rkpp.stat_compute_shared_secret_cnt = v;
- v = atomic64_read(&alg->kpp_err_cnt);
- rkpp.stat_kpp_err_cnt = v;
+ rkpp.stat_setsecret_cnt = atomic64_read(&alg->setsecret_cnt);
+ rkpp.stat_generate_public_key_cnt = atomic64_read(&alg->generate_public_key_cnt);
+ rkpp.stat_compute_shared_secret_cnt = atomic64_read(&alg->compute_shared_secret_cnt);
+ rkpp.stat_kpp_err_cnt = atomic64_read(&alg->kpp_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_KPP, sizeof(rkpp), &rkpp);
}
@@ -172,18 +135,14 @@ static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_hash rhash;
- u64 v64;
memset(&rhash, 0, sizeof(rhash));
strscpy(rhash.type, "ahash", sizeof(rhash.type));
- v64 = atomic64_read(&alg->hash_cnt);
- rhash.stat_hash_cnt = v64;
- v64 = atomic64_read(&alg->hash_tlen);
- rhash.stat_hash_tlen = v64;
- v64 = atomic64_read(&alg->hash_err_cnt);
- rhash.stat_hash_err_cnt = v64;
+ rhash.stat_hash_cnt = atomic64_read(&alg->hash_cnt);
+ rhash.stat_hash_tlen = atomic64_read(&alg->hash_tlen);
+ rhash.stat_hash_err_cnt = atomic64_read(&alg->hash_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);
}
@@ -191,18 +150,14 @@ static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)
static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_hash rhash;
- u64 v64;
memset(&rhash, 0, sizeof(rhash));
strscpy(rhash.type, "shash", sizeof(rhash.type));
- v64 = atomic64_read(&alg->hash_cnt);
- rhash.stat_hash_cnt = v64;
- v64 = atomic64_read(&alg->hash_tlen);
- rhash.stat_hash_tlen = v64;
- v64 = atomic64_read(&alg->hash_err_cnt);
- rhash.stat_hash_err_cnt = v64;
+ rhash.stat_hash_cnt = atomic64_read(&alg->hash_cnt);
+ rhash.stat_hash_tlen = atomic64_read(&alg->hash_tlen);
+ rhash.stat_hash_err_cnt = atomic64_read(&alg->hash_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);
}
@@ -210,20 +165,15 @@ static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)
static int crypto_report_rng(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat_rng rrng;
- u64 v64;
memset(&rrng, 0, sizeof(rrng));
strscpy(rrng.type, "rng", sizeof(rrng.type));
- v64 = atomic64_read(&alg->generate_cnt);
- rrng.stat_generate_cnt = v64;
- v64 = atomic64_read(&alg->generate_tlen);
- rrng.stat_generate_tlen = v64;
- v64 = atomic64_read(&alg->seed_cnt);
- rrng.stat_seed_cnt = v64;
- v64 = atomic64_read(&alg->rng_err_cnt);
- rrng.stat_rng_err_cnt = v64;
+ rrng.stat_generate_cnt = atomic64_read(&alg->generate_cnt);
+ rrng.stat_generate_tlen = atomic64_read(&alg->generate_tlen);
+ rrng.stat_seed_cnt = atomic64_read(&alg->seed_cnt);
+ rrng.stat_rng_err_cnt = atomic64_read(&alg->rng_err_cnt);
return nla_put(skb, CRYPTOCFGA_STAT_RNG, sizeof(rrng), &rrng);
}
--
2.18.1
next prev parent reply other threads:[~2018-11-23 12:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-23 12:02 [PATCH v4 00/11] crypto: crypto_user_stat: misc enhancement Corentin Labbe
2018-11-23 12:02 ` [PATCH v4 01/11] crypto: crypto_user_stat: made crypto_user_stat optional Corentin Labbe
2018-11-23 12:02 ` [PATCH v4 02/11] crypto: CRYPTO_STATS should depend on CRYPTO_USER Corentin Labbe
2018-11-23 12:02 ` [PATCH v4 03/11] crypto: crypto_user_stat: convert all stats from u32 to u64 Corentin Labbe
2018-11-23 12:02 ` [PATCH v4 04/11] crypto: crypto_user_stat: split user space crypto stat structures Corentin Labbe
2018-11-23 12:02 ` [PATCH v4 05/11] crypto: tool: getstat: convert user space example to the new crypto_user_stat uapi Corentin Labbe
2018-11-23 12:02 ` [PATCH v4 06/11] crypto: crypto_user_stat: fix use_after_free of struct xxx_request Corentin Labbe
2018-11-28 23:17 ` Eric Biggers
2018-11-23 12:02 ` [PATCH v4 07/11] crypto: crypto_user_stat: Fix invalid stat reporting Corentin Labbe
2018-11-23 12:02 ` Corentin Labbe [this message]
2018-11-23 12:02 ` [PATCH v4 09/11] crypto: crypto_user_stat: Split stats in multiple structures Corentin Labbe
2018-11-23 12:02 ` [PATCH v4 10/11] crypto: crypto_user_stat: rename err_cnt parameter Corentin Labbe
2018-11-23 12:02 ` [PATCH v4 11/11] crypto: crypto_user_stat: Add crypto_stats_init Corentin Labbe
2018-11-23 18:07 ` [PATCH v4 00/11] crypto: crypto_user_stat: misc enhancement Neil Horman
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=1542974541-23024-9-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).