Apply Crypto API wrappers to the exported crypto symbol in CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64-related crypto to convert them into pluggable interface.
Signed-off-by: Jay Wang <[email protected]> --- arch/x86/crypto/Makefile | 2 +- arch/x86/crypto/aria-avx.h | 35 ++++++++++++++++----------- arch/x86/crypto/aria_aesni_avx_glue.c | 4 +-- arch/x86/crypto/fips140/fips140-api.c | 18 ++++++++++++++ 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile index 103a49fbbac8..bda4e9cd5e2c 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile @@ -62,7 +62,7 @@ sm4-aesni-avx-x86_64-y := sm4-aesni-avx-asm_64.o sm4_aesni_avx_glue.o crypto-objs-$(CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64) += sm4-aesni-avx2-x86_64.o sm4-aesni-avx2-x86_64-y := sm4-aesni-avx2-asm_64.o sm4_aesni_avx2_glue.o -obj-$(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64) += aria-aesni-avx-x86_64.o +crypto-objs-$(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64) += aria-aesni-avx-x86_64.o aria-aesni-avx-x86_64-y := aria-aesni-avx-asm_64.o aria_aesni_avx_glue.o obj-$(CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64) += aria-aesni-avx2-x86_64.o diff --git a/arch/x86/crypto/aria-avx.h b/arch/x86/crypto/aria-avx.h index 6e1b2d8a31ed..e4109e67a640 100644 --- a/arch/x86/crypto/aria-avx.h +++ b/arch/x86/crypto/aria-avx.h @@ -2,6 +2,7 @@ #ifndef ASM_X86_ARIA_AVX_H #define ASM_X86_ARIA_AVX_H +#include <crypto/api.h> #include <linux/types.h> #define ARIA_AESNI_PARALLEL_BLOCKS 16 @@ -13,20 +14,26 @@ #define ARIA_GFNI_AVX512_PARALLEL_BLOCKS 64 #define ARIA_GFNI_AVX512_PARALLEL_BLOCK_SIZE (ARIA_BLOCK_SIZE * ARIA_GFNI_AVX512_PARALLEL_BLOCKS) -asmlinkage void aria_aesni_avx_encrypt_16way(const void *ctx, u8 *dst, - const u8 *src); -asmlinkage void aria_aesni_avx_decrypt_16way(const void *ctx, u8 *dst, - const u8 *src); -asmlinkage void aria_aesni_avx_ctr_crypt_16way(const void *ctx, u8 *dst, - const u8 *src, - u8 *keystream, u8 *iv); -asmlinkage void aria_aesni_avx_gfni_encrypt_16way(const void *ctx, u8 *dst, - const u8 *src); -asmlinkage void aria_aesni_avx_gfni_decrypt_16way(const void *ctx, u8 *dst, - const u8 *src); -asmlinkage void aria_aesni_avx_gfni_ctr_crypt_16way(const void *ctx, u8 *dst, - const u8 *src, - u8 *keystream, u8 *iv); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64, aria_aesni_avx_encrypt_16way, asmlinkage void, + (const void *ctx, u8 *dst, const u8 *src), + (ctx, dst, src)); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64, aria_aesni_avx_decrypt_16way, asmlinkage void, + (const void *ctx, u8 *dst, const u8 *src), + (ctx, dst, src)); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64, aria_aesni_avx_ctr_crypt_16way, asmlinkage void, + (const void *ctx, u8 *dst, const u8 *src, u8 *keystream, u8 *iv), + (ctx, dst, src, keystream, iv)); +#ifdef CONFIG_AS_GFNI +DECLARE_CRYPTO_API(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64, aria_aesni_avx_gfni_encrypt_16way, asmlinkage void, + (const void *ctx, u8 *dst, const u8 *src), + (ctx, dst, src)); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64, aria_aesni_avx_gfni_decrypt_16way, asmlinkage void, + (const void *ctx, u8 *dst, const u8 *src), + (ctx, dst, src)); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64, aria_aesni_avx_gfni_ctr_crypt_16way, asmlinkage void, + (const void *ctx, u8 *dst, const u8 *src, u8 *keystream, u8 *iv), + (ctx, dst, src, keystream, iv)); +#endif /* CONFIG_AS_GFNI */ asmlinkage void aria_aesni_avx2_encrypt_32way(const void *ctx, u8 *dst, const u8 *src); diff --git a/arch/x86/crypto/aria_aesni_avx_glue.c b/arch/x86/crypto/aria_aesni_avx_glue.c index e4e3d78915a5..4a0bb385515a 100644 --- a/arch/x86/crypto/aria_aesni_avx_glue.c +++ b/arch/x86/crypto/aria_aesni_avx_glue.c @@ -215,8 +215,8 @@ static void __exit aria_avx_exit(void) crypto_unregister_skciphers(aria_algs, ARRAY_SIZE(aria_algs)); } -module_init(aria_avx_init); -module_exit(aria_avx_exit); +crypto_module_init(aria_avx_init); +crypto_module_exit(aria_avx_exit); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Taehee Yoo <[email protected]>"); diff --git a/arch/x86/crypto/fips140/fips140-api.c b/arch/x86/crypto/fips140/fips140-api.c index 1333b1ce6cdf..ed7a2ad31f24 100644 --- a/arch/x86/crypto/fips140/fips140-api.c +++ b/arch/x86/crypto/fips140/fips140-api.c @@ -78,4 +78,22 @@ DEFINE_CRYPTO_API_STUB(sm4_cbc_encrypt); DEFINE_CRYPTO_API_STUB(sm4_avx_cbc_decrypt); DEFINE_CRYPTO_API_STUB(sm4_avx_ctr_crypt); +#endif + +/* + * arch/x86/crypto/aria_aesni_avx_glue.c + */ +#if IS_BUILTIN(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64) + +#include <arch/x86/crypto/aria-avx.h> + +DEFINE_CRYPTO_API_STUB(aria_aesni_avx_encrypt_16way); +DEFINE_CRYPTO_API_STUB(aria_aesni_avx_decrypt_16way); +DEFINE_CRYPTO_API_STUB(aria_aesni_avx_ctr_crypt_16way); +#ifdef CONFIG_AS_GFNI +DEFINE_CRYPTO_API_STUB(aria_aesni_avx_gfni_encrypt_16way); +DEFINE_CRYPTO_API_STUB(aria_aesni_avx_gfni_decrypt_16way); +DEFINE_CRYPTO_API_STUB(aria_aesni_avx_gfni_ctr_crypt_16way); +#endif /* CONFIG_AS_GFNI */ + #endif \ No newline at end of file -- 2.47.3
