Finish disentangling ChaCha, Poly1305, and BLAKE2s from CRYPTO
Subsystems (12)
Eric Biggers
maintainerv3 cover Finish disentangling ChaCha, Poly1305, and BLAKE2s from CRYPTO
This series removes the unnecessary dependency of the ChaCha, Poly1305, and BLAKE2s library functions on the generic crypto infrastructure, i.e. CONFIG_CRYPTO. To do this, it moves the architecture-optimized implementations of these functions into new directories arch/*/lib/crypto/ which do not depend on CRYPTO. This mirrors the existing distinction between crypto/ and lib/crypto/.
The last two patches remove the selection of CRYPTO by CRYPTO_LIB_CHACHA and CRYPTO_LIB_POLY1305, and they remove the corresponding *_INTERNAL symbols which were needed only because of the entanglement with CRYPTO.
Note that Curve25519 is still entangled. Later patches will fix that.
Changed in v3:
- Fixed build error on arm with CONFIG_CPU_THUMBONLY=y.
- Small whitespace and commit message fixes.
- Added Acked-by's.
Changed in v2:
- Introduced new directories arch/*/lib/crypto/ instead of keeping the library functions in arch/*/crypto/.
Eric Biggers (13):
crypto: arm64 - drop redundant dependencies on ARM64
crypto: powerpc - drop redundant dependencies on PPC
crypto: s390 - drop redundant dependencies on S390
crypto: x86 - drop redundant dependencies on X86
crypto: arm - move library functions to arch/arm/lib/crypto/
crypto: arm64 - move library functions to arch/arm64/lib/crypto/
crypto: mips - move library functions to arch/mips/lib/crypto/
crypto: powerpc - move library functions to arch/powerpc/lib/crypto/
crypto: riscv - move library functions to arch/riscv/lib/crypto/
crypto: s390 - move library functions to arch/s390/lib/crypto/
crypto: x86 - move library functions to arch/x86/lib/crypto/
crypto: lib/chacha - remove INTERNAL symbol and selection of CRYPTO
crypto: lib/poly1305 - remove INTERNAL symbol and selection of CRYPTO
MAINTAINERS | 1 +
arch/arm/crypto/Kconfig | 23 -----
arch/arm/crypto/Makefile | 14 +--
arch/arm/lib/Makefile | 2 +
arch/arm/lib/crypto/.gitignore | 2 +
arch/arm/lib/crypto/Kconfig | 24 ++++++
arch/arm/lib/crypto/Makefile | 26 ++++++
arch/arm/{ => lib}/crypto/blake2s-core.S | 0
arch/arm/{ => lib}/crypto/blake2s-glue.c | 0
arch/arm/{ => lib}/crypto/chacha-glue.c | 0
arch/arm/{ => lib}/crypto/chacha-neon-core.S | 0
.../arm/{ => lib}/crypto/chacha-scalar-core.S | 0
arch/arm/{ => lib}/crypto/poly1305-armv4.pl | 0
arch/arm/{ => lib}/crypto/poly1305-glue.c | 0
arch/arm64/crypto/Kconfig | 17 +---
arch/arm64/crypto/Makefile | 9 +-
arch/arm64/lib/Makefile | 3 +
arch/arm64/lib/crypto/.gitignore | 2 +
arch/arm64/lib/crypto/Kconfig | 14 +++
arch/arm64/lib/crypto/Makefile | 16 ++++
.../arm64/{ => lib}/crypto/chacha-neon-core.S | 0
.../arm64/{ => lib}/crypto/chacha-neon-glue.c | 0
arch/arm64/{ => lib}/crypto/poly1305-armv8.pl | 0
arch/arm64/{ => lib}/crypto/poly1305-glue.c | 0
arch/mips/crypto/Kconfig | 11 ---
arch/mips/crypto/Makefile | 17 ----
arch/mips/lib/Makefile | 2 +
arch/mips/lib/crypto/.gitignore | 2 +
arch/mips/lib/crypto/Kconfig | 12 +++
arch/mips/lib/crypto/Makefile | 19 ++++
arch/mips/{ => lib}/crypto/chacha-core.S | 0
arch/mips/{ => lib}/crypto/chacha-glue.c | 0
arch/mips/{ => lib}/crypto/poly1305-glue.c | 0
arch/mips/{ => lib}/crypto/poly1305-mips.pl | 0
arch/powerpc/crypto/Kconfig | 22 +----
arch/powerpc/crypto/Makefile | 4 -
arch/powerpc/lib/Makefile | 2 +
arch/powerpc/lib/crypto/Kconfig | 15 ++++
arch/powerpc/lib/crypto/Makefile | 7 ++
.../{ => lib}/crypto/chacha-p10-glue.c | 0
.../{ => lib}/crypto/chacha-p10le-8x.S | 0
.../{ => lib}/crypto/poly1305-p10-glue.c | 0
.../{ => lib}/crypto/poly1305-p10le_64.S | 0
arch/riscv/crypto/Kconfig | 7 --
arch/riscv/crypto/Makefile | 3 -
arch/riscv/lib/Makefile | 1 +
arch/riscv/lib/crypto/Kconfig | 8 ++
arch/riscv/lib/crypto/Makefile | 4 +
.../{ => lib}/crypto/chacha-riscv64-glue.c | 0
.../{ => lib}/crypto/chacha-riscv64-zvkb.S | 0
arch/s390/crypto/Kconfig | 16 ----
arch/s390/crypto/Makefile | 3 -
arch/s390/lib/Makefile | 1 +
arch/s390/lib/crypto/Kconfig | 7 ++
arch/s390/lib/crypto/Makefile | 4 +
arch/s390/{ => lib}/crypto/chacha-glue.c | 0
arch/s390/{ => lib}/crypto/chacha-s390.S | 0
arch/s390/{ => lib}/crypto/chacha-s390.h | 0
arch/x86/crypto/Kconfig | 86 +++++++------------
arch/x86/crypto/Makefile | 15 ----
arch/x86/lib/Makefile | 2 +
arch/x86/lib/crypto/.gitignore | 2 +
arch/x86/lib/crypto/Kconfig | 26 ++++++
arch/x86/lib/crypto/Makefile | 17 ++++
arch/x86/{ => lib}/crypto/blake2s-core.S | 0
arch/x86/{ => lib}/crypto/blake2s-glue.c | 0
.../x86/{ => lib}/crypto/chacha-avx2-x86_64.S | 0
.../{ => lib}/crypto/chacha-avx512vl-x86_64.S | 0
.../{ => lib}/crypto/chacha-ssse3-x86_64.S | 0
arch/x86/{ => lib}/crypto/chacha_glue.c | 0
.../crypto/poly1305-x86_64-cryptogams.pl | 0
arch/x86/{ => lib}/crypto/poly1305_glue.c | 0
crypto/Kconfig | 4 +-
lib/crypto/Kconfig | 56 +++++++-----
74 files changed, 294 insertions(+), 234 deletions(-)
create mode 100644 arch/arm/lib/crypto/.gitignore
create mode 100644 arch/arm/lib/crypto/Kconfig
create mode 100644 arch/arm/lib/crypto/Makefile
rename arch/arm/{ => lib}/crypto/blake2s-core.S (100%)
rename arch/arm/{ => lib}/crypto/blake2s-glue.c (100%)
rename arch/arm/{ => lib}/crypto/chacha-glue.c (100%)
rename arch/arm/{ => lib}/crypto/chacha-neon-core.S (100%)
rename arch/arm/{ => lib}/crypto/chacha-scalar-core.S (100%)
rename arch/arm/{ => lib}/crypto/poly1305-armv4.pl (100%)
rename arch/arm/{ => lib}/crypto/poly1305-glue.c (100%)
create mode 100644 arch/arm64/lib/crypto/.gitignore
create mode 100644 arch/arm64/lib/crypto/Kconfig
create mode 100644 arch/arm64/lib/crypto/Makefile
rename arch/arm64/{ => lib}/crypto/chacha-neon-core.S (100%)
rename arch/arm64/{ => lib}/crypto/chacha-neon-glue.c (100%)
rename arch/arm64/{ => lib}/crypto/poly1305-armv8.pl (100%)
rename arch/arm64/{ => lib}/crypto/poly1305-glue.c (100%)
create mode 100644 arch/mips/lib/crypto/.gitignore
create mode 100644 arch/mips/lib/crypto/Kconfig
create mode 100644 arch/mips/lib/crypto/Makefile
rename arch/mips/{ => lib}/crypto/chacha-core.S (100%)
rename arch/mips/{ => lib}/crypto/chacha-glue.c (100%)
rename arch/mips/{ => lib}/crypto/poly1305-glue.c (100%)
rename arch/mips/{ => lib}/crypto/poly1305-mips.pl (100%)
create mode 100644 arch/powerpc/lib/crypto/Kconfig
create mode 100644 arch/powerpc/lib/crypto/Makefile
rename arch/powerpc/{ => lib}/crypto/chacha-p10-glue.c (100%)
rename arch/powerpc/{ => lib}/crypto/chacha-p10le-8x.S (100%)
rename arch/powerpc/{ => lib}/crypto/poly1305-p10-glue.c (100%)
rename arch/powerpc/{ => lib}/crypto/poly1305-p10le_64.S (100%)
create mode 100644 arch/riscv/lib/crypto/Kconfig
create mode 100644 arch/riscv/lib/crypto/Makefile
rename arch/riscv/{ => lib}/crypto/chacha-riscv64-glue.c (100%)
rename arch/riscv/{ => lib}/crypto/chacha-riscv64-zvkb.S (100%)
create mode 100644 arch/s390/lib/crypto/Kconfig
create mode 100644 arch/s390/lib/crypto/Makefile
rename arch/s390/{ => lib}/crypto/chacha-glue.c (100%)
rename arch/s390/{ => lib}/crypto/chacha-s390.S (100%)
rename arch/s390/{ => lib}/crypto/chacha-s390.h (100%)
create mode 100644 arch/x86/lib/crypto/.gitignore
create mode 100644 arch/x86/lib/crypto/Kconfig
create mode 100644 arch/x86/lib/crypto/Makefile
rename arch/x86/{ => lib}/crypto/blake2s-core.S (100%)
rename arch/x86/{ => lib}/crypto/blake2s-glue.c (100%)
rename arch/x86/{ => lib}/crypto/chacha-avx2-x86_64.S (100%)
rename arch/x86/{ => lib}/crypto/chacha-avx512vl-x86_64.S (100%)
rename arch/x86/{ => lib}/crypto/chacha-ssse3-x86_64.S (100%)
rename arch/x86/{ => lib}/crypto/chacha_glue.c (100%)
rename arch/x86/{ => lib}/crypto/poly1305-x86_64-cryptogams.pl (100%)
rename arch/x86/{ => lib}/crypto/poly1305_glue.c (100%)base-commit: bb9c648b334be581a791c7669abaa594e4b5ebb7
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 1/13 crypto: arm64 - drop redundant dependencies on ARM64
From: Eric Biggers <[email protected]>
arch/arm64/crypto/Kconfig is sourced only when CONFIG_ARM64=y, so there is no need for the symbols defined inside it to depend on ARM64.
--- arch/arm64/crypto/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/crypto/Kconfig +2 -2
@@ -135,11 +135,11 @@ config CRYPTO_AES_ARM64 Architecture: arm64 config CRYPTO_AES_ARM64_CE tristate "Ciphers: AES (ARMv8 Crypto Extensions)" - depends on ARM64 && KERNEL_MODE_NEON + depends on KERNEL_MODE_NEON select CRYPTO_ALGAPI select CRYPTO_LIB_AES help Block ciphers: AES cipher algorithms (FIPS-197)
@@ -252,11 +252,11 @@ config CRYPTO_SM4_ARM64_NEON_BLK Architecture: arm64 using: - NEON (Advanced SIMD) extensions config CRYPTO_AES_ARM64_CE_CCM tristate "AEAD cipher: AES in CCM mode (ARMv8 Crypto Extensions)" - depends on ARM64 && KERNEL_MODE_NEON + depends on KERNEL_MODE_NEON select CRYPTO_ALGAPI select CRYPTO_AES_ARM64_CE select CRYPTO_AES_ARM64_CE_BLK select CRYPTO_AEAD select CRYPTO_LIB_AES
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 2/13 crypto: powerpc - drop redundant dependencies on PPC
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
arch/powerpc/crypto/Kconfig is sourced only when CONFIG_PPC=y, so there is no need for the symbols defined inside it to depend on PPC.
--- arch/powerpc/crypto/Kconfig | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
arch/powerpc/crypto/Kconfig +3 -5
@@ -15,48 +15,46 @@ config CRYPTO_CURVE25519_PPC64 Architecture: PowerPC64 - Little-endian config CRYPTO_MD5_PPC tristate "Digests: MD5" - depends on PPC select CRYPTO_HASH help MD5 message digest algorithm (RFC1321) Architecture: powerpc config CRYPTO_SHA1_PPC tristate "Hash functions: SHA-1" - depends on PPC help SHA-1 secure hash algorithm (FIPS 180) Architecture: powerpc config CRYPTO_SHA1_PPC_SPE tristate "Hash functions: SHA-1 (SPE)" - depends on PPC && SPE + depends on SPE help SHA-1 secure hash algorithm (FIPS 180) Architecture: powerpc using - SPE (Signal Processing Engine) extensions config CRYPTO_SHA256_PPC_SPE tristate "Hash functions: SHA-224 and SHA-256 (SPE)" - depends on PPC && SPE + depends on SPE select CRYPTO_SHA256 select CRYPTO_HASH help SHA-224 and SHA-256 secure hash algorithms (FIPS 180) Architecture: powerpc using - SPE (Signal Processing Engine) extensions config CRYPTO_AES_PPC_SPE tristate "Ciphers: AES, modes: ECB/CBC/CTR/XTS (SPE)" - depends on PPC && SPE + depends on SPE select CRYPTO_SKCIPHER help Block ciphers: AES cipher algorithms (FIPS-197) Length-preserving ciphers: AES with ECB, CBC, CTR, and XTS modes
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 3/13 crypto: s390 - drop redundant dependencies on S390
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
arch/s390/crypto/Kconfig is sourced only when CONFIG_S390=y, so there is no need for the symbols defined inside it to depend on S390.
--- arch/s390/crypto/Kconfig | 10 ---------- 1 file changed, 10 deletions(-)
arch/s390/crypto/Kconfig +0 -10
@@ -2,77 +2,70 @@ menu "Accelerated Cryptographic Algorithms for CPU (s390)" config CRYPTO_SHA512_S390 tristate "Hash functions: SHA-384 and SHA-512" - depends on S390 select CRYPTO_HASH help SHA-384 and SHA-512 secure hash algorithms (FIPS 180) Architecture: s390 It is available as of z10. config CRYPTO_SHA1_S390 tristate "Hash functions: SHA-1" - depends on S390 select CRYPTO_HASH help SHA-1 secure hash algorithm (FIPS 180) Architecture: s390 It is available as of z990. config CRYPTO_SHA256_S390 tristate "Hash functions: SHA-224 and SHA-256" - depends on S390 select CRYPTO_HASH help SHA-224 and SHA-256 secure hash algorithms (FIPS 180) Architecture: s390 It is available as of z9. config CRYPTO_SHA3_256_S390 tristate "Hash functions: SHA3-224 and SHA3-256" - depends on S390 select CRYPTO_HASH help SHA3-224 and SHA3-256 secure hash algorithms (FIPS 202) Architecture: s390 It is available as of z14. config CRYPTO_SHA3_512_S390 tristate "Hash functions: SHA3-384 and SHA3-512" - depends on S390 select CRYPTO_HASH help SHA3-384 and SHA3-512 secure hash algorithms (FIPS 202) Architecture: s390 It is available as of z14. config CRYPTO_GHASH_S390 tristate "Hash functions: GHASH" - depends on S390 select CRYPTO_HASH help GCM GHASH hash function (NIST SP800-38D) Architecture: s390 It is available as of z196. config CRYPTO_AES_S390 tristate "Ciphers: AES, modes: ECB, CBC, CTR, XTS, GCM" - depends on S390 select CRYPTO_ALGAPI select CRYPTO_SKCIPHER help Block cipher: AES cipher algorithms (FIPS 197) AEAD cipher: AES with GCM
@@ -90,11 +83,10 @@ config CRYPTO_AES_S390 key sizes and XTS mode is hardware accelerated for 256 and 512 bit keys. config CRYPTO_DES_S390 tristate "Ciphers: DES and Triple DES EDE, modes: ECB, CBC, CTR" - depends on S390 select CRYPTO_ALGAPI select CRYPTO_SKCIPHER select CRYPTO_LIB_DES help Block ciphers: DES (FIPS 46-2) cipher algorithm
@@ -107,18 +99,16 @@ config CRYPTO_DES_S390 As of z990 the ECB and CBC mode are hardware accelerated. As of z196 the CTR mode is hardware accelerated. config CRYPTO_CHACHA_S390 tristate - depends on S390 select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA default CRYPTO_LIB_CHACHA_INTERNAL config CRYPTO_HMAC_S390 tristate "Keyed-hash message authentication code: HMAC" - depends on S390 select CRYPTO_HASH help s390 specific HMAC hardware support for SHA224, SHA256, SHA384 and SHA512.
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 4/13 crypto: x86 - drop redundant dependencies on X86
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
arch/x86/crypto/Kconfig is sourced only when CONFIG_X86=y, so there is no need for the symbols defined inside it to depend on X86.
In the case of CRYPTO_TWOFISH_586 and CRYPTO_TWOFISH_X86_64, the dependency was actually on '(X86 || UML_X86)', which suggests that these two symbols were intended to be available under user-mode Linux as well. Yet, again these symbols were defined only when CONFIG_X86=y, so that was not the case. Just remove this redundant dependency.
--- arch/x86/crypto/Kconfig | 67 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 34 deletions(-)
arch/x86/crypto/Kconfig +33 -34
@@ -2,11 +2,11 @@ menu "Accelerated Cryptographic Algorithms for CPU (x86)" config CRYPTO_CURVE25519_X86 tristate - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_KPP select CRYPTO_LIB_CURVE25519_GENERIC select CRYPTO_ARCH_HAVE_LIB_CURVE25519 default CRYPTO_LIB_CURVE25519_INTERNAL help
@@ -15,11 +15,10 @@ config CRYPTO_CURVE25519_X86 Architecture: x86_64 using: - ADX (large integer arithmetic) config CRYPTO_AES_NI_INTEL tristate "Ciphers: AES, modes: ECB, CBC, CTS, CTR, XCTR, XTS, GCM (AES-NI/VAES)" - depends on X86 select CRYPTO_AEAD select CRYPTO_LIB_AES select CRYPTO_LIB_GF128MUL select CRYPTO_ALGAPI select CRYPTO_SKCIPHER
@@ -35,11 +34,11 @@ config CRYPTO_AES_NI_INTEL Some algorithm implementations are supported only in 64-bit builds, and some have additional prerequisites such as AVX2 or AVX512. config CRYPTO_BLOWFISH_X86_64 tristate "Ciphers: Blowfish, modes: ECB, CBC" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_BLOWFISH_COMMON imply CRYPTO_CTR help Block cipher: Blowfish cipher algorithm
@@ -47,22 +46,22 @@ config CRYPTO_BLOWFISH_X86_64 Architecture: x86_64 config CRYPTO_CAMELLIA_X86_64 tristate "Ciphers: Camellia with modes: ECB, CBC" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER imply CRYPTO_CTR help Block cipher: Camellia cipher algorithms Length-preserving ciphers: Camellia with ECB and CBC modes Architecture: x86_64 config CRYPTO_CAMELLIA_AESNI_AVX_X86_64 tristate "Ciphers: Camellia with modes: ECB, CBC (AES-NI/AVX)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_CAMELLIA_X86_64 imply CRYPTO_XTS help Length-preserving ciphers: Camellia with ECB and CBC modes
@@ -71,22 +70,22 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64 - AES-NI (AES New Instructions) - AVX (Advanced Vector Extensions) config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 tristate "Ciphers: Camellia with modes: ECB, CBC (AES-NI/AVX2)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_CAMELLIA_AESNI_AVX_X86_64 help Length-preserving ciphers: Camellia with ECB and CBC modes Architecture: x86_64 using: - AES-NI (AES New Instructions) - AVX2 (Advanced Vector Extensions 2) config CRYPTO_CAST5_AVX_X86_64 tristate "Ciphers: CAST5 with modes: ECB, CBC (AVX)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_CAST5 select CRYPTO_CAST_COMMON imply CRYPTO_CTR help
@@ -98,11 +97,11 @@ config CRYPTO_CAST5_AVX_X86_64 Processes 16 blocks in parallel. config CRYPTO_CAST6_AVX_X86_64 tristate "Ciphers: CAST6 with modes: ECB, CBC (AVX)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_CAST6 select CRYPTO_CAST_COMMON imply CRYPTO_XTS imply CRYPTO_CTR
@@ -115,11 +114,11 @@ config CRYPTO_CAST6_AVX_X86_64 Processes eight blocks in parallel. config CRYPTO_DES3_EDE_X86_64 tristate "Ciphers: Triple DES EDE with modes: ECB, CBC" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_LIB_DES imply CRYPTO_CTR help Block cipher: Triple DES EDE (FIPS 46-3) cipher algorithm
@@ -129,11 +128,11 @@ config CRYPTO_DES3_EDE_X86_64 Processes one or three blocks in parallel. config CRYPTO_SERPENT_SSE2_X86_64 tristate "Ciphers: Serpent with modes: ECB, CBC (SSE2)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_SERPENT imply CRYPTO_CTR help Length-preserving ciphers: Serpent cipher algorithm
@@ -144,11 +143,11 @@ config CRYPTO_SERPENT_SSE2_X86_64 Processes eight blocks in parallel. config CRYPTO_SERPENT_SSE2_586 tristate "Ciphers: Serpent with modes: ECB, CBC (32-bit with SSE2)" - depends on X86 && !64BIT + depends on !64BIT select CRYPTO_SKCIPHER select CRYPTO_SERPENT imply CRYPTO_CTR help Length-preserving ciphers: Serpent cipher algorithm
@@ -159,11 +158,11 @@ config CRYPTO_SERPENT_SSE2_586 Processes four blocks in parallel. config CRYPTO_SERPENT_AVX_X86_64 tristate "Ciphers: Serpent with modes: ECB, CBC (AVX)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_SERPENT imply CRYPTO_XTS imply CRYPTO_CTR help
@@ -175,11 +174,11 @@ config CRYPTO_SERPENT_AVX_X86_64 Processes eight blocks in parallel. config CRYPTO_SERPENT_AVX2_X86_64 tristate "Ciphers: Serpent with modes: ECB, CBC (AVX2)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SERPENT_AVX_X86_64 help Length-preserving ciphers: Serpent cipher algorithm with ECB and CBC modes
@@ -188,11 +187,11 @@ config CRYPTO_SERPENT_AVX2_X86_64 Processes 16 blocks in parallel. config CRYPTO_SM4_AESNI_AVX_X86_64 tristate "Ciphers: SM4 with modes: ECB, CBC, CTR (AES-NI/AVX)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_ALGAPI select CRYPTO_SM4 help Length-preserving ciphers: SM4 cipher algorithms
@@ -208,11 +207,11 @@ config CRYPTO_SM4_AESNI_AVX_X86_64 If unsure, say N. config CRYPTO_SM4_AESNI_AVX2_X86_64 tristate "Ciphers: SM4 with modes: ECB, CBC, CTR (AES-NI/AVX2)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_ALGAPI select CRYPTO_SM4 select CRYPTO_SM4_AESNI_AVX_X86_64 help
@@ -229,33 +228,33 @@ config CRYPTO_SM4_AESNI_AVX2_X86_64 If unsure, say N. config CRYPTO_TWOFISH_586 tristate "Ciphers: Twofish (32-bit)" - depends on (X86 || UML_X86) && !64BIT + depends on !64BIT select CRYPTO_ALGAPI select CRYPTO_TWOFISH_COMMON imply CRYPTO_CTR help Block cipher: Twofish cipher algorithm Architecture: x86 (32-bit) config CRYPTO_TWOFISH_X86_64 tristate "Ciphers: Twofish" - depends on (X86 || UML_X86) && 64BIT + depends on 64BIT select CRYPTO_ALGAPI select CRYPTO_TWOFISH_COMMON imply CRYPTO_CTR help Block cipher: Twofish cipher algorithm Architecture: x86_64 config CRYPTO_TWOFISH_X86_64_3WAY tristate "Ciphers: Twofish with modes: ECB, CBC (3-way parallel)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_TWOFISH_COMMON select CRYPTO_TWOFISH_X86_64 help Length-preserving cipher: Twofish cipher algorithm
@@ -266,11 +265,11 @@ config CRYPTO_TWOFISH_X86_64_3WAY Processes three blocks in parallel, better utilizing resources of out-of-order CPUs. config CRYPTO_TWOFISH_AVX_X86_64 tristate "Ciphers: Twofish with modes: ECB, CBC (AVX)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_TWOFISH_COMMON select CRYPTO_TWOFISH_X86_64 select CRYPTO_TWOFISH_X86_64_3WAY imply CRYPTO_XTS
@@ -283,11 +282,11 @@ config CRYPTO_TWOFISH_AVX_X86_64 Processes eight blocks in parallel. config CRYPTO_ARIA_AESNI_AVX_X86_64 tristate "Ciphers: ARIA with modes: ECB, CTR (AES-NI/AVX/GFNI)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_ALGAPI select CRYPTO_ARIA help Length-preserving cipher: ARIA cipher algorithms
@@ -300,11 +299,11 @@ config CRYPTO_ARIA_AESNI_AVX_X86_64 Processes 16 blocks in parallel. config CRYPTO_ARIA_AESNI_AVX2_X86_64 tristate "Ciphers: ARIA with modes: ECB, CTR (AES-NI/AVX2/GFNI)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SKCIPHER select CRYPTO_ALGAPI select CRYPTO_ARIA select CRYPTO_ARIA_AESNI_AVX_X86_64 help
@@ -318,11 +317,11 @@ config CRYPTO_ARIA_AESNI_AVX2_X86_64 Processes 32 blocks in parallel. config CRYPTO_ARIA_GFNI_AVX512_X86_64 tristate "Ciphers: ARIA with modes: ECB, CTR (AVX512/GFNI)" - depends on X86 && 64BIT && AS_GFNI + depends on 64BIT && AS_GFNI select CRYPTO_SKCIPHER select CRYPTO_ALGAPI select CRYPTO_ARIA select CRYPTO_ARIA_AESNI_AVX_X86_64 select CRYPTO_ARIA_AESNI_AVX2_X86_64
@@ -336,49 +335,49 @@ config CRYPTO_ARIA_GFNI_AVX512_X86_64 Processes 64 blocks in parallel. config CRYPTO_CHACHA20_X86_64 tristate - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA default CRYPTO_LIB_CHACHA_INTERNAL config CRYPTO_AEGIS128_AESNI_SSE2 tristate "AEAD ciphers: AEGIS-128 (AES-NI/SSE4.1)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_AEAD help AEGIS-128 AEAD algorithm Architecture: x86_64 using: - AES-NI (AES New Instructions) - SSE4.1 (Streaming SIMD Extensions 4.1) config CRYPTO_NHPOLY1305_SSE2 tristate "Hash functions: NHPoly1305 (SSE2)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_NHPOLY1305 help NHPoly1305 hash function for Adiantum Architecture: x86_64 using: - SSE2 (Streaming SIMD Extensions 2) config CRYPTO_NHPOLY1305_AVX2 tristate "Hash functions: NHPoly1305 (AVX2)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_NHPOLY1305 help NHPoly1305 hash function for Adiantum Architecture: x86_64 using: - AVX2 (Advanced Vector Extensions 2) config CRYPTO_BLAKE2S_X86 bool "Hash functions: BLAKE2s (SSSE3/AVX-512)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_LIB_BLAKE2S_GENERIC select CRYPTO_ARCH_HAVE_LIB_BLAKE2S help BLAKE2s cryptographic hash function (RFC 7693)
@@ -386,27 +385,27 @@ config CRYPTO_BLAKE2S_X86 - SSSE3 (Supplemental SSE3) - AVX-512 (Advanced Vector Extensions-512) config CRYPTO_POLYVAL_CLMUL_NI tristate "Hash functions: POLYVAL (CLMUL-NI)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_POLYVAL help POLYVAL hash function for HCTR2 Architecture: x86_64 using: - CLMUL-NI (carry-less multiplication new instructions) config CRYPTO_POLY1305_X86_64 tristate - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_ARCH_HAVE_LIB_POLY1305 default CRYPTO_LIB_POLY1305_INTERNAL config CRYPTO_SHA1_SSSE3 tristate "Hash functions: SHA-1 (SSSE3/AVX/AVX2/SHA-NI)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SHA1 select CRYPTO_HASH help SHA-1 secure hash algorithm (FIPS 180)
@@ -416,11 +415,11 @@ config CRYPTO_SHA1_SSSE3 - AVX2 (Advanced Vector Extensions 2) - SHA-NI (SHA Extensions New Instructions) config CRYPTO_SHA256_SSSE3 tristate "Hash functions: SHA-224 and SHA-256 (SSSE3/AVX/AVX2/SHA-NI)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SHA256 select CRYPTO_HASH help SHA-224 and SHA-256 secure hash algorithms (FIPS 180)
@@ -430,11 +429,11 @@ config CRYPTO_SHA256_SSSE3 - AVX2 (Advanced Vector Extensions 2) - SHA-NI (SHA Extensions New Instructions) config CRYPTO_SHA512_SSSE3 tristate "Hash functions: SHA-384 and SHA-512 (SSSE3/AVX/AVX2)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_SHA512 select CRYPTO_HASH help SHA-384 and SHA-512 secure hash algorithms (FIPS 180)
@@ -443,11 +442,11 @@ config CRYPTO_SHA512_SSSE3 - AVX (Advanced Vector Extensions) - AVX2 (Advanced Vector Extensions 2) config CRYPTO_SM3_AVX_X86_64 tristate "Hash functions: SM3 (AVX)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_HASH select CRYPTO_LIB_SM3 help SM3 secure hash function as defined by OSCCA GM/T 0004-2012 SM3
@@ -456,11 +455,11 @@ config CRYPTO_SM3_AVX_X86_64 If unsure, say N. config CRYPTO_GHASH_CLMUL_NI_INTEL tristate "Hash functions: GHASH (CLMUL-NI)" - depends on X86 && 64BIT + depends on 64BIT select CRYPTO_CRYPTD help GCM GHASH hash function (NIST SP800-38D) Architecture: x86_64 using:
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 5/13 crypto: arm - move library functions to arch/arm/lib/crypto/
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the arm BLAKE2s, ChaCha, and Poly1305 library functions into a new directory arch/arm/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/.
---
MAINTAINERS | 1 +
arch/arm/crypto/Kconfig | 23 ----------------
arch/arm/crypto/Makefile | 14 +---------
arch/arm/lib/Makefile | 2 ++
arch/arm/lib/crypto/.gitignore | 2 ++
arch/arm/lib/crypto/Kconfig | 24 +++++++++++++++++
arch/arm/lib/crypto/Makefile | 26 +++++++++++++++++++
arch/arm/{ => lib}/crypto/blake2s-core.S | 0
arch/arm/{ => lib}/crypto/blake2s-glue.c | 0
arch/arm/{ => lib}/crypto/chacha-glue.c | 0
arch/arm/{ => lib}/crypto/chacha-neon-core.S | 0
.../arm/{ => lib}/crypto/chacha-scalar-core.S | 0
arch/arm/{ => lib}/crypto/poly1305-armv4.pl | 0
arch/arm/{ => lib}/crypto/poly1305-glue.c | 0
lib/crypto/Kconfig | 6 +++++
15 files changed, 62 insertions(+), 36 deletions(-)
create mode 100644 arch/arm/lib/crypto/.gitignore
create mode 100644 arch/arm/lib/crypto/Kconfig
create mode 100644 arch/arm/lib/crypto/Makefile
rename arch/arm/{ => lib}/crypto/blake2s-core.S (100%)
rename arch/arm/{ => lib}/crypto/blake2s-glue.c (100%)
rename arch/arm/{ => lib}/crypto/chacha-glue.c (100%)
rename arch/arm/{ => lib}/crypto/chacha-neon-core.S (100%)
rename arch/arm/{ => lib}/crypto/chacha-scalar-core.S (100%)
rename arch/arm/{ => lib}/crypto/poly1305-armv4.pl (100%)
rename arch/arm/{ => lib}/crypto/poly1305-glue.c (100%)MAINTAINERS +1 -0
@@ -6286,10 +6286,11 @@ S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git F: Documentation/crypto/ F: Documentation/devicetree/bindings/crypto/ F: arch/*/crypto/ +F: arch/*/lib/crypto/ F: crypto/ F: drivers/crypto/ F: include/crypto/ F: include/linux/crypto* F: lib/crypto/
arch/arm/crypto/Kconfig +0 -23
@@ -44,28 +44,10 @@ config CRYPTO_NHPOLY1305_NEON NHPoly1305 hash function (Adiantum) Architecture: arm using: - NEON (Advanced SIMD) extensions -config CRYPTO_POLY1305_ARM - tristate - select CRYPTO_ARCH_HAVE_LIB_POLY1305 - default CRYPTO_LIB_POLY1305_INTERNAL - -config CRYPTO_BLAKE2S_ARM - bool "Hash functions: BLAKE2s" - select CRYPTO_ARCH_HAVE_LIB_BLAKE2S - help - BLAKE2s cryptographic hash function (RFC 7693) - - Architecture: arm - - This is faster than the generic implementations of BLAKE2s and - BLAKE2b, but slower than the NEON implementation of BLAKE2b. - There is no NEON implementation of BLAKE2s, since NEON doesn't - really help with it. - config CRYPTO_BLAKE2B_NEON tristate "Hash functions: BLAKE2b (NEON)" depends on KERNEL_MODE_NEON select CRYPTO_BLAKE2B help
@@ -204,12 +186,7 @@ config CRYPTO_AES_ARM_CE and IEEE 1619) Architecture: arm using: - ARMv8 Crypto Extensions -config CRYPTO_CHACHA20_NEON - tristate - select CRYPTO_ARCH_HAVE_LIB_CHACHA - default CRYPTO_LIB_CHACHA_INTERNAL - endmenu
arch/arm/crypto/Makefile +1 -13
@@ -7,14 +7,11 @@ obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o obj-$(CONFIG_CRYPTO_AES_ARM_BS) += aes-arm-bs.o obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o -obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += libblake2s-arm.o obj-$(CONFIG_CRYPTO_BLAKE2B_NEON) += blake2b-neon.o -obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o -obj-$(CONFIG_CRYPTO_POLY1305_ARM) += poly1305-arm.o obj-$(CONFIG_CRYPTO_NHPOLY1305_NEON) += nhpoly1305-neon.o obj-$(CONFIG_CRYPTO_CURVE25519_NEON) += curve25519-neon.o obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o
@@ -27,34 +24,25 @@ sha1-arm-y := sha1-armv4-large.o sha1_glue.o sha1-arm-neon-y := sha1-armv7-neon.o sha1_neon_glue.o sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o sha256-arm-y := sha256-core.o sha256_glue.o $(sha256-arm-neon-y) sha512-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha512-neon-glue.o sha512-arm-y := sha512-core.o sha512-glue.o $(sha512-arm-neon-y) -libblake2s-arm-y:= blake2s-core.o blake2s-glue.o blake2b-neon-y := blake2b-neon-core.o blake2b-neon-glue.o sha1-arm-ce-y := sha1-ce-core.o sha1-ce-glue.o sha2-arm-ce-y := sha2-ce-core.o sha2-ce-glue.o aes-arm-ce-y := aes-ce-core.o aes-ce-glue.o ghash-arm-ce-y := ghash-ce-core.o ghash-ce-glue.o -chacha-neon-y := chacha-scalar-core.o chacha-glue.o -chacha-neon-$(CONFIG_KERNEL_MODE_NEON) += chacha-neon-core.o -poly1305-arm-y := poly1305-core.o poly1305-glue.o nhpoly1305-neon-y := nh-neon-core.o nhpoly1305-neon-glue.o curve25519-neon-y := curve25519-core.o curve25519-glue.o quiet_cmd_perl = PERL $@ cmd_perl = $(PERL) $(<) > $(@) $(obj)/%-core.S: $(src)/%-armv4.pl $(call cmd,perl) -clean-files += poly1305-core.S sha256-core.S sha512-core.S +clean-files += sha256-core.S sha512-core.S aflags-thumb2-$(CONFIG_THUMB2_KERNEL) := -U__thumb2__ -D__thumb2__=1 AFLAGS_sha256-core.o += $(aflags-thumb2-y) AFLAGS_sha512-core.o += $(aflags-thumb2-y) - -# massage the perlasm code a bit so we only get the NEON routine if we need it -poly1305-aflags-$(CONFIG_CPU_V7) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=5 -poly1305-aflags-$(CONFIG_KERNEL_MODE_NEON) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=7 -AFLAGS_poly1305-core.o += $(poly1305-aflags-y) $(aflags-thumb2-y)
arch/arm/lib/Makefile +2 -0
@@ -3,10 +3,12 @@ # 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 \
arch/arm/lib/crypto/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +poly1305-core.S
arch/arm/lib/crypto/Kconfig new file +24 -0
@@ -0,0 +1,24 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_BLAKE2S_ARM + bool "Hash functions: BLAKE2s" + select CRYPTO_ARCH_HAVE_LIB_BLAKE2S + help + BLAKE2s cryptographic hash function (RFC 7693) + + Architecture: arm + + This is faster than the generic implementations of BLAKE2s and + BLAKE2b, but slower than the NEON implementation of BLAKE2b. + There is no NEON implementation of BLAKE2s, since NEON doesn't + really help with it. + +config CRYPTO_CHACHA20_NEON + tristate + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_CHACHA + +config CRYPTO_POLY1305_ARM + tristate + default CRYPTO_LIB_POLY1305_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_POLY1305
arch/arm/lib/crypto/Makefile new file +26 -0
@@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += libblake2s-arm.o +libblake2s-arm-y := blake2s-core.o blake2s-glue.o + +obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o +chacha-neon-y := chacha-scalar-core.o chacha-glue.o +chacha-neon-$(CONFIG_KERNEL_MODE_NEON) += chacha-neon-core.o + +obj-$(CONFIG_CRYPTO_POLY1305_ARM) += poly1305-arm.o +poly1305-arm-y := poly1305-core.o poly1305-glue.o + +quiet_cmd_perl = PERL $@ + cmd_perl = $(PERL) $(<) > $(@) + +$(obj)/%-core.S: $(src)/%-armv4.pl + $(call cmd,perl) + +clean-files += poly1305-core.S + +aflags-thumb2-$(CONFIG_THUMB2_KERNEL) := -U__thumb2__ -D__thumb2__=1 + +# massage the perlasm code a bit so we only get the NEON routine if we need it +poly1305-aflags-$(CONFIG_CPU_V7) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=5 +poly1305-aflags-$(CONFIG_KERNEL_MODE_NEON) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=7 +AFLAGS_poly1305-core.o += $(poly1305-aflags-y) $(aflags-thumb2-y)
arch/arm/lib/crypto/blake2s-core.S renamed from arch/arm/crypto/blake2s-core.S +0 -0
arch/arm/lib/crypto/blake2s-glue.c renamed from arch/arm/crypto/blake2s-glue.c +0 -0
arch/arm/lib/crypto/chacha-glue.c renamed from arch/arm/crypto/chacha-glue.c +0 -0
arch/arm/lib/crypto/chacha-neon-core.S renamed from arch/arm/crypto/chacha-neon-core.S +0 -0
arch/arm/lib/crypto/chacha-scalar-core.S renamed from arch/arm/crypto/chacha-scalar-core.S +0 -0
arch/arm/lib/crypto/poly1305-armv4.pl renamed from arch/arm/crypto/poly1305-armv4.pl +0 -0
arch/arm/lib/crypto/poly1305-glue.c renamed from arch/arm/crypto/poly1305-glue.c +0 -0
lib/crypto/Kconfig +6 -0
@@ -153,6 +153,12 @@ config CRYPTO_LIB_SHA256 tristate config CRYPTO_LIB_SM3 tristate +if !KMSAN # avoid false positives from assembly +if ARM +source "arch/arm/lib/crypto/Kconfig" +endif +endif + endmenu
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 6/13 crypto: arm64 - move library functions to arch/arm64/lib/crypto/
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the arm64 ChaCha and Poly1305 library functions into a new directory arch/arm64/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/.
---
arch/arm64/crypto/Kconfig | 13 -------------
arch/arm64/crypto/Makefile | 9 +--------
arch/arm64/lib/Makefile | 3 +++
arch/arm64/lib/crypto/.gitignore | 2 ++
arch/arm64/lib/crypto/Kconfig | 14 ++++++++++++++
arch/arm64/lib/crypto/Makefile | 16 ++++++++++++++++
arch/arm64/{ => lib}/crypto/chacha-neon-core.S | 0
arch/arm64/{ => lib}/crypto/chacha-neon-glue.c | 0
arch/arm64/{ => lib}/crypto/poly1305-armv8.pl | 0
arch/arm64/{ => lib}/crypto/poly1305-glue.c | 0
lib/crypto/Kconfig | 3 +++
11 files changed, 39 insertions(+), 21 deletions(-)
create mode 100644 arch/arm64/lib/crypto/.gitignore
create mode 100644 arch/arm64/lib/crypto/Kconfig
create mode 100644 arch/arm64/lib/crypto/Makefile
rename arch/arm64/{ => lib}/crypto/chacha-neon-core.S (100%)
rename arch/arm64/{ => lib}/crypto/chacha-neon-glue.c (100%)
rename arch/arm64/{ => lib}/crypto/poly1305-armv8.pl (100%)
rename arch/arm64/{ => lib}/crypto/poly1305-glue.c (100%)arch/arm64/crypto/Kconfig +0 -13
@@ -23,16 +23,10 @@ config CRYPTO_NHPOLY1305_NEON NHPoly1305 hash function (Adiantum) Architecture: arm64 using: - NEON (Advanced SIMD) extensions -config CRYPTO_POLY1305_NEON - tristate - depends on KERNEL_MODE_NEON - select CRYPTO_ARCH_HAVE_LIB_POLY1305 - default CRYPTO_LIB_POLY1305_INTERNAL - config CRYPTO_SHA1_ARM64_CE tristate "Hash functions: SHA-1 (ARMv8 Crypto Extensions)" depends on KERNEL_MODE_NEON select CRYPTO_HASH select CRYPTO_SHA1
@@ -178,17 +172,10 @@ config CRYPTO_AES_ARM64_NEON_BLK and IEEE 1619) Architecture: arm64 using: - NEON (Advanced SIMD) extensions -config CRYPTO_CHACHA20_NEON - tristate - depends on KERNEL_MODE_NEON - select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CHACHA - default CRYPTO_LIB_CHACHA_INTERNAL - config CRYPTO_AES_ARM64_BS tristate "Ciphers: AES, modes: ECB/CBC/CTR/XCTR/XTS modes (bit-sliced NEON)" depends on KERNEL_MODE_NEON select CRYPTO_SKCIPHER select CRYPTO_AES_ARM64_NEON_BLK
arch/arm64/crypto/Makefile +1 -8
@@ -60,17 +60,10 @@ obj-$(CONFIG_CRYPTO_SHA256_ARM64) += sha256-arm64.o sha256-arm64-y := sha256-glue.o sha256-core.o obj-$(CONFIG_CRYPTO_SHA512_ARM64) += sha512-arm64.o sha512-arm64-y := sha512-glue.o sha512-core.o -obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o -chacha-neon-y := chacha-neon-core.o chacha-neon-glue.o - -obj-$(CONFIG_CRYPTO_POLY1305_NEON) += poly1305-neon.o -poly1305-neon-y := poly1305-core.o poly1305-glue.o -AFLAGS_poly1305-core.o += -Dpoly1305_init=poly1305_init_arm64 - obj-$(CONFIG_CRYPTO_NHPOLY1305_NEON) += nhpoly1305-neon.o nhpoly1305-neon-y := nh-neon-core.o nhpoly1305-neon-glue.o obj-$(CONFIG_CRYPTO_AES_ARM64) += aes-arm64.o aes-arm64-y := aes-cipher-core.o aes-cipher-glue.o
@@ -85,6 +78,6 @@ $(obj)/%-core.S: $(src)/%-armv8.pl $(call cmd,perlasm) $(obj)/sha256-core.S: $(src)/sha512-armv8.pl $(call cmd,perlasm) -clean-files += poly1305-core.S sha256-core.S sha512-core.S +clean-files += sha256-core.S sha512-core.S
arch/arm64/lib/Makefile +3 -0
@@ -1,6 +1,9 @@ # 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 \ memset.o memcmp.o strcmp.o strncmp.o strlen.o \ strnlen.o strchr.o strrchr.o tishift.o
arch/arm64/lib/crypto/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +poly1305-core.S
arch/arm64/lib/crypto/Kconfig new file +14 -0
@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_CHACHA20_NEON + tristate + depends on KERNEL_MODE_NEON + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_LIB_CHACHA_GENERIC + select CRYPTO_ARCH_HAVE_LIB_CHACHA + +config CRYPTO_POLY1305_NEON + tristate + depends on KERNEL_MODE_NEON + default CRYPTO_LIB_POLY1305_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_POLY1305
arch/arm64/lib/crypto/Makefile new file +16 -0
@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o +chacha-neon-y := chacha-neon-core.o chacha-neon-glue.o + +obj-$(CONFIG_CRYPTO_POLY1305_NEON) += poly1305-neon.o +poly1305-neon-y := poly1305-core.o poly1305-glue.o +AFLAGS_poly1305-core.o += -Dpoly1305_init=poly1305_init_arm64 + +quiet_cmd_perlasm = PERLASM $@ + cmd_perlasm = $(PERL) $(<) void $(@) + +$(obj)/%-core.S: $(src)/%-armv8.pl + $(call cmd,perlasm) + +clean-files += poly1305-core.S
arch/arm64/lib/crypto/chacha-neon-core.S renamed from arch/arm64/crypto/chacha-neon-core.S +0 -0
arch/arm64/lib/crypto/chacha-neon-glue.c renamed from arch/arm64/crypto/chacha-neon-glue.c +0 -0
arch/arm64/lib/crypto/poly1305-armv8.pl renamed from arch/arm64/crypto/poly1305-armv8.pl +0 -0
arch/arm64/lib/crypto/poly1305-glue.c renamed from arch/arm64/crypto/poly1305-glue.c +0 -0
lib/crypto/Kconfig +3 -0
@@ -157,8 +157,11 @@ config CRYPTO_LIB_SM3 if !KMSAN # avoid false positives from assembly if ARM source "arch/arm/lib/crypto/Kconfig" endif +if ARM64 +source "arch/arm64/lib/crypto/Kconfig" +endif endif endmenu
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 7/13 crypto: mips - move library functions to arch/mips/lib/crypto/
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the mips ChaCha and Poly1305 library functions into a new directory arch/mips/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/.
---
arch/mips/crypto/Kconfig | 11 -----------
arch/mips/crypto/Makefile | 17 -----------------
arch/mips/lib/Makefile | 2 ++
arch/mips/lib/crypto/.gitignore | 2 ++
arch/mips/lib/crypto/Kconfig | 12 ++++++++++++
arch/mips/lib/crypto/Makefile | 19 +++++++++++++++++++
arch/mips/{ => lib}/crypto/chacha-core.S | 0
arch/mips/{ => lib}/crypto/chacha-glue.c | 0
arch/mips/{ => lib}/crypto/poly1305-glue.c | 0
arch/mips/{ => lib}/crypto/poly1305-mips.pl | 0
lib/crypto/Kconfig | 3 +++
11 files changed, 38 insertions(+), 28 deletions(-)
create mode 100644 arch/mips/lib/crypto/.gitignore
create mode 100644 arch/mips/lib/crypto/Kconfig
create mode 100644 arch/mips/lib/crypto/Makefile
rename arch/mips/{ => lib}/crypto/chacha-core.S (100%)
rename arch/mips/{ => lib}/crypto/chacha-glue.c (100%)
rename arch/mips/{ => lib}/crypto/poly1305-glue.c (100%)
rename arch/mips/{ => lib}/crypto/poly1305-mips.pl (100%)arch/mips/crypto/Kconfig +0 -11
@@ -1,14 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 menu "Accelerated Cryptographic Algorithms for CPU (mips)" -config CRYPTO_POLY1305_MIPS - tristate - select CRYPTO_ARCH_HAVE_LIB_POLY1305 - default CRYPTO_LIB_POLY1305_INTERNAL - config CRYPTO_MD5_OCTEON tristate "Digests: MD5 (OCTEON)" depends on CPU_CAVIUM_OCTEON select CRYPTO_MD5 select CRYPTO_HASH
@@ -45,12 +40,6 @@ config CRYPTO_SHA512_OCTEON help SHA-384 and SHA-512 secure hash algorithms (FIPS 180) Architecture: mips OCTEON using crypto instructions, when available -config CRYPTO_CHACHA_MIPS - tristate - depends on CPU_MIPS32_R2 - select CRYPTO_ARCH_HAVE_LIB_CHACHA - default CRYPTO_LIB_CHACHA_INTERNAL - endmenu
arch/mips/crypto/Makefile +0 -17
@@ -1,22 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile for MIPS crypto files.. # -obj-$(CONFIG_CRYPTO_CHACHA_MIPS) += chacha-mips.o -chacha-mips-y := chacha-core.o chacha-glue.o -AFLAGS_chacha-core.o += -O2 # needed to fill branch delay slots - -obj-$(CONFIG_CRYPTO_POLY1305_MIPS) += poly1305-mips.o -poly1305-mips-y := poly1305-core.o poly1305-glue.o - -perlasm-flavour-$(CONFIG_32BIT) := o32 -perlasm-flavour-$(CONFIG_64BIT) := 64 - -quiet_cmd_perlasm = PERLASM $@ - cmd_perlasm = $(PERL) $(<) $(perlasm-flavour-y) $(@) - -$(obj)/poly1305-core.S: $(src)/poly1305-mips.pl FORCE - $(call if_changed,perlasm) - -targets += poly1305-core.S
arch/mips/lib/Makefile +2 -0
@@ -1,10 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile for MIPS-specific library files.. # +obj-y += crypto/ + lib-y += bitops.o csum_partial.o delay.o memcpy.o memset.o \ mips-atomic.o strncpy_user.o \ strnlen_user.o uncached.o obj-y += iomap_copy.o
arch/mips/lib/crypto/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +poly1305-core.S
arch/mips/lib/crypto/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_CHACHA_MIPS + tristate + depends on CPU_MIPS32_R2 + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_CHACHA + +config CRYPTO_POLY1305_MIPS + tristate + default CRYPTO_LIB_POLY1305_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_POLY1305
arch/mips/lib/crypto/Makefile new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_CHACHA_MIPS) += chacha-mips.o +chacha-mips-y := chacha-core.o chacha-glue.o +AFLAGS_chacha-core.o += -O2 # needed to fill branch delay slots + +obj-$(CONFIG_CRYPTO_POLY1305_MIPS) += poly1305-mips.o +poly1305-mips-y := poly1305-core.o poly1305-glue.o + +perlasm-flavour-$(CONFIG_32BIT) := o32 +perlasm-flavour-$(CONFIG_64BIT) := 64 + +quiet_cmd_perlasm = PERLASM $@ + cmd_perlasm = $(PERL) $(<) $(perlasm-flavour-y) $(@) + +$(obj)/poly1305-core.S: $(src)/poly1305-mips.pl FORCE + $(call if_changed,perlasm) + +targets += poly1305-core.S
arch/mips/lib/crypto/chacha-core.S renamed from arch/mips/crypto/chacha-core.S +0 -0
arch/mips/lib/crypto/chacha-glue.c renamed from arch/mips/crypto/chacha-glue.c +0 -0
arch/mips/lib/crypto/poly1305-glue.c renamed from arch/mips/crypto/poly1305-glue.c +0 -0
arch/mips/lib/crypto/poly1305-mips.pl renamed from arch/mips/crypto/poly1305-mips.pl +0 -0
lib/crypto/Kconfig +3 -0
@@ -160,8 +160,11 @@ if ARM source "arch/arm/lib/crypto/Kconfig" endif if ARM64 source "arch/arm64/lib/crypto/Kconfig" endif +if MIPS +source "arch/mips/lib/crypto/Kconfig" +endif endif endmenu
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 8/13 crypto: powerpc - move library functions to arch/powerpc/lib/crypto/
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the powerpc ChaCha and Poly1305 library functions into a new directory arch/powerpc/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/.
---
arch/powerpc/crypto/Kconfig | 14 --------------
arch/powerpc/crypto/Makefile | 4 ----
arch/powerpc/lib/Makefile | 2 ++
arch/powerpc/lib/crypto/Kconfig | 15 +++++++++++++++
arch/powerpc/lib/crypto/Makefile | 7 +++++++
arch/powerpc/{ => lib}/crypto/chacha-p10-glue.c | 0
arch/powerpc/{ => lib}/crypto/chacha-p10le-8x.S | 0
arch/powerpc/{ => lib}/crypto/poly1305-p10-glue.c | 0
arch/powerpc/{ => lib}/crypto/poly1305-p10le_64.S | 0
lib/crypto/Kconfig | 3 +++
10 files changed, 27 insertions(+), 18 deletions(-)
create mode 100644 arch/powerpc/lib/crypto/Kconfig
create mode 100644 arch/powerpc/lib/crypto/Makefile
rename arch/powerpc/{ => lib}/crypto/chacha-p10-glue.c (100%)
rename arch/powerpc/{ => lib}/crypto/chacha-p10le-8x.S (100%)
rename arch/powerpc/{ => lib}/crypto/poly1305-p10-glue.c (100%)
rename arch/powerpc/{ => lib}/crypto/poly1305-p10le_64.S (100%)arch/powerpc/crypto/Kconfig +0 -14
@@ -88,24 +88,10 @@ config CRYPTO_AES_GCM_P10 - Power10 or later features Support for cryptographic acceleration instructions on Power10 or later CPU. This module supports stitched acceleration for AES/GCM. -config CRYPTO_CHACHA20_P10 - tristate - depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CHACHA - default CRYPTO_LIB_CHACHA_INTERNAL - -config CRYPTO_POLY1305_P10 - tristate - depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - select CRYPTO_ARCH_HAVE_LIB_POLY1305 - select CRYPTO_LIB_POLY1305_GENERIC - default CRYPTO_LIB_POLY1305_INTERNAL - config CRYPTO_DEV_VMX bool "Support for VMX cryptographic acceleration instructions" depends on PPC64 && VSX help Support for VMX cryptographic acceleration instructions.
arch/powerpc/crypto/Makefile +0 -4
@@ -9,23 +9,19 @@ obj-$(CONFIG_CRYPTO_AES_PPC_SPE) += aes-ppc-spe.o obj-$(CONFIG_CRYPTO_MD5_PPC) += md5-ppc.o obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o obj-$(CONFIG_CRYPTO_AES_GCM_P10) += aes-gcm-p10-crypto.o -obj-$(CONFIG_CRYPTO_CHACHA20_P10) += chacha-p10-crypto.o -obj-$(CONFIG_CRYPTO_POLY1305_P10) += poly1305-p10-crypto.o obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o obj-$(CONFIG_CRYPTO_CURVE25519_PPC64) += curve25519-ppc64le.o aes-ppc-spe-y := aes-spe-core.o aes-spe-keys.o aes-tab-4k.o aes-spe-modes.o aes-spe-glue.o md5-ppc-y := md5-asm.o md5-glue.o sha1-powerpc-y := sha1-powerpc-asm.o sha1.o sha1-ppc-spe-y := sha1-spe-asm.o sha1-spe-glue.o sha256-ppc-spe-y := sha256-spe-asm.o sha256-spe-glue.o aes-gcm-p10-crypto-y := aes-gcm-p10-glue.o aes-gcm-p10.o ghashp10-ppc.o aesp10-ppc.o -chacha-p10-crypto-y := chacha-p10-glue.o chacha-p10le-8x.o -poly1305-p10-crypto-y := poly1305-p10-glue.o poly1305-p10le_64.o vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o curve25519-ppc64le-y := curve25519-ppc64le-core.o curve25519-ppc64le_asm.o ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) override flavour := linux-ppc64le
arch/powerpc/lib/Makefile +2 -0
@@ -1,10 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile for ppc-specific library files.. # +obj-y += crypto/ + CFLAGS_code-patching.o += -fno-stack-protector CFLAGS_feature-fixups.o += -fno-stack-protector CFLAGS_REMOVE_code-patching.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_feature-fixups.o = $(CC_FLAGS_FTRACE)
arch/powerpc/lib/crypto/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_CHACHA20_P10 + tristate + depends on PPC64 && CPU_LITTLE_ENDIAN && VSX + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_LIB_CHACHA_GENERIC + select CRYPTO_ARCH_HAVE_LIB_CHACHA + +config CRYPTO_POLY1305_P10 + tristate + depends on PPC64 && CPU_LITTLE_ENDIAN && VSX + default CRYPTO_LIB_POLY1305_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_POLY1305 + select CRYPTO_LIB_POLY1305_GENERIC
arch/powerpc/lib/crypto/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_CHACHA20_P10) += chacha-p10-crypto.o +chacha-p10-crypto-y := chacha-p10-glue.o chacha-p10le-8x.o + +obj-$(CONFIG_CRYPTO_POLY1305_P10) += poly1305-p10-crypto.o +poly1305-p10-crypto-y := poly1305-p10-glue.o poly1305-p10le_64.o
arch/powerpc/lib/crypto/chacha-p10-glue.c renamed from arch/powerpc/crypto/chacha-p10-glue.c +0 -0
arch/powerpc/lib/crypto/chacha-p10le-8x.S renamed from arch/powerpc/crypto/chacha-p10le-8x.S +0 -0
arch/powerpc/lib/crypto/poly1305-p10-glue.c renamed from arch/powerpc/crypto/poly1305-p10-glue.c +0 -0
arch/powerpc/lib/crypto/poly1305-p10le_64.S renamed from arch/powerpc/crypto/poly1305-p10le_64.S +0 -0
lib/crypto/Kconfig +3 -0
@@ -163,8 +163,11 @@ if ARM64 source "arch/arm64/lib/crypto/Kconfig" endif if MIPS source "arch/mips/lib/crypto/Kconfig" endif +if PPC +source "arch/powerpc/lib/crypto/Kconfig" +endif endif endmenu
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 9/13 crypto: riscv - move library functions to arch/riscv/lib/crypto/
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the riscv ChaCha library functions into a new directory arch/riscv/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/.
---
arch/riscv/crypto/Kconfig | 7 -------
arch/riscv/crypto/Makefile | 3 ---
arch/riscv/lib/Makefile | 1 +
arch/riscv/lib/crypto/Kconfig | 8 ++++++++
arch/riscv/lib/crypto/Makefile | 4 ++++
arch/riscv/{ => lib}/crypto/chacha-riscv64-glue.c | 0
arch/riscv/{ => lib}/crypto/chacha-riscv64-zvkb.S | 0
lib/crypto/Kconfig | 3 +++
8 files changed, 16 insertions(+), 10 deletions(-)
create mode 100644 arch/riscv/lib/crypto/Kconfig
create mode 100644 arch/riscv/lib/crypto/Makefile
rename arch/riscv/{ => lib}/crypto/chacha-riscv64-glue.c (100%)
rename arch/riscv/{ => lib}/crypto/chacha-riscv64-zvkb.S (100%)arch/riscv/crypto/Kconfig +0 -7
@@ -16,17 +16,10 @@ config CRYPTO_AES_RISCV64 - Zvkned vector crypto extension - Zvbb vector extension (XTS) - Zvkb vector crypto extension (CTR) - Zvkg vector crypto extension (XTS) -config CRYPTO_CHACHA_RISCV64 - tristate - depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO - select CRYPTO_ARCH_HAVE_LIB_CHACHA - select CRYPTO_LIB_CHACHA_GENERIC - default CRYPTO_LIB_CHACHA_INTERNAL - config CRYPTO_GHASH_RISCV64 tristate "Hash functions: GHASH" depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO select CRYPTO_GCM help
arch/riscv/crypto/Makefile +0 -3
@@ -2,13 +2,10 @@ obj-$(CONFIG_CRYPTO_AES_RISCV64) += aes-riscv64.o aes-riscv64-y := aes-riscv64-glue.o aes-riscv64-zvkned.o \ aes-riscv64-zvkned-zvbb-zvkg.o aes-riscv64-zvkned-zvkb.o -obj-$(CONFIG_CRYPTO_CHACHA_RISCV64) += chacha-riscv64.o -chacha-riscv64-y := chacha-riscv64-glue.o chacha-riscv64-zvkb.o - obj-$(CONFIG_CRYPTO_GHASH_RISCV64) += ghash-riscv64.o ghash-riscv64-y := ghash-riscv64-glue.o ghash-riscv64-zvkg.o obj-$(CONFIG_CRYPTO_SHA256_RISCV64) += sha256-riscv64.o sha256-riscv64-y := sha256-riscv64-glue.o sha256-riscv64-zvknha_or_zvknhb-zvkb.o
arch/riscv/lib/Makefile +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += crypto/ lib-y += delay.o lib-y += memcpy.o lib-y += memset.o lib-y += memmove.o ifeq ($(CONFIG_KASAN_GENERIC)$(CONFIG_KASAN_SW_TAGS),)
arch/riscv/lib/crypto/Kconfig new file +8 -0
@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_CHACHA_RISCV64 + tristate + depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_CHACHA + select CRYPTO_LIB_CHACHA_GENERIC
arch/riscv/lib/crypto/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_CHACHA_RISCV64) += chacha-riscv64.o +chacha-riscv64-y := chacha-riscv64-glue.o chacha-riscv64-zvkb.o
arch/riscv/lib/crypto/chacha-riscv64-glue.c renamed from arch/riscv/crypto/chacha-riscv64-glue.c +0 -0
arch/riscv/lib/crypto/chacha-riscv64-zvkb.S renamed from arch/riscv/crypto/chacha-riscv64-zvkb.S +0 -0
lib/crypto/Kconfig +3 -0
@@ -166,8 +166,11 @@ if MIPS source "arch/mips/lib/crypto/Kconfig" endif if PPC source "arch/powerpc/lib/crypto/Kconfig" endif +if RISCV +source "arch/riscv/lib/crypto/Kconfig" +endif endif endmenu
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 10/13 crypto: s390 - move library functions to arch/s390/lib/crypto/
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the s390 ChaCha library functions into a new directory arch/s390/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/.
---
arch/s390/crypto/Kconfig | 6 ------
arch/s390/crypto/Makefile | 3 ---
arch/s390/lib/Makefile | 1 +
arch/s390/lib/crypto/Kconfig | 7 +++++++
arch/s390/lib/crypto/Makefile | 4 ++++
arch/s390/{ => lib}/crypto/chacha-glue.c | 0
arch/s390/{ => lib}/crypto/chacha-s390.S | 0
arch/s390/{ => lib}/crypto/chacha-s390.h | 0
lib/crypto/Kconfig | 3 +++
9 files changed, 15 insertions(+), 9 deletions(-)
create mode 100644 arch/s390/lib/crypto/Kconfig
create mode 100644 arch/s390/lib/crypto/Makefile
rename arch/s390/{ => lib}/crypto/chacha-glue.c (100%)
rename arch/s390/{ => lib}/crypto/chacha-s390.S (100%)
rename arch/s390/{ => lib}/crypto/chacha-s390.h (100%)arch/s390/crypto/Kconfig +0 -6
@@ -97,16 +97,10 @@ config CRYPTO_DES_S390 Architecture: s390 As of z990 the ECB and CBC mode are hardware accelerated. As of z196 the CTR mode is hardware accelerated. -config CRYPTO_CHACHA_S390 - tristate - select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CHACHA - default CRYPTO_LIB_CHACHA_INTERNAL - config CRYPTO_HMAC_S390 tristate "Keyed-hash message authentication code: HMAC" select CRYPTO_HASH help s390 specific HMAC hardware support for SHA224, SHA256, SHA384 and
arch/s390/crypto/Makefile +0 -3
@@ -9,12 +9,9 @@ obj-$(CONFIG_CRYPTO_SHA512_S390) += sha512_s390.o sha_common.o obj-$(CONFIG_CRYPTO_SHA3_256_S390) += sha3_256_s390.o sha_common.o obj-$(CONFIG_CRYPTO_SHA3_512_S390) += sha3_512_s390.o sha_common.o obj-$(CONFIG_CRYPTO_DES_S390) += des_s390.o obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o obj-$(CONFIG_CRYPTO_PAES_S390) += paes_s390.o -obj-$(CONFIG_CRYPTO_CHACHA_S390) += chacha_s390.o obj-$(CONFIG_S390_PRNG) += prng.o obj-$(CONFIG_CRYPTO_GHASH_S390) += ghash_s390.o obj-$(CONFIG_CRYPTO_HMAC_S390) += hmac_s390.o obj-y += arch_random.o - -chacha_s390-y := chacha-glue.o chacha-s390.o
arch/s390/lib/Makefile +1 -0
@@ -1,10 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile for s390-specific library files.. # +obj-y += crypto/ lib-y += delay.o string.o uaccess.o find.o spinlock.o tishift.o lib-y += csum-partial.o obj-y += mem.o xor.o lib-$(CONFIG_KPROBES) += probes.o lib-$(CONFIG_UPROBES) += probes.o
arch/s390/lib/crypto/Kconfig new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_CHACHA_S390 + tristate + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_LIB_CHACHA_GENERIC + select CRYPTO_ARCH_HAVE_LIB_CHACHA
arch/s390/lib/crypto/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_CHACHA_S390) += chacha_s390.o +chacha_s390-y := chacha-glue.o chacha-s390.o
arch/s390/lib/crypto/chacha-glue.c renamed from arch/s390/crypto/chacha-glue.c +0 -0
arch/s390/lib/crypto/chacha-s390.S renamed from arch/s390/crypto/chacha-s390.S +0 -0
arch/s390/lib/crypto/chacha-s390.h renamed from arch/s390/crypto/chacha-s390.h +0 -0
lib/crypto/Kconfig +3 -0
@@ -169,8 +169,11 @@ if PPC source "arch/powerpc/lib/crypto/Kconfig" endif if RISCV source "arch/riscv/lib/crypto/Kconfig" endif +if S390 +source "arch/s390/lib/crypto/Kconfig" +endif endif endmenu
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 11/13 crypto: x86 - move library functions to arch/x86/lib/crypto/
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the x86 BLAKE2s, ChaCha, and Poly1305 library functions into a new directory arch/x86/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/.
---
arch/x86/crypto/Kconfig | 25 ------------------
arch/x86/crypto/Makefile | 15 -----------
arch/x86/lib/Makefile | 2 ++
arch/x86/lib/crypto/.gitignore | 2 ++
arch/x86/lib/crypto/Kconfig | 26 +++++++++++++++++++
arch/x86/lib/crypto/Makefile | 17 ++++++++++++
arch/x86/{ => lib}/crypto/blake2s-core.S | 0
arch/x86/{ => lib}/crypto/blake2s-glue.c | 0
.../x86/{ => lib}/crypto/chacha-avx2-x86_64.S | 0
.../{ => lib}/crypto/chacha-avx512vl-x86_64.S | 0
.../{ => lib}/crypto/chacha-ssse3-x86_64.S | 0
arch/x86/{ => lib}/crypto/chacha_glue.c | 0
.../crypto/poly1305-x86_64-cryptogams.pl | 0
arch/x86/{ => lib}/crypto/poly1305_glue.c | 0
lib/crypto/Kconfig | 3 +++
15 files changed, 50 insertions(+), 40 deletions(-)
create mode 100644 arch/x86/lib/crypto/.gitignore
create mode 100644 arch/x86/lib/crypto/Kconfig
create mode 100644 arch/x86/lib/crypto/Makefile
rename arch/x86/{ => lib}/crypto/blake2s-core.S (100%)
rename arch/x86/{ => lib}/crypto/blake2s-glue.c (100%)
rename arch/x86/{ => lib}/crypto/chacha-avx2-x86_64.S (100%)
rename arch/x86/{ => lib}/crypto/chacha-avx512vl-x86_64.S (100%)
rename arch/x86/{ => lib}/crypto/chacha-ssse3-x86_64.S (100%)
rename arch/x86/{ => lib}/crypto/chacha_glue.c (100%)
rename arch/x86/{ => lib}/crypto/poly1305-x86_64-cryptogams.pl (100%)
rename arch/x86/{ => lib}/crypto/poly1305_glue.c (100%)arch/x86/crypto/Kconfig +0 -25
@@ -333,17 +333,10 @@ config CRYPTO_ARIA_GFNI_AVX512_X86_64 - AVX512 (Advanced Vector Extensions) - GFNI (Galois Field New Instructions) Processes 64 blocks in parallel. -config CRYPTO_CHACHA20_X86_64 - tristate - depends on 64BIT - select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CHACHA - default CRYPTO_LIB_CHACHA_INTERNAL - config CRYPTO_AEGIS128_AESNI_SSE2 tristate "AEAD ciphers: AEGIS-128 (AES-NI/SSE4.1)" depends on 64BIT select CRYPTO_AEAD help
@@ -371,38 +364,20 @@ config CRYPTO_NHPOLY1305_AVX2 NHPoly1305 hash function for Adiantum Architecture: x86_64 using: - AVX2 (Advanced Vector Extensions 2) -config CRYPTO_BLAKE2S_X86 - bool "Hash functions: BLAKE2s (SSSE3/AVX-512)" - depends on 64BIT - select CRYPTO_LIB_BLAKE2S_GENERIC - select CRYPTO_ARCH_HAVE_LIB_BLAKE2S - help - BLAKE2s cryptographic hash function (RFC 7693) - - Architecture: x86_64 using: - - SSSE3 (Supplemental SSE3) - - AVX-512 (Advanced Vector Extensions-512) - config CRYPTO_POLYVAL_CLMUL_NI tristate "Hash functions: POLYVAL (CLMUL-NI)" depends on 64BIT select CRYPTO_POLYVAL help POLYVAL hash function for HCTR2 Architecture: x86_64 using: - CLMUL-NI (carry-less multiplication new instructions) -config CRYPTO_POLY1305_X86_64 - tristate - depends on 64BIT - select CRYPTO_ARCH_HAVE_LIB_POLY1305 - default CRYPTO_LIB_POLY1305_INTERNAL - config CRYPTO_SHA1_SSSE3 tristate "Hash functions: SHA-1 (SSSE3/AVX/AVX2/SHA-NI)" depends on 64BIT select CRYPTO_SHA1 select CRYPTO_HASH
arch/x86/crypto/Makefile +0 -15
@@ -40,13 +40,10 @@ obj-$(CONFIG_CRYPTO_CAST6_AVX_X86_64) += cast6-avx-x86_64.o cast6-avx-x86_64-y := cast6-avx-x86_64-asm_64.o cast6_avx_glue.o obj-$(CONFIG_CRYPTO_AEGIS128_AESNI_SSE2) += aegis128-aesni.o aegis128-aesni-y := aegis128-aesni-asm.o aegis128-aesni-glue.o -obj-$(CONFIG_CRYPTO_CHACHA20_X86_64) += chacha-x86_64.o -chacha-x86_64-y := chacha-avx2-x86_64.o chacha-ssse3-x86_64.o chacha-avx512vl-x86_64.o chacha_glue.o - obj-$(CONFIG_CRYPTO_AES_NI_INTEL) += aesni-intel.o aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o aesni-intel-$(CONFIG_64BIT) += aes-ctr-avx-x86_64.o \ aes-gcm-aesni-x86_64.o \ aes-xts-avx-x86_64.o
@@ -61,23 +58,16 @@ obj-$(CONFIG_CRYPTO_SHA256_SSSE3) += sha256-ssse3.o sha256-ssse3-y := sha256-ssse3-asm.o sha256-avx-asm.o sha256-avx2-asm.o sha256_ni_asm.o sha256_ssse3_glue.o obj-$(CONFIG_CRYPTO_SHA512_SSSE3) += sha512-ssse3.o sha512-ssse3-y := sha512-ssse3-asm.o sha512-avx-asm.o sha512-avx2-asm.o sha512_ssse3_glue.o -obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += libblake2s-x86_64.o -libblake2s-x86_64-y := blake2s-core.o blake2s-glue.o - obj-$(CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL) += ghash-clmulni-intel.o ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o obj-$(CONFIG_CRYPTO_POLYVAL_CLMUL_NI) += polyval-clmulni.o polyval-clmulni-y := polyval-clmulni_asm.o polyval-clmulni_glue.o -obj-$(CONFIG_CRYPTO_POLY1305_X86_64) += poly1305-x86_64.o -poly1305-x86_64-y := poly1305-x86_64-cryptogams.o poly1305_glue.o -targets += poly1305-x86_64-cryptogams.S - obj-$(CONFIG_CRYPTO_NHPOLY1305_SSE2) += nhpoly1305-sse2.o nhpoly1305-sse2-y := nh-sse2-x86_64.o nhpoly1305-sse2-glue.o obj-$(CONFIG_CRYPTO_NHPOLY1305_AVX2) += nhpoly1305-avx2.o nhpoly1305-avx2-y := nh-avx2-x86_64.o nhpoly1305-avx2-glue.o
@@ -99,12 +89,7 @@ obj-$(CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64) += aria-aesni-avx2-x86_64.o aria-aesni-avx2-x86_64-y := aria-aesni-avx2-asm_64.o aria_aesni_avx2_glue.o obj-$(CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64) += aria-gfni-avx512-x86_64.o aria-gfni-avx512-x86_64-y := aria-gfni-avx512-asm_64.o aria_gfni_avx512_glue.o -quiet_cmd_perlasm = PERLASM $@ - cmd_perlasm = $(PERL) $< > $@ -$(obj)/%.S: $(src)/%.pl FORCE - $(call if_changed,perlasm) - # Disable GCOV in odd or sensitive code GCOV_PROFILE_curve25519-x86_64.o := n
arch/x86/lib/Makefile +2 -0
@@ -1,10 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile for x86 specific library files. # +obj-y += crypto/ + # Produces uninteresting flaky coverage. KCOV_INSTRUMENT_delay.o := n # KCSAN uses udelay for introducing watchpoint delay; avoid recursion. KCSAN_SANITIZE_delay.o := n
arch/x86/lib/crypto/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +poly1305-x86_64-cryptogams.S
arch/x86/lib/crypto/Kconfig new file +26 -0
@@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_BLAKE2S_X86 + bool "Hash functions: BLAKE2s (SSSE3/AVX-512)" + depends on 64BIT + select CRYPTO_LIB_BLAKE2S_GENERIC + select CRYPTO_ARCH_HAVE_LIB_BLAKE2S + help + BLAKE2s cryptographic hash function (RFC 7693) + + Architecture: x86_64 using: + - SSSE3 (Supplemental SSE3) + - AVX-512 (Advanced Vector Extensions-512) + +config CRYPTO_CHACHA20_X86_64 + tristate + depends on 64BIT + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_LIB_CHACHA_GENERIC + select CRYPTO_ARCH_HAVE_LIB_CHACHA + +config CRYPTO_POLY1305_X86_64 + tristate + depends on 64BIT + default CRYPTO_LIB_POLY1305_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_POLY1305
arch/x86/lib/crypto/Makefile new file +17 -0
@@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += libblake2s-x86_64.o +libblake2s-x86_64-y := blake2s-core.o blake2s-glue.o + +obj-$(CONFIG_CRYPTO_CHACHA20_X86_64) += chacha-x86_64.o +chacha-x86_64-y := chacha-avx2-x86_64.o chacha-ssse3-x86_64.o chacha-avx512vl-x86_64.o chacha_glue.o + +obj-$(CONFIG_CRYPTO_POLY1305_X86_64) += poly1305-x86_64.o +poly1305-x86_64-y := poly1305-x86_64-cryptogams.o poly1305_glue.o +targets += poly1305-x86_64-cryptogams.S + +quiet_cmd_perlasm = PERLASM $@ + cmd_perlasm = $(PERL) $< > $@ + +$(obj)/%.S: $(src)/%.pl FORCE + $(call if_changed,perlasm)
arch/x86/lib/crypto/blake2s-core.S renamed from arch/x86/crypto/blake2s-core.S +0 -0
arch/x86/lib/crypto/blake2s-glue.c renamed from arch/x86/crypto/blake2s-glue.c +0 -0
arch/x86/lib/crypto/chacha-avx2-x86_64.S renamed from arch/x86/crypto/chacha-avx2-x86_64.S +0 -0
arch/x86/lib/crypto/chacha-avx512vl-x86_64.S renamed from arch/x86/crypto/chacha-avx512vl-x86_64.S +0 -0
arch/x86/lib/crypto/chacha-ssse3-x86_64.S renamed from arch/x86/crypto/chacha-ssse3-x86_64.S +0 -0
arch/x86/lib/crypto/chacha_glue.c renamed from arch/x86/crypto/chacha_glue.c +0 -0
arch/x86/lib/crypto/poly1305-x86_64-cryptogams.pl renamed from arch/x86/crypto/poly1305-x86_64-cryptogams.pl +0 -0
arch/x86/lib/crypto/poly1305_glue.c renamed from arch/x86/crypto/poly1305_glue.c +0 -0
lib/crypto/Kconfig +3 -0
@@ -172,8 +172,11 @@ if RISCV source "arch/riscv/lib/crypto/Kconfig" endif if S390 source "arch/s390/lib/crypto/Kconfig" endif +if X86 +source "arch/x86/lib/crypto/Kconfig" +endif endif endmenu
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 12/13 crypto: lib/chacha - remove INTERNAL symbol and selection of CRYPTO
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Now that the architecture-optimized ChaCha kconfig symbols are defined regardless of CRYPTO, there is no need for CRYPTO_LIB_CHACHA to select CRYPTO. So, remove that. This makes the indirection through the CRYPTO_LIB_CHACHA_INTERNAL symbol unnecessary, so get rid of that and just use CRYPTO_LIB_CHACHA directly. Finally, make the fallback to the generic implementation use a default value instead of a select; this makes it consistent with how the arch-optimized code gets enabled and also with how CRYPTO_LIB_BLAKE2S_GENERIC gets enabled.
--- arch/arm/lib/crypto/Kconfig | 2 +- arch/arm64/lib/crypto/Kconfig | 2 +- arch/mips/lib/crypto/Kconfig | 2 +- arch/powerpc/lib/crypto/Kconfig | 2 +- arch/riscv/lib/crypto/Kconfig | 2 +- arch/s390/lib/crypto/Kconfig | 2 +- arch/x86/lib/crypto/Kconfig | 2 +- crypto/Kconfig | 2 +- lib/crypto/Kconfig | 16 +++++----------- 9 files changed, 13 insertions(+), 19 deletions(-)
arch/arm/lib/crypto/Kconfig +1 -1
@@ -13,11 +13,11 @@ config CRYPTO_BLAKE2S_ARM There is no NEON implementation of BLAKE2s, since NEON doesn't really help with it. config CRYPTO_CHACHA20_NEON tristate - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_ARM tristate default CRYPTO_LIB_POLY1305_INTERNAL
arch/arm64/lib/crypto/Kconfig +1 -1
@@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only config CRYPTO_CHACHA20_NEON tristate depends on KERNEL_MODE_NEON - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_NEON tristate
arch/mips/lib/crypto/Kconfig +1 -1
@@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only config CRYPTO_CHACHA_MIPS tristate depends on CPU_MIPS32_R2 - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_MIPS tristate default CRYPTO_LIB_POLY1305_INTERNAL
arch/powerpc/lib/crypto/Kconfig +1 -1
@@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only config CRYPTO_CHACHA20_P10 tristate depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_P10 tristate
arch/riscv/lib/crypto/Kconfig +1 -1
@@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only config CRYPTO_CHACHA_RISCV64 tristate depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_ARCH_HAVE_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC
arch/s390/lib/crypto/Kconfig +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config CRYPTO_CHACHA_S390 tristate - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA
arch/x86/lib/crypto/Kconfig +1 -1
@@ -13,11 +13,11 @@ config CRYPTO_BLAKE2S_X86 - AVX-512 (Advanced Vector Extensions-512) config CRYPTO_CHACHA20_X86_64 tristate depends on 64BIT - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_X86_64 tristate
crypto/Kconfig +1 -1
@@ -632,12 +632,12 @@ config CRYPTO_ARC4 WEP, but it should not be for other purposes because of the weakness of the algorithm. config CRYPTO_CHACHA20 tristate "ChaCha" + select CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_LIB_CHACHA_INTERNAL select CRYPTO_SKCIPHER help The ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms ChaCha20 is a 256-bit high-speed stream cipher designed by Daniel J.
lib/crypto/Kconfig +5 -11
@@ -48,26 +48,20 @@ config CRYPTO_ARCH_HAVE_LIB_CHACHA accelerated implementation of the ChaCha library interface, either builtin or as a module. config CRYPTO_LIB_CHACHA_GENERIC tristate + default CRYPTO_LIB_CHACHA if !CRYPTO_ARCH_HAVE_LIB_CHACHA select CRYPTO_LIB_UTILS help - This symbol can be depended upon by arch implementations of the - ChaCha library interface that require the generic code as a - fallback, e.g., for SIMD implementations. If no arch specific - implementation is enabled, this implementation serves the users - of CRYPTO_LIB_CHACHA. - -config CRYPTO_LIB_CHACHA_INTERNAL - tristate - select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n + This symbol can be selected by arch implementations of the ChaCha + library interface that require the generic code as a fallback, e.g., + for SIMD implementations. If no arch specific implementation is + enabled, this implementation serves the users of CRYPTO_LIB_CHACHA. config CRYPTO_LIB_CHACHA tristate - select CRYPTO - select CRYPTO_LIB_CHACHA_INTERNAL help Enable the ChaCha library interface. This interface may be fulfilled by either the generic implementation or an arch-specific one, if one is available and enabled.
Signature · 1 line
2.49.0
Eric Biggers
maintainerPATCH v3 13/13 crypto: lib/poly1305 - remove INTERNAL symbol and selection of CRYPTO
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Now that the architecture-optimized Poly1305 kconfig symbols are defined regardless of CRYPTO, there is no need for CRYPTO_LIB_POLY1305 to select CRYPTO. So, remove that. This makes the indirection through the CRYPTO_LIB_POLY1305_INTERNAL symbol unnecessary, so get rid of that and just use CRYPTO_LIB_POLY1305 directly. Finally, make the fallback to the generic implementation use a default value instead of a select; this makes it consistent with how the arch-optimized code gets enabled and also with how CRYPTO_LIB_BLAKE2S_GENERIC gets enabled.
--- arch/arm/lib/crypto/Kconfig | 2 +- arch/arm64/lib/crypto/Kconfig | 2 +- arch/mips/lib/crypto/Kconfig | 2 +- arch/powerpc/lib/crypto/Kconfig | 2 +- arch/x86/lib/crypto/Kconfig | 2 +- crypto/Kconfig | 2 +- lib/crypto/Kconfig | 16 +++++----------- 7 files changed, 11 insertions(+), 17 deletions(-)
arch/arm/lib/crypto/Kconfig +1 -1
@@ -18,7 +18,7 @@ config CRYPTO_CHACHA20_NEON default CRYPTO_LIB_CHACHA select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_ARM tristate - default CRYPTO_LIB_POLY1305_INTERNAL + default CRYPTO_LIB_POLY1305 select CRYPTO_ARCH_HAVE_LIB_POLY1305
arch/arm64/lib/crypto/Kconfig +1 -1
@@ -8,7 +8,7 @@ config CRYPTO_CHACHA20_NEON select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_NEON tristate depends on KERNEL_MODE_NEON - default CRYPTO_LIB_POLY1305_INTERNAL + default CRYPTO_LIB_POLY1305 select CRYPTO_ARCH_HAVE_LIB_POLY1305
arch/mips/lib/crypto/Kconfig +1 -1
@@ -6,7 +6,7 @@ config CRYPTO_CHACHA_MIPS default CRYPTO_LIB_CHACHA select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_MIPS tristate - default CRYPTO_LIB_POLY1305_INTERNAL + default CRYPTO_LIB_POLY1305 select CRYPTO_ARCH_HAVE_LIB_POLY1305
arch/powerpc/lib/crypto/Kconfig +1 -1
@@ -8,8 +8,8 @@ config CRYPTO_CHACHA20_P10 select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_P10 tristate depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - default CRYPTO_LIB_POLY1305_INTERNAL + default CRYPTO_LIB_POLY1305 select CRYPTO_ARCH_HAVE_LIB_POLY1305 select CRYPTO_LIB_POLY1305_GENERIC
arch/x86/lib/crypto/Kconfig +1 -1
@@ -20,7 +20,7 @@ config CRYPTO_CHACHA20_X86_64 select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_X86_64 tristate depends on 64BIT - default CRYPTO_LIB_POLY1305_INTERNAL + default CRYPTO_LIB_POLY1305 select CRYPTO_ARCH_HAVE_LIB_POLY1305
crypto/Kconfig +1 -1
@@ -954,12 +954,12 @@ config CRYPTO_POLYVAL cryptographic hash function. config CRYPTO_POLY1305 tristate "Poly1305" select CRYPTO_HASH + select CRYPTO_LIB_POLY1305 select CRYPTO_LIB_POLY1305_GENERIC - select CRYPTO_LIB_POLY1305_INTERNAL help Poly1305 authenticator algorithm (RFC7539) Poly1305 is an authenticator algorithm designed by Daniel J. Bernstein. It is used for the ChaCha20-Poly1305 AEAD, specified in RFC7539 for use
lib/crypto/Kconfig +5 -11
@@ -112,25 +112,19 @@ config CRYPTO_ARCH_HAVE_LIB_POLY1305 accelerated implementation of the Poly1305 library interface, either builtin or as a module. config CRYPTO_LIB_POLY1305_GENERIC tristate + default CRYPTO_LIB_POLY1305 if !CRYPTO_ARCH_HAVE_LIB_POLY1305 help - This symbol can be depended upon by arch implementations of the - Poly1305 library interface that require the generic code as a - fallback, e.g., for SIMD implementations. If no arch specific - implementation is enabled, this implementation serves the users - of CRYPTO_LIB_POLY1305. - -config CRYPTO_LIB_POLY1305_INTERNAL - tristate - select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n + This symbol can be selected by arch implementations of the Poly1305 + library interface that require the generic code as a fallback, e.g., + for SIMD implementations. If no arch specific implementation is + enabled, this implementation serves the users of CRYPTO_LIB_POLY1305. config CRYPTO_LIB_POLY1305 tristate - select CRYPTO - select CRYPTO_LIB_POLY1305_INTERNAL help Enable the Poly1305 library interface. This interface may be fulfilled by either the generic implementation or an arch-specific one, if one is available and enabled.
Signature · 1 line
2.49.0
Herbert Xu
maintainerQuoted 164 lines · Eric Biggers
This series removes the unnecessary dependency of the ChaCha, Poly1305, and BLAKE2s library functions on the generic crypto infrastructure, i.e.
CONFIG_CRYPTO. To do this, it moves the architecture-optimized implementations of these functions into new directoriesarch/*/lib/crypto/which do not depend on CRYPTO. This mirrors the existing distinction betweencrypto/andlib/crypto/.The last two patches remove the selection of CRYPTO by
CRYPTO_LIB_CHACHAandCRYPTO_LIB_POLY1305, and they remove the corresponding*_INTERNALsymbols which were needed only because of the entanglement with CRYPTO.Note that Curve25519 is still entangled. Later patches will fix that.
Changed in v3:
- Fixed build error on arm withCONFIG_CPU_THUMBONLY=y.
- Small whitespace and commit message fixes.
- Added Acked-by's.Changed in v2:
- Introduced new directoriesarch/*/lib/crypto/instead of keeping the library functions inarch/*/crypto/.Eric Biggers (13):
crypto: arm64 - drop redundant dependencies on ARM64
crypto: powerpc - drop redundant dependencies on PPC
crypto: s390 - drop redundant dependencies on S390
crypto: x86 - drop redundant dependencies on X86
crypto: arm - move library functions toarch/arm/lib/crypto/
crypto: arm64 - move library functions toarch/arm64/lib/crypto/
crypto: mips - move library functions toarch/mips/lib/crypto/
crypto: powerpc - move library functions toarch/powerpc/lib/crypto/
crypto: riscv - move library functions toarch/riscv/lib/crypto/
crypto: s390 - move library functions toarch/s390/lib/crypto/
crypto: x86 - move library functions toarch/x86/lib/crypto/
crypto: lib/chacha - remove INTERNAL symbol and selection of CRYPTO
crypto: lib/poly1305 - remove INTERNAL symbol and selection of CRYPTOMAINTAINERS | 1 + arch/arm/crypto/Kconfig | 23 ----- arch/arm/crypto/Makefile | 14 +-- arch/arm/lib/Makefile | 2 + arch/arm/lib/crypto/.gitignore | 2 + arch/arm/lib/crypto/Kconfig | 24 ++++++ arch/arm/lib/crypto/Makefile | 26 ++++++ arch/arm/{ => lib}/crypto/blake2s-core.S | 0 arch/arm/{ => lib}/crypto/blake2s-glue.c | 0 arch/arm/{ => lib}/crypto/chacha-glue.c | 0 arch/arm/{ => lib}/crypto/chacha-neon-core.S | 0 .../arm/{ => lib}/crypto/chacha-scalar-core.S | 0 arch/arm/{ => lib}/crypto/poly1305-armv4.pl | 0 arch/arm/{ => lib}/crypto/poly1305-glue.c | 0 arch/arm64/crypto/Kconfig | 17 +--- arch/arm64/crypto/Makefile | 9 +- arch/arm64/lib/Makefile | 3 + arch/arm64/lib/crypto/.gitignore | 2 + arch/arm64/lib/crypto/Kconfig | 14 +++ arch/arm64/lib/crypto/Makefile | 16 ++++ .../arm64/{ => lib}/crypto/chacha-neon-core.S | 0 .../arm64/{ => lib}/crypto/chacha-neon-glue.c | 0 arch/arm64/{ => lib}/crypto/poly1305-armv8.pl | 0 arch/arm64/{ => lib}/crypto/poly1305-glue.c | 0 arch/mips/crypto/Kconfig | 11 --- arch/mips/crypto/Makefile | 17 ---- arch/mips/lib/Makefile | 2 + arch/mips/lib/crypto/.gitignore | 2 + arch/mips/lib/crypto/Kconfig | 12 +++ arch/mips/lib/crypto/Makefile | 19 ++++ arch/mips/{ => lib}/crypto/chacha-core.S | 0 arch/mips/{ => lib}/crypto/chacha-glue.c | 0 arch/mips/{ => lib}/crypto/poly1305-glue.c | 0 arch/mips/{ => lib}/crypto/poly1305-mips.pl | 0 arch/powerpc/crypto/Kconfig | 22 +---- arch/powerpc/crypto/Makefile | 4 - arch/powerpc/lib/Makefile | 2 + arch/powerpc/lib/crypto/Kconfig | 15 ++++ arch/powerpc/lib/crypto/Makefile | 7 ++ .../{ => lib}/crypto/chacha-p10-glue.c | 0 .../{ => lib}/crypto/chacha-p10le-8x.S | 0 .../{ => lib}/crypto/poly1305-p10-glue.c | 0 .../{ => lib}/crypto/poly1305-p10le_64.S | 0 arch/riscv/crypto/Kconfig | 7 -- arch/riscv/crypto/Makefile | 3 - arch/riscv/lib/Makefile | 1 + arch/riscv/lib/crypto/Kconfig | 8 ++ arch/riscv/lib/crypto/Makefile | 4 + .../{ => lib}/crypto/chacha-riscv64-glue.c | 0 .../{ => lib}/crypto/chacha-riscv64-zvkb.S | 0 arch/s390/crypto/Kconfig | 16 ---- arch/s390/crypto/Makefile | 3 - arch/s390/lib/Makefile | 1 + arch/s390/lib/crypto/Kconfig | 7 ++ arch/s390/lib/crypto/Makefile | 4 + arch/s390/{ => lib}/crypto/chacha-glue.c | 0 arch/s390/{ => lib}/crypto/chacha-s390.S | 0 arch/s390/{ => lib}/crypto/chacha-s390.h | 0 arch/x86/crypto/Kconfig | 86 +++++++------------ arch/x86/crypto/Makefile | 15 ---- arch/x86/lib/Makefile | 2 + arch/x86/lib/crypto/.gitignore | 2 + arch/x86/lib/crypto/Kconfig | 26 ++++++ arch/x86/lib/crypto/Makefile | 17 ++++ arch/x86/{ => lib}/crypto/blake2s-core.S | 0 arch/x86/{ => lib}/crypto/blake2s-glue.c | 0 .../x86/{ => lib}/crypto/chacha-avx2-x86_64.S | 0 .../{ => lib}/crypto/chacha-avx512vl-x86_64.S | 0 .../{ => lib}/crypto/chacha-ssse3-x86_64.S | 0 arch/x86/{ => lib}/crypto/chacha_glue.c | 0 .../crypto/poly1305-x86_64-cryptogams.pl | 0 arch/x86/{ => lib}/crypto/poly1305_glue.c | 0 crypto/Kconfig | 4 +- lib/crypto/Kconfig | 56 +++++++----- 74 files changed, 294 insertions(+), 234 deletions(-)create mode 100644
arch/arm/lib/crypto/.gitignore
create mode 100644arch/arm/lib/crypto/Kconfig
create mode 100644arch/arm/lib/crypto/Makefile
renamearch/arm/{=>lib}/crypto/blake2s-core.S(100%) renamearch/arm/{=>lib}/crypto/blake2s-glue.c(100%) renamearch/arm/{=>lib}/crypto/chacha-glue.c(100%) renamearch/arm/{=>lib}/crypto/chacha-neon-core.S(100%) renamearch/arm/{=>lib}/crypto/chacha-scalar-core.S(100%) renamearch/arm/{=>lib}/crypto/poly1305-armv4.pl(100%) renamearch/arm/{=>lib}/crypto/poly1305-glue.c(100%) create mode 100644arch/arm64/lib/crypto/.gitignore
create mode 100644arch/arm64/lib/crypto/Kconfig
create mode 100644arch/arm64/lib/crypto/Makefile
renamearch/arm64/{=>lib}/crypto/chacha-neon-core.S(100%) renamearch/arm64/{=>lib}/crypto/chacha-neon-glue.c(100%) renamearch/arm64/{=>lib}/crypto/poly1305-armv8.pl(100%) renamearch/arm64/{=>lib}/crypto/poly1305-glue.c(100%) create mode 100644arch/mips/lib/crypto/.gitignore
create mode 100644arch/mips/lib/crypto/Kconfig
create mode 100644arch/mips/lib/crypto/Makefile
renamearch/mips/{=>lib}/crypto/chacha-core.S(100%) renamearch/mips/{=>lib}/crypto/chacha-glue.c(100%) renamearch/mips/{=>lib}/crypto/poly1305-glue.c(100%) renamearch/mips/{=>lib}/crypto/poly1305-mips.pl(100%) create mode 100644arch/powerpc/lib/crypto/Kconfig
create mode 100644arch/powerpc/lib/crypto/Makefile
renamearch/powerpc/{=>lib}/crypto/chacha-p10-glue.c(100%) renamearch/powerpc/{=>lib}/crypto/chacha-p10le-8x.S(100%) renamearch/powerpc/{=>lib}/crypto/poly1305-p10-glue.c(100%) renamearch/powerpc/{=>lib}/crypto/poly1305-p10le_64.S(100%) create mode 100644arch/riscv/lib/crypto/Kconfig
create mode 100644arch/riscv/lib/crypto/Makefile
renamearch/riscv/{=>lib}/crypto/chacha-riscv64-glue.c(100%) renamearch/riscv/{=>lib}/crypto/chacha-riscv64-zvkb.S(100%) create mode 100644arch/s390/lib/crypto/Kconfig
create mode 100644arch/s390/lib/crypto/Makefile
renamearch/s390/{=>lib}/crypto/chacha-glue.c(100%) renamearch/s390/{=>lib}/crypto/chacha-s390.S(100%) renamearch/s390/{=>lib}/crypto/chacha-s390.h(100%) create mode 100644arch/x86/lib/crypto/.gitignore
create mode 100644arch/x86/lib/crypto/Kconfig
create mode 100644arch/x86/lib/crypto/Makefile
renamearch/x86/{=>lib}/crypto/blake2s-core.S(100%) renamearch/x86/{=>lib}/crypto/blake2s-glue.c(100%) renamearch/x86/{=>lib}/crypto/chacha-avx2-x86_64.S(100%) renamearch/x86/{=>lib}/crypto/chacha-avx512vl-x86_64.S(100%) renamearch/x86/{=>lib}/crypto/chacha-ssse3-x86_64.S(100%) renamearch/x86/{=>lib}/crypto/chacha_glue.c(100%) renamearch/x86/{=>lib}/crypto/poly1305-x86_64-cryptogams.pl(100%) renamearch/x86/{=>lib}/crypto/poly1305_glue.c(100%)
Quoted 1 line
base-commit:
bb9c648b334be581a791c7669abaa594e4b5ebb7
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Re: [PATCH v3 02/13] crypto: powerpc - drop redundant dependencies on PPC
In reply to Eric BiggersLe 22/04/2025 à 17:27, Eric Biggers a écrit :
Quoted 7 lines
From: Eric Biggers <[email protected]>
arch/powerpc/crypto/Kconfigis sourced only whenCONFIG_PPC=y, so there is no need for the symbols defined inside it to depend on PPC.Acked-by Ard Biesheuvel <[email protected]>Signed-off-by Eric Biggers <[email protected]>
Note that there are other redundancies in the file, for instance CONFIG_VSX already depends on CONFIG_PPC64
Christophe