From patchwork Tue Nov 20 12:32:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin LABBE X-Patchwork-Id: 10690365 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AAD5917FE for ; Tue, 20 Nov 2018 12:34:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98983294B6 for ; Tue, 20 Nov 2018 12:34:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C77D2A3B1; Tue, 20 Nov 2018 12:34:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29171294B6 for ; Tue, 20 Nov 2018 12:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728469AbeKTXCR (ORCPT ); Tue, 20 Nov 2018 18:02:17 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34928 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728854AbeKTXCQ (ORCPT ); Tue, 20 Nov 2018 18:02:16 -0500 Received: by mail-wr1-f65.google.com with SMTP id 96so1802554wrb.2 for ; Tue, 20 Nov 2018 04:33:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1aCpJW3/a42CFCztC9Cmox2pxI2mezP04ciavDjkWRE=; b=N1sQ6EPq1pFpDFVrTTo2AXERw+/j40ZOBYM3IXFLKtKxXBzVVQ9ZTNjBnfiG71zXcy eM+pRv/aXQMyiAvEnXJD8pMD9wHI20J3IxkNc+7+sPRBOCxt7ZGgSMAIyIMzhllkuK2D FcnuH8HLPQZcyCkaoYp4Bk4WgSvk4shmDtz15zSF0OEvdh6hoDGuRqL9BOnVBCpIR4/I 78ewyCtpiFZYCqih9+Pu5TI8Qh7SiuYDnUcVCdPAKgPUNNINZ481dij73ksMjVpm+UE8 Ld3CC02zIMG8XETpA6qphphg/LfByehwqiw7VMS4bWkbRuCYYekbBI+jHr3zjPUgUTJB Xftg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1aCpJW3/a42CFCztC9Cmox2pxI2mezP04ciavDjkWRE=; b=JeKXO+O9QyywqDjYuyL7fw6xz4RYdBzEAXtu8KzFAA5Z0IYW5q8fIJyihdULbLWd4P BKtWpZnHOyvqhQtmF31liqoGZ5TQBpG7aQTJ8DVsKcpUtoMtNUgR4XNNmyRTc6MJ3hkd vic5a79UZSZy0YKSu6o/3cUgOM+VqHYwuWNbLJH5w//iwKpomFinIe7HA+cXNJXb3DVC W9vCeJ7CR/Z6wThwv98F+asYubLbrzG6N/bLoAMoRDoPBxHwwDopR/jPlXSdgZAu0q24 bMtRwTBZAQezhcnib6iOiQTRN7gNgE8F+ijkoWC7a5QyTgEqez7EIVmh1dDw5cTenIs2 BKSw== X-Gm-Message-State: AA+aEWbquuNuaEEDQFO5gLEeP7Rqd8lyuJOGdPzqELyES7J3qLeW/2dV hm7p6Mn8cnPbz0v8+tUV+V7z1x0EL4E= X-Google-Smtp-Source: AFSGD/UH9/XjRfTQIU0rpOJqliSMpspewuNK3MmS51JSJ2VUE4whqd+7pM9QlUAw0AZAnstwiQOdmg== X-Received: by 2002:adf:9bd6:: with SMTP id e22-v6mr1734089wrc.295.1542717200563; Tue, 20 Nov 2018 04:33:20 -0800 (PST) Received: from localhost.localdomain ([51.15.160.169]) by smtp.googlemail.com with ESMTPSA id x81sm2766951wmg.17.2018.11.20.04.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Nov 2018 04:33:19 -0800 (PST) From: Corentin Labbe To: davem@davemloft.net, ebiggers@kernel.org, herbert@gondor.apana.org.au, nhorman@tuxdriver.com Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH v3 01/10] crypto: crypto_user_stat: made crypto_user_stat optional Date: Tue, 20 Nov 2018 12:32:17 +0000 Message-Id: <1542717146-34917-2-git-send-email-clabbe@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542717146-34917-1-git-send-email-clabbe@baylibre.com> References: <1542717146-34917-1-git-send-email-clabbe@baylibre.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 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;