From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34E191624E1; Thu, 22 May 2025 17:04:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747933443; cv=none; b=jmFjqg1BjGCLjm0Ycqx0O+/6SfvK0p3iXROwC1f42pvR1kl6/575gygWm4UBuxS/7bBWM3NLHZuxX+88YO0ogqQKneCsrT8xlxMmoW4NPAlgSn8ggpTCLR3eiEJC9k2XTukl4O52Q6hwWR+JHO8rtFPDJrM1ZDW8yQupXCYAtb8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747933443; c=relaxed/simple; bh=E8QqureQfaGCks3wK6MIJ0jEsKrqxgalEfNCkdNueVw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=NrOK6cdiTkhXiq0cKsF4iclFUE7MBUg7RZtuVXVPfsWrBdEmGaN31pYo2AMSbHcfR74qCTrvMNNlcRnlxIETGaAO3H41F7yH5Gx6a/QpoD6aOY4HuYAtGIChIMWIYs1FuEv69F9zsH3ZfT0FStILdiu/Uc29XJCa8OGnpwVaJb8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Oi11Mvx0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Oi11Mvx0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F367C4CEED; Thu, 22 May 2025 17:04:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747933442; bh=E8QqureQfaGCks3wK6MIJ0jEsKrqxgalEfNCkdNueVw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Oi11Mvx0NKXXK90Kh22MmiezyrpeR2dwtYVjUk6dserRLYwRF4o0KYrPn/tRt+3pq otFxp8v0k+GMKUL7ud96f4FVCGmYmtxetH+bw+O9AaZV6n6vjiVp7RtJLEYsRrpuDf tX9ZDjTLVeGNLGusVBRd3YoKnx0W3m+0lZTQrEt0pdcMBQLamLYUWKOZCjZOwbTJVz A38rXdRWAdB/32hso7g7qrKOUlBr4BbOgcYZiNmA20X+ex5L/LIdy7qwaW/gKHz0nj cCb+8jYfHoyy0TLU0b/o816xd6WIM6F0kfyYh3yFh50L1HxbKvhUlcdcs4/DKUrkww nQ3GYVp7nSQfg== Date: Thu, 22 May 2025 14:03:59 -0300 From: Arnaldo Carvalho de Melo To: Yuzhuo Jing Cc: Peter Zijlstra , Ingo Molnar , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Liang Kan , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , "Steven Rostedt (Google)" , James Clark , Tomas Glozar , Leo Yan , Guilherme Amadio , Yang Jihong , "Masami Hiramatsu (Google)" , Adhemerval Zanella , Wei Yang , Ard Biesheuvel , "Mike Rapoport (Microsoft)" , Athira Rajeev , Kajol Jain , Aditya Gupta , Charlie Jenkins , "Steinar H. Gunderson" , "Dr. David Alan Gilbert" , Herbert Xu , Jeff Johnson , Al Viro , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, llvm@lists.linux.dev Subject: Re: [PATCH v1 2/4] perf tools: Add sha1 utils Message-ID: References: <20250521225307.743726-1-yuzhuo@google.com> <20250521225307.743726-3-yuzhuo@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250521225307.743726-3-yuzhuo@google.com> On Wed, May 21, 2025 at 03:53:05PM -0700, Yuzhuo Jing wrote: > Those new files are derived from the kernel tree, namely: > > tools/perf/util/sha1.c from lib/crypto/sha1.c > tools/perf/util/sha1.h from include/crypto/sha1.h > tools/perf/util/sha1_base.h from include/crypto/sha1_base.h > tools/perf/util/sha1_generic.c from crypto/sha1_generic.c > > The reason that we are not syncing them with the kernel tree like other > tools header files is because of the deep dependency in That is ok, we do it in some other cases, but while looking at this patchset I checked and the source code for sha1_transform() is verbatim the same, as intended, I wonder if we could add infrastructure to check_headers.h to instead of checking whole files, check if the source code we got from the kernel is the same, something along the lines of: ⬢ [acme@toolbx perf-tools-next]$ line=$(ctags -x --c-kinds=f lib/crypto/sha1.c | awk '$1 == "sha1_transform" {print $3}') ⬢ [acme@toolbx perf-tools-next]$ sed -n $line,\$p lib/crypto/sha1.c | awk '{print} /\{/ {c++} /\}/ {c--; if (c==0) exit}' void sha1_transform(__u32 *digest, const char *data, __u32 *array) { __u32 A, B, C, D, E; unsigned int i = 0; A = digest[0]; B = digest[1]; C = digest[2]; D = digest[3]; E = digest[4]; /* Round 1 - iterations 0-16 take their input from 'data' */ for (; i < 16; ++i) T_0_15(i, A, B, C, D, E); /* Round 1 - tail. Input from 512-bit mixing array */ for (; i < 20; ++i) T_16_19(i, A, B, C, D, E); /* Round 2 */ for (; i < 40; ++i) T_20_39(i, A, B, C, D, E); /* Round 3 */ for (; i < 60; ++i) T_40_59(i, A, B, C, D, E); /* Round 4 */ for (; i < 80; ++i) T_60_79(i, A, B, C, D, E); digest[0] += A; digest[1] += B; digest[2] += C; digest[3] += D; digest[4] += E; } ⬢ [acme@toolbx perf-tools-next]$ But that can be done later :-) - Arnaldo > include/crypto/hash.h. It's painful to import the whole kernel crypto > driver infrastructure into tools. > The derived files get rid of struct shash_desc definition, and directly > operates on the struct sha1_state. > Signed-off-by: Yuzhuo Jing > --- > tools/perf/util/Build | 2 + > tools/perf/util/sha1.c | 122 +++++++++++++++++++++++++++++++++ > tools/perf/util/sha1.h | 41 +++++++++++ > tools/perf/util/sha1_base.h | 103 ++++++++++++++++++++++++++++ > tools/perf/util/sha1_generic.c | 49 +++++++++++++ > 5 files changed, 317 insertions(+) > create mode 100644 tools/perf/util/sha1.c > create mode 100644 tools/perf/util/sha1.h > create mode 100644 tools/perf/util/sha1_base.h > create mode 100644 tools/perf/util/sha1_generic.c > > diff --git a/tools/perf/util/Build b/tools/perf/util/Build > index 7910d908c814..ecee96b3f3fa 100644 > --- a/tools/perf/util/Build > +++ b/tools/perf/util/Build > @@ -41,6 +41,8 @@ perf-util-y += rbtree.o > perf-util-y += libstring.o > perf-util-y += bitmap.o > perf-util-y += hweight.o > +perf-util-y += sha1.o > +perf-util-y += sha1_generic.o > perf-util-y += smt.o > perf-util-y += strbuf.o > perf-util-y += string.o > diff --git a/tools/perf/util/sha1.c b/tools/perf/util/sha1.c > new file mode 100644 > index 000000000000..5ae658afb56b > --- /dev/null > +++ b/tools/perf/util/sha1.c > @@ -0,0 +1,122 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * SHA1 routine optimized to do word accesses rather than byte accesses, > + * and to avoid unnecessary copies into the context array. > + * > + * This was based on the git SHA1 implementation. > + */ > + > +#include > +#include > +#include > +#include > + > +#include "sha1.h" > + > +/* > + * If you have 32 registers or more, the compiler can (and should) > + * try to change the array[] accesses into registers. However, on > + * machines with less than ~25 registers, that won't really work, > + * and at least gcc will make an unholy mess of it. > + * > + * So to avoid that mess which just slows things down, we force > + * the stores to memory to actually happen (we might be better off > + * with a 'W(t)=(val);asm("":"+m" (W(t))' there instead, as > + * suggested by Artur Skawina - that will also make gcc unable to > + * try to do the silly "optimize away loads" part because it won't > + * see what the value will be). > + * > + * Ben Herrenschmidt reports that on PPC, the C version comes close > + * to the optimized asm with this (ie on PPC you don't want that > + * 'volatile', since there are lots of registers). > + * > + * On ARM we get the best code generation by forcing a full memory barrier > + * between each SHA_ROUND, otherwise gcc happily get wild with spilling and > + * the stack frame size simply explode and performance goes down the drain. > + */ > + > +#ifdef CONFIG_X86 > + #define setW(x, val) (*(volatile __u32 *)&W(x) = (val)) > +#elif defined(CONFIG_ARM) > + #define setW(x, val) do { W(x) = (val); __asm__("":::"memory"); } while (0) > +#else > + #define setW(x, val) (W(x) = (val)) > +#endif > + > +/* This "rolls" over the 512-bit array */ > +#define W(x) (array[(x)&15]) > + > +/* > + * Where do we get the source from? The first 16 iterations get it from > + * the input data, the next mix it from the 512-bit array. > + */ > +#define SHA_SRC(t) get_unaligned_be32((__u32 *)data + t) > +#define SHA_MIX(t) rol32(W(t+13) ^ W(t+8) ^ W(t+2) ^ W(t), 1) > + > +#define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \ > + __u32 TEMP = input(t); setW(t, TEMP); \ > + E += TEMP + rol32(A,5) + (fn) + (constant); \ > + B = ror32(B, 2); \ > + TEMP = E; E = D; D = C; C = B; B = A; A = TEMP; } while (0) > + > +#define T_0_15(t, A, B, C, D, E) SHA_ROUND(t, SHA_SRC, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E ) > +#define T_16_19(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E ) > +#define T_20_39(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0x6ed9eba1, A, B, C, D, E ) > +#define T_40_59(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, ((B&C)+(D&(B^C))) , 0x8f1bbcdc, A, B, C, D, E ) > +#define T_60_79(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0xca62c1d6, A, B, C, D, E ) > + > +/** > + * sha1_transform - single block SHA1 transform (deprecated) > + * > + * @digest: 160 bit digest to update > + * @data: 512 bits of data to hash > + * @array: 16 words of workspace (see note) > + * > + * This function executes SHA-1's internal compression function. It updates the > + * 160-bit internal state (@digest) with a single 512-bit data block (@data). > + * > + * Don't use this function. SHA-1 is no longer considered secure. And even if > + * you do have to use SHA-1, this isn't the correct way to hash something with > + * SHA-1 as this doesn't handle padding and finalization. > + * > + * Note: If the hash is security sensitive, the caller should be sure > + * to clear the workspace. This is left to the caller to avoid > + * unnecessary clears between chained hashing operations. > + */ > +void sha1_transform(__u32 *digest, const char *data, __u32 *array) > +{ > + __u32 A, B, C, D, E; > + unsigned int i = 0; > + > + A = digest[0]; > + B = digest[1]; > + C = digest[2]; > + D = digest[3]; > + E = digest[4]; > + > + /* Round 1 - iterations 0-16 take their input from 'data' */ > + for (; i < 16; ++i) > + T_0_15(i, A, B, C, D, E); > + > + /* Round 1 - tail. Input from 512-bit mixing array */ > + for (; i < 20; ++i) > + T_16_19(i, A, B, C, D, E); > + > + /* Round 2 */ > + for (; i < 40; ++i) > + T_20_39(i, A, B, C, D, E); > + > + /* Round 3 */ > + for (; i < 60; ++i) > + T_40_59(i, A, B, C, D, E); > + > + /* Round 4 */ > + for (; i < 80; ++i) > + T_60_79(i, A, B, C, D, E); > + > + digest[0] += A; > + digest[1] += B; > + digest[2] += C; > + digest[3] += D; > + digest[4] += E; > +} > diff --git a/tools/perf/util/sha1.h b/tools/perf/util/sha1.h > new file mode 100644 > index 000000000000..9da4ece49bc6 > --- /dev/null > +++ b/tools/perf/util/sha1.h > @@ -0,0 +1,41 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Common values for SHA-1 algorithms > + */ > + > +#ifndef _CRYPTO_SHA1_H > +#define _CRYPTO_SHA1_H > + > +#include > + > +#define SHA1_DIGEST_SIZE 20 > +#define SHA1_BLOCK_SIZE 64 > + > +#define SHA1_H0 0x67452301UL > +#define SHA1_H1 0xefcdab89UL > +#define SHA1_H2 0x98badcfeUL > +#define SHA1_H3 0x10325476UL > +#define SHA1_H4 0xc3d2e1f0UL > + > +struct sha1_state { > + u32 state[SHA1_DIGEST_SIZE / 4]; > + u64 count; > + u8 buffer[SHA1_BLOCK_SIZE]; > +}; > + > +extern int crypto_sha1_update(struct sha1_state *desc, const u8 *data, > + unsigned int len); > + > +extern int crypto_sha1_finup(struct sha1_state *desc, const u8 *data, > + unsigned int len, u8 *hash); > + > +/* > + * An implementation of SHA-1's compression function. Don't use in new code! > + * You shouldn't be using SHA-1, and even if you *have* to use SHA-1, this isn't > + * the correct way to hash something with SHA-1 (use crypto_shash instead). > + */ > +#define SHA1_DIGEST_WORDS (SHA1_DIGEST_SIZE / 4) > +#define SHA1_WORKSPACE_WORDS 16 > +void sha1_transform(__u32 *digest, const char *data, __u32 *W); > + > +#endif /* _CRYPTO_SHA1_H */ > diff --git a/tools/perf/util/sha1_base.h b/tools/perf/util/sha1_base.h > new file mode 100644 > index 000000000000..cea22c5a4952 > --- /dev/null > +++ b/tools/perf/util/sha1_base.h > @@ -0,0 +1,103 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * sha1_base.h - core logic for SHA-1 implementations > + * > + * Copyright (C) 2015 Linaro Ltd > + */ > + > +#ifndef _CRYPTO_SHA1_BASE_H > +#define _CRYPTO_SHA1_BASE_H > + > +#include > + > +#include > +#include > + > +#include "sha1.h" > + > +typedef void (sha1_block_fn)(struct sha1_state *sst, u8 const *src, int blocks); > + > +static inline int sha1_base_init(struct sha1_state *sctx) > +{ > + sctx->state[0] = SHA1_H0; > + sctx->state[1] = SHA1_H1; > + sctx->state[2] = SHA1_H2; > + sctx->state[3] = SHA1_H3; > + sctx->state[4] = SHA1_H4; > + sctx->count = 0; > + > + return 0; > +} > + > +static inline int sha1_base_do_update(struct sha1_state *sctx, > + const u8 *data, > + unsigned int len, > + sha1_block_fn *block_fn) > +{ > + unsigned int partial = sctx->count % SHA1_BLOCK_SIZE; > + > + sctx->count += len; > + > + if (unlikely((partial + len) >= SHA1_BLOCK_SIZE)) { > + int blocks; > + > + if (partial) { > + int p = SHA1_BLOCK_SIZE - partial; > + > + memcpy(sctx->buffer + partial, data, p); > + data += p; > + len -= p; > + > + block_fn(sctx, sctx->buffer, 1); > + } > + > + blocks = len / SHA1_BLOCK_SIZE; > + len %= SHA1_BLOCK_SIZE; > + > + if (blocks) { > + block_fn(sctx, data, blocks); > + data += blocks * SHA1_BLOCK_SIZE; > + } > + partial = 0; > + } > + if (len) > + memcpy(sctx->buffer + partial, data, len); > + > + return 0; > +} > + > +static inline int sha1_base_do_finalize(struct sha1_state *sctx, > + sha1_block_fn *block_fn) > +{ > + const int bit_offset = SHA1_BLOCK_SIZE - sizeof(__be64); > + __be64 *bits = (__be64 *)(sctx->buffer + bit_offset); > + unsigned int partial = sctx->count % SHA1_BLOCK_SIZE; > + > + sctx->buffer[partial++] = 0x80; > + if (partial > bit_offset) { > + memset(sctx->buffer + partial, 0x0, SHA1_BLOCK_SIZE - partial); > + partial = 0; > + > + block_fn(sctx, sctx->buffer, 1); > + } > + > + memset(sctx->buffer + partial, 0x0, bit_offset - partial); > + *bits = cpu_to_be64(sctx->count << 3); > + block_fn(sctx, sctx->buffer, 1); > + > + return 0; > +} > + > +static inline int sha1_base_finish(struct sha1_state *sctx, u8 *out) > +{ > + __be32 *digest = (__be32 *)out; > + int i; > + > + for (i = 0; i < SHA1_DIGEST_SIZE / (int)sizeof(__be32); i++) > + put_unaligned_be32(sctx->state[i], digest++); > + > + memzero_explicit(sctx, sizeof(*sctx)); > + return 0; > +} > + > +#endif /* _CRYPTO_SHA1_BASE_H */ > diff --git a/tools/perf/util/sha1_generic.c b/tools/perf/util/sha1_generic.c > new file mode 100644 > index 000000000000..b0a7af370d59 > --- /dev/null > +++ b/tools/perf/util/sha1_generic.c > @@ -0,0 +1,49 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Cryptographic API. > + * > + * SHA1 Secure Hash Algorithm. > + * > + * Derived from cryptoapi implementation, adapted for in-place > + * scatterlist interface. > + * > + * Copyright (c) Alan Smithee. > + * Copyright (c) Andrew McDonald > + * Copyright (c) Jean-Francois Dive > + */ > +#include > +#include > +#include > + > +#include "sha1_base.h" > + > +static void sha1_generic_block_fn(struct sha1_state *sst, u8 const *src, > + int blocks) > +{ > + u32 temp[SHA1_WORKSPACE_WORDS]; > + > + while (blocks--) { > + sha1_transform(sst->state, (const char *)src, temp); > + src += SHA1_BLOCK_SIZE; > + } > + memzero_explicit(temp, sizeof(temp)); > +} > + > +int crypto_sha1_update(struct sha1_state *desc, const u8 *data, > + unsigned int len) > +{ > + return sha1_base_do_update(desc, data, len, sha1_generic_block_fn); > +} > + > +static int sha1_final(struct sha1_state *desc, u8 *out) > +{ > + sha1_base_do_finalize(desc, sha1_generic_block_fn); > + return sha1_base_finish(desc, out); > +} > + > +int crypto_sha1_finup(struct sha1_state *desc, const u8 *data, > + unsigned int len, u8 *out) > +{ > + sha1_base_do_update(desc, data, len, sha1_generic_block_fn); > + return sha1_final(desc, out); > +} > -- > 2.49.0.1164.gab81da1b16-goog