Skip to content

Commit 675f52b

Browse files
committed
tools: Sync x86's vmx.h with the kernel
To pick the changes from: 1b07304 ("KVM: nVMX: support descriptor table exits") That adds entries to VMX_EXIT_REASONS, that is used by tools/perf/arch/x86/util/kvm-stat.c. This also picks the changes in: 1dc35da ("KVM: nVMX: check host CR3 on vmentry and vmexit") But these are not used in 'perf kvm stat', do it just to silence the kernel/tools file cache coherency detector: $ make -C tools/perf make: Entering directory '/home/acme/git/linux/tools/perf' BUILD: Doing 'make -j4' parallel build Warning: arch/x86/include/uapi/asm/vmx.h differs from kernel Cc: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Ladi Prosek <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Wang Nan <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent bfacbe3 commit 675f52b

File tree

1 file changed

+5
-0
lines changed
  • tools/arch/x86/include/uapi/asm

1 file changed

+5
-0
lines changed

tools/arch/x86/include/uapi/asm/vmx.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
#define EXIT_REASON_TPR_BELOW_THRESHOLD 43
6666
#define EXIT_REASON_APIC_ACCESS 44
6767
#define EXIT_REASON_EOI_INDUCED 45
68+
#define EXIT_REASON_GDTR_IDTR 46
69+
#define EXIT_REASON_LDTR_TR 47
6870
#define EXIT_REASON_EPT_VIOLATION 48
6971
#define EXIT_REASON_EPT_MISCONFIG 49
7072
#define EXIT_REASON_INVEPT 50
@@ -113,6 +115,8 @@
113115
{ EXIT_REASON_MCE_DURING_VMENTRY, "MCE_DURING_VMENTRY" }, \
114116
{ EXIT_REASON_TPR_BELOW_THRESHOLD, "TPR_BELOW_THRESHOLD" }, \
115117
{ EXIT_REASON_APIC_ACCESS, "APIC_ACCESS" }, \
118+
{ EXIT_REASON_GDTR_IDTR, "GDTR_IDTR" }, \
119+
{ EXIT_REASON_LDTR_TR, "LDTR_TR" }, \
116120
{ EXIT_REASON_EPT_VIOLATION, "EPT_VIOLATION" }, \
117121
{ EXIT_REASON_EPT_MISCONFIG, "EPT_MISCONFIG" }, \
118122
{ EXIT_REASON_INVEPT, "INVEPT" }, \
@@ -129,6 +133,7 @@
129133
{ EXIT_REASON_XRSTORS, "XRSTORS" }
130134

131135
#define VMX_ABORT_SAVE_GUEST_MSR_FAIL 1
136+
#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL 2
132137
#define VMX_ABORT_LOAD_HOST_MSR_FAIL 4
133138

134139
#endif /* _UAPIVMX_H */

0 commit comments

Comments
 (0)