crypto: user - convert all stats from u32 to u64

All the 32-bit fields need to be 64-bit.  In some cases, UINT32_MAX crypto
operations can be done in seconds.

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

diff --git a/crypto/algapi.c b/crypto/algapi.c
index f5396c88e8cd176c70b09027442bc097d59ca530..42fe316f80eeade100ea8080c4076e71dfc11995 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -259,13 +259,13 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
        list_add(&larval->alg.cra_list, &crypto_alg_list);
 
 #ifdef CONFIG_CRYPTO_STATS
-       atomic_set(&alg->encrypt_cnt, 0);
-       atomic_set(&alg->decrypt_cnt, 0);
+       atomic64_set(&alg->encrypt_cnt, 0);
+       atomic64_set(&alg->decrypt_cnt, 0);
        atomic64_set(&alg->encrypt_tlen, 0);
        atomic64_set(&alg->decrypt_tlen, 0);
-       atomic_set(&alg->verify_cnt, 0);
-       atomic_set(&alg->cipher_err_cnt, 0);
-       atomic_set(&alg->sign_cnt, 0);
+       atomic64_set(&alg->verify_cnt, 0);
+       atomic64_set(&alg->cipher_err_cnt, 0);
+       atomic64_set(&alg->sign_cnt, 0);
 #endif
 
 out:

diff --git a/crypto/crypto_user_stat.c b/crypto/crypto_user_stat.c
index a6fb2e6f618df42a53c03e1602363ae6f8d61f8b..352569f378a0ad70ea0fffb96f8e8864710f346c 100644 (file)
--- a/crypto/crypto_user_stat.c
+++ b/crypto/crypto_user_stat.c
@@ -35,22 +35,21 @@ static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_stat raead;
        u64 v64;
-       u32 v32;
 
        memset(&raead, 0, sizeof(raead));
 
        strscpy(raead.type, "aead", sizeof(raead.type));
 
-       v32 = atomic_read(&alg->encrypt_cnt);
-       raead.stat_encrypt_cnt = v32;
+       v64 = atomic64_read(&alg->encrypt_cnt);
+       raead.stat_encrypt_cnt = v64;
        v64 = atomic64_read(&alg->encrypt_tlen);
        raead.stat_encrypt_tlen = v64;
-       v32 = atomic_read(&alg->decrypt_cnt);
-       raead.stat_decrypt_cnt = v32;
+       v64 = atomic64_read(&alg->decrypt_cnt);
+       raead.stat_decrypt_cnt = v64;
        v64 = atomic64_read(&alg->decrypt_tlen);
        raead.stat_decrypt_tlen = v64;
-       v32 = atomic_read(&alg->aead_err_cnt);
-       raead.stat_aead_err_cnt = v32;
+       v64 = atomic64_read(&alg->aead_err_cnt);
+       raead.stat_aead_err_cnt = v64;
 
        return nla_put(skb, CRYPTOCFGA_STAT_AEAD, sizeof(raead), &raead);
 }
@@ -59,22 +58,21 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_stat rcipher;
        u64 v64;
-       u32 v32;
 
        memset(&rcipher, 0, sizeof(rcipher));
 
        strscpy(rcipher.type, "cipher", sizeof(rcipher.type));
 
-       v32 = atomic_read(&alg->encrypt_cnt);
-       rcipher.stat_encrypt_cnt = v32;
+       v64 = atomic64_read(&alg->encrypt_cnt);
+       rcipher.stat_encrypt_cnt = v64;
        v64 = atomic64_read(&alg->encrypt_tlen);
        rcipher.stat_encrypt_tlen = v64;
-       v32 = atomic_read(&alg->decrypt_cnt);
-       rcipher.stat_decrypt_cnt = v32;
+       v64 = atomic64_read(&alg->decrypt_cnt);
+       rcipher.stat_decrypt_cnt = v64;
        v64 = atomic64_read(&alg->decrypt_tlen);
        rcipher.stat_decrypt_tlen = v64;
-       v32 = atomic_read(&alg->cipher_err_cnt);
-       rcipher.stat_cipher_err_cnt = v32;
+       v64 = atomic64_read(&alg->cipher_err_cnt);
+       rcipher.stat_cipher_err_cnt = v64;
 
        return nla_put(skb, CRYPTOCFGA_STAT_CIPHER, sizeof(rcipher), &rcipher);
 }
@@ -83,21 +81,20 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_stat rcomp;
        u64 v64;
-       u32 v32;
 
        memset(&rcomp, 0, sizeof(rcomp));
 
        strscpy(rcomp.type, "compression", sizeof(rcomp.type));
-       v32 = atomic_read(&alg->compress_cnt);
-       rcomp.stat_compress_cnt = v32;
+       v64 = atomic64_read(&alg->compress_cnt);
+       rcomp.stat_compress_cnt = v64;
        v64 = atomic64_read(&alg->compress_tlen);
        rcomp.stat_compress_tlen = v64;
-       v32 = atomic_read(&alg->decompress_cnt);
-       rcomp.stat_decompress_cnt = v32;
+       v64 = atomic64_read(&alg->decompress_cnt);
+       rcomp.stat_decompress_cnt = v64;
        v64 = atomic64_read(&alg->decompress_tlen);
        rcomp.stat_decompress_tlen = v64;
-       v32 = atomic_read(&alg->cipher_err_cnt);
-       rcomp.stat_compress_err_cnt = v32;
+       v64 = atomic64_read(&alg->cipher_err_cnt);
+       rcomp.stat_compress_err_cnt = v64;
 
        return nla_put(skb, CRYPTOCFGA_STAT_COMPRESS, sizeof(rcomp), &rcomp);
 }
@@ -106,21 +103,20 @@ static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_stat racomp;
        u64 v64;
-       u32 v32;
 
        memset(&racomp, 0, sizeof(racomp));
 
        strscpy(racomp.type, "acomp", sizeof(racomp.type));
-       v32 = atomic_read(&alg->compress_cnt);
-       racomp.stat_compress_cnt = v32;
+       v64 = atomic64_read(&alg->compress_cnt);
+       racomp.stat_compress_cnt = v64;
        v64 = atomic64_read(&alg->compress_tlen);
        racomp.stat_compress_tlen = v64;
-       v32 = atomic_read(&alg->decompress_cnt);
-       racomp.stat_decompress_cnt = v32;
+       v64 = atomic64_read(&alg->decompress_cnt);
+       racomp.stat_decompress_cnt = v64;
        v64 = atomic64_read(&alg->decompress_tlen);
        racomp.stat_decompress_tlen = v64;
-       v32 = atomic_read(&alg->cipher_err_cnt);
-       racomp.stat_compress_err_cnt = v32;
+       v64 = atomic64_read(&alg->cipher_err_cnt);
+       racomp.stat_compress_err_cnt = v64;
 
        return nla_put(skb, CRYPTOCFGA_STAT_ACOMP, sizeof(racomp), &racomp);
 }
@@ -129,25 +125,24 @@ static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_stat rakcipher;
        u64 v64;
-       u32 v32;
 
        memset(&rakcipher, 0, sizeof(rakcipher));
 
        strscpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
-       v32 = atomic_read(&alg->encrypt_cnt);
-       rakcipher.stat_encrypt_cnt = v32;
+       v64 = atomic64_read(&alg->encrypt_cnt);
+       rakcipher.stat_encrypt_cnt = v64;
        v64 = atomic64_read(&alg->encrypt_tlen);
        rakcipher.stat_encrypt_tlen = v64;
-       v32 = atomic_read(&alg->decrypt_cnt);
-       rakcipher.stat_decrypt_cnt = v32;
+       v64 = atomic64_read(&alg->decrypt_cnt);
+       rakcipher.stat_decrypt_cnt = v64;
        v64 = atomic64_read(&alg->decrypt_tlen);
        rakcipher.stat_decrypt_tlen = v64;
-       v32 = atomic_read(&alg->sign_cnt);
-       rakcipher.stat_sign_cnt = v32;
-       v32 = atomic_read(&alg->verify_cnt);
-       rakcipher.stat_verify_cnt = v32;
-       v32 = atomic_read(&alg->akcipher_err_cnt);
-       rakcipher.stat_akcipher_err_cnt = v32;
+       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;
 
        return nla_put(skb, CRYPTOCFGA_STAT_AKCIPHER,
                       sizeof(rakcipher), &rakcipher);
@@ -156,19 +151,19 @@ 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 rkpp;
-       u32 v;
+       u64 v;
 
        memset(&rkpp, 0, sizeof(rkpp));
 
        strscpy(rkpp.type, "kpp", sizeof(rkpp.type));
 
-       v = atomic_read(&alg->setsecret_cnt);
+       v = atomic64_read(&alg->setsecret_cnt);
        rkpp.stat_setsecret_cnt = v;
-       v = atomic_read(&alg->generate_public_key_cnt);
+       v = atomic64_read(&alg->generate_public_key_cnt);
        rkpp.stat_generate_public_key_cnt = v;
-       v = atomic_read(&alg->compute_shared_secret_cnt);
+       v = atomic64_read(&alg->compute_shared_secret_cnt);
        rkpp.stat_compute_shared_secret_cnt = v;
-       v = atomic_read(&alg->kpp_err_cnt);
+       v = atomic64_read(&alg->kpp_err_cnt);
        rkpp.stat_kpp_err_cnt = v;
 
        return nla_put(skb, CRYPTOCFGA_STAT_KPP, sizeof(rkpp), &rkpp);
@@ -178,18 +173,17 @@ static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_stat rhash;
        u64 v64;
-       u32 v32;
 
        memset(&rhash, 0, sizeof(rhash));
 
        strscpy(rhash.type, "ahash", sizeof(rhash.type));
 
-       v32 = atomic_read(&alg->hash_cnt);
-       rhash.stat_hash_cnt = v32;
+       v64 = atomic64_read(&alg->hash_cnt);
+       rhash.stat_hash_cnt = v64;
        v64 = atomic64_read(&alg->hash_tlen);
        rhash.stat_hash_tlen = v64;
-       v32 = atomic_read(&alg->hash_err_cnt);
-       rhash.stat_hash_err_cnt = v32;
+       v64 = atomic64_read(&alg->hash_err_cnt);
+       rhash.stat_hash_err_cnt = v64;
 
        return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);
 }
@@ -198,18 +192,17 @@ static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_stat rhash;
        u64 v64;
-       u32 v32;
 
        memset(&rhash, 0, sizeof(rhash));
 
        strscpy(rhash.type, "shash", sizeof(rhash.type));
 
-       v32 = atomic_read(&alg->hash_cnt);
-       rhash.stat_hash_cnt = v32;
+       v64 = atomic64_read(&alg->hash_cnt);
+       rhash.stat_hash_cnt = v64;
        v64 = atomic64_read(&alg->hash_tlen);
        rhash.stat_hash_tlen = v64;
-       v32 = atomic_read(&alg->hash_err_cnt);
-       rhash.stat_hash_err_cnt = v32;
+       v64 = atomic64_read(&alg->hash_err_cnt);
+       rhash.stat_hash_err_cnt = v64;
 
        return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);
 }
@@ -218,20 +211,19 @@ static int crypto_report_rng(struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_stat rrng;
        u64 v64;
-       u32 v32;
 
        memset(&rrng, 0, sizeof(rrng));
 
        strscpy(rrng.type, "rng", sizeof(rrng.type));
 
-       v32 = atomic_read(&alg->generate_cnt);
-       rrng.stat_generate_cnt = v32;
+       v64 = atomic64_read(&alg->generate_cnt);
+       rrng.stat_generate_cnt = v64;
        v64 = atomic64_read(&alg->generate_tlen);
        rrng.stat_generate_tlen = v64;
-       v32 = atomic_read(&alg->seed_cnt);
-       rrng.stat_seed_cnt = v32;
-       v32 = atomic_read(&alg->hash_err_cnt);
-       rrng.stat_rng_err_cnt = v32;
+       v64 = atomic64_read(&alg->seed_cnt);
+       rrng.stat_seed_cnt = v64;
+       v64 = atomic64_read(&alg->hash_err_cnt);
+       rrng.stat_rng_err_cnt = v64;
 
        return nla_put(skb, CRYPTOCFGA_STAT_RNG, sizeof(rrng), &rrng);
 }

diff --git a/include/crypto/acompress.h b/include/crypto/acompress.h
index 22e6f412c595a117a3ea9247cf712ce374823460..f799181968119d6cea241e9c0ce115148680308b 100644 (file)
--- a/include/crypto/acompress.h
+++ b/include/crypto/acompress.h
@@ -240,9 +240,9 @@ static inline void crypto_stat_compress(struct acomp_req *req, int ret)
        struct crypto_acomp *tfm = crypto_acomp_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&tfm->base.__crt_alg->compress_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->compress_err_cnt);
        } else {
-               atomic_inc(&tfm->base.__crt_alg->compress_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->compress_cnt);
                atomic64_add(req->slen, &tfm->base.__crt_alg->compress_tlen);
        }
 #endif
@@ -254,9 +254,9 @@ static inline void crypto_stat_decompress(struct acomp_req *req, int ret)
        struct crypto_acomp *tfm = crypto_acomp_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&tfm->base.__crt_alg->compress_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->compress_err_cnt);
        } else {
-               atomic_inc(&tfm->base.__crt_alg->decompress_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->decompress_cnt);
                atomic64_add(req->slen, &tfm->base.__crt_alg->decompress_tlen);
        }
 #endif

diff --git a/include/crypto/aead.h b/include/crypto/aead.h
index 0d765d7bfb82715d381eb3c093452f1cd41572ba..99afd78c665d8f3920b465c2029da91a8b57d557 100644 (file)
--- a/include/crypto/aead.h
+++ b/include/crypto/aead.h
@@ -312,9 +312,9 @@ static inline void crypto_stat_aead_encrypt(struct aead_request *req, int ret)
        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&tfm->base.__crt_alg->aead_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->aead_err_cnt);
        } else {
-               atomic_inc(&tfm->base.__crt_alg->encrypt_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->encrypt_cnt);
                atomic64_add(req->cryptlen, &tfm->base.__crt_alg->encrypt_tlen);
        }
 #endif
@@ -326,9 +326,9 @@ static inline void crypto_stat_aead_decrypt(struct aead_request *req, int ret)
        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&tfm->base.__crt_alg->aead_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->aead_err_cnt);
        } else {
-               atomic_inc(&tfm->base.__crt_alg->decrypt_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->decrypt_cnt);
                atomic64_add(req->cryptlen, &tfm->base.__crt_alg->decrypt_tlen);
        }
 #endif

diff --git a/include/crypto/akcipher.h b/include/crypto/akcipher.h
index afac711193968f6072966f9757066b350d0d0fb3..3dc05cf7e0a952cb3c362b70d46f8e6a28a0c814 100644 (file)
--- a/include/crypto/akcipher.h
+++ b/include/crypto/akcipher.h
@@ -278,9 +278,9 @@ static inline void crypto_stat_akcipher_encrypt(struct akcipher_request *req,
        struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&tfm->base.__crt_alg->akcipher_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->akcipher_err_cnt);
        } else {
-               atomic_inc(&tfm->base.__crt_alg->encrypt_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->encrypt_cnt);
                atomic64_add(req->src_len, &tfm->base.__crt_alg->encrypt_tlen);
        }
 #endif
@@ -293,9 +293,9 @@ static inline void crypto_stat_akcipher_decrypt(struct akcipher_request *req,
        struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&tfm->base.__crt_alg->akcipher_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->akcipher_err_cnt);
        } else {
-               atomic_inc(&tfm->base.__crt_alg->decrypt_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->decrypt_cnt);
                atomic64_add(req->src_len, &tfm->base.__crt_alg->decrypt_tlen);
        }
 #endif
@@ -308,9 +308,9 @@ static inline void crypto_stat_akcipher_sign(struct akcipher_request *req,
        struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic_inc(&tfm->base.__crt_alg->akcipher_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->akcipher_err_cnt);
        else
-               atomic_inc(&tfm->base.__crt_alg->sign_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->sign_cnt);
 #endif
 }
 
@@ -321,9 +321,9 @@ static inline void crypto_stat_akcipher_verify(struct akcipher_request *req,
        struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic_inc(&tfm->base.__crt_alg->akcipher_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->akcipher_err_cnt);
        else
-               atomic_inc(&tfm->base.__crt_alg->verify_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->verify_cnt);
 #endif
 }
 

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index bc7796600338518a96ecfe5912a5e41aa571eeeb..52920bed05bad6ddac512e6824094571e6171713 100644 (file)
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -418,7 +418,7 @@ static inline void crypto_stat_ahash_update(struct ahash_request *req, int ret)
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic_inc(&tfm->base.__crt_alg->hash_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->hash_err_cnt);
        else
                atomic64_add(req->nbytes, &tfm->base.__crt_alg->hash_tlen);
 #endif
@@ -430,9 +430,9 @@ static inline void crypto_stat_ahash_final(struct ahash_request *req, int ret)
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&tfm->base.__crt_alg->hash_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->hash_err_cnt);
        } else {
-               atomic_inc(&tfm->base.__crt_alg->hash_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->hash_cnt);
                atomic64_add(req->nbytes, &tfm->base.__crt_alg->hash_tlen);
        }
 #endif

diff --git a/include/crypto/kpp.h b/include/crypto/kpp.h
index f517ba6d3a27628b6cebc9a61b36654bd2f4247f..bd5103a80919817bc74d5fa6d01f9399803766f5 100644 (file)
--- a/include/crypto/kpp.h
+++ b/include/crypto/kpp.h
@@ -272,9 +272,9 @@ static inline void crypto_stat_kpp_set_secret(struct crypto_kpp *tfm, int ret)
 {
 #ifdef CONFIG_CRYPTO_STATS
        if (ret)
-               atomic_inc(&tfm->base.__crt_alg->kpp_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->kpp_err_cnt);
        else
-               atomic_inc(&tfm->base.__crt_alg->setsecret_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->setsecret_cnt);
 #endif
 }
 
@@ -285,9 +285,9 @@ static inline void crypto_stat_kpp_generate_public_key(struct kpp_request *req,
        struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);
 
        if (ret)
-               atomic_inc(&tfm->base.__crt_alg->kpp_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->kpp_err_cnt);
        else
-               atomic_inc(&tfm->base.__crt_alg->generate_public_key_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->generate_public_key_cnt);
 #endif
 }
 
@@ -298,9 +298,9 @@ static inline void crypto_stat_kpp_compute_shared_secret(struct kpp_request *req
        struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);
 
        if (ret)
-               atomic_inc(&tfm->base.__crt_alg->kpp_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->kpp_err_cnt);
        else
-               atomic_inc(&tfm->base.__crt_alg->compute_shared_secret_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->compute_shared_secret_cnt);
 #endif
 }
 

diff --git a/include/crypto/rng.h b/include/crypto/rng.h
index 6d258f5b68f1f91caef13757f7b24129c8aa44d3..966615bba45e557ca67283403d70194058c77fc6 100644 (file)
--- a/include/crypto/rng.h
+++ b/include/crypto/rng.h
@@ -126,9 +126,9 @@ static inline void crypto_stat_rng_seed(struct crypto_rng *tfm, int ret)
 {
 #ifdef CONFIG_CRYPTO_STATS
        if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic_inc(&tfm->base.__crt_alg->rng_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->rng_err_cnt);
        else
-               atomic_inc(&tfm->base.__crt_alg->seed_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->seed_cnt);
 #endif
 }
 
@@ -137,9 +137,9 @@ static inline void crypto_stat_rng_generate(struct crypto_rng *tfm,
 {
 #ifdef CONFIG_CRYPTO_STATS
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&tfm->base.__crt_alg->rng_err_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->rng_err_cnt);
        } else {
-               atomic_inc(&tfm->base.__crt_alg->generate_cnt);
+               atomic64_inc(&tfm->base.__crt_alg->generate_cnt);
                atomic64_add(dlen, &tfm->base.__crt_alg->generate_tlen);
        }
 #endif

diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h
index 925f547cdcfa2c63bfa58dcbba614b989c97bbdc..dff54731ddf4ff16ae79f0fd81a49c7d730bb56b 100644 (file)
--- a/include/crypto/skcipher.h
+++ b/include/crypto/skcipher.h
@@ -491,9 +491,9 @@ static inline void crypto_stat_skcipher_encrypt(struct skcipher_request *req,
 {
 #ifdef CONFIG_CRYPTO_STATS
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&alg->cipher_err_cnt);
+               atomic64_inc(&alg->cipher_err_cnt);
        } else {
-               atomic_inc(&alg->encrypt_cnt);
+               atomic64_inc(&alg->encrypt_cnt);
                atomic64_add(req->cryptlen, &alg->encrypt_tlen);
        }
 #endif
@@ -504,9 +504,9 @@ static inline void crypto_stat_skcipher_decrypt(struct skcipher_request *req,
 {
 #ifdef CONFIG_CRYPTO_STATS
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&alg->cipher_err_cnt);
+               atomic64_inc(&alg->cipher_err_cnt);
        } else {
-               atomic_inc(&alg->decrypt_cnt);
+               atomic64_inc(&alg->decrypt_cnt);
                atomic64_add(req->cryptlen, &alg->decrypt_tlen);
        }
 #endif

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 3e05053b8d57eb59df4e89b5c75f325b05081a80..b109b50906e74f4b548cc1000f425245c4cc6bb5 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -517,11 +517,11 @@ struct crypto_alg {
 
 #ifdef CONFIG_CRYPTO_STATS
        union {
-               atomic_t encrypt_cnt;
-               atomic_t compress_cnt;
-               atomic_t generate_cnt;
-               atomic_t hash_cnt;
-               atomic_t setsecret_cnt;
+               atomic64_t encrypt_cnt;
+               atomic64_t compress_cnt;
+               atomic64_t generate_cnt;
+               atomic64_t hash_cnt;
+               atomic64_t setsecret_cnt;
        };
        union {
                atomic64_t encrypt_tlen;
@@ -530,29 +530,29 @@ struct crypto_alg {
                atomic64_t hash_tlen;
        };
        union {
-               atomic_t akcipher_err_cnt;
-               atomic_t cipher_err_cnt;
-               atomic_t compress_err_cnt;
-               atomic_t aead_err_cnt;
-               atomic_t hash_err_cnt;
-               atomic_t rng_err_cnt;
-               atomic_t kpp_err_cnt;
+               atomic64_t akcipher_err_cnt;
+               atomic64_t cipher_err_cnt;
+               atomic64_t compress_err_cnt;
+               atomic64_t aead_err_cnt;
+               atomic64_t hash_err_cnt;
+               atomic64_t rng_err_cnt;
+               atomic64_t kpp_err_cnt;
        };
        union {
-               atomic_t decrypt_cnt;
-               atomic_t decompress_cnt;
-               atomic_t seed_cnt;
-               atomic_t generate_public_key_cnt;
+               atomic64_t decrypt_cnt;
+               atomic64_t decompress_cnt;
+               atomic64_t seed_cnt;
+               atomic64_t generate_public_key_cnt;
        };
        union {
                atomic64_t decrypt_tlen;
                atomic64_t decompress_tlen;
        };
        union {
-               atomic_t verify_cnt;
-               atomic_t compute_shared_secret_cnt;
+               atomic64_t verify_cnt;
+               atomic64_t compute_shared_secret_cnt;
        };
-       atomic_t sign_cnt;
+       atomic64_t sign_cnt;
 #endif /* CONFIG_CRYPTO_STATS */
 
 } CRYPTO_MINALIGN_ATTR;
@@ -983,9 +983,9 @@ static inline void crypto_stat_ablkcipher_encrypt(struct ablkcipher_request *req
                crypto_ablkcipher_crt(crypto_ablkcipher_reqtfm(req));
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&crt->base->base.__crt_alg->cipher_err_cnt);
+               atomic64_inc(&crt->base->base.__crt_alg->cipher_err_cnt);
        } else {
-               atomic_inc(&crt->base->base.__crt_alg->encrypt_cnt);
+               atomic64_inc(&crt->base->base.__crt_alg->encrypt_cnt);
                atomic64_add(req->nbytes, &crt->base->base.__crt_alg->encrypt_tlen);
        }
 #endif
@@ -999,9 +999,9 @@ static inline void crypto_stat_ablkcipher_decrypt(struct ablkcipher_request *req
                crypto_ablkcipher_crt(crypto_ablkcipher_reqtfm(req));
 
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic_inc(&crt->base->base.__crt_alg->cipher_err_cnt);
+               atomic64_inc(&crt->base->base.__crt_alg->cipher_err_cnt);
        } else {
-               atomic_inc(&crt->base->base.__crt_alg->decrypt_cnt);
+               atomic64_inc(&crt->base->base.__crt_alg->decrypt_cnt);
                atomic64_add(req->nbytes, &crt->base->base.__crt_alg->decrypt_tlen);
        }
 #endif

diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h
index 6dafbc3e441461c9a07a5cd70cde9aa42ca9cf52..9f8187077ce4c427b0178b925b83ffc093d9ec4a 100644 (file)
--- a/include/uapi/linux/cryptouser.h
+++ b/include/uapi/linux/cryptouser.h
@@ -79,11 +79,11 @@ struct crypto_user_alg {
 struct crypto_stat {
        char type[CRYPTO_MAX_NAME];
        union {
-               __u32 stat_encrypt_cnt;
-               __u32 stat_compress_cnt;
-               __u32 stat_generate_cnt;
-               __u32 stat_hash_cnt;
-               __u32 stat_setsecret_cnt;
+               __u64 stat_encrypt_cnt;
+               __u64 stat_compress_cnt;
+               __u64 stat_generate_cnt;
+               __u64 stat_hash_cnt;
+               __u64 stat_setsecret_cnt;
        };
        union {
                __u64 stat_encrypt_tlen;
@@ -92,29 +92,29 @@ struct crypto_stat {
                __u64 stat_hash_tlen;
        };
        union {
-               __u32 stat_akcipher_err_cnt;
-               __u32 stat_cipher_err_cnt;
-               __u32 stat_compress_err_cnt;
-               __u32 stat_aead_err_cnt;
-               __u32 stat_hash_err_cnt;
-               __u32 stat_rng_err_cnt;
-               __u32 stat_kpp_err_cnt;
+               __u64 stat_akcipher_err_cnt;
+               __u64 stat_cipher_err_cnt;
+               __u64 stat_compress_err_cnt;
+               __u64 stat_aead_err_cnt;
+               __u64 stat_hash_err_cnt;
+               __u64 stat_rng_err_cnt;
+               __u64 stat_kpp_err_cnt;
        };
        union {
-               __u32 stat_decrypt_cnt;
-               __u32 stat_decompress_cnt;
-               __u32 stat_seed_cnt;
-               __u32 stat_generate_public_key_cnt;
+               __u64 stat_decrypt_cnt;
+               __u64 stat_decompress_cnt;
+               __u64 stat_seed_cnt;
+               __u64 stat_generate_public_key_cnt;
        };
        union {
                __u64 stat_decrypt_tlen;
                __u64 stat_decompress_tlen;
        };
        union {
-               __u32 stat_verify_cnt;
-               __u32 stat_compute_shared_secret_cnt;
+               __u64 stat_verify_cnt;
+               __u64 stat_compute_shared_secret_cnt;
        };
-       __u32 stat_sign_cnt;
+       __u64 stat_sign_cnt;
 };
 
 struct crypto_report_larval {