Skip to content

Commit 34524cd

Browse files
committed
tools headers: Sync UAPI KVM headers with kernel sources
To pick up changes from: ad9c62b ("KVM: arm64: VM exit to userspace to handle SEA") 8e8678e ("KVM: s390: Add capability that forwards operation exceptions") e0c26d4 ("Merge tag 'kvm-s390-next-6.19-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD") 7a61d61 ("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: Namhyung Kim <namhyung@kernel.org>
1 parent be6c9e8 commit 34524cd

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

  • tools
    • arch/x86/include/uapi/asm
    • include/uapi/linux

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ struct kvm_sync_regs {
502502
/* vendor-specific groups and attributes for system fd */
503503
#define KVM_X86_GRP_SEV 1
504504
# define KVM_X86_SEV_VMSA_FEATURES 0
505+
# define KVM_X86_SNP_POLICY_BITS 1
505506

506507
struct kvm_vmx_nested_state_data {
507508
__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

tools/include/uapi/linux/kvm.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ struct kvm_xen_exit {
179179
#define KVM_EXIT_LOONGARCH_IOCSR 38
180180
#define KVM_EXIT_MEMORY_FAULT 39
181181
#define KVM_EXIT_TDX 40
182+
#define KVM_EXIT_ARM_SEA 41
182183

183184
/* For KVM_EXIT_INTERNAL_ERROR */
184185
/* Emulate instruction failed. */
@@ -473,6 +474,14 @@ struct kvm_run {
473474
} setup_event_notify;
474475
};
475476
} tdx;
477+
/* KVM_EXIT_ARM_SEA */
478+
struct {
479+
#define KVM_EXIT_ARM_SEA_FLAG_GPA_VALID (1ULL << 0)
480+
__u64 flags;
481+
__u64 esr;
482+
__u64 gva;
483+
__u64 gpa;
484+
} arm_sea;
476485
/* Fix the size of the union. */
477486
char padding[256];
478487
};
@@ -963,6 +972,8 @@ struct kvm_enable_cap {
963972
#define KVM_CAP_RISCV_MP_STATE_RESET 242
964973
#define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243
965974
#define KVM_CAP_GUEST_MEMFD_FLAGS 244
975+
#define KVM_CAP_ARM_SEA_TO_USER 245
976+
#define KVM_CAP_S390_USER_OPEREXEC 246
966977

967978
struct kvm_irq_routing_irqchip {
968979
__u32 irqchip;

0 commit comments

Comments
 (0)