Skip to content

Commit bd842ff

Browse files
committed
tools headers: Sync KVM headers with the kernel source
To pick up the changes in this cset: f55ce5a KVM: arm64: Expose new KVM cap for cacheable PFNMAP 28224ef KVM: TDX: Report supported optional TDVMCALLs in TDX capabilities 4580dbe KVM: TDX: Exit to userspace for SetupEventNotifyInterrupt 25e8b1d KVM: TDX: Exit to userspace for GetTdVmCallInfo cf207ea KVM: TDX: Handle TDG.VP.VMCALL<GetQuote> This addresses these 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 for further details. Cc: Paolo Bonzini <[email protected]> Cc: [email protected] Signed-off-by: Namhyung Kim <[email protected]>
1 parent 22ec0fa commit bd842ff

File tree

2 files changed

+34
-1
lines changed
  • tools
    • arch/x86/include/uapi/asm
    • include/uapi/linux

2 files changed

+34
-1
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,13 @@ struct kvm_tdx_cmd {
965965
struct kvm_tdx_capabilities {
966966
__u64 supported_attrs;
967967
__u64 supported_xfam;
968-
__u64 reserved[254];
968+
969+
__u64 kernel_tdvmcallinfo_1_r11;
970+
__u64 user_tdvmcallinfo_1_r11;
971+
__u64 kernel_tdvmcallinfo_1_r12;
972+
__u64 user_tdvmcallinfo_1_r12;
973+
974+
__u64 reserved[250];
969975

970976
/* Configurable CPUID bits for userspace */
971977
struct kvm_cpuid2 cpuid;

tools/include/uapi/linux/kvm.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ struct kvm_xen_exit {
178178
#define KVM_EXIT_NOTIFY 37
179179
#define KVM_EXIT_LOONGARCH_IOCSR 38
180180
#define KVM_EXIT_MEMORY_FAULT 39
181+
#define KVM_EXIT_TDX 40
181182

182183
/* For KVM_EXIT_INTERNAL_ERROR */
183184
/* Emulate instruction failed. */
@@ -447,6 +448,31 @@ struct kvm_run {
447448
__u64 gpa;
448449
__u64 size;
449450
} memory_fault;
451+
/* KVM_EXIT_TDX */
452+
struct {
453+
__u64 flags;
454+
__u64 nr;
455+
union {
456+
struct {
457+
__u64 ret;
458+
__u64 data[5];
459+
} unknown;
460+
struct {
461+
__u64 ret;
462+
__u64 gpa;
463+
__u64 size;
464+
} get_quote;
465+
struct {
466+
__u64 ret;
467+
__u64 leaf;
468+
__u64 r11, r12, r13, r14;
469+
} get_tdvmcall_info;
470+
struct {
471+
__u64 ret;
472+
__u64 vector;
473+
} setup_event_notify;
474+
};
475+
} tdx;
450476
/* Fix the size of the union. */
451477
char padding[256];
452478
};
@@ -935,6 +961,7 @@ struct kvm_enable_cap {
935961
#define KVM_CAP_ARM_EL2 240
936962
#define KVM_CAP_ARM_EL2_E2H0 241
937963
#define KVM_CAP_RISCV_MP_STATE_RESET 242
964+
#define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243
938965

939966
struct kvm_irq_routing_irqchip {
940967
__u32 irqchip;

0 commit comments

Comments
 (0)