Commit 42251572 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

x86: remove always-defined CONFIG_AS_AVX 



CONFIG_AS_AVX was introduced by commit ea4d26ae ("raid5: add AVX
optimized RAID5 checksumming").

We raise the minimal supported binutils version from time to time.
The last bump was commit 1fb12b35 ("kbuild: Raise the minimum
required binutils version to 2.21").

I confirmed the code in $(call as-instr,...) can be assembled by the
binutils 2.21 assembler and also by LLVM integrated assembler.

Remove CONFIG_AS_AVX, which is always defined.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
parent 92203b02

arch/x86/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -178,15 +178,14 @@ ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1) 
endif



# does binutils support specific instructions?

avx_instr := $(call as-instr,vxorps %ymm0$(comma)%ymm1$(comma)%ymm2,-DCONFIG_AS_AVX=1)

avx2_instr :=$(call as-instr,vpbroadcastb %xmm0$(comma)%ymm1,-DCONFIG_AS_AVX2=1)

avx512_instr :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,-DCONFIG_AS_AVX512=1)

sha1_ni_instr :=$(call as-instr,sha1msg1 %xmm0$(comma)%xmm1,-DCONFIG_AS_SHA1_NI=1)

sha256_ni_instr :=$(call as-instr,sha256msg1 %xmm0$(comma)%xmm1,-DCONFIG_AS_SHA256_NI=1)

adx_instr := $(call as-instr,adox %r10$(comma)%r10,-DCONFIG_AS_ADX=1)



KBUILD_AFLAGS += $(avx_instr) $(avx2_instr) $(avx512_instr) $(sha1_ni_instr) $(sha256_ni_instr) $(adx_instr)

KBUILD_CFLAGS += $(avx_instr) $(avx2_instr) $(avx512_instr) $(sha1_ni_instr) $(sha256_ni_instr) $(adx_instr)

KBUILD_AFLAGS += $(avx2_instr) $(avx512_instr) $(sha1_ni_instr) $(sha256_ni_instr) $(adx_instr)

KBUILD_CFLAGS += $(avx2_instr) $(avx512_instr) $(sha1_ni_instr) $(sha256_ni_instr) $(adx_instr)



KBUILD_LDFLAGS := -m elf_$(UTS_MACHINE)

arch/x86/crypto/Makefile

+12 −20
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


OBJECT_FILES_NON_STANDARD := y



avx_supported := $(call as-instr,vpxor %xmm0$(comma)%xmm0$(comma)%xmm0,yes,no)

avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\

				$(comma)4)$(comma)%ymm2,yes,no)

avx512_supported :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,yes,no)
@@ -47,15 +46,12 @@ ifeq ($(adx_supported),yes) 
endif



# These modules require assembler to support AVX.

ifeq ($(avx_supported),yes)

	obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64) += \

						camellia-aesni-avx-x86_64.o

obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64) += camellia-aesni-avx-x86_64.o

obj-$(CONFIG_CRYPTO_CAST5_AVX_X86_64) += cast5-avx-x86_64.o

obj-$(CONFIG_CRYPTO_CAST6_AVX_X86_64) += cast6-avx-x86_64.o

obj-$(CONFIG_CRYPTO_TWOFISH_AVX_X86_64) += twofish-avx-x86_64.o

obj-$(CONFIG_CRYPTO_SERPENT_AVX_X86_64) += serpent-avx-x86_64.o

obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += blake2s-x86_64.o

endif



# These modules require assembler to support AVX2.

ifeq ($(avx2_supported),yes)
@@ -83,16 +79,12 @@ ifneq ($(CONFIG_CRYPTO_POLY1305_X86_64),) 
targets += poly1305-x86_64-cryptogams.S

endif



ifeq ($(avx_supported),yes)

camellia-aesni-avx-x86_64-y := camellia-aesni-avx-asm_64.o \

				camellia_aesni_avx_glue.o

cast5-avx-x86_64-y := cast5-avx-x86_64-asm_64.o cast5_avx_glue.o

cast6-avx-x86_64-y := cast6-avx-x86_64-asm_64.o cast6_avx_glue.o

	twofish-avx-x86_64-y := twofish-avx-x86_64-asm_64.o \

				twofish_avx_glue.o

	serpent-avx-x86_64-y := serpent-avx-x86_64-asm_64.o \

				serpent_avx_glue.o

endif

twofish-avx-x86_64-y := twofish-avx-x86_64-asm_64.o twofish_avx_glue.o

serpent-avx-x86_64-y := serpent-avx-x86_64-asm_64.o serpent_avx_glue.o



ifeq ($(avx2_supported),yes)

	camellia-aesni-avx2-y := camellia-aesni-avx2-asm_64.o camellia_aesni_avx2_glue.o

arch/x86/crypto/aesni-intel_avx-x86_64.S

+0 −3
Original line number Diff line number Diff line
@@ -886,7 +886,6 @@ _less_than_8_bytes_left_\@: 
_partial_block_done_\@:

.endm # PARTIAL_BLOCK



#ifdef CONFIG_AS_AVX

###############################################################################

# GHASH_MUL MACRO to implement: Data*HashKey mod (128,127,126,121,0)

# Input: A and B (128-bits each, bit-reflected)
@@ -1869,8 +1868,6 @@ key_256_finalize: 
        ret

SYM_FUNC_END(aesni_gcm_finalize_avx_gen2)



#endif /* CONFIG_AS_AVX */



#ifdef CONFIG_AS_AVX2

###############################################################################

# GHASH_MUL MACRO to implement: Data*HashKey mod (128,127,126,121,0)

arch/x86/crypto/aesni-intel_glue.c

+1 −13
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ static const struct aesni_gcm_tfm_s aesni_gcm_tfm_sse = { 
	.finalize = &aesni_gcm_finalize,

};



#ifdef CONFIG_AS_AVX

asmlinkage void aes_ctr_enc_128_avx_by8(const u8 *in, u8 *iv,

		void *keys, u8 *out, unsigned int num_bytes);

asmlinkage void aes_ctr_enc_192_avx_by8(const u8 *in, u8 *iv,
@@ -234,8 +233,6 @@ static const struct aesni_gcm_tfm_s aesni_gcm_tfm_avx_gen2 = { 
	.finalize = &aesni_gcm_finalize_avx_gen2,

};



#endif



#ifdef CONFIG_AS_AVX2

/*

 * asmlinkage void aesni_gcm_init_avx_gen4()
@@ -476,7 +473,6 @@ static void ctr_crypt_final(struct crypto_aes_ctx *ctx, 
	crypto_inc(ctrblk, AES_BLOCK_SIZE);

}



#ifdef CONFIG_AS_AVX

static void aesni_ctr_enc_avx_tfm(struct crypto_aes_ctx *ctx, u8 *out,

			      const u8 *in, unsigned int len, u8 *iv)

{
@@ -493,7 +489,6 @@ static void aesni_ctr_enc_avx_tfm(struct crypto_aes_ctx *ctx, u8 *out, 
	else

		aes_ctr_enc_256_avx_by8(in, iv, (void *)ctx, out, len);

}

#endif



static int ctr_crypt(struct skcipher_request *req)

{
@@ -715,10 +710,8 @@ static int gcmaes_crypt_by_sg(bool enc, struct aead_request *req, 
	if (left < AVX_GEN4_OPTSIZE && gcm_tfm == &aesni_gcm_tfm_avx_gen4)

		gcm_tfm = &aesni_gcm_tfm_avx_gen2;

#endif

#ifdef CONFIG_AS_AVX

	if (left < AVX_GEN2_OPTSIZE && gcm_tfm == &aesni_gcm_tfm_avx_gen2)

		gcm_tfm = &aesni_gcm_tfm_sse;

#endif



	/* Linearize assoc, if not already linear */

	if (req->src->length >= assoclen && req->src->length &&
@@ -1082,24 +1075,19 @@ static int __init aesni_init(void) 
		aesni_gcm_tfm = &aesni_gcm_tfm_avx_gen4;

	} else

#endif

#ifdef CONFIG_AS_AVX

	if (boot_cpu_has(X86_FEATURE_AVX)) {

		pr_info("AVX version of gcm_enc/dec engaged.\n");

		aesni_gcm_tfm = &aesni_gcm_tfm_avx_gen2;

	} else

#endif

	{

	} else {

		pr_info("SSE version of gcm_enc/dec engaged.\n");

		aesni_gcm_tfm = &aesni_gcm_tfm_sse;

	}

	aesni_ctr_enc_tfm = aesni_ctr_enc;

#ifdef CONFIG_AS_AVX

	if (boot_cpu_has(X86_FEATURE_AVX)) {

		/* optimize performance of ctr mode encryption transform */

		aesni_ctr_enc_tfm = aesni_ctr_enc_avx_tfm;

		pr_info("AES CTR mode by8 optimization enabled\n");

	}

#endif

#endif



	err = crypto_register_alg(&aesni_cipher_alg);

arch/x86/crypto/poly1305-x86_64-cryptogams.pl

+0 −8
Original line number Diff line number Diff line
@@ -404,10 +404,6 @@ ___ 
&end_function("poly1305_emit_x86_64");

if ($avx) {



if($kernel) {

	$code .= "#ifdef CONFIG_AS_AVX\n";

}



########################################################################

# Layout of opaque area is following.

#
@@ -1516,10 +1512,6 @@ $code.=<<___; 
___

&end_function("poly1305_emit_avx");



if ($kernel) {

	$code .= "#endif\n";

}



if ($avx>1) {



if ($kernel) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE