tools headers cpufeatures: Sync with the kernel sources
PATCH 1/1 tools headers cpufeatures: Sync with the kernel sources
FYI, I'm carrying this on the perf tools tree,
Regards,
- Arnaldo
---
To pick the changes from:
d45476d983240937 ("x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE")
Its just a comment fixup.
This only causes these perf files to be rebuilt:
CC /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o
CC /tmp/build/perf/bench/mem-memset-x86-64-asm.o
And addresses this perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h
--- tools/arch/x86/include/asm/cpufeatures.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/arch/x86/include/asm/cpufeatures.h +1 -1
@@ -204,7 +204,7 @@/* FREE! ( 7*32+10) */ #define X86_FEATURE_PTI ( 7*32+11)/* Kernel Page Table Isolation enabled */ #define X86_FEATURE_RETPOLINE ( 7*32+12)/* "" Generic Retpoline mitigation for Spectre variant 2 */ -#define X86_FEATURE_RETPOLINE_LFENCE ( 7*32+13)/* "" Use LFENCEs for Spectre variant 2 */ +#define X86_FEATURE_RETPOLINE_LFENCE ( 7*32+13)/* "" Use LFENCE for Spectre variant 2 */ #define X86_FEATURE_INTEL_PPIN ( 7*32+14)/* Intel Processor Inventory Number */ #define X86_FEATURE_CDP_L2 ( 7*32+15)/* Code and Data Prioritization L2 */ #define X86_FEATURE_MSR_SPEC_CTRL ( 7*32+16)/* "" MSR SPEC_CTRL is implemented */
Signature · 1 line
2.35.1
Quoted 38 lines · Arnaldo Carvalho de Melo
FYI, I'm carrying this on the perf tools tree,
Regards,
- Arnaldo
---
To pick the changes from:
d45476d983240937("x86/speculation: RenameRETPOLINE_AMDtoRETPOLINE_LFENCE")Its just a comment fixup.
This only causes these perf files to be rebuilt:
CC
/tmp/build/perf/bench/mem-memcpy-x86-64-asm.o
CC/tmp/build/perf/bench/mem-memset-x86-64-asm.oAnd addresses this perf build warning:
Warning: Kernel ABI header at '
tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' diff -utools/arch/x86/include/asm/cpufeatures.harch/x86/include/asm/cpufeatures.hCc Borislav Petkov <[email protected]>Cc Peter Zijlstra (Intel) <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- tools/arch/x86/include/asm/cpufeatures.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/arch/x86/include/asm/cpufeatures.h +0
-0
tools/arch/x86/include/asm/cpufeatures.h line 210
Quoted 8 lines
tools/arch/x86/include/asm/cpufeatures.h +1
-1@@ -204,7 +204,7 @@/* FREE! ( 7*32+10) */ #define X86_FEATURE_PTI ( 7*32+11)/* Kernel Page Table Isolation enabled */ #define X86_FEATURE_RETPOLINE ( 7*32+12)/* "" Generic Retpoline mitigation for Spectre variant 2 */ -#define X86_FEATURE_RETPOLINE_LFENCE ( 7*32+13)/* "" Use LFENCEs for Spectre variant 2 */ +#define X86_FEATURE_RETPOLINE_LFENCE ( 7*32+13)/* "" Use LFENCE for Spectre variant 2 */ #define X86_FEATURE_INTEL_PPIN ( 7*32+14)/* Intel Processor Inventory Number */ #define X86_FEATURE_CDP_L2 ( 7*32+15)/* Code and Data Prioritization L2 */ #define X86_FEATURE_MSR_SPEC_CTRL ( 7*32+16)/* "" MSR SPEC_CTRL is implemented */
ACK.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Ivo Totev, HRB 36809, AG Nürnberg