Commit 564b4800 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Aichun Shi
Browse files

tools headers UAPI: Sync KVM's kvm.h and vmx.h headers with the kernel sources 

mainline inclusion
from mainline-v5.12-rc3
commit 33dc525f
category: feature
feature: KVM Bus Lock VM Exit
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I5RJCB
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/


commit/?id=33dc525f

Intel-SIG: commit 33dc525f ("tools headers UAPI: Sync KVM's kvm.h and vmx.h headers with the kernel sources")

-------------------------------------

tools headers UAPI: Sync KVM's kvm.h and vmx.h headers with the kernel sources

To pick the changes in:

  fe6b6bc8 ("KVM: VMX: Enable bus lock VM exit")

That makes 'perf kvm-stat' aware of this new BUS_LOCK exit reason, thus
addressing the following perf build warning:

  Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/vmx.h' differs from latest version at 'arch/x86/include/uapi/asm/vmx.h'
  diff -u tools/arch/x86/include/uapi/asm/vmx.h arch/x86/include/uapi/asm/vmx.h

Cc: Chenyi Qiang <chenyi.qiang@intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent fbea8438

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

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ struct kvm_ioapic_state { 
#define KVM_NR_IRQCHIPS          3



#define KVM_RUN_X86_SMM		 (1 << 0)

#define KVM_RUN_X86_BUS_LOCK     (1 << 1)



/* for KVM_GET_REGS and KVM_SET_REGS */

struct kvm_regs {

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

+3 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#define EXIT_REASON_XRSTORS             64

#define EXIT_REASON_UMWAIT              67

#define EXIT_REASON_TPAUSE              68

#define EXIT_REASON_BUS_LOCK            74



#define VMX_EXIT_REASONS \

	{ EXIT_REASON_EXCEPTION_NMI,         "EXCEPTION_NMI" }, \
@@ -148,7 +149,8 @@ 
	{ EXIT_REASON_XSAVES,                "XSAVES" }, \

	{ EXIT_REASON_XRSTORS,               "XRSTORS" }, \

	{ EXIT_REASON_UMWAIT,                "UMWAIT" }, \

	{ EXIT_REASON_TPAUSE,                "TPAUSE" }

	{ EXIT_REASON_TPAUSE,                "TPAUSE" }, \

	{ EXIT_REASON_BUS_LOCK,              "BUS_LOCK" }



#define VMX_EXIT_REASON_FLAGS \

	{ VMX_EXIT_REASONS_FAILED_VMENTRY,	"FAILED_VMENTRY" }