OSDN Git Service

Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[uclinux-h8/linux.git] / crypto / algapi.c
index 2545c5f..4c9c86b 100644 (file)
@@ -258,13 +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);
 
-       atomic_set(&alg->encrypt_cnt, 0);
-       atomic_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);
+       crypto_stats_init(alg);
 
 out:
        return larval;
@@ -500,6 +494,24 @@ out:
 }
 EXPORT_SYMBOL_GPL(crypto_register_template);
 
+int crypto_register_templates(struct crypto_template *tmpls, int count)
+{
+       int i, err;
+
+       for (i = 0; i < count; i++) {
+               err = crypto_register_template(&tmpls[i]);
+               if (err)
+                       goto out;
+       }
+       return 0;
+
+out:
+       for (--i; i >= 0; --i)
+               crypto_unregister_template(&tmpls[i]);
+       return err;
+}
+EXPORT_SYMBOL_GPL(crypto_register_templates);
+
 void crypto_unregister_template(struct crypto_template *tmpl)
 {
        struct crypto_instance *inst;
@@ -529,6 +541,15 @@ void crypto_unregister_template(struct crypto_template *tmpl)
 }
 EXPORT_SYMBOL_GPL(crypto_unregister_template);
 
+void crypto_unregister_templates(struct crypto_template *tmpls, int count)
+{
+       int i;
+
+       for (i = count - 1; i >= 0; --i)
+               crypto_unregister_template(&tmpls[i]);
+}
+EXPORT_SYMBOL_GPL(crypto_unregister_templates);
+
 static struct crypto_template *__crypto_lookup_template(const char *name)
 {
        struct crypto_template *q, *tmpl = NULL;
@@ -614,6 +635,9 @@ int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
 {
        int err = -EAGAIN;
 
+       if (WARN_ON_ONCE(inst == NULL))
+               return -EINVAL;
+
        spawn->inst = inst;
        spawn->mask = mask;
 
@@ -851,8 +875,8 @@ int crypto_inst_setname(struct crypto_instance *inst, const char *name,
 }
 EXPORT_SYMBOL_GPL(crypto_inst_setname);
 
-void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,
-                            unsigned int head)
+void *crypto_alloc_instance(const char *name, struct crypto_alg *alg,
+                           unsigned int head)
 {
        struct crypto_instance *inst;
        char *p;
@@ -875,35 +899,6 @@ err_free_inst:
        kfree(p);
        return ERR_PTR(err);
 }
-EXPORT_SYMBOL_GPL(crypto_alloc_instance2);
-
-struct crypto_instance *crypto_alloc_instance(const char *name,
-                                             struct crypto_alg *alg)
-{
-       struct crypto_instance *inst;
-       struct crypto_spawn *spawn;
-       int err;
-
-       inst = crypto_alloc_instance2(name, alg, 0);
-       if (IS_ERR(inst))
-               goto out;
-
-       spawn = crypto_instance_ctx(inst);
-       err = crypto_init_spawn(spawn, alg, inst,
-                               CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
-
-       if (err)
-               goto err_free_inst;
-
-       return inst;
-
-err_free_inst:
-       kfree(inst);
-       inst = ERR_PTR(err);
-
-out:
-       return inst;
-}
 EXPORT_SYMBOL_GPL(crypto_alloc_instance);
 
 void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen)
@@ -1076,6 +1071,245 @@ 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_ablkcipher_encrypt(unsigned int nbytes, 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(nbytes, &alg->stats.cipher.encrypt_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_ablkcipher_encrypt);
+
+void crypto_stats_ablkcipher_decrypt(unsigned int nbytes, 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(nbytes, &alg->stats.cipher.decrypt_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_ablkcipher_decrypt);
+
+void crypto_stats_aead_encrypt(unsigned int cryptlen, struct crypto_alg *alg,
+                              int ret)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
+               atomic64_inc(&alg->stats.aead.err_cnt);
+       } else {
+               atomic64_inc(&alg->stats.aead.encrypt_cnt);
+               atomic64_add(cryptlen, &alg->stats.aead.encrypt_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_aead_encrypt);
+
+void crypto_stats_aead_decrypt(unsigned int cryptlen, struct crypto_alg *alg,
+                              int ret)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
+               atomic64_inc(&alg->stats.aead.err_cnt);
+       } else {
+               atomic64_inc(&alg->stats.aead.decrypt_cnt);
+               atomic64_add(cryptlen, &alg->stats.aead.decrypt_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_aead_decrypt);
+
+void crypto_stats_akcipher_encrypt(unsigned int src_len, int ret,
+                                  struct crypto_alg *alg)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
+               atomic64_inc(&alg->stats.akcipher.err_cnt);
+       } else {
+               atomic64_inc(&alg->stats.akcipher.encrypt_cnt);
+               atomic64_add(src_len, &alg->stats.akcipher.encrypt_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_akcipher_encrypt);
+
+void crypto_stats_akcipher_decrypt(unsigned int src_len, int ret,
+                                  struct crypto_alg *alg)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
+               atomic64_inc(&alg->stats.akcipher.err_cnt);
+       } else {
+               atomic64_inc(&alg->stats.akcipher.decrypt_cnt);
+               atomic64_add(src_len, &alg->stats.akcipher.decrypt_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_akcipher_decrypt);
+
+void crypto_stats_akcipher_sign(int ret, struct crypto_alg *alg)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY)
+               atomic64_inc(&alg->stats.akcipher.err_cnt);
+       else
+               atomic64_inc(&alg->stats.akcipher.sign_cnt);
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_akcipher_sign);
+
+void crypto_stats_akcipher_verify(int ret, struct crypto_alg *alg)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY)
+               atomic64_inc(&alg->stats.akcipher.err_cnt);
+       else
+               atomic64_inc(&alg->stats.akcipher.verify_cnt);
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_akcipher_verify);
+
+void crypto_stats_compress(unsigned int slen, int ret, struct crypto_alg *alg)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
+               atomic64_inc(&alg->stats.compress.err_cnt);
+       } else {
+               atomic64_inc(&alg->stats.compress.compress_cnt);
+               atomic64_add(slen, &alg->stats.compress.compress_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_compress);
+
+void crypto_stats_decompress(unsigned int slen, int ret, struct crypto_alg *alg)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
+               atomic64_inc(&alg->stats.compress.err_cnt);
+       } else {
+               atomic64_inc(&alg->stats.compress.decompress_cnt);
+               atomic64_add(slen, &alg->stats.compress.decompress_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_decompress);
+
+void crypto_stats_ahash_update(unsigned int nbytes, int ret,
+                              struct crypto_alg *alg)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY)
+               atomic64_inc(&alg->stats.hash.err_cnt);
+       else
+               atomic64_add(nbytes, &alg->stats.hash.hash_tlen);
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_ahash_update);
+
+void crypto_stats_ahash_final(unsigned int nbytes, int ret,
+                             struct crypto_alg *alg)
+{
+       if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
+               atomic64_inc(&alg->stats.hash.err_cnt);
+       } else {
+               atomic64_inc(&alg->stats.hash.hash_cnt);
+               atomic64_add(nbytes, &alg->stats.hash.hash_tlen);
+       }
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_ahash_final);
+
+void crypto_stats_kpp_set_secret(struct crypto_alg *alg, int ret)
+{
+       if (ret)
+               atomic64_inc(&alg->stats.kpp.err_cnt);
+       else
+               atomic64_inc(&alg->stats.kpp.setsecret_cnt);
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_kpp_set_secret);
+
+void crypto_stats_kpp_generate_public_key(struct crypto_alg *alg, int ret)
+{
+       if (ret)
+               atomic64_inc(&alg->stats.kpp.err_cnt);
+       else
+               atomic64_inc(&alg->stats.kpp.generate_public_key_cnt);
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_kpp_generate_public_key);
+
+void crypto_stats_kpp_compute_shared_secret(struct crypto_alg *alg, int ret)
+{
+       if (ret)
+               atomic64_inc(&alg->stats.kpp.err_cnt);
+       else
+               atomic64_inc(&alg->stats.kpp.compute_shared_secret_cnt);
+       crypto_alg_put(alg);
+}
+EXPORT_SYMBOL_GPL(crypto_stats_kpp_compute_shared_secret);
+
+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 int __init crypto_algapi_init(void)
 {
        crypto_init_proc();