To pick up the changes in this cset: f55ce5a6cd33211c KVM: arm64: Expose new KVM cap for cacheable PFNMAP 28224ef02b56fcee KVM: TDX: Report supported optional TDVMCALLs in TDX capabilities 4580dbef5ce0f95a KVM: TDX: Exit to userspace for SetupEventNotifyInterrupt 25e8b1dd4883e6c2 KVM: TDX: Exit to userspace for GetTdVmCallInfo cf207eac06f661fb 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.
Showing the changes to tools/include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -178,6 +178,7 @@ struct kvm_xen_exit { · 177 unmodified lines | |||
| 178 | #define KVM_EXIT_NOTIFY 37 | 178 | #define KVM_EXIT_NOTIFY 37 |
| 179 | #define KVM_EXIT_LOONGARCH_IOCSR 38 | 179 | #define KVM_EXIT_LOONGARCH_IOCSR 38 |
| 180 | #define KVM_EXIT_MEMORY_FAULT 39 | 180 | #define KVM_EXIT_MEMORY_FAULT 39 |
| 181 | #define KVM_EXIT_TDX 40 | ||
| 181 | 182 | ||
| 182 | /* For KVM_EXIT_INTERNAL_ERROR */ | 183 | /* For KVM_EXIT_INTERNAL_ERROR */ |
| 183 | /* Emulate instruction failed. */ | 184 | /* Emulate instruction failed. */ |
| @@ -447,6 +448,31 @@ struct kvm_run { · 263 unmodified lines | |||
| 447 | __u64 gpa; | 448 | __u64 gpa; |
| 448 | __u64 size; | 449 | __u64 size; |
| 449 | } memory_fault; | 450 | } 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; | ||
| 450 | /* Fix the size of the union. */ | 476 | /* Fix the size of the union. */ |
| 451 | char padding[256]; | 477 | char padding[256]; |
| 452 | }; | 478 | }; |
| @@ -935,6 +961,7 @@ struct kvm_enable_cap { · 482 unmodified lines | |||
| 935 | #define KVM_CAP_ARM_EL2 240 | 961 | #define KVM_CAP_ARM_EL2 240 |
| 936 | #define KVM_CAP_ARM_EL2_E2H0 241 | 962 | #define KVM_CAP_ARM_EL2_E2H0 241 |
| 937 | #define KVM_CAP_RISCV_MP_STATE_RESET 242 | 963 | #define KVM_CAP_RISCV_MP_STATE_RESET 242 |
| 964 | #define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243 | ||
| 938 | 965 | ||
| 939 | struct kvm_irq_routing_irqchip { | 966 | struct kvm_irq_routing_irqchip { |
| 940 | __u32 irqchip; | 967 | __u32 irqchip; |