crypto: arm64/poly1305 - remove redundant shash algorithm

Since crypto/poly1305.c now registers a poly1305-$(ARCH) shash algorithm
that uses the architecture's Poly1305 library functions, individual
architectures no longer need to do the same.  Therefore, remove the
redundant shash algorithm from the arch-specific code and leave just the
library functions there.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 9dd1ae7a68a4bf62893807ff0f8639c4db66a6d0..7c2f63f2e30726f33c21f9ce214436d3eecf7757 100644 (file)
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -28,14 +28,8 @@ config CRYPTO_NHPOLY1305_NEON
 config CRYPTO_POLY1305_NEON
        tristate
        depends on KERNEL_MODE_NEON
-       select CRYPTO_HASH
        select CRYPTO_ARCH_HAVE_LIB_POLY1305
        default CRYPTO_LIB_POLY1305_INTERNAL
-       help
-         Poly1305 authenticator algorithm (RFC7539)
-
-         Architecture: arm64 using:
-         - NEON (Advanced SIMD) extensions
 
 config CRYPTO_SHA1_ARM64_CE
        tristate "Hash functions: SHA-1 (ARMv8 Crypto Extensions)"

diff --git a/arch/arm64/crypto/poly1305-glue.c b/arch/arm64/crypto/poly1305-glue.c
index 89415731d9be7bd6819e5820a693fe620f6a55ab..cb152ceac14a1e7e2f8cdb0e8947091cc4eb4cae 100644 (file)
--- a/arch/arm64/crypto/poly1305-glue.c
+++ b/arch/arm64/crypto/poly1305-glue.c
@@ -8,15 +8,12 @@
 #include <asm/hwcap.h>
 #include <asm/neon.h>
 #include <asm/simd.h>
-#include <linux/unaligned.h>
-#include <crypto/algapi.h>
-#include <crypto/internal/hash.h>
-#include <crypto/internal/poly1305.h>
+#include <crypto/poly1305.h>
 #include <crypto/internal/simd.h>
 #include <linux/cpufeature.h>
-#include <linux/crypto.h>
 #include <linux/jump_label.h>
 #include <linux/module.h>
+#include <linux/unaligned.h>
 
 asmlinkage void poly1305_init_arm64(void *state, const u8 *key);
 asmlinkage void poly1305_blocks(void *state, const u8 *src, u32 len, u32 hibit);
@@ -36,92 +33,6 @@ void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 key[POLY1305_KE
 }
 EXPORT_SYMBOL(poly1305_init_arch);
 
-static int neon_poly1305_init(struct shash_desc *desc)
-{
-       struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
-
-       dctx->buflen = 0;
-       dctx->rset = 0;
-       dctx->sset = false;
-
-       return 0;
-}
-
-static void neon_poly1305_blocks(struct poly1305_desc_ctx *dctx, const u8 *src,
-                                u32 len, u32 hibit, bool do_neon)
-{
-       if (unlikely(!dctx->sset)) {
-               if (!dctx->rset) {
-                       poly1305_init_arm64(&dctx->h, src);
-                       src += POLY1305_BLOCK_SIZE;
-                       len -= POLY1305_BLOCK_SIZE;
-                       dctx->rset = 1;
-               }
-               if (len >= POLY1305_BLOCK_SIZE) {
-                       dctx->s[0] = get_unaligned_le32(src +  0);
-                       dctx->s[1] = get_unaligned_le32(src +  4);
-                       dctx->s[2] = get_unaligned_le32(src +  8);
-                       dctx->s[3] = get_unaligned_le32(src + 12);
-                       src += POLY1305_BLOCK_SIZE;
-                       len -= POLY1305_BLOCK_SIZE;
-                       dctx->sset = true;
-               }
-               if (len < POLY1305_BLOCK_SIZE)
-                       return;
-       }
-
-       len &= ~(POLY1305_BLOCK_SIZE - 1);
-
-       if (static_branch_likely(&have_neon) && likely(do_neon))
-               poly1305_blocks_neon(&dctx->h, src, len, hibit);
-       else
-               poly1305_blocks(&dctx->h, src, len, hibit);
-}
-
-static void neon_poly1305_do_update(struct poly1305_desc_ctx *dctx,
-                                   const u8 *src, u32 len, bool do_neon)
-{
-       if (unlikely(dctx->buflen)) {
-               u32 bytes = min(len, POLY1305_BLOCK_SIZE - dctx->buflen);
-
-               memcpy(dctx->buf + dctx->buflen, src, bytes);
-               src += bytes;
-               len -= bytes;
-               dctx->buflen += bytes;
-
-               if (dctx->buflen == POLY1305_BLOCK_SIZE) {
-                       neon_poly1305_blocks(dctx, dctx->buf,
-                                            POLY1305_BLOCK_SIZE, 1, false);
-                       dctx->buflen = 0;
-               }
-       }
-
-       if (likely(len >= POLY1305_BLOCK_SIZE)) {
-               neon_poly1305_blocks(dctx, src, len, 1, do_neon);
-               src += round_down(len, POLY1305_BLOCK_SIZE);
-               len %= POLY1305_BLOCK_SIZE;
-       }
-
-       if (unlikely(len)) {
-               dctx->buflen = len;
-               memcpy(dctx->buf, src, len);
-       }
-}
-
-static int neon_poly1305_update(struct shash_desc *desc,
-                               const u8 *src, unsigned int srclen)
-{
-       bool do_neon = crypto_simd_usable() && srclen > 128;
-       struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
-
-       if (static_branch_likely(&have_neon) && do_neon)
-               kernel_neon_begin();
-       neon_poly1305_do_update(dctx, src, srclen, do_neon);
-       if (static_branch_likely(&have_neon) && do_neon)
-               kernel_neon_end();
-       return 0;
-}
-
 void poly1305_update_arch(struct poly1305_desc_ctx *dctx, const u8 *src,
                          unsigned int nbytes)
 {
@@ -181,31 +92,6 @@ void poly1305_final_arch(struct poly1305_desc_ctx *dctx, u8 *dst)
 }
 EXPORT_SYMBOL(poly1305_final_arch);
 
-static int neon_poly1305_final(struct shash_desc *desc, u8 *dst)
-{
-       struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
-
-       if (unlikely(!dctx->sset))
-               return -ENOKEY;
-
-       poly1305_final_arch(dctx, dst);
-       return 0;
-}
-
-static struct shash_alg neon_poly1305_alg = {
-       .init                   = neon_poly1305_init,
-       .update                 = neon_poly1305_update,
-       .final                  = neon_poly1305_final,
-       .digestsize             = POLY1305_DIGEST_SIZE,
-       .descsize               = sizeof(struct poly1305_desc_ctx),
-
-       .base.cra_name          = "poly1305",
-       .base.cra_driver_name   = "poly1305-neon",
-       .base.cra_priority      = 200,
-       .base.cra_blocksize     = POLY1305_BLOCK_SIZE,
-       .base.cra_module        = THIS_MODULE,
-};
-
 bool poly1305_is_arch_optimized(void)
 {
        /* We always can use at least the ARM64 scalar implementation. */
@@ -215,25 +101,11 @@ EXPORT_SYMBOL(poly1305_is_arch_optimized);
 
 static int __init neon_poly1305_mod_init(void)
 {
-       if (!cpu_have_named_feature(ASIMD))
-               return 0;
-
-       static_branch_enable(&have_neon);
-
-       return IS_REACHABLE(CONFIG_CRYPTO_HASH) ?
-               crypto_register_shash(&neon_poly1305_alg) : 0;
-}
-
-static void __exit neon_poly1305_mod_exit(void)
-{
-       if (IS_REACHABLE(CONFIG_CRYPTO_HASH) && cpu_have_named_feature(ASIMD))
-               crypto_unregister_shash(&neon_poly1305_alg);
+       if (cpu_have_named_feature(ASIMD))
+               static_branch_enable(&have_neon);
+       return 0;
 }
-
 arch_initcall(neon_poly1305_mod_init);
-module_exit(neon_poly1305_mod_exit);
 
-MODULE_DESCRIPTION("Poly1305 transform using NEON instructions");
+MODULE_DESCRIPTION("Poly1305 authenticator (ARM64 optimized)");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS_CRYPTO("poly1305");
-MODULE_ALIAS_CRYPTO("poly1305-neon");