lib/crypto: mips/md5: Migrate optimized code into library

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

Note: to see the diff from arch/mips/cavium-octeon/crypto/octeon-md5.c
to lib/crypto/mips/md5.h, view this commit with 'git show -M10'.

Link: https://lore.kernel.org/r/20250805222855.10362-3-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

diff --git a/arch/mips/cavium-octeon/crypto/Makefile b/arch/mips/cavium-octeon/crypto/Makefile
index 83f2f5dd93cccde4ddaee1c0097a23625dff3c97..b7d03e8a03187ecece68b670fc54666982c4ba55 100644 (file)
--- a/arch/mips/cavium-octeon/crypto/Makefile
+++ b/arch/mips/cavium-octeon/crypto/Makefile
@@ -4,5 +4,3 @@
 #
 
 obj-y += octeon-crypto.o
-
-obj-$(CONFIG_CRYPTO_MD5_OCTEON)                += octeon-md5.o

diff --git a/arch/mips/cavium-octeon/crypto/octeon-md5.c b/arch/mips/cavium-octeon/crypto/octeon-md5.c
deleted file mode 100644 (file)
index a8ce831..0000000
--- a/arch/mips/cavium-octeon/crypto/octeon-md5.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Cryptographic API.
- *
- * MD5 Message Digest Algorithm (RFC1321).
- *
- * Adapted for OCTEON by Aaro Koskinen <aaro.koskinen@iki.fi>.
- *
- * Based on crypto/md5.c, which is:
- *
- * Derived from cryptoapi implementation, originally based on the
- * public domain implementation written by Colin Plumb in 1993.
- *
- * Copyright (c) Cryptoapi developers.
- * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#include <asm/octeon/crypto.h>
-#include <asm/octeon/octeon.h>
-#include <crypto/internal/hash.h>
-#include <crypto/md5.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/unaligned.h>
-
-struct octeon_md5_state {
-       __le32 hash[MD5_HASH_WORDS];
-       u64 byte_count;
-};
-
-/*
- * We pass everything as 64-bit. OCTEON can handle misaligned data.
- */
-
-static void octeon_md5_store_hash(struct octeon_md5_state *ctx)
-{
-       u64 *hash = (u64 *)ctx->hash;
-
-       write_octeon_64bit_hash_dword(hash[0], 0);
-       write_octeon_64bit_hash_dword(hash[1], 1);
-}
-
-static void octeon_md5_read_hash(struct octeon_md5_state *ctx)
-{
-       u64 *hash = (u64 *)ctx->hash;
-
-       hash[0] = read_octeon_64bit_hash_dword(0);
-       hash[1] = read_octeon_64bit_hash_dword(1);
-}
-
-static void octeon_md5_transform(const void *_block)
-{
-       const u64 *block = _block;
-
-       write_octeon_64bit_block_dword(block[0], 0);
-       write_octeon_64bit_block_dword(block[1], 1);
-       write_octeon_64bit_block_dword(block[2], 2);
-       write_octeon_64bit_block_dword(block[3], 3);
-       write_octeon_64bit_block_dword(block[4], 4);
-       write_octeon_64bit_block_dword(block[5], 5);
-       write_octeon_64bit_block_dword(block[6], 6);
-       octeon_md5_start(block[7]);
-}
-
-static int octeon_md5_init(struct shash_desc *desc)
-{
-       struct octeon_md5_state *mctx = shash_desc_ctx(desc);
-
-       mctx->hash[0] = cpu_to_le32(MD5_H0);
-       mctx->hash[1] = cpu_to_le32(MD5_H1);
-       mctx->hash[2] = cpu_to_le32(MD5_H2);
-       mctx->hash[3] = cpu_to_le32(MD5_H3);
-       mctx->byte_count = 0;
-
-       return 0;
-}
-
-static int octeon_md5_update(struct shash_desc *desc, const u8 *data,
-                            unsigned int len)
-{
-       struct octeon_md5_state *mctx = shash_desc_ctx(desc);
-       struct octeon_cop2_state state;
-       unsigned long flags;
-
-       mctx->byte_count += len;
-       flags = octeon_crypto_enable(&state);
-       octeon_md5_store_hash(mctx);
-
-       do {
-               octeon_md5_transform(data);
-               data += MD5_HMAC_BLOCK_SIZE;
-               len -= MD5_HMAC_BLOCK_SIZE;
-       } while (len >= MD5_HMAC_BLOCK_SIZE);
-
-       octeon_md5_read_hash(mctx);
-       octeon_crypto_disable(&state, flags);
-       mctx->byte_count -= len;
-       return len;
-}
-
-static int octeon_md5_finup(struct shash_desc *desc, const u8 *src,
-                           unsigned int offset, u8 *out)
-{
-       struct octeon_md5_state *mctx = shash_desc_ctx(desc);
-       int padding = 56 - (offset + 1);
-       struct octeon_cop2_state state;
-       u32 block[MD5_BLOCK_WORDS];
-       unsigned long flags;
-       char *p;
-
-       p = memcpy(block, src, offset);
-       p += offset;
-       *p++ = 0x80;
-
-       flags = octeon_crypto_enable(&state);
-       octeon_md5_store_hash(mctx);
-
-       if (padding < 0) {
-               memset(p, 0x00, padding + sizeof(u64));
-               octeon_md5_transform(block);
-               p = (char *)block;
-               padding = 56;
-       }
-
-       memset(p, 0, padding);
-       mctx->byte_count += offset;
-       block[14] = mctx->byte_count << 3;
-       block[15] = mctx->byte_count >> 29;
-       cpu_to_le32_array(block + 14, 2);
-       octeon_md5_transform(block);
-
-       octeon_md5_read_hash(mctx);
-       octeon_crypto_disable(&state, flags);
-
-       memzero_explicit(block, sizeof(block));
-       memcpy(out, mctx->hash, sizeof(mctx->hash));
-
-       return 0;
-}
-
-static int octeon_md5_export(struct shash_desc *desc, void *out)
-{
-       struct octeon_md5_state *ctx = shash_desc_ctx(desc);
-       union {
-               u8 *u8;
-               u32 *u32;
-               u64 *u64;
-       } p = { .u8 = out };
-       int i;
-
-       for (i = 0; i < MD5_HASH_WORDS; i++)
-               put_unaligned(le32_to_cpu(ctx->hash[i]), p.u32++);
-       put_unaligned(ctx->byte_count, p.u64);
-       return 0;
-}
-
-static int octeon_md5_import(struct shash_desc *desc, const void *in)
-{
-       struct octeon_md5_state *ctx = shash_desc_ctx(desc);
-       union {
-               const u8 *u8;
-               const u32 *u32;
-               const u64 *u64;
-       } p = { .u8 = in };
-       int i;
-
-       for (i = 0; i < MD5_HASH_WORDS; i++)
-               ctx->hash[i] = cpu_to_le32(get_unaligned(p.u32++));
-       ctx->byte_count = get_unaligned(p.u64);
-       return 0;
-}
-
-static struct shash_alg alg = {
-       .digestsize     =       MD5_DIGEST_SIZE,
-       .init           =       octeon_md5_init,
-       .update         =       octeon_md5_update,
-       .finup          =       octeon_md5_finup,
-       .export         =       octeon_md5_export,
-       .import         =       octeon_md5_import,
-       .statesize      =       MD5_STATE_SIZE,
-       .descsize       =       sizeof(struct octeon_md5_state),
-       .base           =       {
-               .cra_name       =       "md5",
-               .cra_driver_name=       "octeon-md5",
-               .cra_priority   =       OCTEON_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_AHASH_ALG_BLOCK_ONLY,
-               .cra_blocksize  =       MD5_HMAC_BLOCK_SIZE,
-               .cra_module     =       THIS_MODULE,
-       }
-};
-
-static int __init md5_mod_init(void)
-{
-       if (!octeon_has_crypto())
-               return -ENOTSUPP;
-       return crypto_register_shash(&alg);
-}
-
-static void __exit md5_mod_fini(void)
-{
-       crypto_unregister_shash(&alg);
-}
-
-module_init(md5_mod_init);
-module_exit(md5_mod_fini);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("MD5 Message Digest Algorithm (OCTEON)");
-MODULE_AUTHOR("Aaro Koskinen <aaro.koskinen@iki.fi>");

diff --git a/arch/mips/configs/cavium_octeon_defconfig b/arch/mips/configs/cavium_octeon_defconfig
index 3f50e1d78894a1738a666eab997a299132f0b008..68c363366bceb8cb36bf53f5beb7c681fb0c9fd1 100644 (file)
--- a/arch/mips/configs/cavium_octeon_defconfig
+++ b/arch/mips/configs/cavium_octeon_defconfig
@@ -155,7 +155,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5_OCTEON=y
 CONFIG_CRYPTO_DES=y
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_FS=y

diff --git a/arch/mips/crypto/Kconfig b/arch/mips/crypto/Kconfig
index 7b91f4ec65bffb3dff641349150b8c245eff48de..6a5bd5074867e0363df76037e15bbbe9168d1610 100644 (file)
--- a/arch/mips/crypto/Kconfig
+++ b/arch/mips/crypto/Kconfig
@@ -2,14 +2,4 @@
 
 menu "Accelerated Cryptographic Algorithms for CPU (mips)"
 
-config CRYPTO_MD5_OCTEON
-       tristate "Digests: MD5 (OCTEON)"
-       depends on CPU_CAVIUM_OCTEON
-       select CRYPTO_MD5
-       select CRYPTO_HASH
-       help
-         MD5 message digest algorithm (RFC1321)
-
-         Architecture: mips OCTEON using crypto instructions, when available
-
 endmenu

diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index e38e8ed779d843231787412cc7e53ece8de6eb79..7b4e47ce37bbe45688282304e8b52a0db83e6a40 100644 (file)
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -110,6 +110,7 @@ config CRYPTO_LIB_MD5
 config CRYPTO_LIB_MD5_ARCH
        bool
        depends on CRYPTO_LIB_MD5 && !UML
+       default y if MIPS && CPU_CAVIUM_OCTEON
 
 config CRYPTO_LIB_POLY1305_RSIZE
        int

diff --git a/lib/crypto/mips/md5.h b/lib/crypto/mips/md5.h
new file mode 100644 (file)
index 0000000..e08e28a
--- /dev/null
+++ b/lib/crypto/mips/md5.h
@@ -0,0 +1,65 @@
+/*
+ * Cryptographic API.
+ *
+ * MD5 Message Digest Algorithm (RFC1321).
+ *
+ * Adapted for OCTEON by Aaro Koskinen <aaro.koskinen@iki.fi>.
+ *
+ * Based on crypto/md5.c, which is:
+ *
+ * Derived from cryptoapi implementation, originally based on the
+ * public domain implementation written by Colin Plumb in 1993.
+ *
+ * Copyright (c) Cryptoapi developers.
+ * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <asm/octeon/crypto.h>
+#include <asm/octeon/octeon.h>
+
+/*
+ * We pass everything as 64-bit. OCTEON can handle misaligned data.
+ */
+
+static void md5_blocks(struct md5_block_state *state,
+                      const u8 *data, size_t nblocks)
+{
+       struct octeon_cop2_state cop2_state;
+       u64 *state64 = (u64 *)state;
+       unsigned long flags;
+
+       if (!octeon_has_crypto())
+               return md5_blocks_generic(state, data, nblocks);
+
+       cpu_to_le32_array(state->h, ARRAY_SIZE(state->h));
+
+       flags = octeon_crypto_enable(&cop2_state);
+       write_octeon_64bit_hash_dword(state64[0], 0);
+       write_octeon_64bit_hash_dword(state64[1], 1);
+
+       do {
+               const u64 *block = (const u64 *)data;
+
+               write_octeon_64bit_block_dword(block[0], 0);
+               write_octeon_64bit_block_dword(block[1], 1);
+               write_octeon_64bit_block_dword(block[2], 2);
+               write_octeon_64bit_block_dword(block[3], 3);
+               write_octeon_64bit_block_dword(block[4], 4);
+               write_octeon_64bit_block_dword(block[5], 5);
+               write_octeon_64bit_block_dword(block[6], 6);
+               octeon_md5_start(block[7]);
+
+               data += MD5_BLOCK_SIZE;
+       } while (--nblocks);
+
+       state64[0] = read_octeon_64bit_hash_dword(0);
+       state64[1] = read_octeon_64bit_hash_dword(1);
+       octeon_crypto_disable(&cop2_state, flags);
+
+       le32_to_cpu_array(state->h, ARRAY_SIZE(state->h));
+}