From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FSL_HELO_FAKE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7ED9C0044C for ; Tue, 6 Nov 2018 01:42:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B01AD2081D for ; Tue, 6 Nov 2018 01:42:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ix2KHwqA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B01AD2081D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729304AbeKFLFZ (ORCPT ); Tue, 6 Nov 2018 06:05:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:54804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726228AbeKFLFY (ORCPT ); Tue, 6 Nov 2018 06:05:24 -0500 Received: from gmail.com (unknown [104.132.51.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A7C9A2081D; Tue, 6 Nov 2018 01:42:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541468563; bh=r1uftKosZawVa4mSfsDYSC0QvHzk0AzL6IKIoEFesto=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ix2KHwqAZDLHUhotp2ZIdPtWnDI1SYJtYOMsfo/qP6waD+ElCYzMMz7Oz0R3K6kp/ hwyXdTwkkLRWwcHKmFrnvYDsMip+lxk9z7GyTUky7qA63Kx234sKD4aWyCmWZwGKfO gesUOg4Z5G5KP6gd/ptsIPbDvDmPMv32L9S/otfk= Date: Mon, 5 Nov 2018 17:42:42 -0800 From: Eric Biggers To: Corentin Labbe Cc: davem@davemloft.net, herbert@gondor.apana.org.au, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/5] crypto: crypto_user_stat: convert all stats from u32 to u64 Message-ID: <20181106014242.GD28490@gmail.com> References: <1541422274-40060-1-git-send-email-clabbe@baylibre.com> <1541422274-40060-3-git-send-email-clabbe@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1541422274-40060-3-git-send-email-clabbe@baylibre.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Corentin, On Mon, Nov 05, 2018 at 12:51:11PM +0000, Corentin Labbe wrote: > All the 32-bit fields need to be 64-bit. In some cases, UINT32_MAX crypto > operations can be done in seconds. > > Reported-by: Eric Biggers > Signed-off-by: Corentin Labbe > --- > crypto/algapi.c | 10 +-- > crypto/crypto_user_stat.c | 114 +++++++++++++++----------------- > include/crypto/acompress.h | 8 +-- > include/crypto/aead.h | 8 +-- > include/crypto/akcipher.h | 16 ++--- > include/crypto/hash.h | 6 +- > include/crypto/kpp.h | 12 ++-- > include/crypto/rng.h | 8 +-- > include/crypto/skcipher.h | 8 +-- > include/linux/crypto.h | 46 ++++++------- > include/uapi/linux/cryptouser.h | 38 +++++------ > 11 files changed, 133 insertions(+), 141 deletions(-) > > diff --git a/crypto/algapi.c b/crypto/algapi.c > index f5396c88e8cd..42fe316f80ee 100644 > --- a/crypto/algapi.c > +++ b/crypto/algapi.c > @@ -259,13 +259,13 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg) > 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_cnt, 0); > + atomic64_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); > + atomic64_set(&alg->verify_cnt, 0); > + atomic64_set(&alg->cipher_err_cnt, 0); > + atomic64_set(&alg->sign_cnt, 0); > #endif > > out: > diff --git a/crypto/crypto_user_stat.c b/crypto/crypto_user_stat.c > index a6fb2e6f618d..352569f378a0 100644 > --- a/crypto/crypto_user_stat.c > +++ b/crypto/crypto_user_stat.c > @@ -35,22 +35,21 @@ static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg) > { > struct crypto_stat raead; > u64 v64; > - u32 v32; > > memset(&raead, 0, sizeof(raead)); > > strscpy(raead.type, "aead", sizeof(raead.type)); > > - v32 = atomic_read(&alg->encrypt_cnt); > - raead.stat_encrypt_cnt = v32; > + v64 = atomic64_read(&alg->encrypt_cnt); > + raead.stat_encrypt_cnt = v64; > v64 = atomic64_read(&alg->encrypt_tlen); > raead.stat_encrypt_tlen = v64; > - v32 = atomic_read(&alg->decrypt_cnt); > - raead.stat_decrypt_cnt = v32; > + v64 = atomic64_read(&alg->decrypt_cnt); > + raead.stat_decrypt_cnt = v64; > v64 = atomic64_read(&alg->decrypt_tlen); > raead.stat_decrypt_tlen = v64; > - v32 = atomic_read(&alg->aead_err_cnt); > - raead.stat_aead_err_cnt = v32; > + v64 = atomic64_read(&alg->aead_err_cnt); > + raead.stat_aead_err_cnt = v64; > > return nla_put(skb, CRYPTOCFGA_STAT_AEAD, sizeof(raead), &raead); > } Why not assign the result of atomic64_read() directly? I don't see the point of the 'v64' variable. - Eric