From nobody Thu Oct 2 11:48:25 2025 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40382311953 for ; Wed, 1 Oct 2025 21:04:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759352647; cv=none; b=pxyKqKeWMYBO3vkr+akH28WxrvXigaa7e8Lgu9RHJL3JJZrAj69ZWM9p/L1CGTspkoBF/itD5O05OFNjjhI8IqEIlB5nY7h7RnmhZ0JkM0uiPqjUunZY6nIVhkZX7uo0BjsP9yN4IMt3BTtl2g5M3JUvdhOgwuFRhoqSdXXQCso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759352647; c=relaxed/simple; bh=zG+BMEqFMjLimSd+uHsTmtpB2rdFbSN9A/I9ca/nWJc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NPiemp49UCLNVC8H2gg+qzBYtfrRmBxMQMgTi6zGuPFbZ0ZLZ0VAsd39q3i8gVRG4UyP+M+wkz2A4kAx0ep74hCeCF8BjhaxnyKQ9TNSeBUbqOuK1GPBBnTAkwMN92g8hI018AvzDeDcl+FHcCIgQFIKD3W4ZjhMtVvk2vXnKXA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=o8IV+b2/; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="o8IV+b2/" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-46e3e177893so1535965e9.2 for ; Wed, 01 Oct 2025 14:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759352642; x=1759957442; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wjS59fjLSBp23Zb/zP6WgADegb2YBV3/Wv9KxGpAaxY=; b=o8IV+b2/1q6jm/GUPgeWTEe9y0iy1F+1PX3QUYe0GKXACEcW44HFdL9tySc7wgH4hc LpT69GZCpXaUFfNwXgDVglEkXeFe2mJHPN/TwE4Y2VTFGCbZIKnOt7e32l/PPJUJAFy/ /rl82LVCKOZI4A++vApXFh1mmwqziu66kIjbQqmomI//tLJBaTYSs/2sH7opr8guFf8v YnD+BXVVy/4B5l46gq7wDYp9G00mkkxlnER5N+ldHQsI9PPD9wViFcB1aB84ttFS30BA ObF+w5pCP5uCdFrsfczejRY9RFah/smeQo8bPOiJogLLSv7tPWAECRVJdvGn151dEKc1 iafg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759352642; x=1759957442; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wjS59fjLSBp23Zb/zP6WgADegb2YBV3/Wv9KxGpAaxY=; b=jxVg8EHaEgnCG89WZjgWGNCDuNZw9DVFDW4mN91CrEQ5VbwU8HgpMlB168cAfdBirL 5cRyrLsGCh1jhnFhDe9QluC2QCc/q9oiXFb0P+QWngI6LBOQQDu3ngH93ER/2dEW/fem ZH/6c4zkeIIIRtfsmFloBjL2e9Jp+Zwby8AaUTgit/vaCd2PocTshYb2lD3EYeU9LsAp 7S1Kw8BUEFq/WDFbpRzF90B2c+cejO6fpjMJ/BwdZJCyCDXoN/toUrozQ7iJvJUvXtBz NcExDMJuc1zGffJCMzczICruiFvHHLJ2GiNx8GEm3H3qkPKpcW1nyLEZuz5hi3fobfoh 01og== X-Forwarded-Encrypted: i=1; AJvYcCU+K0tra5PFa/+SQiaQkYkYIXmWeNTHVe6m2CnaGTgqLIDgjz/i8RAma4QoCMQ3b8zrYYOnSbfz1EVg8pw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz61R/QAzcbabLt6wwzhRxjo9sPD5GLfoBJFJ7SQ6Ew1UiAfrki KOBzTyfOg0Ubm+n8DRJjTCL2G/322OcJ8vR2wBKChovXM+p6roHk3gb5nhaOgkZTCDmdvj3ajA= = X-Google-Smtp-Source: AGHT+IEuIn0Xw8cSb0i16YD4euJ4+Kdw5OD8+fY/WVV0z4DuW0G513nRxE00Rg9xEjZ/WTTSw7yU1AAt X-Received: from wmcu7.prod.google.com ([2002:a7b:c047:0:b0:46e:3190:9ce]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:820c:b0:46e:4882:94c7 with SMTP id 5b1f17b1804b1-46e612cb269mr38395125e9.28.1759352642677; Wed, 01 Oct 2025 14:04:02 -0700 (PDT) Date: Wed, 1 Oct 2025 23:02:12 +0200 In-Reply-To: <20251001210201.838686-22-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251001210201.838686-22-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=9679; i=ardb@kernel.org; h=from:subject; bh=2x6PFDcDyExpe+QvLhnrBBMaZb8fzyr9//78pWmLSeM=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIePutC8aWtMOahe/uP15eVdzpfyKr+IGu7exxaxkcM5rX +RYwv2qo5SFQYyLQVZMkUVg9t93O09PlKp1niULM4eVCWQIAxenAEwkcRUjQwdTaMu7taGPZ98u lwx8s7Px0My84NWPth/49DM9af5WG6CKr+tNrpyZcUZph+bui8JeH/80b/1yz3l5gtNDxsddDT8 yOAA= X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251001210201.838686-32-ardb+git@google.com> Subject: [PATCH v2 10/20] lib/crypto: Switch ARM and arm64 to 'ksimd' scoped guard API From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, herbert@gondor.apana.org.au, linux@armlinux.org.uk, Ard Biesheuvel , Marc Zyngier , Will Deacon , Mark Rutland , Kees Cook , Catalin Marinas , Mark Brown , Eric Biggers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ard Biesheuvel Before modifying the prototypes of kernel_neon_begin() and kernel_neon_end() to accommodate kernel mode FP/SIMD state buffers allocated on the stack, move arm64 to the new 'ksimd' scoped guard API, which encapsulates the calls to those functions. For symmetry, do the same for 32-bit ARM too. Signed-off-by: Ard Biesheuvel --- lib/crypto/arm/chacha-glue.c | 6 ++---- lib/crypto/arm/poly1305-glue.c | 6 ++---- lib/crypto/arm/sha1.h | 13 ++++++------- lib/crypto/arm/sha256.h | 14 +++++++------- lib/crypto/arm/sha512.h | 6 +++--- lib/crypto/arm64/chacha-neon-glue.c | 11 ++++------- lib/crypto/arm64/poly1305-glue.c | 6 ++---- lib/crypto/arm64/sha1.h | 7 +++---- lib/crypto/arm64/sha256.h | 15 +++++++-------- lib/crypto/arm64/sha512.h | 8 ++++---- 10 files changed, 40 insertions(+), 52 deletions(-) diff --git a/lib/crypto/arm/chacha-glue.c b/lib/crypto/arm/chacha-glue.c index 88ec96415283..9c2e8d5edf20 100644 --- a/lib/crypto/arm/chacha-glue.c +++ b/lib/crypto/arm/chacha-glue.c @@ -14,7 +14,6 @@ =20 #include #include -#include #include =20 asmlinkage void chacha_block_xor_neon(const struct chacha_state *state, @@ -90,9 +89,8 @@ void chacha_crypt_arch(struct chacha_state *state, u8 *ds= t, const u8 *src, do { unsigned int todo =3D min_t(unsigned int, bytes, SZ_4K); =20 - kernel_neon_begin(); - chacha_doneon(state, dst, src, todo, nrounds); - kernel_neon_end(); + scoped_ksimd() + chacha_doneon(state, dst, src, todo, nrounds); =20 bytes -=3D todo; src +=3D todo; diff --git a/lib/crypto/arm/poly1305-glue.c b/lib/crypto/arm/poly1305-glue.c index 2d86c78af883..3e4624477e9f 100644 --- a/lib/crypto/arm/poly1305-glue.c +++ b/lib/crypto/arm/poly1305-glue.c @@ -6,7 +6,6 @@ */ =20 #include -#include #include #include #include @@ -39,9 +38,8 @@ void poly1305_blocks_arch(struct poly1305_block_state *st= ate, const u8 *src, do { unsigned int todo =3D min_t(unsigned int, len, SZ_4K); =20 - kernel_neon_begin(); - poly1305_blocks_neon(state, src, todo, padbit); - kernel_neon_end(); + scoped_ksimd() + poly1305_blocks_neon(state, src, todo, padbit); =20 len -=3D todo; src +=3D todo; diff --git a/lib/crypto/arm/sha1.h b/lib/crypto/arm/sha1.h index fa1e92419000..a4296ffefd05 100644 --- a/lib/crypto/arm/sha1.h +++ b/lib/crypto/arm/sha1.h @@ -4,7 +4,6 @@ * * Copyright 2025 Google LLC */ -#include #include =20 static __ro_after_init DEFINE_STATIC_KEY_FALSE(have_neon); @@ -22,12 +21,12 @@ static void sha1_blocks(struct sha1_block_state *state, { if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && static_branch_likely(&have_neon) && likely(may_use_simd())) { - kernel_neon_begin(); - if (static_branch_likely(&have_ce)) - sha1_ce_transform(state, data, nblocks); - else - sha1_transform_neon(state, data, nblocks); - kernel_neon_end(); + scoped_ksimd() { + if (static_branch_likely(&have_ce)) + sha1_ce_transform(state, data, nblocks); + else + sha1_transform_neon(state, data, nblocks); + } } else { sha1_block_data_order(state, data, nblocks); } diff --git a/lib/crypto/arm/sha256.h b/lib/crypto/arm/sha256.h index da75cbdc51d4..df861cc5b9ff 100644 --- a/lib/crypto/arm/sha256.h +++ b/lib/crypto/arm/sha256.h @@ -4,7 +4,7 @@ * * Copyright 2025 Google LLC */ -#include +#include #include =20 asmlinkage void sha256_block_data_order(struct sha256_block_state *state, @@ -22,12 +22,12 @@ static void sha256_blocks(struct sha256_block_state *st= ate, { if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && static_branch_likely(&have_neon) && crypto_simd_usable()) { - kernel_neon_begin(); - if (static_branch_likely(&have_ce)) - sha256_ce_transform(state, data, nblocks); - else - sha256_block_data_order_neon(state, data, nblocks); - kernel_neon_end(); + scoped_ksimd() { + if (static_branch_likely(&have_ce)) + sha256_ce_transform(state, data, nblocks); + else + sha256_block_data_order_neon(state, data, nblocks); + } } else { sha256_block_data_order(state, data, nblocks); } diff --git a/lib/crypto/arm/sha512.h b/lib/crypto/arm/sha512.h index f147b6490d6c..35b80e7e7db7 100644 --- a/lib/crypto/arm/sha512.h +++ b/lib/crypto/arm/sha512.h @@ -6,6 +6,7 @@ */ =20 #include +#include #include =20 static __ro_after_init DEFINE_STATIC_KEY_FALSE(have_neon); @@ -20,9 +21,8 @@ static void sha512_blocks(struct sha512_block_state *stat= e, { if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && static_branch_likely(&have_neon) && likely(crypto_simd_usable())) { - kernel_neon_begin(); - sha512_block_data_order_neon(state, data, nblocks); - kernel_neon_end(); + scoped_ksimd() + sha512_block_data_order_neon(state, data, nblocks); } else { sha512_block_data_order(state, data, nblocks); } diff --git a/lib/crypto/arm64/chacha-neon-glue.c b/lib/crypto/arm64/chacha-= neon-glue.c index d0188f974ca5..a3d109f0ce1e 100644 --- a/lib/crypto/arm64/chacha-neon-glue.c +++ b/lib/crypto/arm64/chacha-neon-glue.c @@ -25,7 +25,6 @@ #include =20 #include -#include #include =20 asmlinkage void chacha_block_xor_neon(const struct chacha_state *state, @@ -67,9 +66,8 @@ void hchacha_block_arch(const struct chacha_state *state, if (!static_branch_likely(&have_neon) || !crypto_simd_usable()) { hchacha_block_generic(state, out, nrounds); } else { - kernel_neon_begin(); - hchacha_block_neon(state, out, nrounds); - kernel_neon_end(); + scoped_ksimd() + hchacha_block_neon(state, out, nrounds); } } EXPORT_SYMBOL(hchacha_block_arch); @@ -84,9 +82,8 @@ void chacha_crypt_arch(struct chacha_state *state, u8 *ds= t, const u8 *src, do { unsigned int todo =3D min_t(unsigned int, bytes, SZ_4K); =20 - kernel_neon_begin(); - chacha_doneon(state, dst, src, todo, nrounds); - kernel_neon_end(); + scoped_ksimd() + chacha_doneon(state, dst, src, todo, nrounds); =20 bytes -=3D todo; src +=3D todo; diff --git a/lib/crypto/arm64/poly1305-glue.c b/lib/crypto/arm64/poly1305-g= lue.c index 31aea21ce42f..c83ce7d835d9 100644 --- a/lib/crypto/arm64/poly1305-glue.c +++ b/lib/crypto/arm64/poly1305-glue.c @@ -6,7 +6,6 @@ */ =20 #include -#include #include #include #include @@ -38,9 +37,8 @@ void poly1305_blocks_arch(struct poly1305_block_state *st= ate, const u8 *src, do { unsigned int todo =3D min_t(unsigned int, len, SZ_4K); =20 - kernel_neon_begin(); - poly1305_blocks_neon(state, src, todo, padbit); - kernel_neon_end(); + scoped_ksimd() + poly1305_blocks_neon(state, src, todo, padbit); =20 len -=3D todo; src +=3D todo; diff --git a/lib/crypto/arm64/sha1.h b/lib/crypto/arm64/sha1.h index f822563538cc..3d0da0045fed 100644 --- a/lib/crypto/arm64/sha1.h +++ b/lib/crypto/arm64/sha1.h @@ -4,7 +4,6 @@ * * Copyright 2025 Google LLC */ -#include #include #include =20 @@ -20,9 +19,9 @@ static void sha1_blocks(struct sha1_block_state *state, do { size_t rem; =20 - kernel_neon_begin(); - rem =3D __sha1_ce_transform(state, data, nblocks); - kernel_neon_end(); + scoped_ksimd() + rem =3D __sha1_ce_transform(state, data, nblocks); + data +=3D (nblocks - rem) * SHA1_BLOCK_SIZE; nblocks =3D rem; } while (nblocks); diff --git a/lib/crypto/arm64/sha256.h b/lib/crypto/arm64/sha256.h index a211966c124a..0a9f9d70bb43 100644 --- a/lib/crypto/arm64/sha256.h +++ b/lib/crypto/arm64/sha256.h @@ -4,7 +4,7 @@ * * Copyright 2025 Google LLC */ -#include +#include #include #include =20 @@ -27,17 +27,16 @@ static void sha256_blocks(struct sha256_block_state *st= ate, do { size_t rem; =20 - kernel_neon_begin(); - rem =3D __sha256_ce_transform(state, - data, nblocks); - kernel_neon_end(); + scoped_ksimd() + rem =3D __sha256_ce_transform(state, data, + nblocks); + data +=3D (nblocks - rem) * SHA256_BLOCK_SIZE; nblocks =3D rem; } while (nblocks); } else { - kernel_neon_begin(); - sha256_block_neon(state, data, nblocks); - kernel_neon_end(); + scoped_ksimd() + sha256_block_neon(state, data, nblocks); } } else { sha256_block_data_order(state, data, nblocks); diff --git a/lib/crypto/arm64/sha512.h b/lib/crypto/arm64/sha512.h index 6abb40b467f2..1b6c3974d553 100644 --- a/lib/crypto/arm64/sha512.h +++ b/lib/crypto/arm64/sha512.h @@ -5,7 +5,7 @@ * Copyright 2025 Google LLC */ =20 -#include +#include #include #include =20 @@ -25,9 +25,9 @@ static void sha512_blocks(struct sha512_block_state *stat= e, do { size_t rem; =20 - kernel_neon_begin(); - rem =3D __sha512_ce_transform(state, data, nblocks); - kernel_neon_end(); + scoped_ksimd() + rem =3D __sha512_ce_transform(state, data, nblocks); + data +=3D (nblocks - rem) * SHA512_BLOCK_SIZE; nblocks =3D rem; } while (nblocks); --=20 2.51.0.618.g983fd99d29-goog