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

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

diff --git a/crypto/kpp.c b/crypto/kpp.c
index 678e871ce418c089208056c22998c1b29cdd34cb..74f2e8e918fa5854e444ae858c604d2d52c6c97c 100644 (file)
--- a/crypto/kpp.c
+++ b/crypto/kpp.c
@@ -5,23 +5,20 @@
  * Copyright (c) 2016, Intel Corporation
  * Authors: Salvatore Benedetto <salvatore.benedetto@intel.com>
  */
+
+#include <crypto/internal/kpp.h>
+#include <linux/cryptouser.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
-#include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/crypto.h>
-#include <crypto/algapi.h>
-#include <linux/cryptouser.h>
-#include <linux/compiler.h>
 #include <net/netlink.h>
-#include <crypto/kpp.h>
-#include <crypto/internal/kpp.h>
+
 #include "internal.h"
 
-#ifdef CONFIG_NET
-static int crypto_kpp_report(struct sk_buff *skb, struct crypto_alg *alg)
+static int __maybe_unused crypto_kpp_report(
+       struct sk_buff *skb, struct crypto_alg *alg)
 {
        struct crypto_report_kpp rkpp;
 
@@ -31,12 +28,6 @@ static int crypto_kpp_report(struct sk_buff *skb, struct crypto_alg *alg)
 
        return nla_put(skb, CRYPTOCFGA_REPORT_KPP, sizeof(rkpp), &rkpp);
 }
-#else
-static int crypto_kpp_report(struct sk_buff *skb, struct crypto_alg *alg)
-{
-       return -ENOSYS;
-}
-#endif
 
 static void crypto_kpp_show(struct seq_file *m, struct crypto_alg *alg)
        __maybe_unused;
@@ -75,6 +66,29 @@ static void crypto_kpp_free_instance(struct crypto_instance *inst)
        kpp->free(kpp);
 }
 
+static int __maybe_unused crypto_kpp_report_stat(
+       struct sk_buff *skb, struct crypto_alg *alg)
+{
+       struct kpp_alg *kpp = __crypto_kpp_alg(alg);
+       struct crypto_istat_kpp *istat;
+       struct crypto_stat_kpp rkpp;
+
+       istat = kpp_get_stat(kpp);
+
+       memset(&rkpp, 0, sizeof(rkpp));
+
+       strscpy(rkpp.type, "kpp", sizeof(rkpp.type));
+
+       rkpp.stat_setsecret_cnt = atomic64_read(&istat->setsecret_cnt);
+       rkpp.stat_generate_public_key_cnt =
+               atomic64_read(&istat->generate_public_key_cnt);
+       rkpp.stat_compute_shared_secret_cnt =
+               atomic64_read(&istat->compute_shared_secret_cnt);
+       rkpp.stat_err_cnt = atomic64_read(&istat->err_cnt);
+
+       return nla_put(skb, CRYPTOCFGA_STAT_KPP, sizeof(rkpp), &rkpp);
+}
+
 static const struct crypto_type crypto_kpp_type = {
        .extsize = crypto_alg_extsize,
        .init_tfm = crypto_kpp_init_tfm,
@@ -82,7 +96,12 @@ static const struct crypto_type crypto_kpp_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_kpp_show,
 #endif
+#ifdef CONFIG_CRYPTO_USER
        .report = crypto_kpp_report,
+#endif
+#ifdef CONFIG_CRYPTO_STATS
+       .report_stat = crypto_kpp_report_stat,
+#endif
        .maskclear = ~CRYPTO_ALG_TYPE_MASK,
        .maskset = CRYPTO_ALG_TYPE_MASK,
        .type = CRYPTO_ALG_TYPE_KPP,
@@ -112,11 +131,15 @@ EXPORT_SYMBOL_GPL(crypto_has_kpp);
 
 static void kpp_prepare_alg(struct kpp_alg *alg)
 {
+       struct crypto_istat_kpp *istat = kpp_get_stat(alg);
        struct crypto_alg *base = &alg->base;
 
        base->cra_type = &crypto_kpp_type;
        base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;
        base->cra_flags |= CRYPTO_ALG_TYPE_KPP;
+
+       if (IS_ENABLED(CONFIG_CRYPTO_STATS))
+               memset(istat, 0, sizeof(*istat));
 }
 
 int crypto_register_kpp(struct kpp_alg *alg)