From patchwork Fri Nov 23 12:02:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin LABBE X-Patchwork-Id: 10695687 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 539E515A7 for ; Fri, 23 Nov 2018 12:02:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44A0D2C2DA for ; Fri, 23 Nov 2018 12:02:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 393C82C1B0; Fri, 23 Nov 2018 12:02:54 +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 D2A492C360 for ; Fri, 23 Nov 2018 12:02:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503995AbeKWWqt (ORCPT ); Fri, 23 Nov 2018 17:46:49 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41623 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504040AbeKWWqt (ORCPT ); Fri, 23 Nov 2018 17:46:49 -0500 Received: by mail-wr1-f68.google.com with SMTP id x10so12104611wrs.8 for ; Fri, 23 Nov 2018 04:02:51 -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=hRGHdejg5JBOgjxW3k8B0GPaLm05r9sHdxdq5izdOJ8=; b=TgRdK4DLEyYzVpTHihkZZBMVJ/pRVEBvFIUlK1jmulrWpI1KMwKWQU3E4rsg+wm30D GMd2H0ER+TSCgNanVn7XXk4WXyxJQ4br6pArdjoPejQ2Yv/NaSrU6oFlQgYbn07SISYD WktdGSJY4v+DFOWqrWZfKhq/A81RsRjISTUWvdlVArCIJqZBuojciuaqxfsPivrFjgax jsCj33U1hilXzWRNEjuGPLiQAKYhyRwmRLLkBFAPyoi4bSmzKIdtlyGB7DVZBfXjW84c yE8zMDq/9RQJUPRVlJoIk4WnXbufQ2Pd4m2UT5Z9S6iuh7GWkQfn0Tv/1TDlmRNKi8SN vnXg== 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=hRGHdejg5JBOgjxW3k8B0GPaLm05r9sHdxdq5izdOJ8=; b=GTJgPnjh6foGfx5iFXcBXYGSd4EU05WPYdy3N8vStQy5vki4rcC/N7pes5O2ohdAml rGQj+Z55/Os7aqnUcTFR9tGzdw1oSysDPpNDTMl8o6mkh4BAaZNZ7G6gd5WHedJVrQn1 /Blo3rQk326M/h8/QxLbrGfnP3l4vFSMkYHD8YVfYrjSVzMG+dJbr0jbajmEOaxq6Vym aqpj8qBWoA2ZON6NfJeUKebpLShw946PR3MD+VjlWH/62ryqU2HyYMAx6wvufX0PcAeM VawOE788dWRU1a3xYpYmtic8rACMxaVzkm0zmHHqIcSWyfZxBxnm+MK24vD0ovWDBqGu twhA== X-Gm-Message-State: AA+aEWYO6bY12oykbUCijqJy5J4nQ46Q47Wug8uFRtFCFEqnPDhXnu8h Rks/Flh5LmLUfxXJKhAm3R0E8A== X-Google-Smtp-Source: AFSGD/VA0FvHaQW9s8VBCEg+qmgw7k9bl1dAqLPDdIv6eL167R+L8ftg/7HjUdJkJ256MEh4L4NYfQ== X-Received: by 2002:a5d:4652:: with SMTP id j18mr14014405wrs.279.1542974570922; Fri, 23 Nov 2018 04:02:50 -0800 (PST) Received: from localhost.localdomain ([51.15.160.169]) by smtp.googlemail.com with ESMTPSA id a18sm25164379wrp.13.2018.11.23.04.02.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Nov 2018 04:02:49 -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 v4 11/11] crypto: crypto_user_stat: Add crypto_stats_init Date: Fri, 23 Nov 2018 12:02:21 +0000 Message-Id: <1542974541-23024-12-git-send-email-clabbe@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542974541-23024-1-git-send-email-clabbe@baylibre.com> References: <1542974541-23024-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 This patch add the crypto_stats_init() function. This will permit to remove some ifdef from __crypto_register_alg(). Signed-off-by: Corentin Labbe --- crypto/algapi.c | 11 ++++++++--- include/linux/crypto.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crypto/algapi.c b/crypto/algapi.c index 84e9b4e5389a..0a76d8464d9f 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -258,9 +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 - memset(&alg->stats, 0, sizeof(alg->stats)); -#endif + crypto_stats_init(alg); out: return larval; @@ -1073,6 +1071,11 @@ 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)); +} + void crypto_stats_get(struct crypto_alg *alg) { crypto_alg_get(alg); @@ -1284,6 +1287,8 @@ void crypto_stats_skcipher_decrypt(unsigned int cryptlen, int ret, crypto_alg_put(alg); } #else +void crypto_stats_init(struct crypto_alg *alg) +{} void crypto_stats_get(struct crypto_alg *alg) {} void crypto_stats_ablkcipher_encrypt(unsigned int nbytes, int ret, diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 132a052b3483..4fa9903c0887 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -613,6 +613,7 @@ struct crypto_alg { } CRYPTO_MINALIGN_ATTR; +void crypto_stats_init(struct crypto_alg *alg); void crypto_stats_get(struct crypto_alg *alg); void crypto_stats_ablkcipher_encrypt(unsigned int nbytes, int ret, struct crypto_alg *alg); void crypto_stats_ablkcipher_decrypt(unsigned int nbytes, int ret, struct crypto_alg *alg);