There were changes related to the deprecation of the "pcommit" instruction: fd1d961dd681 ("x86/insn: remove pcommit") dfa169bbee00 ("Revert "KVM: x86: add pcommit support"") No need to update anything in the tools, as "pcommit" wasn't being listed on the VMX_EXIT_REASONS in the tools/perf/arch/x86/util/kvm-stat.c file. Just grab fresh copies of these files to silence the file cache coherency detector: $ make -C tools/perf O=/tmp/build/perf install-bin make: Entering directory '/home/acme/git/linux/tools/perf' BUILD: Doing 'make -j4' parallel build Warning: tools/arch/x86/include/asm/cpufeatures.h differs from kernel Warning: tools/arch/x86/include/uapi/asm/vmx.h differs from kernel INSTALL GTK UI <SNIP> #
Unified · Split
| @@ -225,7 +225,6 @@ · 224 unmodified lines | |||
| 225 | #define X86_FEATURE_RDSEED ( 9*32+18) /* The RDSEED instruction */ | 225 | #define X86_FEATURE_RDSEED ( 9*32+18) /* The RDSEED instruction */ |
| 226 | #define X86_FEATURE_ADX ( 9*32+19) /* The ADCX and ADOX instructions */ | 226 | #define X86_FEATURE_ADX ( 9*32+19) /* The ADCX and ADOX instructions */ |
| 227 | #define X86_FEATURE_SMAP ( 9*32+20) /* Supervisor Mode Access Prevention */ | 227 | #define X86_FEATURE_SMAP ( 9*32+20) /* Supervisor Mode Access Prevention */ |
| 228 | #define X86_FEATURE_PCOMMIT ( 9*32+22) /* PCOMMIT instruction */ | ||
| 229 | #define X86_FEATURE_CLFLUSHOPT ( 9*32+23) /* CLFLUSHOPT instruction */ | 228 | #define X86_FEATURE_CLFLUSHOPT ( 9*32+23) /* CLFLUSHOPT instruction */ |
| 230 | #define X86_FEATURE_CLWB ( 9*32+24) /* CLWB instruction */ | 229 | #define X86_FEATURE_CLWB ( 9*32+24) /* CLWB instruction */ |
| 231 | #define X86_FEATURE_AVX512PF ( 9*32+26) /* AVX-512 Prefetch */ | 230 | #define X86_FEATURE_AVX512PF ( 9*32+26) /* AVX-512 Prefetch */ |
| @@ -301,10 +300,6 @@ · 69 unmodified lines | |||
| 301 | #define X86_BUG_FXSAVE_LEAK X86_BUG(6) /* FXSAVE leaks FOP/FIP/FOP */ | 300 | #define X86_BUG_FXSAVE_LEAK X86_BUG(6) /* FXSAVE leaks FOP/FIP/FOP */ |
| 302 | #define X86_BUG_CLFLUSH_MONITOR X86_BUG(7) /* AAI65, CLFLUSH required before MONITOR */ | 301 | #define X86_BUG_CLFLUSH_MONITOR X86_BUG(7) /* AAI65, CLFLUSH required before MONITOR */ |
| 303 | #define X86_BUG_SYSRET_SS_ATTRS X86_BUG(8) /* SYSRET doesn't fix up SS attrs */ | 302 | #define X86_BUG_SYSRET_SS_ATTRS X86_BUG(8) /* SYSRET doesn't fix up SS attrs */ |
| 304 | #define X86_BUG_NULL_SEG X86_BUG(9) /* Nulling a selector preserves the base */ | ||
| 305 | #define X86_BUG_SWAPGS_FENCE X86_BUG(10) /* SWAPGS without input dep on GS */ | ||
| 306 | |||
| 307 | |||
| 308 | #ifdef CONFIG_X86_32 | 303 | #ifdef CONFIG_X86_32 |
| 309 | /* | 304 | /* |
| 310 | * 64-bit kernels don't use X86_BUG_ESPFIX. Make the define conditional | 305 | * 64-bit kernels don't use X86_BUG_ESPFIX. Make the define conditional |
| @@ -312,5 +307,7 @@ · 1 unmodified line | |||
| 312 | */ | 307 | */ |
| 313 | #define X86_BUG_ESPFIX X86_BUG(9) /* "" IRET to 16-bit SS corrupts ESP/RSP high bits */ | 308 | #define X86_BUG_ESPFIX X86_BUG(9) /* "" IRET to 16-bit SS corrupts ESP/RSP high bits */ |
| 314 | #endif | 309 | #endif |
| 315 | 310 | #define X86_BUG_NULL_SEG X86_BUG(10) /* Nulling a selector preserves the base */ | |
| 311 | #define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */ | ||
| 312 | #define X86_BUG_MONITOR X86_BUG(12) /* IPI required to wake up remote CPU */ | ||
| 316 | #endif /* _ASM_X86_CPUFEATURES_H */ | 313 | #endif /* _ASM_X86_CPUFEATURES_H */ |
| @@ -78,7 +78,6 @@ · 77 unmodified lines | |||
| 78 | #define EXIT_REASON_PML_FULL 62 | 78 | #define EXIT_REASON_PML_FULL 62 |
| 79 | #define EXIT_REASON_XSAVES 63 | 79 | #define EXIT_REASON_XSAVES 63 |
| 80 | #define EXIT_REASON_XRSTORS 64 | 80 | #define EXIT_REASON_XRSTORS 64 |
| 81 | #define EXIT_REASON_PCOMMIT 65 | ||
| 82 | 81 | ||
| 83 | #define VMX_EXIT_REASONS \ | 82 | #define VMX_EXIT_REASONS \ |
| 84 | { EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \ | 83 | { EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \ |
| @@ -127,8 +126,7 @@ · 42 unmodified lines | |||
| 127 | { EXIT_REASON_INVVPID, "INVVPID" }, \ | 126 | { EXIT_REASON_INVVPID, "INVVPID" }, \ |
| 128 | { EXIT_REASON_INVPCID, "INVPCID" }, \ | 127 | { EXIT_REASON_INVPCID, "INVPCID" }, \ |
| 129 | { EXIT_REASON_XSAVES, "XSAVES" }, \ | 128 | { EXIT_REASON_XSAVES, "XSAVES" }, \ |
| 130 | { EXIT_REASON_XRSTORS, "XRSTORS" }, \ | 129 | { EXIT_REASON_XRSTORS, "XRSTORS" } |
| 131 | { EXIT_REASON_PCOMMIT, "PCOMMIT" } | ||
| 132 | 130 | ||
| 133 | #define VMX_ABORT_SAVE_GUEST_MSR_FAIL 1 | 131 | #define VMX_ABORT_SAVE_GUEST_MSR_FAIL 1 |
| 134 | #define VMX_ABORT_LOAD_HOST_MSR_FAIL 4 | 132 | #define VMX_ABORT_LOAD_HOST_MSR_FAIL 4 |