x86/cpufeatures: Automatically generate required and disabled feature masks
Subsystems (5)
cover x86/cpufeatures: Automatically generate required and disabled feature masks
When a CPU feature is not configured, e.g., CONFIG_X86_FRED=n, in a build config, its feature disable flag, e.g. DISABLE_FRED, needs to be defined and added to a specific disabled CPU features mask in <asm/disabled-features.h>, as the following commit:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=x86/fred&id=e554a8ca49d6d6d782f546ae4d7f036946e7dd87
This patch set adds an awk script to automatically generate a header with required and disabled CPU features masks based on build config.
H. Peter Anvin (Intel) (2):
x86/cpufeatures: Add {required,disabled} feature configs x86/cpufeatures: Generate a feature mask header based on build config
Xin Li (Intel) (1):
x86/cpufeatures: Remove {disabled,required}-features.h
arch/x86/Kconfig | 4 +- arch/x86/Kconfig.cpu | 16 +- arch/x86/Kconfig.cpufeatures | 149 +++++++++++++++++ arch/x86/Makefile | 17 +- arch/x86/boot/cpucheck.c | 3 +- arch/x86/boot/cpuflags.c | 1 - arch/x86/boot/mkcpustr.c | 3 +- arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/asm-prototypes.h | 2 +- arch/x86/include/asm/atomic64_32.h | 2 +- arch/x86/include/asm/bitops.h | 4 +- arch/x86/include/asm/cmpxchg_32.h | 4 +- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/cpufeatures.h | 8 - arch/x86/include/asm/disabled-features.h | 154 ------------------ arch/x86/include/asm/required-features.h | 104 ------------ arch/x86/kernel/verify_cpu.S | 1 + arch/x86/lib/Makefile | 2 +- arch/x86/lib/cmpxchg8b_emu.S | 2 +- arch/x86/tools/featuremasks.awk | 108 ++++++++++++ lib/atomic64_test.c | 2 +- tools/arch/x86/include/asm/cpufeatures.h | 8 - .../arch/x86/include/asm/disabled-features.h | 154 ------------------ .../arch/x86/include/asm/required-features.h | 104 ------------ tools/perf/check-headers.sh | 2 - 25 files changed, 303 insertions(+), 553 deletions(-) create mode 100644 arch/x86/Kconfig.cpufeatures delete mode 100644 arch/x86/include/asm/disabled-features.h delete mode 100644 arch/x86/include/asm/required-features.h create mode 100755 arch/x86/tools/featuremasks.awk delete mode 100644 tools/arch/x86/include/asm/disabled-features.h delete mode 100644 tools/arch/x86/include/asm/required-features.h
base-commit: 078b7b997b47c7166c1240cf1d39db9f646a56be
Signature · 1 line
2.43.0
PATCH 1/3 x86/cpufeatures: Add {required,disabled} feature configs
From: "H. Peter Anvin (Intel)" <[email protected]>
To prepare for auto-generating a header with required and disabled feature masks based on build config, add feature Kconfig items:
- X86_REQUIRED_FEATURE_x
- X86_DISABLED_FEATURE_x
which are set to "y" if their preconditions are met.
X86_CMPXCHG64 and X86_CMOV are required features, thus renamed to X86_REQUIRED_FEATURE_CX8 and X86_REQUIRED_FEATURE_CMOV.
--- arch/x86/Kconfig | 4 +- arch/x86/Kconfig.cpu | 16 +- arch/x86/Kconfig.cpufeatures | 149 ++++++++++++++++++ arch/x86/include/asm/asm-prototypes.h | 2 +- arch/x86/include/asm/atomic64_32.h | 2 +- arch/x86/include/asm/bitops.h | 4 +- arch/x86/include/asm/cmpxchg_32.h | 4 +- arch/x86/include/asm/required-features.h | 4 +- arch/x86/lib/Makefile | 2 +- arch/x86/lib/cmpxchg8b_emu.S | 2 +- lib/atomic64_test.c | 2 +- .../arch/x86/include/asm/required-features.h | 4 +- 12 files changed, 178 insertions(+), 17 deletions(-) create mode 100644 arch/x86/Kconfig.cpufeatures
arch/x86/Kconfig +3 -1
@@ -120,7 +120,7 @@ config X86 select ARCH_SUPPORTS_LTO_CLANG select ARCH_SUPPORTS_LTO_CLANG_THIN select ARCH_USE_BUILTIN_BSWAP - select ARCH_USE_CMPXCHG_LOCKREF if X86_CMPXCHG64 + select ARCH_USE_CMPXCHG_LOCKREF if X86_REQUIRED_FEATURE_CX8 select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS
@@ -3066,4 +3066,6 @@ config HAVE_ATOMIC_IOMAP source "arch/x86/kvm/Kconfig" +source "arch/x86/Kconfig.cpufeatures" + source "arch/x86/Kconfig.assembler"
arch/x86/Kconfig.cpu +13 -3
@@ -358,6 +358,10 @@ config X86_P6_NOP depends on X86_64 depends on (MCORE2 || MPENTIUM4 || MPSC) +config X86_REQUIRED_FEATURE_NOPL + def_bool y + depends on X86_64 || X86_P6_NOP + config X86_TSC def_bool y depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
@@ -366,21 +370,27 @@ config X86_HAVE_PAE def_bool y depends on MCRUSOE || MEFFICEON || MCYRIXIII || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC7 || MCORE2 || MATOM || X86_64 -config X86_CMPXCHG64 +config X86_REQUIRED_FEATURE_CX8 def_bool y depends on X86_HAVE_PAE || M586TSC || M586MMX || MK6 || MK7 # this should be set for all -march=.. options where the compiler # generates cmov. -config X86_CMOV +config X86_REQUIRED_FEATURE_CMOV def_bool y depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) +# this should be set for all -march= options where the compiler +# generates movbe. +config X86_REQUIRED_FEATURE_MOVBE + def_bool y + depends on MATOM + config X86_MINIMUM_CPU_FAMILY int default "64" if X86_64 default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8) - default "5" if X86_32 && X86_CMPXCHG64 + default "5" if X86_32 && X86_REQUIRED_FEATURE_CX8 default "4" config X86_DEBUGCTLMSR
arch/x86/Kconfig.cpufeatures new file +149 -0
149 lines not on this page · raw message
arch/x86/include/asm/asm-prototypes.h +1 -1
@@ -15,7 +15,7 @@#include <asm/fred.h> #include <asm/gsseg.h> -#ifndef CONFIG_X86_CMPXCHG64 +#ifndef CONFIG_X86_REQUIRED_FEATURE_CX8 extern void cmpxchg8b_emu (void );#endif
arch/x86/include/asm/atomic64_32.h +1 -1
@@ -22,7 +22,7 @@ typedef struct { ATOMIC64_EXPORT(atomic64_##sym)#endif -#ifdef CONFIG_X86_CMPXCHG64 +#ifdef CONFIG_X86_REQUIRED_FEATURE_CX8 #define __alternative_atomic64(f, g, out, in...) \ asm volatile("call %P[func]" \ : out : [func] "i" (atomic64_##g##_cx8), ## in)
arch/x86/include/asm/bitops.h +2 -2
@@ -321,7 +321,7 @@ static __always_inline int variable_ffs(int x) asm("bsfl %1,%0" :"=r" (r) :"rm" (x),"0" (-1 )); -#elif defined(CONFIG_X86_CMOV ) +#elif defined(CONFIG_X86_REQUIRED_FEATURE_CMOV ) asm("bsfl %1,%0\n\t" "cmovzl %2,%0" :"=&r" (r) :"rm" (x),"r" (-1 ));
@@ -378,7 +378,7 @@ static __always_inline int fls(unsigned int x) asm("bsrl %1,%0" :"=r" (r) :"rm" (x),"0" (-1 )); -#elif defined(CONFIG_X86_CMOV ) +#elif defined(CONFIG_X86_REQUIRED_FEATURE_CMOV ) asm("bsrl %1,%0\n\t" "cmovzl %2,%0" :"=&r" (r) :"rm" (x),"rm" (-1 ));
arch/x86/include/asm/cmpxchg_32.h +2 -2
@@ -7,7 +7,7 @@* you need to test for the feature in boot_cpu_data. */ -#ifdef CONFIG_X86_CMPXCHG64 +#ifdef CONFIG_X86_REQUIRED_FEATURE_CX8 #define arch_cmpxchg64 (ptr, o, n) \ ((__typeof__(*(ptr)))__cmpxchg64((ptr), (unsigned long long)(o), \ (unsigned long long)(n)))
@@ -63,7 +63,7 @@ static inline bool __try_cmpxchg64(volatile u64 *ptr, u64 *pold, u64 new)return success; } -#ifndef CONFIG_X86_CMPXCHG64 +#ifndef CONFIG_X86_REQUIRED_FEATURE_CX8 /* * Building a kernel capable running on 80386 and 80486. It may be necessary * to simulate the cmpxchg8b on the 80386 and 80486 CPU.
arch/x86/include/asm/required-features.h +2 -2
@@ -23,13 +23,13 @@# define NEED_PAE 0#endif -#ifdef CONFIG_X86_CMPXCHG64 +#ifdef CONFIG_X86_REQUIRED_FEATURE_CX8 # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31))#else # define NEED_CX8 0#endif -#if defined(CONFIG_X86_CMOV ) || defined(CONFIG_X86_64 ) +#if defined(CONFIG_X86_REQUIRED_FEATURE_CMOV ) || defined(CONFIG_X86_64 )# define NEED_CMOV (1<<(X86_FEATURE_CMOV & 31))#else # define NEED_CMOV 0
arch/x86/lib/Makefile +1 -1
@@ -62,7 +62,7 @@ ifeq ($(CONFIG_X86_32),y) lib-y += string_32.o lib-y += memmove_32.o lib-y += cmpxchg8b_emu.o -ifneq ($(CONFIG_X86_CMPXCHG64),y) +ifneq ($(CONFIG_X86_REQUIRED_FEATURE_CX8),y) lib-y += atomic64_386_32.o endif else
arch/x86/lib/cmpxchg8b_emu.S +1 -1
@@ -7,7 +7,7 @@ .text -#ifndef CONFIG_X86_CMPXCHG64 +#ifndef CONFIG_X86_REQUIRED_FEATURE_CX8 /* * Emulate 'cmpxchg8b (%esi)' on UP
lib/atomic64_test.c +1 -1
@@ -254,7 +254,7 @@ static __init int test_atomics_init(void) pr_info("passed for %s platform %s CX8 and %s SSE\n", #ifdef CONFIG_X86_64 "x86-64", -#elif defined(CONFIG_X86_CMPXCHG64) +#elif defined(CONFIG_X86_REQUIRED_FEATURE_CX8) "i586+", #else "i386+",
tools/arch/x86/include/asm/required-features.h +2 -2
@@ -23,13 +23,13 @@# define NEED_PAE 0#endif -#ifdef CONFIG_X86_CMPXCHG64 +#ifdef CONFIG_X86_REQUIRED_FEATURE_CX8 # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31))#else # define NEED_CX8 0#endif -#if defined(CONFIG_X86_CMOV ) || defined(CONFIG_X86_64 ) +#if defined(CONFIG_X86_REQUIRED_FEATURE_CMOV ) || defined(CONFIG_X86_64 )# define NEED_CMOV (1<<(X86_FEATURE_CMOV & 31))#else # define NEED_CMOV 0
Signature · 1 line
2.43.0
PATCH 2/3 x86/cpufeatures: Generate a feature mask header based on build config
In reply to Xin Li (Intel)From: "H. Peter Anvin (Intel)" <[email protected]>
Introduce an awk script to auto-generate a header with required and disabled feature masks based on <asm/cpufeatures.h> and build config.
Thus for any feature with a build config, e.g., X86_FRED, just add
config X86_DISABLED_FEATURE_FRED
def_bool y
depends on !X86_FRED
to arch/x86/Kconfig.cpufeatures, instead of adding a feature disable flag, e.g., DISABLE_FRED, to <asm/disabled-features.h>.
--- arch/x86/Makefile | 17 ++++- arch/x86/boot/cpucheck.c | 3 +- arch/x86/boot/cpuflags.c | 1 - arch/x86/boot/mkcpustr.c | 3 +- arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/cpufeatures.h | 8 --- arch/x86/kernel/verify_cpu.S | 1 + arch/x86/tools/featuremasks.awk | 108 +++++++++++++++++++++++++++++ 9 files changed, 129 insertions(+), 14 deletions(-) create mode 100755 arch/x86/tools/featuremasks.awk
arch/x86/Makefile +15 -2
@@ -243,9 +243,22 @@ archscripts: scripts_basic $(Q)$(MAKE) $(build)=arch/x86/tools relocs ### -# Syscall table generation +# Feature masks header and syscall table generation -archheaders: +out := arch/x86/include/generated/asm +featuremasks_hdr := featuremasks.h +featuremasks_awk := $(srctree)/arch/x86/tools/featuremasks.awk +cpufeatures_hdr := $(srctree)/arch/x86/include/asm/cpufeatures.h +quiet_cmd_gen_featuremasks = GEN $@ + cmd_gen_featuremasks = $(AWK) -f $(featuremasks_awk) $(cpufeatures_hdr) $(KCONFIG_CONFIG) > $@ + +$(out)/$(featuremasks_hdr): $(featuremasks_awk) $(cpufeatures_hdr) $(KCONFIG_CONFIG) FORCE + $(shell mkdir -p $(out)) + $(call if_changed,gen_featuremasks) + +targets += $(out)/$(featuremasks_hdr) + +archheaders: $(out)/$(featuremasks_hdr) $(Q)$(MAKE) $(build)=arch/x86/entry/syscalls all ###
arch/x86/boot/cpucheck.c +2 -1
@@ -22,10 +22,11 @@# include "boot.h" #endif #include <linux/types.h> +#include <asm/featuremasks.h> #include <asm/intel-family.h> #include <asm/processor-flags.h> -#include <asm/required-features.h> #include <asm/msr-index.h> +#include "string.h" #include "msr.h"
arch/x86/boot/cpuflags.c +0 -1
@@ -3,7 +3,6 @@#include "bitops.h" #include <asm/processor-flags.h> -#include <asm/required-features.h> #include <asm/msr-index.h> #include "cpuflags.h"
arch/x86/boot/mkcpustr.c +1 -2
@@ -12,8 +12,6 @@#include <stdio.h> -#include "../include/asm/required-features.h" -#include "../include/asm/disabled-features.h" #include "../include/asm/cpufeatures.h" #include "../include/asm/vmxfeatures.h" #include "../kernel/cpu/capflags.c"
@@ -23,6 +21,7 @@ int main(void)int i, j;const char *str; +printf ("#include <asm/featuremasks.h>\n\n" );printf ("static const char x86_cap_strs[] =\n" );for (i =0 ; i <NCAPINTS ; i++) {
arch/x86/include/asm/Kbuild +1 -0
@@ -8,6 +8,7 @@ generated-y += syscalls_x32.h generated-y += unistd_32_ia32.h generated-y += unistd_64_x32.h generated-y += xen-hypercalls.h +generated-y += featuremasks.h generic-y += early_ioremap.h generic-y += mcs_spinlock.h
arch/x86/include/asm/cpufeature.h +1 -0
@@ -9,6 +9,7 @@#include <asm/asm.h> #include <linux/bitops.h> #include <asm/alternative.h> +#include <asm/featuremasks.h> enum cpuid_leafs {
arch/x86/include/asm/cpufeatures.h +0 -8
@@ -2,14 +2,6 @@#ifndef _ASM_X86_CPUFEATURES_H#define _ASM_X86_CPUFEATURES_H -#ifndef _ASM_X86_REQUIRED_FEATURES_H -#include <asm/required-features.h> -#endif - -#ifndef _ASM_X86_DISABLED_FEATURES_H -#include <asm/disabled-features.h> -#endif -/* * Defines x86 CPU feature bits */
arch/x86/kernel/verify_cpu.S +1 -0
@@ -29,6 +29,7 @@ */ #include <asm/cpufeatures.h> +#include <asm/featuremasks.h> #include <asm/msr-index.h> SYM_FUNC_START_LOCAL(verify_cpu)
arch/x86/tools/featuremasks.awk new file +108 -0
108 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 3/3 x86/cpufeatures: Remove {disabled,required}-features.h
In reply to Xin Li (Intel)The functionalities of {disabled,required}-features.h are replaced with the auto-generated header cpufeature_masks.h. Thus they are no longer needed. So delete them.
None of the macros defined in {disabled,required}-features.h is used in tools directory, delete them.
--- arch/x86/include/asm/disabled-features.h | 154 ------------------ arch/x86/include/asm/required-features.h | 104 ------------ tools/arch/x86/include/asm/cpufeatures.h | 8 - .../arch/x86/include/asm/disabled-features.h | 154 ------------------ .../arch/x86/include/asm/required-features.h | 104 ------------ tools/perf/check-headers.sh | 2 - 6 files changed, 526 deletions(-) delete mode 100644 arch/x86/include/asm/disabled-features.h delete mode 100644 arch/x86/include/asm/required-features.h delete mode 100644 tools/arch/x86/include/asm/disabled-features.h delete mode 100644 tools/arch/x86/include/asm/required-features.h
arch/x86/include/asm/disabled-features.h deleted +0 -154
@@ -1,154 +0,0 @@ -#ifndef _ASM_X86_DISABLED_FEATURES_H -#define _ASM_X86_DISABLED_FEATURES_H - -/* These features, although they might be available in a CPU -* will not be used because the compile options to support -* them are not present. -* -* This code allows them to be checked and disabled at -* compile time without an explicit #ifdef. Use -* cpu_feature_enabled(). -*/ - -#ifdef CONFIG_X86_UMIP -# define DISABLE_UMIP 0 -#else -# define DISABLE_UMIP (1<<(X86_FEATURE_UMIP & 31)) -#endif - -#ifdef CONFIG_X86_64 -# define DISABLE_VME (1<<(X86_FEATURE_VME & 31)) -# define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31)) -# define DISABLE_CYRIX_ARR (1<<(X86_FEATURE_CYRIX_ARR & 31)) -# define DISABLE_CENTAUR_MCR (1<<(X86_FEATURE_CENTAUR_MCR & 31)) -# define DISABLE_PCID 0 -#else -# define DISABLE_VME 0 -# define DISABLE_K6_MTRR 0 -# define DISABLE_CYRIX_ARR 0 -# define DISABLE_CENTAUR_MCR 0 -# define DISABLE_PCID (1<<(X86_FEATURE_PCID & 31)) -#endif /* CONFIG_X86_64 */ - -#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS -# define DISABLE_PKU 0 -# define DISABLE_OSPKE 0 -#else -# define DISABLE_PKU (1<<(X86_FEATURE_PKU & 31)) -# define DISABLE_OSPKE (1<<(X86_FEATURE_OSPKE & 31)) -#endif /* CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS */ - -#ifdef CONFIG_X86_5LEVEL -# define DISABLE_LA57 0 -#else -# define DISABLE_LA57 (1<<(X86_FEATURE_LA57 & 31)) -#endif - -#ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION -# define DISABLE_PTI 0 -#else -# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31)) -#endif - -#ifdef CONFIG_MITIGATION_RETPOLINE -# define DISABLE_RETPOLINE 0 -#else -# define DISABLE_RETPOLINE ((1 << (X86_FEATURE_RETPOLINE & 31)) | \ - (1 << (X86_FEATURE_RETPOLINE_LFENCE & 31))) -#endif - -#ifdef CONFIG_MITIGATION_RETHUNK -# define DISABLE_RETHUNK 0 -#else -# define DISABLE_RETHUNK (1 << (X86_FEATURE_RETHUNK & 31)) -#endif - -#ifdef CONFIG_MITIGATION_UNRET_ENTRY -# define DISABLE_UNRET 0 -#else -# define DISABLE_UNRET (1 << (X86_FEATURE_UNRET & 31)) -#endif - -#ifdef CONFIG_MITIGATION_CALL_DEPTH_TRACKING -# define DISABLE_CALL_DEPTH_TRACKING 0 -#else -# define DISABLE_CALL_DEPTH_TRACKING (1 << (X86_FEATURE_CALL_DEPTH & 31)) -#endif - -#ifdef CONFIG_ADDRESS_MASKING -# define DISABLE_LAM 0 -#else -# define DISABLE_LAM (1 << (X86_FEATURE_LAM & 31)) -#endif - -#ifdef CONFIG_INTEL_IOMMU_SVM -# define DISABLE_ENQCMD 0 -#else -# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) -#endif - -#ifdef CONFIG_X86_SGX -# define DISABLE_SGX 0 -#else -# define DISABLE_SGX (1 << (X86_FEATURE_SGX & 31)) -#endif - -#ifdef CONFIG_XEN_PV -# define DISABLE_XENPV 0 -#else -# define DISABLE_XENPV (1 << (X86_FEATURE_XENPV & 31)) -#endif - -#ifdef CONFIG_INTEL_TDX_GUEST -# define DISABLE_TDX_GUEST 0 -#else -# define DISABLE_TDX_GUEST (1 << (X86_FEATURE_TDX_GUEST & 31)) -#endif - -#ifdef CONFIG_X86_USER_SHADOW_STACK -#define DISABLE_USER_SHSTK 0 -#else -#define DISABLE_USER_SHSTK (1 << (X86_FEATURE_USER_SHSTK & 31)) -#endif - -#ifdef CONFIG_X86_KERNEL_IBT -#define DISABLE_IBT 0 -#else -#define DISABLE_IBT (1 << (X86_FEATURE_IBT & 31)) -#endif - -#ifdef CONFIG_X86_FRED -# define DISABLE_FRED 0 -#else -# define DISABLE_FRED (1 << (X86_FEATURE_FRED & 31)) -#endif - -/* -* Make sure to add features to the correct mask -*/ -#define DISABLED_MASK0 (DISABLE_VME) -#define DISABLED_MASK1 0 -#define DISABLED_MASK2 0 -#define DISABLED_MASK3 (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR) -#define DISABLED_MASK4 (DISABLE_PCID) -#define DISABLED_MASK5 0 -#define DISABLED_MASK6 0 -#define DISABLED_MASK7 (DISABLE_PTI) -#define DISABLED_MASK8 (DISABLE_XENPV|DISABLE_TDX_GUEST) -#define DISABLED_MASK9 (DISABLE_SGX) -#define DISABLED_MASK10 0 -#define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ - DISABLE_CALL_DEPTH_TRACKING|DISABLE_USER_SHSTK) -#define DISABLED_MASK12 (DISABLE_FRED|DISABLE_LAM) -#define DISABLED_MASK13 0 -#define DISABLED_MASK14 0 -#define DISABLED_MASK15 0 -#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP| \ - DISABLE_ENQCMD) -#define DISABLED_MASK17 0 -#define DISABLED_MASK18 (DISABLE_IBT) -#define DISABLED_MASK19 0 -#define DISABLED_MASK20 0 -#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 21) - -#endif /* _ASM_X86_DISABLED_FEATURES_H */
arch/x86/include/asm/required-features.h deleted +0 -104
104 lines not on this page · raw message
tools/arch/x86/include/asm/cpufeatures.h +0 -8
@@ -2,14 +2,6 @@#ifndef _ASM_X86_CPUFEATURES_H#define _ASM_X86_CPUFEATURES_H -#ifndef _ASM_X86_REQUIRED_FEATURES_H -#include <asm/required-features.h> -#endif - -#ifndef _ASM_X86_DISABLED_FEATURES_H -#include <asm/disabled-features.h> -#endif -/* * Defines x86 CPU feature bits */
tools/arch/x86/include/asm/disabled-features.h deleted +0 -154
154 lines not on this page · raw message
tools/arch/x86/include/asm/required-features.h deleted +0 -104
104 lines not on this page · raw message
tools/perf/check-headers.sh +0 -2
@@ -33,8 +33,6 @@ FILES=( "include/linux/hash.h" "include/linux/list-sort.h" "include/uapi/linux/hw_breakpoint.h" - "arch/x86/include/asm/disabled-features.h" - "arch/x86/include/asm/required-features.h" "arch/x86/include/asm/cpufeatures.h" "arch/x86/include/asm/inat_types.h" "arch/x86/include/asm/emulate_prefix.h"
Signature · 1 line
2.43.0
Quoted 8 lines · Xin Li (Intel)
When a CPU feature is not configured, e.g.,
CONFIG_X86_FRED=n, in a build config, its feature disable flag, e.g.DISABLE_FRED, needs to be defined and added to a specific disabled CPU features mask in <asm/disabled-features.h>, as the following commit:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=x86/fred&id=e554a8ca49d6d6d782f546ae4d7f036946e7dd87This patch set adds an awk script to automatically generate a header with required and disabled CPU features masks based on build config.
A gentle ping.
This is an infrastructural improvement which has a lower priority, however it would be nice to get some feedback first.
Thanks!
Xin
Quoted 44 lines
H. Peter Anvin (Intel) (2):
x86/cpufeatures: Add {required,disabled} feature configs x86/cpufeatures: Generate a feature mask header based on build configXin Li (Intel) (1):
x86/cpufeatures: Remove {disabled,required}-features.harch/x86/Kconfig | 4 +- arch/x86/Kconfig.cpu | 16 +- arch/x86/Kconfig.cpufeatures | 149 +++++++++++++++++ arch/x86/Makefile | 17 +- arch/x86/boot/cpucheck.c | 3 +- arch/x86/boot/cpuflags.c | 1 - arch/x86/boot/mkcpustr.c | 3 +- arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/asm-prototypes.h | 2 +- arch/x86/include/asm/atomic64_32.h | 2 +- arch/x86/include/asm/bitops.h | 4 +- arch/x86/include/asm/cmpxchg_32.h | 4 +- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/cpufeatures.h | 8 - arch/x86/include/asm/disabled-features.h | 154 ------------------ arch/x86/include/asm/required-features.h | 104 ------------ arch/x86/kernel/verify_cpu.S | 1 + arch/x86/lib/Makefile | 2 +- arch/x86/lib/cmpxchg8b_emu.S | 2 +- arch/x86/tools/featuremasks.awk | 108 ++++++++++++ lib/atomic64_test.c | 2 +- tools/arch/x86/include/asm/cpufeatures.h | 8 - .../arch/x86/include/asm/disabled-features.h | 154 ------------------ .../arch/x86/include/asm/required-features.h | 104 ------------ tools/perf/check-headers.sh | 2 - 25 files changed, 303 insertions(+), 553 deletions(-)create mode 100644
arch/x86/Kconfig.cpufeatures
delete mode 100644arch/x86/include/asm/disabled-features.hdelete mode 100644arch/x86/include/asm/required-features.hcreate mode 100755arch/x86/tools/featuremasks.awkdelete mode 100644tools/arch/x86/include/asm/disabled-features.hdelete mode 100644tools/arch/x86/include/asm/required-features.hbase-commit:
078b7b997b47c7166c1240cf1d39db9f646a56be
Signature · 2 lines
Thanks!
XinH. Peter Anvin
reviewerQuoted 10 lines · Xin Li
Quoted 8 lines · Xin Li (Intel)
When a CPU feature is not configured, e.g.,
CONFIG_X86_FRED=n, in a build config, its feature disable flag, e.g.DISABLE_FRED, needs to be defined and added to a specific disabled CPU features mask in <asm/disabled-features.h>, as the following commit:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=x86/fred&id=e554a8ca49d6d6d782f546ae4d7f036946e7dd87This patch set adds an awk script to automatically generate a header with required and disabled CPU features masks based on build config.
Quoted 54 lines
A gentle ping.
This is an infrastructural improvement which has a lower priority, however it would be nice to get some feedback first.
Thanks!
XinQuoted 44 lines
H. Peter Anvin (Intel) (2):
x86/cpufeatures: Add {required,disabled} feature configs x86/cpufeatures: Generate a feature mask header based on build configXin Li (Intel) (1):
x86/cpufeatures: Remove {disabled,required}-features.harch/x86/Kconfig | 4 +- arch/x86/Kconfig.cpu | 16 +- arch/x86/Kconfig.cpufeatures | 149 +++++++++++++++++ arch/x86/Makefile | 17 +- arch/x86/boot/cpucheck.c | 3 +- arch/x86/boot/cpuflags.c | 1 - arch/x86/boot/mkcpustr.c | 3 +- arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/asm-prototypes.h | 2 +- arch/x86/include/asm/atomic64_32.h | 2 +- arch/x86/include/asm/bitops.h | 4 +- arch/x86/include/asm/cmpxchg_32.h | 4 +- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/cpufeatures.h | 8 - arch/x86/include/asm/disabled-features.h | 154 ------------------ arch/x86/include/asm/required-features.h | 104 ------------ arch/x86/kernel/verify_cpu.S | 1 + arch/x86/lib/Makefile | 2 +- arch/x86/lib/cmpxchg8b_emu.S | 2 +- arch/x86/tools/featuremasks.awk | 108 ++++++++++++ lib/atomic64_test.c | 2 +- tools/arch/x86/include/asm/cpufeatures.h | 8 - .../arch/x86/include/asm/disabled-features.h | 154 ------------------ .../arch/x86/include/asm/required-features.h | 104 ------------ tools/perf/check-headers.sh | 2 - 25 files changed, 303 insertions(+), 553 deletions(-)create mode 100644
arch/x86/Kconfig.cpufeatures
delete mode 100644arch/x86/include/asm/disabled-features.hdelete mode 100644arch/x86/include/asm/required-features.hcreate mode 100755arch/x86/tools/featuremasks.awkdelete mode 100644tools/arch/x86/include/asm/disabled-features.hdelete mode 100644tools/arch/x86/include/asm/required-features.hbase-commit:
078b7b997b47c7166c1240cf1d39db9f646a56be
A key pay of this is that it eliminates the need to manually assign features to cpufeature words. It was one thing when there were four of them, but with over 20 it is going to cause mistakes.