Skip to content

Commit 4dcbfc3

Browse files
zx2c4masahir0y
zx2c4
authored and
masahir0y
committed
crypto: x86 - rework configuration based on Kconfig
Now that assembler capabilities are probed inside of Kconfig, we can set up proper Kconfig-based dependencies. We also take this opportunity to reorder the Makefile, so that items are grouped logically by primitive. Signed-off-by: Jason A. Donenfeld <[email protected]> Acked-by: Herbert Xu <[email protected]> Acked-by: Ingo Molnar <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent e9e070c commit 4dcbfc3

File tree

2 files changed

+69
-91
lines changed

2 files changed

+69
-91
lines changed

‎arch/x86/crypto/Makefile

Lines changed: 65 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,100 @@
11
# SPDX-License-Identifier: GPL-2.0
22
#
3-
# Arch-specific CryptoAPI modules.
4-
#
3+
# x86 crypto algorithms
54

65
OBJECT_FILES_NON_STANDARD := y
76

8-
avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\
9-
$(comma)4)$(comma)%ymm2,yes,no)
10-
avx512_supported :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,yes,no)
11-
sha1_ni_supported :=$(call as-instr,sha1msg1 %xmm0$(comma)%xmm1,yes,no)
12-
sha256_ni_supported :=$(call as-instr,sha256msg1 %xmm0$(comma)%xmm1,yes,no)
13-
adx_supported := $(call as-instr,adox %r10$(comma)%r10,yes,no)
14-
157
obj-$(CONFIG_CRYPTO_GLUE_HELPER_X86) += glue_helper.o
168

179
obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
10+
twofish-i586-y := twofish-i586-asm_32.o twofish_glue.o
11+
obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
12+
twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_glue.o
13+
obj-$(CONFIG_CRYPTO_TWOFISH_X86_64_3WAY) += twofish-x86_64-3way.o
14+
twofish-x86_64-3way-y := twofish-x86_64-asm_64-3way.o twofish_glue_3way.o
15+
obj-$(CONFIG_CRYPTO_TWOFISH_AVX_X86_64) += twofish-avx-x86_64.o
16+
twofish-avx-x86_64-y := twofish-avx-x86_64-asm_64.o twofish_avx_glue.o
17+
1818
obj-$(CONFIG_CRYPTO_SERPENT_SSE2_586) += serpent-sse2-i586.o
19+
serpent-sse2-i586-y := serpent-sse2-i586-asm_32.o serpent_sse2_glue.o
20+
obj-$(CONFIG_CRYPTO_SERPENT_SSE2_X86_64) += serpent-sse2-x86_64.o
21+
serpent-sse2-x86_64-y := serpent-sse2-x86_64-asm_64.o serpent_sse2_glue.o
22+
obj-$(CONFIG_CRYPTO_SERPENT_AVX_X86_64) += serpent-avx-x86_64.o
23+
serpent-avx-x86_64-y := serpent-avx-x86_64-asm_64.o serpent_avx_glue.o
24+
obj-$(CONFIG_CRYPTO_SERPENT_AVX2_X86_64) += serpent-avx2.o
25+
serpent-avx2-y := serpent-avx2-asm_64.o serpent_avx2_glue.o
1926

2027
obj-$(CONFIG_CRYPTO_DES3_EDE_X86_64) += des3_ede-x86_64.o
28+
des3_ede-x86_64-y := des3_ede-asm_64.o des3_ede_glue.o
29+
2130
obj-$(CONFIG_CRYPTO_CAMELLIA_X86_64) += camellia-x86_64.o
31+
camellia-x86_64-y := camellia-x86_64-asm_64.o camellia_glue.o
32+
obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64) += camellia-aesni-avx-x86_64.o
33+
camellia-aesni-avx-x86_64-y := camellia-aesni-avx-asm_64.o camellia_aesni_avx_glue.o
34+
obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64) += camellia-aesni-avx2.o
35+
camellia-aesni-avx2-y := camellia-aesni-avx2-asm_64.o camellia_aesni_avx2_glue.o
36+
2237
obj-$(CONFIG_CRYPTO_BLOWFISH_X86_64) += blowfish-x86_64.o
23-
obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
24-
obj-$(CONFIG_CRYPTO_TWOFISH_X86_64_3WAY) += twofish-x86_64-3way.o
38+
blowfish-x86_64-y := blowfish-x86_64-asm_64.o blowfish_glue.o
39+
40+
obj-$(CONFIG_CRYPTO_CAST5_AVX_X86_64) += cast5-avx-x86_64.o
41+
cast5-avx-x86_64-y := cast5-avx-x86_64-asm_64.o cast5_avx_glue.o
42+
43+
obj-$(CONFIG_CRYPTO_CAST6_AVX_X86_64) += cast6-avx-x86_64.o
44+
cast6-avx-x86_64-y := cast6-avx-x86_64-asm_64.o cast6_avx_glue.o
45+
46+
obj-$(CONFIG_CRYPTO_AEGIS128_AESNI_SSE2) += aegis128-aesni.o
47+
aegis128-aesni-y := aegis128-aesni-asm.o aegis128-aesni-glue.o
48+
2549
obj-$(CONFIG_CRYPTO_CHACHA20_X86_64) += chacha-x86_64.o
26-
obj-$(CONFIG_CRYPTO_SERPENT_SSE2_X86_64) += serpent-sse2-x86_64.o
50+
chacha-x86_64-y := chacha-ssse3-x86_64.o chacha_glue.o
51+
chacha-x86_64-$(CONFIG_AS_AVX2) += chacha-avx2-x86_64.o
52+
chacha-x86_64-$(CONFIG_AS_AVX512) += chacha-avx512vl-x86_64.o
53+
2754
obj-$(CONFIG_CRYPTO_AES_NI_INTEL) += aesni-intel.o
28-
obj-$(CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL) += ghash-clmulni-intel.o
55+
aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o
56+
aesni-intel-$(CONFIG_64BIT) += aesni-intel_avx-x86_64.o aes_ctrby8_avx-x86_64.o
2957

30-
obj-$(CONFIG_CRYPTO_CRC32C_INTEL) += crc32c-intel.o
3158
obj-$(CONFIG_CRYPTO_SHA1_SSSE3) += sha1-ssse3.o
32-
obj-$(CONFIG_CRYPTO_CRC32_PCLMUL) += crc32-pclmul.o
33-
obj-$(CONFIG_CRYPTO_SHA256_SSSE3) += sha256-ssse3.o
34-
obj-$(CONFIG_CRYPTO_SHA512_SSSE3) += sha512-ssse3.o
35-
obj-$(CONFIG_CRYPTO_CRCT10DIF_PCLMUL) += crct10dif-pclmul.o
36-
obj-$(CONFIG_CRYPTO_POLY1305_X86_64) += poly1305-x86_64.o
37-
38-
obj-$(CONFIG_CRYPTO_AEGIS128_AESNI_SSE2) += aegis128-aesni.o
59+
sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o
60+
sha1-ssse3-$(CONFIG_AS_AVX2) += sha1_avx2_x86_64_asm.o
61+
sha1-ssse3-$(CONFIG_AS_SHA1_NI) += sha1_ni_asm.o
3962

40-
obj-$(CONFIG_CRYPTO_NHPOLY1305_SSE2) += nhpoly1305-sse2.o
41-
obj-$(CONFIG_CRYPTO_NHPOLY1305_AVX2) += nhpoly1305-avx2.o
63+
obj-$(CONFIG_CRYPTO_SHA256_SSSE3) += sha256-ssse3.o
64+
sha256-ssse3-y := sha256-ssse3-asm.o sha256-avx-asm.o sha256-avx2-asm.o sha256_ssse3_glue.o
65+
sha256-ssse3-$(CONFIG_AS_SHA256_NI) += sha256_ni_asm.o
4266

43-
# These modules require the assembler to support ADX.
44-
ifeq ($(adx_supported),yes)
45-
obj-$(CONFIG_CRYPTO_CURVE25519_X86) += curve25519-x86_64.o
46-
endif
67+
obj-$(CONFIG_CRYPTO_SHA512_SSSE3) += sha512-ssse3.o
68+
sha512-ssse3-y := sha512-ssse3-asm.o sha512-avx-asm.o sha512-avx2-asm.o sha512_ssse3_glue.o
4769

48-
# These modules require assembler to support AVX.
49-
obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64) += camellia-aesni-avx-x86_64.o
50-
obj-$(CONFIG_CRYPTO_CAST5_AVX_X86_64) += cast5-avx-x86_64.o
51-
obj-$(CONFIG_CRYPTO_CAST6_AVX_X86_64) += cast6-avx-x86_64.o
52-
obj-$(CONFIG_CRYPTO_TWOFISH_AVX_X86_64) += twofish-avx-x86_64.o
53-
obj-$(CONFIG_CRYPTO_SERPENT_AVX_X86_64) += serpent-avx-x86_64.o
5470
obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += blake2s-x86_64.o
71+
blake2s-x86_64-y := blake2s-core.o blake2s-glue.o
5572

56-
# These modules require assembler to support AVX2.
57-
ifeq ($(avx2_supported),yes)
58-
obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64) += camellia-aesni-avx2.o
59-
obj-$(CONFIG_CRYPTO_SERPENT_AVX2_X86_64) += serpent-avx2.o
60-
endif
73+
obj-$(CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL) += ghash-clmulni-intel.o
74+
ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o
6175

62-
twofish-i586-y := twofish-i586-asm_32.o twofish_glue.o
63-
serpent-sse2-i586-y := serpent-sse2-i586-asm_32.o serpent_sse2_glue.o
76+
obj-$(CONFIG_CRYPTO_CRC32C_INTEL) += crc32c-intel.o
77+
crc32c-intel-y := crc32c-intel_glue.o
78+
crc32c-intel-$(CONFIG_64BIT) += crc32c-pcl-intel-asm_64.o
6479

65-
des3_ede-x86_64-y := des3_ede-asm_64.o des3_ede_glue.o
66-
camellia-x86_64-y := camellia-x86_64-asm_64.o camellia_glue.o
67-
blowfish-x86_64-y := blowfish-x86_64-asm_64.o blowfish_glue.o
68-
twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_glue.o
69-
twofish-x86_64-3way-y := twofish-x86_64-asm_64-3way.o twofish_glue_3way.o
70-
chacha-x86_64-y := chacha-ssse3-x86_64.o chacha_glue.o
71-
serpent-sse2-x86_64-y := serpent-sse2-x86_64-asm_64.o serpent_sse2_glue.o
80+
obj-$(CONFIG_CRYPTO_CRC32_PCLMUL) += crc32-pclmul.o
81+
crc32-pclmul-y := crc32-pclmul_asm.o crc32-pclmul_glue.o
7282

73-
aegis128-aesni-y := aegis128-aesni-asm.o aegis128-aesni-glue.o
83+
obj-$(CONFIG_CRYPTO_CRCT10DIF_PCLMUL) += crct10dif-pclmul.o
84+
crct10dif-pclmul-y := crct10dif-pcl-asm_64.o crct10dif-pclmul_glue.o
7485

75-
nhpoly1305-sse2-y := nh-sse2-x86_64.o nhpoly1305-sse2-glue.o
76-
blake2s-x86_64-y := blake2s-core.o blake2s-glue.o
86+
obj-$(CONFIG_CRYPTO_POLY1305_X86_64) += poly1305-x86_64.o
7787
poly1305-x86_64-y := poly1305-x86_64-cryptogams.o poly1305_glue.o
7888
ifneq ($(CONFIG_CRYPTO_POLY1305_X86_64),)
7989
targets += poly1305-x86_64-cryptogams.S
8090
endif
8191

82-
camellia-aesni-avx-x86_64-y := camellia-aesni-avx-asm_64.o \
83-
camellia_aesni_avx_glue.o
84-
cast5-avx-x86_64-y := cast5-avx-x86_64-asm_64.o cast5_avx_glue.o
85-
cast6-avx-x86_64-y := cast6-avx-x86_64-asm_64.o cast6_avx_glue.o
86-
twofish-avx-x86_64-y := twofish-avx-x86_64-asm_64.o twofish_avx_glue.o
87-
serpent-avx-x86_64-y := serpent-avx-x86_64-asm_64.o serpent_avx_glue.o
88-
89-
ifeq ($(avx2_supported),yes)
90-
camellia-aesni-avx2-y := camellia-aesni-avx2-asm_64.o camellia_aesni_avx2_glue.o
91-
chacha-x86_64-y += chacha-avx2-x86_64.o
92-
serpent-avx2-y := serpent-avx2-asm_64.o serpent_avx2_glue.o
93-
94-
nhpoly1305-avx2-y := nh-avx2-x86_64.o nhpoly1305-avx2-glue.o
95-
endif
96-
97-
ifeq ($(avx512_supported),yes)
98-
chacha-x86_64-y += chacha-avx512vl-x86_64.o
99-
endif
92+
obj-$(CONFIG_CRYPTO_NHPOLY1305_SSE2) += nhpoly1305-sse2.o
93+
nhpoly1305-sse2-y := nh-sse2-x86_64.o nhpoly1305-sse2-glue.o
94+
obj-$(CONFIG_CRYPTO_NHPOLY1305_AVX2) += nhpoly1305-avx2.o
95+
nhpoly1305-avx2-y := nh-avx2-x86_64.o nhpoly1305-avx2-glue.o
10096

101-
aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o
102-
aesni-intel-$(CONFIG_64BIT) += aesni-intel_avx-x86_64.o aes_ctrby8_avx-x86_64.o
103-
ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o
104-
sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o
105-
ifeq ($(avx2_supported),yes)
106-
sha1-ssse3-y += sha1_avx2_x86_64_asm.o
107-
endif
108-
ifeq ($(sha1_ni_supported),yes)
109-
sha1-ssse3-y += sha1_ni_asm.o
110-
endif
111-
crc32c-intel-y := crc32c-intel_glue.o
112-
crc32c-intel-$(CONFIG_64BIT) += crc32c-pcl-intel-asm_64.o
113-
crc32-pclmul-y := crc32-pclmul_asm.o crc32-pclmul_glue.o
114-
sha256-ssse3-y := sha256-ssse3-asm.o sha256-avx-asm.o sha256-avx2-asm.o sha256_ssse3_glue.o
115-
ifeq ($(sha256_ni_supported),yes)
116-
sha256-ssse3-y += sha256_ni_asm.o
117-
endif
118-
sha512-ssse3-y := sha512-ssse3-asm.o sha512-avx-asm.o sha512-avx2-asm.o sha512_ssse3_glue.o
119-
crct10dif-pclmul-y := crct10dif-pcl-asm_64.o crct10dif-pclmul_glue.o
97+
obj-$(CONFIG_CRYPTO_CURVE25519_X86) += curve25519-x86_64.o
12098

12199
quiet_cmd_perlasm = PERLASM $@
122100
cmd_perlasm = $(PERL) $< > $@

‎crypto/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ config CRYPTO_CURVE25519
267267

268268
config CRYPTO_CURVE25519_X86
269269
tristate "x86_64 accelerated Curve25519 scalar multiplication library"
270-
depends on X86 && 64BIT
270+
depends on X86 && 64BIT && AS_ADX
271271
select CRYPTO_LIB_CURVE25519_GENERIC
272272
select CRYPTO_ARCH_HAVE_LIB_CURVE25519
273273

@@ -465,7 +465,7 @@ config CRYPTO_NHPOLY1305_SSE2
465465

466466
config CRYPTO_NHPOLY1305_AVX2
467467
tristate "NHPoly1305 hash function (x86_64 AVX2 implementation)"
468-
depends on X86 && 64BIT
468+
depends on X86 && 64BIT && AS_AVX2
469469
select CRYPTO_NHPOLY1305
470470
help
471471
AVX2 optimized implementation of the hash function used by the
@@ -1303,7 +1303,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64
13031303

13041304
config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
13051305
tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX2)"
1306-
depends on X86 && 64BIT
1306+
depends on X86 && 64BIT && AS_AVX2
13071307
depends on CRYPTO
13081308
select CRYPTO_CAMELLIA_AESNI_AVX_X86_64
13091309
help
@@ -1573,7 +1573,7 @@ config CRYPTO_SERPENT_AVX_X86_64
15731573

15741574
config CRYPTO_SERPENT_AVX2_X86_64
15751575
tristate "Serpent cipher algorithm (x86_64/AVX2)"
1576-
depends on X86 && 64BIT
1576+
depends on X86 && 64BIT && AS_AVX2
15771577
select CRYPTO_SERPENT_AVX_X86_64
15781578
help
15791579
Serpent cipher algorithm, by Anderson, Biham & Knudsen.

0 commit comments

Comments
 (0)