lib/crypto: sha512: Use underlying functions instead of crypto_simd_usable()
Subsystems (3)
Eric Biggers
maintainerPATCH 1/1 lib/crypto: sha512: Use underlying functions instead of crypto_simd_usable()
Since sha512_kunit tests the fallback code paths without using crypto_simd_disabled_for_test, make the SHA-512 code just use the underlying may_use_simd() and irq_fpu_usable() functions directly instead of crypto_simd_usable(). This eliminates an unnecessary layer.
--- lib/crypto/arm/sha512.h | 5 ++--- lib/crypto/arm64/sha512.h | 5 ++--- lib/crypto/riscv/sha512.h | 4 +--- lib/crypto/x86/sha512.h | 4 +--- 4 files changed, 6 insertions(+), 12 deletions(-)
lib/crypto/arm/sha512.h +2 -3
@@ -2,13 +2,12 @@/* * arm32-optimized SHA-512 block function * * Copyright 2025 Google LLC */ -#include <asm/neon.h> -#include <crypto/internal/simd.h> +#include <asm/simd.h> static __ro_after_init DEFINE_STATIC_KEY_FALSE (have_neon); asmlinkage void sha512_block_data_order(struct sha512_block_state *state,const u8 *data,size_t nblocks);
@@ -17,11 +16,11 @@ asmlinkage void sha512_block_data_order_neon(struct sha512_block_state *state,static void sha512_blocks (struct sha512_block_state *state,const u8 *data,size_t nblocks) {if (IS_ENABLED (CONFIG_KERNEL_MODE_NEON ) && -static_branch_likely (&have_neon) &&likely (crypto_simd_usable ())) { +static_branch_likely (&have_neon) &&likely (may_use_simd ())) {kernel_neon_begin ();sha512_block_data_order_neon (state, data, nblocks);kernel_neon_end (); }else {sha512_block_data_order (state, data, nblocks);
lib/crypto/arm64/sha512.h +2 -3
@@ -2,13 +2,12 @@/* * arm64-optimized SHA-512 block function * * Copyright 2025 Google LLC */ -#include <asm/neon.h> -#include <crypto/internal/simd.h> +#include <asm/simd.h> #include <linux/cpufeature.h> static __ro_after_init DEFINE_STATIC_KEY_FALSE (have_sha512_insns); asmlinkage void sha512_block_data_order(struct sha512_block_state *state,
@@ -19,11 +18,11 @@ asmlinkage size_t __sha512_ce_transform(struct sha512_block_state *state,static void sha512_blocks (struct sha512_block_state *state,const u8 *data,size_t nblocks) {if (IS_ENABLED (CONFIG_KERNEL_MODE_NEON ) &&static_branch_likely (&have_sha512_insns) && -likely (crypto_simd_usable ())) { +likely (may_use_simd ())) { do { size_t rem; kernel_neon_begin(); rem = __sha512_ce_transform(state, data, nblocks);
lib/crypto/riscv/sha512.h +1 -3
@@ -9,22 +9,20 @@* Author: Jerry Shih <[email protected]> */ #include <asm/simd.h> #include <asm/vector.h> -#include <crypto/internal/simd.h> static __ro_after_init DEFINE_STATIC_KEY_FALSE (have_extensions); asmlinkage void sha512_transform_zvknhb_zvkb(struct sha512_block_state *state,const u8 *data,size_t nblocks);static void sha512_blocks (struct sha512_block_state *state,const u8 *data,size_t nblocks) { -if (static_branch_likely (&have_extensions) && -likely (crypto_simd_usable ())) { +if (static_branch_likely (&have_extensions) &&likely (may_use_simd ())) {kernel_vector_begin ();sha512_transform_zvknhb_zvkb (state, data, nblocks);kernel_vector_end (); }else {sha512_blocks_generic (state, data, nblocks);
lib/crypto/x86/sha512.h +1 -3
@@ -2,24 +2,22 @@/* * x86-optimized SHA-512 block function * * Copyright 2025 Google LLC */ -#include <asm/fpu/api.h> -#include <crypto/internal/simd.h> #include <linux/static_call.h> DEFINE_STATIC_CALL (sha512_blocks_x86, sha512_blocks_generic);#define DEFINE_X86_SHA512_FN (c_fn, asm_fn) \ asmlinkage void asm_fn(struct sha512_block_state *state, \ const u8 *data, size_t nblocks); \ static void c_fn(struct sha512_block_state *state, const u8 *data, \ size_t nblocks) \ { \ - if (likely(crypto_simd_usable())) { \ + if (likely(irq_fpu_usable())) { \ kernel_fpu_begin(); \ asm_fn(state, data, nblocks); \ kernel_fpu_end(); \ } else { \ sha512_blocks_generic(state, data, nblocks); \
base-commit: d6084bb815c453de27af8071a23163a711586a6c
Signature · 1 line
2.50.1
Quoted 5 lines · Eric Biggers
Since
sha512_kunittests the fallback code paths without usingcrypto_simd_disabled_for_test, make the SHA-512 code just use the underlyingmay_use_simd()andirq_fpu_usable()functions directly instead ofcrypto_simd_usable(). This eliminates an unnecessary layer.
Quoted 7 lines
Signed-off-by Eric Biggers <[email protected]>--- lib/crypto/arm/sha512.h | 5 ++--- lib/crypto/arm64/sha512.h | 5 ++--- lib/crypto/riscv/sha512.h | 4 +--- lib/crypto/x86/sha512.h | 4 +--- 4 files changed, 6 insertions(+), 12 deletions(-)
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git/log/?h=libcrypto-next
- Eric