lib/crypto: sparc/sha1: Migrate optimized code into library

Instead of exposing the sparc-optimized SHA-1 code via sparc-specific
crypto_shash algorithms, instead just implement the sha1_blocks()
library function.  This is much simpler, it makes the SHA-1 library
functions be sparc-optimized, and it fixes the longstanding issue where
the sparc-optimized SHA-1 code was disabled by default.  SHA-1 still
remains available through crypto_shash, but individual architectures no
longer need to handle it.

Note: to see the diff from arch/sparc/crypto/sha1_glue.c to
lib/crypto/sparc/sha1.h, view this commit with 'git show -M10'.

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250712232329.818226-13-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

diff --git a/arch/sparc/crypto/Kconfig b/arch/sparc/crypto/Kconfig
index 9d8da9aef3a410d0da93ef377eb564995c6588d3..f5b2e720fec3c1b1b003d7b2a3b0f02bdd703238 100644 (file)
--- a/arch/sparc/crypto/Kconfig
+++ b/arch/sparc/crypto/Kconfig
@@ -26,16 +26,6 @@ config CRYPTO_MD5_SPARC64
 
          Architecture: sparc64 using crypto instructions, when available
 
-config CRYPTO_SHA1_SPARC64
-       tristate "Hash functions: SHA-1"
-       depends on SPARC64
-       select CRYPTO_SHA1
-       select CRYPTO_HASH
-       help
-         SHA-1 secure hash algorithm (FIPS 180)
-
-         Architecture: sparc64
-
 config CRYPTO_AES_SPARC64
        tristate "Ciphers: AES, modes: ECB, CBC, CTR"
        depends on SPARC64

diff --git a/arch/sparc/crypto/Makefile b/arch/sparc/crypto/Makefile
index 99a7e8fd13bc9103f2dd983e7a1c36d4f34c5c7e..0d05a17988c4cde79877bd6fa5d5c5f24f23cb48 100644 (file)
--- a/arch/sparc/crypto/Makefile
+++ b/arch/sparc/crypto/Makefile
@@ -3,14 +3,12 @@
 # Arch-specific CryptoAPI modules.
 #
 
-obj-$(CONFIG_CRYPTO_SHA1_SPARC64) += sha1-sparc64.o
 obj-$(CONFIG_CRYPTO_MD5_SPARC64) += md5-sparc64.o
 
 obj-$(CONFIG_CRYPTO_AES_SPARC64) += aes-sparc64.o
 obj-$(CONFIG_CRYPTO_DES_SPARC64) += des-sparc64.o
 obj-$(CONFIG_CRYPTO_CAMELLIA_SPARC64) += camellia-sparc64.o
 
-sha1-sparc64-y := sha1_asm.o sha1_glue.o
 md5-sparc64-y := md5_asm.o md5_glue.o
 
 aes-sparc64-y := aes_asm.o aes_glue.o

diff --git a/arch/sparc/crypto/sha1_asm.S b/arch/sparc/crypto/sha1_asm.S
deleted file mode 100644 (file)
index 00b46ba..0000000
--- a/arch/sparc/crypto/sha1_asm.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#include <linux/linkage.h>
-#include <asm/opcodes.h>
-#include <asm/visasm.h>
-
-ENTRY(sha1_sparc64_transform)
-       /* %o0 = digest, %o1 = data, %o2 = rounds */
-       VISEntryHalf
-       ld      [%o0 + 0x00], %f0
-       ld      [%o0 + 0x04], %f1
-       ld      [%o0 + 0x08], %f2
-       andcc   %o1, 0x7, %g0
-       ld      [%o0 + 0x0c], %f3
-       bne,pn  %xcc, 10f
-        ld     [%o0 + 0x10], %f4
-
-1:
-       ldd     [%o1 + 0x00], %f8
-       ldd     [%o1 + 0x08], %f10
-       ldd     [%o1 + 0x10], %f12
-       ldd     [%o1 + 0x18], %f14
-       ldd     [%o1 + 0x20], %f16
-       ldd     [%o1 + 0x28], %f18
-       ldd     [%o1 + 0x30], %f20
-       ldd     [%o1 + 0x38], %f22
-
-       SHA1
-
-       subcc   %o2, 1, %o2
-       bne,pt  %xcc, 1b
-        add    %o1, 0x40, %o1
-
-5:
-       st      %f0, [%o0 + 0x00]
-       st      %f1, [%o0 + 0x04]
-       st      %f2, [%o0 + 0x08]
-       st      %f3, [%o0 + 0x0c]
-       st      %f4, [%o0 + 0x10]
-       retl
-        VISExitHalf
-10:
-       alignaddr %o1, %g0, %o1
-
-       ldd     [%o1 + 0x00], %f10
-1:
-       ldd     [%o1 + 0x08], %f12
-       ldd     [%o1 + 0x10], %f14
-       ldd     [%o1 + 0x18], %f16
-       ldd     [%o1 + 0x20], %f18
-       ldd     [%o1 + 0x28], %f20
-       ldd     [%o1 + 0x30], %f22
-       ldd     [%o1 + 0x38], %f24
-       ldd     [%o1 + 0x40], %f26
-
-       faligndata %f10, %f12, %f8
-       faligndata %f12, %f14, %f10
-       faligndata %f14, %f16, %f12
-       faligndata %f16, %f18, %f14
-       faligndata %f18, %f20, %f16
-       faligndata %f20, %f22, %f18
-       faligndata %f22, %f24, %f20
-       faligndata %f24, %f26, %f22
-
-       SHA1
-
-       subcc   %o2, 1, %o2
-       fsrc2   %f26, %f10
-       bne,pt  %xcc, 1b
-        add    %o1, 0x40, %o1
-
-       ba,a,pt %xcc, 5b
-ENDPROC(sha1_sparc64_transform)

diff --git a/arch/sparc/crypto/sha1_glue.c b/arch/sparc/crypto/sha1_glue.c
deleted file mode 100644 (file)
index ef19d50..0000000
--- a/arch/sparc/crypto/sha1_glue.c
+++ /dev/null
@@ -1,94 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Glue code for SHA1 hashing optimized for sparc64 crypto opcodes.
- *
- * This is based largely upon arch/x86/crypto/sha1_ssse3_glue.c
- *
- * Copyright (c) Alan Smithee.
- * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
- * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
- * Copyright (c) Mathias Krause <minipli@googlemail.com>
- */
-
-#define pr_fmt(fmt)    KBUILD_MODNAME ": " fmt
-
-#include <asm/elf.h>
-#include <asm/opcodes.h>
-#include <asm/pstate.h>
-#include <crypto/internal/hash.h>
-#include <crypto/sha1.h>
-#include <crypto/sha1_base.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-
-asmlinkage void sha1_sparc64_transform(struct sha1_state *digest,
-                                      const u8 *data, int rounds);
-
-static int sha1_sparc64_update(struct shash_desc *desc, const u8 *data,
-                              unsigned int len)
-{
-       return sha1_base_do_update_blocks(desc, data, len,
-                                         sha1_sparc64_transform);
-}
-
-/* Add padding and return the message digest. */
-static int sha1_sparc64_finup(struct shash_desc *desc, const u8 *src,
-                             unsigned int len, u8 *out)
-{
-       sha1_base_do_finup(desc, src, len, sha1_sparc64_transform);
-       return sha1_base_finish(desc, out);
-}
-
-static struct shash_alg alg = {
-       .digestsize     =       SHA1_DIGEST_SIZE,
-       .init           =       sha1_base_init,
-       .update         =       sha1_sparc64_update,
-       .finup          =       sha1_sparc64_finup,
-       .descsize       =       SHA1_STATE_SIZE,
-       .base           =       {
-               .cra_name       =       "sha1",
-               .cra_driver_name=       "sha1-sparc64",
-               .cra_priority   =       SPARC_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY,
-               .cra_blocksize  =       SHA1_BLOCK_SIZE,
-               .cra_module     =       THIS_MODULE,
-       }
-};
-
-static bool __init sparc64_has_sha1_opcode(void)
-{
-       unsigned long cfr;
-
-       if (!(sparc64_elf_hwcap & HWCAP_SPARC_CRYPTO))
-               return false;
-
-       __asm__ __volatile__("rd %%asr26, %0" : "=r" (cfr));
-       if (!(cfr & CFR_SHA1))
-               return false;
-
-       return true;
-}
-
-static int __init sha1_sparc64_mod_init(void)
-{
-       if (sparc64_has_sha1_opcode()) {
-               pr_info("Using sparc64 sha1 opcode optimized SHA-1 implementation\n");
-               return crypto_register_shash(&alg);
-       }
-       pr_info("sparc64 sha1 opcode not available.\n");
-       return -ENODEV;
-}
-
-static void __exit sha1_sparc64_mod_fini(void)
-{
-       crypto_unregister_shash(&alg);
-}
-
-module_init(sha1_sparc64_mod_init);
-module_exit(sha1_sparc64_mod_fini);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated");
-
-MODULE_ALIAS_CRYPTO("sha1");
-
-#include "crop_devid.c"

diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index 7da0432d8164387eeb69301a9a67ad6fe4f4710d..019034f2bb53313c80dd71391f6a764cc7d768cd 100644 (file)
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -151,6 +151,7 @@ config CRYPTO_LIB_SHA1_ARCH
        default y if MIPS && CPU_CAVIUM_OCTEON
        default y if PPC
        default y if S390
+       default y if SPARC64
 
 config CRYPTO_LIB_SHA256
        tristate

diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 02f672562928e1993fb2050fa4f02f69a3bdd892..7897da2de6236fc6f28da1de14600504f028ae55 100644 (file)
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -81,6 +81,7 @@ ifeq ($(CONFIG_PPC),y)
 libsha1-y += powerpc/sha1-powerpc-asm.o
 libsha1-$(CONFIG_SPE) += powerpc/sha1-spe-asm.o
 endif
+libsha1-$(CONFIG_SPARC) += sparc/sha1_asm.o
 endif # CONFIG_CRYPTO_LIB_SHA1_ARCH
 
 ################################################################################

diff --git a/lib/crypto/sparc/sha1.h b/lib/crypto/sparc/sha1.h
new file mode 100644 (file)
index 0000000..5015f93
--- /dev/null
+++ b/lib/crypto/sparc/sha1.h
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * SHA-1 accelerated using the sparc64 crypto opcodes
+ *
+ * Copyright (c) Alan Smithee.
+ * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
+ * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
+ * Copyright (c) Mathias Krause <minipli@googlemail.com>
+ */
+
+#include <asm/elf.h>
+#include <asm/opcodes.h>
+#include <asm/pstate.h>
+
+static __ro_after_init DEFINE_STATIC_KEY_FALSE(have_sha1_opcodes);
+
+asmlinkage void sha1_sparc64_transform(struct sha1_block_state *state,
+                                      const u8 *data, size_t nblocks);
+
+static void sha1_blocks(struct sha1_block_state *state,
+                       const u8 *data, size_t nblocks)
+{
+       if (static_branch_likely(&have_sha1_opcodes))
+               sha1_sparc64_transform(state, data, nblocks);
+       else
+               sha1_blocks_generic(state, data, nblocks);
+}
+
+#define sha1_mod_init_arch sha1_mod_init_arch
+static inline void sha1_mod_init_arch(void)
+{
+       unsigned long cfr;
+
+       if (!(sparc64_elf_hwcap & HWCAP_SPARC_CRYPTO))
+               return;
+
+       __asm__ __volatile__("rd %%asr26, %0" : "=r" (cfr));
+       if (!(cfr & CFR_SHA1))
+               return;
+
+       static_branch_enable(&have_sha1_opcodes);
+       pr_info("Using sparc64 sha1 opcode optimized SHA-1 implementation\n");
+}

diff --git a/lib/crypto/sparc/sha1_asm.S b/lib/crypto/sparc/sha1_asm.S
new file mode 100644 (file)
index 0000000..00b46ba
--- /dev/null
+++ b/lib/crypto/sparc/sha1_asm.S
@@ -0,0 +1,72 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/linkage.h>
+#include <asm/opcodes.h>
+#include <asm/visasm.h>
+
+ENTRY(sha1_sparc64_transform)
+       /* %o0 = digest, %o1 = data, %o2 = rounds */
+       VISEntryHalf
+       ld      [%o0 + 0x00], %f0
+       ld      [%o0 + 0x04], %f1
+       ld      [%o0 + 0x08], %f2
+       andcc   %o1, 0x7, %g0
+       ld      [%o0 + 0x0c], %f3
+       bne,pn  %xcc, 10f
+        ld     [%o0 + 0x10], %f4
+
+1:
+       ldd     [%o1 + 0x00], %f8
+       ldd     [%o1 + 0x08], %f10
+       ldd     [%o1 + 0x10], %f12
+       ldd     [%o1 + 0x18], %f14
+       ldd     [%o1 + 0x20], %f16
+       ldd     [%o1 + 0x28], %f18
+       ldd     [%o1 + 0x30], %f20
+       ldd     [%o1 + 0x38], %f22
+
+       SHA1
+
+       subcc   %o2, 1, %o2
+       bne,pt  %xcc, 1b
+        add    %o1, 0x40, %o1
+
+5:
+       st      %f0, [%o0 + 0x00]
+       st      %f1, [%o0 + 0x04]
+       st      %f2, [%o0 + 0x08]
+       st      %f3, [%o0 + 0x0c]
+       st      %f4, [%o0 + 0x10]
+       retl
+        VISExitHalf
+10:
+       alignaddr %o1, %g0, %o1
+
+       ldd     [%o1 + 0x00], %f10
+1:
+       ldd     [%o1 + 0x08], %f12
+       ldd     [%o1 + 0x10], %f14
+       ldd     [%o1 + 0x18], %f16
+       ldd     [%o1 + 0x20], %f18
+       ldd     [%o1 + 0x28], %f20
+       ldd     [%o1 + 0x30], %f22
+       ldd     [%o1 + 0x38], %f24
+       ldd     [%o1 + 0x40], %f26
+
+       faligndata %f10, %f12, %f8
+       faligndata %f12, %f14, %f10
+       faligndata %f14, %f16, %f12
+       faligndata %f16, %f18, %f14
+       faligndata %f18, %f20, %f16
+       faligndata %f20, %f22, %f18
+       faligndata %f22, %f24, %f20
+       faligndata %f24, %f26, %f22
+
+       SHA1
+
+       subcc   %o2, 1, %o2
+       fsrc2   %f26, %f10
+       bne,pt  %xcc, 1b
+        add    %o1, 0x40, %o1
+
+       ba,a,pt %xcc, 5b
+ENDPROC(sha1_sparc64_transform)