Merge tag 'riscv-for-linus-6.4-mw1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / crypto / algapi.c

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 6fcb6192a3d76b7928008acff427334dfeff3603..d7eb8f9e988339825ee355a2c1b35e57bdc3e71c 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -339,8 +339,6 @@ __crypto_register_alg(struct crypto_alg *alg, struct list_head *algs_to_put)
 
        list_add(&alg->cra_list, &crypto_alg_list);
 
-       crypto_stats_init(alg);
-
        if (larval) {
                /* No cheating! */
                alg->cra_flags &= ~CRYPTO_ALG_TESTED;
@@ -493,7 +491,9 @@ void crypto_unregister_alg(struct crypto_alg *alg)
        if (WARN(ret, "Algorithm %s is not registered", alg->cra_driver_name))
                return;
 
-       BUG_ON(refcount_read(&alg->cra_refcnt) != 1);
+       if (WARN_ON(refcount_read(&alg->cra_refcnt) != 1))
+               return;
+
        if (alg->cra_destroy)
                alg->cra_destroy(alg);
 
@@ -1038,69 +1038,6 @@ 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);
-}
-EXPORT_SYMBOL_GPL(crypto_stats_get);
-
-void crypto_stats_rng_seed(struct crypto_alg *alg, int ret)
-{
-       if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic64_inc(&alg->stats.rng.err_cnt);
-       else
-               atomic64_inc(&alg->stats.rng.seed_cnt);
-       crypto_alg_put(alg);
-}
-EXPORT_SYMBOL_GPL(crypto_stats_rng_seed);
-
-void crypto_stats_rng_generate(struct crypto_alg *alg, unsigned int dlen,
-                              int ret)
-{
-       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.rng.err_cnt);
-       } else {
-               atomic64_inc(&alg->stats.rng.generate_cnt);
-               atomic64_add(dlen, &alg->stats.rng.generate_tlen);
-       }
-       crypto_alg_put(alg);
-}
-EXPORT_SYMBOL_GPL(crypto_stats_rng_generate);
-
-void crypto_stats_skcipher_encrypt(unsigned int cryptlen, int ret,
-                                  struct crypto_alg *alg)
-{
-       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.cipher.err_cnt);
-       } else {
-               atomic64_inc(&alg->stats.cipher.encrypt_cnt);
-               atomic64_add(cryptlen, &alg->stats.cipher.encrypt_tlen);
-       }
-       crypto_alg_put(alg);
-}
-EXPORT_SYMBOL_GPL(crypto_stats_skcipher_encrypt);
-
-void crypto_stats_skcipher_decrypt(unsigned int cryptlen, int ret,
-                                  struct crypto_alg *alg)
-{
-       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.cipher.err_cnt);
-       } else {
-               atomic64_inc(&alg->stats.cipher.decrypt_cnt);
-               atomic64_add(cryptlen, &alg->stats.cipher.decrypt_tlen);
-       }
-       crypto_alg_put(alg);
-}
-EXPORT_SYMBOL_GPL(crypto_stats_skcipher_decrypt);
-#endif
-
 static void __init crypto_start_tests(void)
 {
        if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS))