From 61f86c70cf419c826ee3b9c175d1e355844d8b45 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 19 Jun 2025 12:19:01 -0700 Subject: [PATCH] lib/crypto: arm64: Move arch/arm64/lib/crypto/ into lib/crypto/ Move the contents of arch/arm64/lib/crypto/ into lib/crypto/arm64/. The new code organization makes a lot more sense for how this code actually works and is developed. In particular, it makes it possible to build each algorithm as a single module, with better inlining and dead code elimination. For a more detailed explanation, see the patchset which did this for the CRC library code: https://lore.kernel.org/r/20250607200454.73587-1-ebiggers@kernel.org/. Also see the patchset which did this for SHA-512: https://lore.kernel.org/linux-crypto/20250616014019.415791-1-ebiggers@kernel.org/ This is just a preparatory commit, which does the move to get the files into their new location but keeps them building the same way as before. Later commits will make the actual improvements to the way the arch-optimized code is integrated for each algorithm. Add a gitignore entry for the removed directory arch/arm64/lib/crypto/ so that people don't accidentally commit leftover generated files. Acked-by: Ard Biesheuvel Reviewed-by: Martin K. Petersen Reviewed-by: Sohil Mehta Link: https://lore.kernel.org/r/20250619191908.134235-3-ebiggers@kernel.org Signed-off-by: Eric Biggers --- arch/arm64/lib/.gitignore | 4 ++++ arch/arm64/lib/Makefile | 3 --- arch/arm64/lib/crypto/.gitignore | 3 --- lib/crypto/Kconfig | 2 +- lib/crypto/Makefile | 3 ++- lib/crypto/arm64/.gitignore | 2 ++ {arch/arm64/lib/crypto => lib/crypto/arm64}/Kconfig | 0 {arch/arm64/lib/crypto => lib/crypto/arm64}/Makefile | 0 .../arm64/lib/crypto => lib/crypto/arm64}/chacha-neon-core.S | 0 .../arm64/lib/crypto => lib/crypto/arm64}/chacha-neon-glue.c | 0 {arch/arm64/lib/crypto => lib/crypto/arm64}/poly1305-armv8.pl | 0 {arch/arm64/lib/crypto => lib/crypto/arm64}/poly1305-glue.c | 0 {arch/arm64/lib/crypto => lib/crypto/arm64}/sha2-armv8.pl | 0 {arch/arm64/lib/crypto => lib/crypto/arm64}/sha256-ce.S | 0 {arch/arm64/lib/crypto => lib/crypto/arm64}/sha256.c | 0 15 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 arch/arm64/lib/.gitignore delete mode 100644 arch/arm64/lib/crypto/.gitignore rename {arch/arm64/lib/crypto => lib/crypto/arm64}/Kconfig (100%) rename {arch/arm64/lib/crypto => lib/crypto/arm64}/Makefile (100%) rename {arch/arm64/lib/crypto => lib/crypto/arm64}/chacha-neon-core.S (100%) rename {arch/arm64/lib/crypto => lib/crypto/arm64}/chacha-neon-glue.c (100%) rename {arch/arm64/lib/crypto => lib/crypto/arm64}/poly1305-armv8.pl (100%) rename {arch/arm64/lib/crypto => lib/crypto/arm64}/poly1305-glue.c (100%) rename {arch/arm64/lib/crypto => lib/crypto/arm64}/sha2-armv8.pl (100%) rename {arch/arm64/lib/crypto => lib/crypto/arm64}/sha256-ce.S (100%) rename {arch/arm64/lib/crypto => lib/crypto/arm64}/sha256.c (100%) diff --git a/arch/arm64/lib/.gitignore b/arch/arm64/lib/.gitignore new file mode 100644 index 0000000000000..647d7a922e680 --- /dev/null +++ b/arch/arm64/lib/.gitignore @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# This now-removed directory used to contain generated files. +/crypto/ diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile index 027bfa9689c6a..d97e290619bc5 100644 --- a/arch/arm64/lib/Makefile +++ b/arch/arm64/lib/Makefile @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 - -obj-y += crypto/ - lib-y := clear_user.o delay.o copy_from_user.o \ copy_to_user.o copy_page.o \ clear_page.o csum.o insn.o memchr.o memcpy.o \ diff --git a/arch/arm64/lib/crypto/.gitignore b/arch/arm64/lib/crypto/.gitignore deleted file mode 100644 index 12d74d8b03d0a..0000000000000 --- a/arch/arm64/lib/crypto/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -poly1305-core.S -sha256-core.S diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index e14bef8e87af2..fdeb91bf00328 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -193,7 +193,7 @@ if ARM source "lib/crypto/arm/Kconfig" endif if ARM64 -source "arch/arm64/lib/crypto/Kconfig" +source "lib/crypto/arm64/Kconfig" endif if MIPS source "arch/mips/lib/crypto/Kconfig" diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 5f2b81f82a85d..19e9880c5d5f0 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -87,7 +87,7 @@ endif ifeq ($(CONFIG_ARM64),y) libsha512-y += arm64/sha512-core.o -$(obj)/arm64/sha512-core.S: $(src)/../../arch/arm64/lib/crypto/sha2-armv8.pl +$(obj)/arm64/sha512-core.S: $(src)/arm64/sha2-armv8.pl $(call cmd,perlasm_with_args) clean-files += arm64/sha512-core.S libsha512-$(CONFIG_KERNEL_MODE_NEON) += arm64/sha512-ce-core.o @@ -108,3 +108,4 @@ obj-$(CONFIG_CRYPTO_LIB_SM3) += libsm3.o libsm3-y := sm3.o obj-$(CONFIG_ARM) += arm/ +obj-$(CONFIG_ARM64) += arm64/ diff --git a/lib/crypto/arm64/.gitignore b/lib/crypto/arm64/.gitignore index 670a4d97b5684..f6c4e8ef80dae 100644 --- a/lib/crypto/arm64/.gitignore +++ b/lib/crypto/arm64/.gitignore @@ -1,2 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only +poly1305-core.S +sha256-core.S sha512-core.S diff --git a/arch/arm64/lib/crypto/Kconfig b/lib/crypto/arm64/Kconfig similarity index 100% rename from arch/arm64/lib/crypto/Kconfig rename to lib/crypto/arm64/Kconfig diff --git a/arch/arm64/lib/crypto/Makefile b/lib/crypto/arm64/Makefile similarity index 100% rename from arch/arm64/lib/crypto/Makefile rename to lib/crypto/arm64/Makefile diff --git a/arch/arm64/lib/crypto/chacha-neon-core.S b/lib/crypto/arm64/chacha-neon-core.S similarity index 100% rename from arch/arm64/lib/crypto/chacha-neon-core.S rename to lib/crypto/arm64/chacha-neon-core.S diff --git a/arch/arm64/lib/crypto/chacha-neon-glue.c b/lib/crypto/arm64/chacha-neon-glue.c similarity index 100% rename from arch/arm64/lib/crypto/chacha-neon-glue.c rename to lib/crypto/arm64/chacha-neon-glue.c diff --git a/arch/arm64/lib/crypto/poly1305-armv8.pl b/lib/crypto/arm64/poly1305-armv8.pl similarity index 100% rename from arch/arm64/lib/crypto/poly1305-armv8.pl rename to lib/crypto/arm64/poly1305-armv8.pl diff --git a/arch/arm64/lib/crypto/poly1305-glue.c b/lib/crypto/arm64/poly1305-glue.c similarity index 100% rename from arch/arm64/lib/crypto/poly1305-glue.c rename to lib/crypto/arm64/poly1305-glue.c diff --git a/arch/arm64/lib/crypto/sha2-armv8.pl b/lib/crypto/arm64/sha2-armv8.pl similarity index 100% rename from arch/arm64/lib/crypto/sha2-armv8.pl rename to lib/crypto/arm64/sha2-armv8.pl diff --git a/arch/arm64/lib/crypto/sha256-ce.S b/lib/crypto/arm64/sha256-ce.S similarity index 100% rename from arch/arm64/lib/crypto/sha256-ce.S rename to lib/crypto/arm64/sha256-ce.S diff --git a/arch/arm64/lib/crypto/sha256.c b/lib/crypto/arm64/sha256.c similarity index 100% rename from arch/arm64/lib/crypto/sha256.c rename to lib/crypto/arm64/sha256.c -- 2.47.2