Commit bc23fe6d authored by Uros Bizjak's avatar Uros Bizjak Committed by Herbert Xu
Browse files

crypto: x86 - Remove CONFIG_AS_AVX512 handling 



Current minimum required version of binutils is 2.25,
which supports AVX-512 instruction mnemonics.

Remove check for assembler support of AVX-512 instructions
and all relevant macros for conditional compilation.

No functional change intended.

Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Reviewed-by: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d032a27e

arch/x86/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ config CRYPTO_ARIA_AESNI_AVX2_X86_64 


config CRYPTO_ARIA_GFNI_AVX512_X86_64

	tristate "Ciphers: ARIA with modes: ECB, CTR (AVX512/GFNI)"

	depends on X86 && 64BIT && AS_AVX512 && AS_GFNI

	depends on X86 && 64BIT && AS_GFNI

	select CRYPTO_SKCIPHER

	select CRYPTO_ALGAPI

	select CRYPTO_ARIA

arch/x86/crypto/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ 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_glue.o

chacha-x86_64-$(CONFIG_AS_AVX512) += chacha-avx512vl-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

arch/x86/crypto/blake2s-core.S

+0 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ SIGMA: 
.byte 13,  7, 12,  3, 11, 14,  1,  9,  2,  5, 15,  8, 10,  0,  4,  6

.byte  6, 14, 11,  0, 15,  9,  3,  8, 10, 12, 13,  1,  5,  2,  7,  4

.byte 10,  8,  7,  1,  2,  4,  6,  5, 13, 15,  9,  3,  0, 11, 14, 12

#ifdef CONFIG_AS_AVX512

.section .rodata.cst64.BLAKE2S_SIGMA2, "aM", @progbits, 640

.align 64

SIGMA2:
@@ -43,7 +42,6 @@ SIGMA2: 
.long  6, 13,  0, 14, 12,  2,  1, 11, 15,  4,  5,  8,  7,  9,  3, 10

.long 15,  5,  4, 13, 10,  7,  3, 11, 12,  2,  0,  6,  9,  8,  1, 14

.long  8,  7, 14, 11, 13, 15,  0, 12, 10,  4,  5,  6,  3,  2,  1,  9

#endif /* CONFIG_AS_AVX512 */



.text

SYM_FUNC_START(blake2s_compress_ssse3)
@@ -174,7 +172,6 @@ SYM_FUNC_START(blake2s_compress_ssse3) 
	RET

SYM_FUNC_END(blake2s_compress_ssse3)



#ifdef CONFIG_AS_AVX512

SYM_FUNC_START(blake2s_compress_avx512)

	vmovdqu		(%rdi),%xmm0

	vmovdqu		0x10(%rdi),%xmm1
@@ -253,4 +250,3 @@ SYM_FUNC_START(blake2s_compress_avx512) 
	vzeroupper

	RET

SYM_FUNC_END(blake2s_compress_avx512)
 
#endif /* CONFIG_AS_AVX512 */

arch/x86/crypto/blake2s-glue.c

+2 −4
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ void blake2s_compress(struct blake2s_state *state, const u8 *block, 
					    SZ_4K / BLAKE2S_BLOCK_SIZE);



		kernel_fpu_begin();

		if (IS_ENABLED(CONFIG_AS_AVX512) &&

		    static_branch_likely(&blake2s_use_avx512))

		if (static_branch_likely(&blake2s_use_avx512))

			blake2s_compress_avx512(state, block, blocks, inc);

		else

			blake2s_compress_ssse3(state, block, blocks, inc);
@@ -59,8 +58,7 @@ static int __init blake2s_mod_init(void) 
	if (boot_cpu_has(X86_FEATURE_SSSE3))

		static_branch_enable(&blake2s_use_ssse3);



	if (IS_ENABLED(CONFIG_AS_AVX512) &&

	    boot_cpu_has(X86_FEATURE_AVX) &&

	if (boot_cpu_has(X86_FEATURE_AVX) &&

	    boot_cpu_has(X86_FEATURE_AVX2) &&

	    boot_cpu_has(X86_FEATURE_AVX512F) &&

	    boot_cpu_has(X86_FEATURE_AVX512VL) &&

arch/x86/crypto/chacha_glue.c

+2 −4
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ static unsigned int chacha_advance(unsigned int len, unsigned int maxblocks) 
static void chacha_dosimd(u32 *state, u8 *dst, const u8 *src,

			  unsigned int bytes, int nrounds)

{

	if (IS_ENABLED(CONFIG_AS_AVX512) &&

	    static_branch_likely(&chacha_use_avx512vl)) {

	if (static_branch_likely(&chacha_use_avx512vl)) {

		while (bytes >= CHACHA_BLOCK_SIZE * 8) {

			chacha_8block_xor_avx512vl(state, dst, src, bytes,

						   nrounds);
@@ -258,8 +257,7 @@ static int __init chacha_simd_mod_init(void) 
	    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL)) {

		static_branch_enable(&chacha_use_avx2);



		if (IS_ENABLED(CONFIG_AS_AVX512) &&

		    boot_cpu_has(X86_FEATURE_AVX512VL) &&

		if (boot_cpu_has(X86_FEATURE_AVX512VL) &&

		    boot_cpu_has(X86_FEATURE_AVX512BW)) /* kmovq */

			static_branch_enable(&chacha_use_avx512vl);

	}