Commit 5e8ebd84 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Masahiro Yamada
Browse files

x86: probe assembler capabilities via kconfig instead of makefile 



Doing this probing inside of the Makefiles means we have a maze of
ifdefs inside the source code and child Makefiles that need to make
proper decisions on this too. Instead, we do it at Kconfig time, like
many other compiler and assembler options, which allows us to set up the
dependencies normally for full compilation units. In the process, the
ADX test changes to use %eax instead of %r10 so that it's valid in both
32-bit and 64-bit mode.

Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 8192e551

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2931,3 +2931,5 @@ config HAVE_ATOMIC_IOMAP 
source "drivers/firmware/Kconfig"



source "arch/x86/kvm/Kconfig"



source "arch/x86/Kconfig.assembler"

arch/x86/Kconfig.assembler

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Copyright (C) 2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.



config AS_AVX2

	def_bool $(as-instr,vpbroadcastb %xmm0$(comma)%ymm1)



config AS_AVX512

	def_bool $(as-instr,vpmovm2b %k1$(comma)%zmm5)



config AS_SHA1_NI

	def_bool $(as-instr,sha1msg1 %xmm0$(comma)%xmm1)



config AS_SHA256_NI

	def_bool $(as-instr,sha256msg1 %xmm0$(comma)%xmm1)



config AS_ADX

	def_bool $(as-instr,adox %eax$(comma)%eax)

arch/x86/Makefile

+0 −10
Original line number Diff line number Diff line
@@ -177,16 +177,6 @@ ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1) 
	KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,)

endif



# does binutils support specific instructions?

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 += $(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)



#

net/netfilter/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ nf_tables-objs := nf_tables_core.o nf_tables_api.o nft_chain_filter.o \ 
		  nft_set_pipapo.o



ifdef CONFIG_X86_64

ifneq (,$(findstring -DCONFIG_AS_AVX2=1,$(KBUILD_CFLAGS)))

ifdef CONFIG_AS_AVX2

nf_tables-objs += nft_set_pipapo_avx2.o

endif

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE