On Tue, Nov 20, 2018 at 12:32:17PM +0000, Corentin Labbe wrote:
> Even if CRYPTO_STATS is set to n, some part of CRYPTO_STATS are
> compiled.
> This patch made all part of crypto_user_stat uncompiled in that case.
>
> Signed-off-by: Corentin Labbe <clabbe@xxxxxxxxxxxx>
> ---
> crypto/Makefile | 3 ++-
> crypto/algapi.c | 2 ++
> include/crypto/internal/cryptouser.h | 17 +++++++++++++++++
> include/linux/crypto.h | 2 ++
> 4 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/crypto/Makefile b/crypto/Makefile
> index abbd86fdbad2..22f9f84f961d 100644
> --- a/crypto/Makefile
> +++ b/crypto/Makefile
> @@ -54,7 +54,8 @@ cryptomgr-y := algboss.o testmgr.o
>
> obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o
> obj-$(CONFIG_CRYPTO_USER) += crypto_user.o
> -crypto_user-y := crypto_user_base.o crypto_user_stat.o
> +crypto_user-y := crypto_user_base.o
> +crypto_user-$(CONFIG_CRYPTO_STATS) += crypto_user_stat.o
> obj-$(CONFIG_CRYPTO_CMAC) += cmac.o
> obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
> obj-$(CONFIG_CRYPTO_VMAC) += vmac.o
> diff --git a/crypto/algapi.c b/crypto/algapi.c
> index 2545c5f89c4c..f5396c88e8cd 100644
> --- a/crypto/algapi.c
> +++ b/crypto/algapi.c
> @@ -258,6 +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);
>
> +#ifdef CONFIG_CRYPTO_STATS
> atomic_set(&alg->encrypt_cnt, 0);
> atomic_set(&alg->decrypt_cnt, 0);
> atomic64_set(&alg->encrypt_tlen, 0);
> @@ -265,6 +266,7 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
> atomic_set(&alg->verify_cnt, 0);
> atomic_set(&alg->cipher_err_cnt, 0);
> atomic_set(&alg->sign_cnt, 0);
> +#endif
>
If you created a helper function in crypto_user_stat.c to initalize all the
stats, you could ifdef it in the cryptouser.h header if unconfigured, and avoid
the ifdef leakage to this file above.
Neil
> out:
> return larval;
> diff --git a/include/crypto/internal/cryptouser.h b/include/crypto/internal/cryptouser.h
> index 8db299c25566..3492ab42eefb 100644
> --- a/include/crypto/internal/cryptouser.h
> +++ b/include/crypto/internal/cryptouser.h
> @@ -3,6 +3,23 @@
>
> struct crypto_alg *crypto_alg_match(struct crypto_user_alg *p, int exact);
>
> +#ifdef CONFIG_CRYPTO_STATS
> int crypto_dump_reportstat(struct sk_buff *skb, struct netlink_callback *cb);
> int crypto_reportstat(struct sk_buff *in_skb, struct nlmsghdr *in_nlh, struct nlattr **attrs);
> int crypto_dump_reportstat_done(struct netlink_callback *cb);
> +#else
> +static int crypto_dump_reportstat(struct sk_buff *skb, struct netlink_callback *cb)
> +{
> + return -ENOTSUPP;
> +}
> +
> +static int crypto_reportstat(struct sk_buff *in_skb, struct nlmsghdr *in_nlh, struct nlattr **attrs)
> +{
> + return -ENOTSUPP;
> +}
> +
> +static int crypto_dump_reportstat_done(struct netlink_callback *cb)
> +{
> + return -ENOTSUPP;
> +}
> +#endif
> diff --git a/include/linux/crypto.h b/include/linux/crypto.h
> index 3634ad6fe202..3e05053b8d57 100644
> --- a/include/linux/crypto.h
> +++ b/include/linux/crypto.h
> @@ -515,6 +515,7 @@ struct crypto_alg {
>
> struct module *cra_module;
>
> +#ifdef CONFIG_CRYPTO_STATS
> union {
> atomic_t encrypt_cnt;
> atomic_t compress_cnt;
> @@ -552,6 +553,7 @@ struct crypto_alg {
> atomic_t compute_shared_secret_cnt;
> };
> atomic_t sign_cnt;
> +#endif /* CONFIG_CRYPTO_STATS */
>
> } CRYPTO_MINALIGN_ATTR;
>
> --
> 2.18.1
>
>
