crypto: arm64/sm4-ce - rename to sm4-ce-cipher

The subsequent patches of the series will have an implementation
of SM4-ECB/CBC/CFB/CTR accelerated by the CE instruction set, which
conflicts with the current module name. In order to keep the naming
rules of the AES algorithm consistent, the sm4-ce algorithm is
renamed to sm4-ce-cipher.

In addition, the speed of sm4-ce-cipher is better than that of SM4
NEON. By the way, the priority of the algorithm is adjusted to 300,
which is also to leave room for the priority of SM4 NEON.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile
index 09a805c..85863e6 100644 (file)
--- a/arch/arm64/crypto/Makefile
+++ b/arch/arm64/crypto/Makefile
@@ -20,8 +20,8 @@ sha3-ce-y := sha3-ce-glue.o sha3-ce-core.o
 obj-$(CONFIG_CRYPTO_SM3_ARM64_CE) += sm3-ce.o
 sm3-ce-y := sm3-ce-glue.o sm3-ce-core.o
 
-obj-$(CONFIG_CRYPTO_SM4_ARM64_CE) += sm4-ce.o
-sm4-ce-y := sm4-ce-glue.o sm4-ce-core.o
+obj-$(CONFIG_CRYPTO_SM4_ARM64_CE) += sm4-ce-cipher.o
+sm4-ce-cipher-y := sm4-ce-cipher-glue.o sm4-ce-cipher-core.o
 
 obj-$(CONFIG_CRYPTO_GHASH_ARM64_CE) += ghash-ce.o
 ghash-ce-y := ghash-ce-glue.o ghash-ce-core.o

diff --git a/arch/arm64/crypto/sm4-ce-cipher-core.S b/arch/arm64/crypto/sm4-ce-cipher-core.S
new file mode 100644 (file)
index 0000000..4ac6cfb
--- /dev/null
+++ b/arch/arm64/crypto/sm4-ce-cipher-core.S
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+       .irp            b, 0, 1, 2, 3, 4, 5, 6, 7, 8
+       .set            .Lv\b\().4s, \b
+       .endr
+
+       .macro          sm4e, rd, rn
+       .inst           0xcec08400 | .L\rd | (.L\rn << 5)
+       .endm
+
+       /*
+        * void sm4_ce_do_crypt(const u32 *rk, u32 *out, const u32 *in);
+        */
+       .text
+SYM_FUNC_START(sm4_ce_do_crypt)
+       ld1             {v8.4s}, [x2]
+       ld1             {v0.4s-v3.4s}, [x0], #64
+CPU_LE(        rev32           v8.16b, v8.16b          )
+       ld1             {v4.4s-v7.4s}, [x0]
+       sm4e            v8.4s, v0.4s
+       sm4e            v8.4s, v1.4s
+       sm4e            v8.4s, v2.4s
+       sm4e            v8.4s, v3.4s
+       sm4e            v8.4s, v4.4s
+       sm4e            v8.4s, v5.4s
+       sm4e            v8.4s, v6.4s
+       sm4e            v8.4s, v7.4s
+       rev64           v8.4s, v8.4s
+       ext             v8.16b, v8.16b, v8.16b, #8
+CPU_LE(        rev32           v8.16b, v8.16b          )
+       st1             {v8.4s}, [x1]
+       ret
+SYM_FUNC_END(sm4_ce_do_crypt)

diff --git a/arch/arm64/crypto/sm4-ce-cipher-glue.c b/arch/arm64/crypto/sm4-ce-cipher-glue.c
new file mode 100644 (file)
index 0000000..76a34ef
--- /dev/null
+++ b/arch/arm64/crypto/sm4-ce-cipher-glue.c
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <asm/neon.h>
+#include <asm/simd.h>
+#include <crypto/sm4.h>
+#include <crypto/internal/simd.h>
+#include <linux/module.h>
+#include <linux/cpufeature.h>
+#include <linux/crypto.h>
+#include <linux/types.h>
+
+MODULE_ALIAS_CRYPTO("sm4");
+MODULE_ALIAS_CRYPTO("sm4-ce");
+MODULE_DESCRIPTION("SM4 symmetric cipher using ARMv8 Crypto Extensions");
+MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
+MODULE_LICENSE("GPL v2");
+
+asmlinkage void sm4_ce_do_crypt(const u32 *rk, void *out, const void *in);
+
+static int sm4_ce_setkey(struct crypto_tfm *tfm, const u8 *key,
+                      unsigned int key_len)
+{
+       struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);
+
+       return sm4_expandkey(ctx, key, key_len);
+}
+
+static void sm4_ce_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
+{
+       const struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);
+
+       if (!crypto_simd_usable()) {
+               sm4_crypt_block(ctx->rkey_enc, out, in);
+       } else {
+               kernel_neon_begin();
+               sm4_ce_do_crypt(ctx->rkey_enc, out, in);
+               kernel_neon_end();
+       }
+}
+
+static void sm4_ce_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
+{
+       const struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);
+
+       if (!crypto_simd_usable()) {
+               sm4_crypt_block(ctx->rkey_dec, out, in);
+       } else {
+               kernel_neon_begin();
+               sm4_ce_do_crypt(ctx->rkey_dec, out, in);
+               kernel_neon_end();
+       }
+}
+
+static struct crypto_alg sm4_ce_alg = {
+       .cra_name                       = "sm4",
+       .cra_driver_name                = "sm4-ce",
+       .cra_priority                   = 300,
+       .cra_flags                      = CRYPTO_ALG_TYPE_CIPHER,
+       .cra_blocksize                  = SM4_BLOCK_SIZE,
+       .cra_ctxsize                    = sizeof(struct sm4_ctx),
+       .cra_module                     = THIS_MODULE,
+       .cra_u.cipher = {
+               .cia_min_keysize        = SM4_KEY_SIZE,
+               .cia_max_keysize        = SM4_KEY_SIZE,
+               .cia_setkey             = sm4_ce_setkey,
+               .cia_encrypt            = sm4_ce_encrypt,
+               .cia_decrypt            = sm4_ce_decrypt
+       }
+};
+
+static int __init sm4_ce_mod_init(void)
+{
+       return crypto_register_alg(&sm4_ce_alg);
+}
+
+static void __exit sm4_ce_mod_fini(void)
+{
+       crypto_unregister_alg(&sm4_ce_alg);
+}
+
+module_cpu_feature_match(SM4, sm4_ce_mod_init);
+module_exit(sm4_ce_mod_fini);

diff --git a/arch/arm64/crypto/sm4-ce-core.S b/arch/arm64/crypto/sm4-ce-core.S
deleted file mode 100644 (file)
index 4ac6cfb..0000000
--- a/arch/arm64/crypto/sm4-ce-core.S
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <linux/linkage.h>
-#include <asm/assembler.h>
-
-       .irp            b, 0, 1, 2, 3, 4, 5, 6, 7, 8
-       .set            .Lv\b\().4s, \b
-       .endr
-
-       .macro          sm4e, rd, rn
-       .inst           0xcec08400 | .L\rd | (.L\rn << 5)
-       .endm
-
-       /*
-        * void sm4_ce_do_crypt(const u32 *rk, u32 *out, const u32 *in);
-        */
-       .text
-SYM_FUNC_START(sm4_ce_do_crypt)
-       ld1             {v8.4s}, [x2]
-       ld1             {v0.4s-v3.4s}, [x0], #64
-CPU_LE(        rev32           v8.16b, v8.16b          )
-       ld1             {v4.4s-v7.4s}, [x0]
-       sm4e            v8.4s, v0.4s
-       sm4e            v8.4s, v1.4s
-       sm4e            v8.4s, v2.4s
-       sm4e            v8.4s, v3.4s
-       sm4e            v8.4s, v4.4s
-       sm4e            v8.4s, v5.4s
-       sm4e            v8.4s, v6.4s
-       sm4e            v8.4s, v7.4s
-       rev64           v8.4s, v8.4s
-       ext             v8.16b, v8.16b, v8.16b, #8
-CPU_LE(        rev32           v8.16b, v8.16b          )
-       st1             {v8.4s}, [x1]
-       ret
-SYM_FUNC_END(sm4_ce_do_crypt)

diff --git a/arch/arm64/crypto/sm4-ce-glue.c b/arch/arm64/crypto/sm4-ce-glue.c
deleted file mode 100644 (file)
index 9c93cfc..0000000
--- a/arch/arm64/crypto/sm4-ce-glue.c
+++ /dev/null
@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <asm/neon.h>
-#include <asm/simd.h>
-#include <crypto/sm4.h>
-#include <crypto/internal/simd.h>
-#include <linux/module.h>
-#include <linux/cpufeature.h>
-#include <linux/crypto.h>
-#include <linux/types.h>
-
-MODULE_ALIAS_CRYPTO("sm4");
-MODULE_ALIAS_CRYPTO("sm4-ce");
-MODULE_DESCRIPTION("SM4 symmetric cipher using ARMv8 Crypto Extensions");
-MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
-MODULE_LICENSE("GPL v2");
-
-asmlinkage void sm4_ce_do_crypt(const u32 *rk, void *out, const void *in);
-
-static int sm4_ce_setkey(struct crypto_tfm *tfm, const u8 *key,
-                      unsigned int key_len)
-{
-       struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       return sm4_expandkey(ctx, key, key_len);
-}
-
-static void sm4_ce_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-{
-       const struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       if (!crypto_simd_usable()) {
-               sm4_crypt_block(ctx->rkey_enc, out, in);
-       } else {
-               kernel_neon_begin();
-               sm4_ce_do_crypt(ctx->rkey_enc, out, in);
-               kernel_neon_end();
-       }
-}
-
-static void sm4_ce_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-{
-       const struct sm4_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       if (!crypto_simd_usable()) {
-               sm4_crypt_block(ctx->rkey_dec, out, in);
-       } else {
-               kernel_neon_begin();
-               sm4_ce_do_crypt(ctx->rkey_dec, out, in);
-               kernel_neon_end();
-       }
-}
-
-static struct crypto_alg sm4_ce_alg = {
-       .cra_name                       = "sm4",
-       .cra_driver_name                = "sm4-ce",
-       .cra_priority                   = 200,
-       .cra_flags                      = CRYPTO_ALG_TYPE_CIPHER,
-       .cra_blocksize                  = SM4_BLOCK_SIZE,
-       .cra_ctxsize                    = sizeof(struct sm4_ctx),
-       .cra_module                     = THIS_MODULE,
-       .cra_u.cipher = {
-               .cia_min_keysize        = SM4_KEY_SIZE,
-               .cia_max_keysize        = SM4_KEY_SIZE,
-               .cia_setkey             = sm4_ce_setkey,
-               .cia_encrypt            = sm4_ce_encrypt,
-               .cia_decrypt            = sm4_ce_decrypt
-       }
-};
-
-static int __init sm4_ce_mod_init(void)
-{
-       return crypto_register_alg(&sm4_ce_alg);
-}
-
-static void __exit sm4_ce_mod_fini(void)
-{
-       crypto_unregister_alg(&sm4_ce_alg);
-}
-
-module_cpu_feature_match(SM4, sm4_ce_mod_init);
-module_exit(sm4_ce_mod_fini);