Commit ddc59297 authored by Namhyung Kim's avatar Namhyung Kim
Browse files

tools headers: Update the KVM headers with the kernel sources 



To pick up the changes in:

  af5366be KVM: x86: Drop the now unused KVM_X86_DISABLE_VALID_EXITS
  915d2f07 KVM: Move KVM_REG_SIZE() definition to common uAPI header
  5c178481 KVM: x86/xen: Restrict hypercall MSR to unofficial synthetic range
  93647895 KVM: x86: Add a VM type define for TDX
  fa662c90 KVM: SVM: Add Idle HLT intercept support
  3adaee78 KVM: arm64: Allow userspace to change the implementation ID registers
  faf7714a KVM: arm64: nv: Allow userland to set VGIC maintenance IRQ
  c0000e58 KVM: arm64: Introduce KVM_REG_ARM_VENDOR_HYP_BMAP_2
  f83c41fb KVM: arm64: Allow userspace to limit NV support to nVHE

Addressing this perf tools build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h
    diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h
    diff -u tools/arch/x86/include/uapi/asm/svm.h arch/x86/include/uapi/asm/svm.h
    diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi/asm/kvm.h

Please see tools/include/uapi/README for further details.

Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarVenkat Rao Bagalkote <venkat88@linux.ibm.com>
Cc: kvm@vger.kernel.org
Link: https://lore.kernel.org/r/20250410001125.391820-2-namhyung@kernel.org


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 0af2f6be

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

+2 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ 
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_DIRTY_LOG_PAGE_OFFSET 64



#define KVM_REG_SIZE(id)						\

	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))



struct kvm_regs {

	struct user_pt_regs regs;	/* sp = sp_el0 */
@@ -108,6 +105,7 @@ struct kvm_regs { 
#define KVM_ARM_VCPU_PTRAUTH_ADDRESS	5 /* VCPU uses address authentication */

#define KVM_ARM_VCPU_PTRAUTH_GENERIC	6 /* VCPU uses generic authentication */

#define KVM_ARM_VCPU_HAS_EL2		7 /* Support nested virtualization */

#define KVM_ARM_VCPU_HAS_EL2_E2H0	8 /* Limit NV support to E2H RES0 */



struct kvm_vcpu_init {

	__u32 target;
@@ -418,6 +416,7 @@ enum { 
#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6

#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7

#define KVM_DEV_ARM_VGIC_GRP_ITS_REGS 8

#define KVM_DEV_ARM_VGIC_GRP_MAINT_IRQ  9

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \

			(0x3fffffULL << KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)

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

+4 −0
Original line number Diff line number Diff line
@@ -559,6 +559,9 @@ struct kvm_x86_mce { 
#define KVM_XEN_HVM_CONFIG_PVCLOCK_TSC_UNSTABLE	(1 << 7)

#define KVM_XEN_HVM_CONFIG_SHARED_INFO_HVA	(1 << 8)



#define KVM_XEN_MSR_MIN_INDEX			0x40000000u

#define KVM_XEN_MSR_MAX_INDEX			0x4fffffffu



struct kvm_xen_hvm_config {

	__u32 flags;

	__u32 msr;
@@ -925,5 +928,6 @@ struct kvm_hyperv_eventfd { 
#define KVM_X86_SEV_VM		2

#define KVM_X86_SEV_ES_VM	3

#define KVM_X86_SNP_VM		4

#define KVM_X86_TDX_VM		5



#endif /* _ASM_X86_KVM_H */

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

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
#define SVM_EXIT_CR14_WRITE_TRAP		0x09e

#define SVM_EXIT_CR15_WRITE_TRAP		0x09f

#define SVM_EXIT_INVPCID       0x0a2

#define SVM_EXIT_IDLE_HLT      0x0a6

#define SVM_EXIT_NPF           0x400

#define SVM_EXIT_AVIC_INCOMPLETE_IPI		0x401

#define SVM_EXIT_AVIC_UNACCELERATED_ACCESS	0x402
@@ -224,6 +225,7 @@ 
	{ SVM_EXIT_CR4_WRITE_TRAP,	"write_cr4_trap" }, \

	{ SVM_EXIT_CR8_WRITE_TRAP,	"write_cr8_trap" }, \

	{ SVM_EXIT_INVPCID,     "invpcid" }, \

	{ SVM_EXIT_IDLE_HLT,     "idle-halt" }, \

	{ SVM_EXIT_NPF,         "npf" }, \

	{ SVM_EXIT_AVIC_INCOMPLETE_IPI,		"avic_incomplete_ipi" }, \

	{ SVM_EXIT_AVIC_UNACCELERATED_ACCESS,   "avic_unaccelerated_access" }, \

tools/include/uapi/linux/kvm.h

+5 −4
Original line number Diff line number Diff line
@@ -617,10 +617,6 @@ struct kvm_ioeventfd { 
#define KVM_X86_DISABLE_EXITS_HLT            (1 << 1)

#define KVM_X86_DISABLE_EXITS_PAUSE          (1 << 2)

#define KVM_X86_DISABLE_EXITS_CSTATE         (1 << 3)

#define KVM_X86_DISABLE_VALID_EXITS          (KVM_X86_DISABLE_EXITS_MWAIT | \

                                              KVM_X86_DISABLE_EXITS_HLT | \

                                              KVM_X86_DISABLE_EXITS_PAUSE | \

                                              KVM_X86_DISABLE_EXITS_CSTATE)



/* for KVM_ENABLE_CAP */

struct kvm_enable_cap {
@@ -933,6 +929,7 @@ struct kvm_enable_cap { 
#define KVM_CAP_PRE_FAULT_MEMORY 236

#define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237

#define KVM_CAP_X86_GUEST_MODE 238

#define KVM_CAP_ARM_WRITABLE_IMP_ID_REGS 239



struct kvm_irq_routing_irqchip {

	__u32 irqchip;
@@ -1070,6 +1067,10 @@ struct kvm_dirty_tlb { 


#define KVM_REG_SIZE_SHIFT	52

#define KVM_REG_SIZE_MASK	0x00f0000000000000ULL



#define KVM_REG_SIZE(id)		\

	(1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))



#define KVM_REG_SIZE_U8		0x0000000000000000ULL

#define KVM_REG_SIZE_U16	0x0010000000000000ULL

#define KVM_REG_SIZE_U32	0x0020000000000000ULL