Commit 34524cde authored by Namhyung Kim's avatar Namhyung Kim
Browse files

tools headers: Sync UAPI KVM headers with kernel sources 

To pick up changes from:

  ad9c62bd ("KVM: arm64: VM exit to userspace to handle SEA")
  8e8678e7 ("KVM: s390: Add capability that forwards operation exceptions")
  e0c26d47 ("Merge tag 'kvm-s390-next-6.19-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux

 into HEAD")
  7a61d613 ("KVM: SEV: Publish supported SEV-SNP policy bits")

This should be used to beautify DRM syscall arguments and it addresses
these tools/perf build warnings:

  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

Please see tools/include/uapi/README.

Cc: kvm@vger.kernel.org
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent be6c9e82

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

+1 −0
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ struct kvm_sync_regs { 
/* vendor-specific groups and attributes for system fd */

#define KVM_X86_GRP_SEV			1

#  define KVM_X86_SEV_VMSA_FEATURES	0

#  define KVM_X86_SNP_POLICY_BITS	1



struct kvm_vmx_nested_state_data {

	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

tools/include/uapi/linux/kvm.h

+11 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ struct kvm_xen_exit { 
#define KVM_EXIT_LOONGARCH_IOCSR  38

#define KVM_EXIT_MEMORY_FAULT     39

#define KVM_EXIT_TDX              40

#define KVM_EXIT_ARM_SEA          41



/* For KVM_EXIT_INTERNAL_ERROR */

/* Emulate instruction failed. */
@@ -473,6 +474,14 @@ struct kvm_run { 
				} setup_event_notify;

			};

		} tdx;

		/* KVM_EXIT_ARM_SEA */

		struct {

#define KVM_EXIT_ARM_SEA_FLAG_GPA_VALID	(1ULL << 0)

			__u64 flags;

			__u64 esr;

			__u64 gva;

			__u64 gpa;

		} arm_sea;

		/* Fix the size of the union. */

		char padding[256];

	};
@@ -963,6 +972,8 @@ struct kvm_enable_cap { 
#define KVM_CAP_RISCV_MP_STATE_RESET 242

#define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243

#define KVM_CAP_GUEST_MEMFD_FLAGS 244

#define KVM_CAP_ARM_SEA_TO_USER 245

#define KVM_CAP_S390_USER_OPEREXEC 246



struct kvm_irq_routing_irqchip {

	__u32 irqchip;