[PATCH 1/9] lib/crypto/arm: move arch/arm/lib/crypto/ to lib/crypto/arm/
Eric Biggers
ebiggers at kernel.org
Wed Jun 18 08:27:18 AEST 2025
From: Eric Biggers <ebiggers at google.com>
Move the contents of arch/arm/lib/crypto/ into lib/crypto/arm/.
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.
arch/arm/lib/crypto/.gitignore is intentionally kept for now. See
https://lore.kernel.org/r/CAHk-=whu2fb22rEy6+oKx1-+NCHuWucZepvD0H2MD38DrJVKtg@mail.gmail.com/
I'll remove it later after some time has passed.
Signed-off-by: Eric Biggers <ebiggers at google.com>
---
arch/arm/lib/Makefile | 2 --
lib/crypto/Kconfig | 2 +-
lib/crypto/Makefile | 2 ++
lib/crypto/arm/.gitignore | 2 ++
{arch/arm/lib/crypto => lib/crypto/arm}/Kconfig | 0
{arch/arm/lib/crypto => lib/crypto/arm}/Makefile | 0
{arch/arm/lib/crypto => lib/crypto/arm}/blake2s-core.S | 0
{arch/arm/lib/crypto => lib/crypto/arm}/blake2s-glue.c | 0
{arch/arm/lib/crypto => lib/crypto/arm}/chacha-glue.c | 0
{arch/arm/lib/crypto => lib/crypto/arm}/chacha-neon-core.S | 0
{arch/arm/lib/crypto => lib/crypto/arm}/chacha-scalar-core.S | 0
{arch/arm/lib/crypto => lib/crypto/arm}/poly1305-armv4.pl | 0
{arch/arm/lib/crypto => lib/crypto/arm}/poly1305-glue.c | 0
{arch/arm/lib/crypto => lib/crypto/arm}/sha256-armv4.pl | 0
{arch/arm/lib/crypto => lib/crypto/arm}/sha256-ce.S | 0
{arch/arm/lib/crypto => lib/crypto/arm}/sha256.c | 0
16 files changed, 5 insertions(+), 3 deletions(-)
rename {arch/arm/lib/crypto => lib/crypto/arm}/Kconfig (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/Makefile (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/blake2s-core.S (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/blake2s-glue.c (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/chacha-glue.c (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/chacha-neon-core.S (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/chacha-scalar-core.S (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/poly1305-armv4.pl (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/poly1305-glue.c (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/sha256-armv4.pl (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/sha256-ce.S (100%)
rename {arch/arm/lib/crypto => lib/crypto/arm}/sha256.c (100%)
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 91ea0e29107af..d05dd672bcd9c 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -3,12 +3,10 @@
# linux/arch/arm/lib/Makefile
#
# Copyright (C) 1995-2000 Russell King
#
-obj-y += crypto/
-
lib-y := changebit.o csumipv6.o csumpartial.o \
csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
delay.o delay-loop.o findbit.o memchr.o memcpy.o \
memmove.o memset.o setbit.o \
strchr.o strrchr.o \
diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index dce127a69f131..e14bef8e87af2 100644
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -188,11 +188,11 @@ config CRYPTO_LIB_SHA512_ARCH
config CRYPTO_LIB_SM3
tristate
if !KMSAN # avoid false positives from assembly
if ARM
-source "arch/arm/lib/crypto/Kconfig"
+source "lib/crypto/arm/Kconfig"
endif
if ARM64
source "arch/arm64/lib/crypto/Kconfig"
endif
if MIPS
diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 4a76169de251b..ddf04e2270f1e 100644
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -100,5 +100,7 @@ obj-$(CONFIG_MPILIB) += mpi/
obj-$(CONFIG_CRYPTO_SELFTESTS) += simd.o
obj-$(CONFIG_CRYPTO_LIB_SM3) += libsm3.o
libsm3-y := sm3.o
+
+obj-$(CONFIG_ARM) += arm/
diff --git a/lib/crypto/arm/.gitignore b/lib/crypto/arm/.gitignore
index 670a4d97b5684..f6c4e8ef80dae 100644
--- a/lib/crypto/arm/.gitignore
+++ b/lib/crypto/arm/.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/arm/lib/crypto/Kconfig b/lib/crypto/arm/Kconfig
similarity index 100%
rename from arch/arm/lib/crypto/Kconfig
rename to lib/crypto/arm/Kconfig
diff --git a/arch/arm/lib/crypto/Makefile b/lib/crypto/arm/Makefile
similarity index 100%
rename from arch/arm/lib/crypto/Makefile
rename to lib/crypto/arm/Makefile
diff --git a/arch/arm/lib/crypto/blake2s-core.S b/lib/crypto/arm/blake2s-core.S
similarity index 100%
rename from arch/arm/lib/crypto/blake2s-core.S
rename to lib/crypto/arm/blake2s-core.S
diff --git a/arch/arm/lib/crypto/blake2s-glue.c b/lib/crypto/arm/blake2s-glue.c
similarity index 100%
rename from arch/arm/lib/crypto/blake2s-glue.c
rename to lib/crypto/arm/blake2s-glue.c
diff --git a/arch/arm/lib/crypto/chacha-glue.c b/lib/crypto/arm/chacha-glue.c
similarity index 100%
rename from arch/arm/lib/crypto/chacha-glue.c
rename to lib/crypto/arm/chacha-glue.c
diff --git a/arch/arm/lib/crypto/chacha-neon-core.S b/lib/crypto/arm/chacha-neon-core.S
similarity index 100%
rename from arch/arm/lib/crypto/chacha-neon-core.S
rename to lib/crypto/arm/chacha-neon-core.S
diff --git a/arch/arm/lib/crypto/chacha-scalar-core.S b/lib/crypto/arm/chacha-scalar-core.S
similarity index 100%
rename from arch/arm/lib/crypto/chacha-scalar-core.S
rename to lib/crypto/arm/chacha-scalar-core.S
diff --git a/arch/arm/lib/crypto/poly1305-armv4.pl b/lib/crypto/arm/poly1305-armv4.pl
similarity index 100%
rename from arch/arm/lib/crypto/poly1305-armv4.pl
rename to lib/crypto/arm/poly1305-armv4.pl
diff --git a/arch/arm/lib/crypto/poly1305-glue.c b/lib/crypto/arm/poly1305-glue.c
similarity index 100%
rename from arch/arm/lib/crypto/poly1305-glue.c
rename to lib/crypto/arm/poly1305-glue.c
diff --git a/arch/arm/lib/crypto/sha256-armv4.pl b/lib/crypto/arm/sha256-armv4.pl
similarity index 100%
rename from arch/arm/lib/crypto/sha256-armv4.pl
rename to lib/crypto/arm/sha256-armv4.pl
diff --git a/arch/arm/lib/crypto/sha256-ce.S b/lib/crypto/arm/sha256-ce.S
similarity index 100%
rename from arch/arm/lib/crypto/sha256-ce.S
rename to lib/crypto/arm/sha256-ce.S
diff --git a/arch/arm/lib/crypto/sha256.c b/lib/crypto/arm/sha256.c
similarity index 100%
rename from arch/arm/lib/crypto/sha256.c
rename to lib/crypto/arm/sha256.c
--
2.49.0
More information about the Linuxppc-dev
mailing list