tools headers UAPI: Sync kvm headers with the kernel sources

To pick the changes in:

4af663c2f64a8d25 ("KVM: SEV: Allow per-guest configuration of GHCB protocol version")
4f5defae708992dd ("KVM: SEV: introduce KVM_SEV_INIT2 operation")
26c44aa9e076ed83 ("KVM: SEV: define VM types for SEV and SEV-ES")
ac5c48027bacb1b5 ("KVM: SEV: publish supported VMSA features")
651d61bc8b7d8bb6 ("KVM: PPC: Fix documentation for ppc mmu caps")

That don't change functionality in tools/perf, as no new ioctl is added
for the 'perf trace' scripts to harvest.

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

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Joel Stanley <joel@jms.id.au>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michael Roth <michael.roth@amd.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: https://lore.kernel.org/lkml/ZlYxAdHjyAkvGtMW@x1
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+22 -4
+20 -2
tools/arch/x86/include/uapi/asm/kvm.h
··· 457 457 458 458 #define KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE 0x00000001 459 459 460 - /* attributes for system fd (group 0) */ 461 - #define KVM_X86_XCOMP_GUEST_SUPP 0 460 + /* vendor-independent attributes for system fd (group 0) */ 461 + #define KVM_X86_GRP_SYSTEM 0 462 + # define KVM_X86_XCOMP_GUEST_SUPP 0 463 + 464 + /* vendor-specific groups and attributes for system fd */ 465 + #define KVM_X86_GRP_SEV 1 466 + # define KVM_X86_SEV_VMSA_FEATURES 0 462 467 463 468 struct kvm_vmx_nested_state_data { 464 469 __u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE]; ··· 694 689 /* Guest Migration Extension */ 695 690 KVM_SEV_SEND_CANCEL, 696 691 692 + /* Second time is the charm; improved versions of the above ioctls. */ 693 + KVM_SEV_INIT2, 694 + 697 695 KVM_SEV_NR_MAX, 698 696 }; 699 697 ··· 706 698 __u64 data; 707 699 __u32 error; 708 700 __u32 sev_fd; 701 + }; 702 + 703 + struct kvm_sev_init { 704 + __u64 vmsa_features; 705 + __u32 flags; 706 + __u16 ghcb_version; 707 + __u16 pad1; 708 + __u32 pad2[8]; 709 709 }; 710 710 711 711 struct kvm_sev_launch_start { ··· 872 856 873 857 #define KVM_X86_DEFAULT_VM 0 874 858 #define KVM_X86_SW_PROTECTED_VM 1 859 + #define KVM_X86_SEV_VM 2 860 + #define KVM_X86_SEV_ES_VM 3 875 861 876 862 #endif /* _ASM_X86_KVM_H */
+2 -2
tools/include/uapi/linux/kvm.h
··· 1221 1221 /* Available with KVM_CAP_SPAPR_RESIZE_HPT */ 1222 1222 #define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt) 1223 1223 #define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt) 1224 - /* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_MMU_HASH_V3 */ 1224 + /* Available with KVM_CAP_PPC_MMU_RADIX or KVM_CAP_PPC_MMU_HASH_V3 */ 1225 1225 #define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg) 1226 - /* Available with KVM_CAP_PPC_RADIX_MMU */ 1226 + /* Available with KVM_CAP_PPC_MMU_RADIX */ 1227 1227 #define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info) 1228 1228 /* Available with KVM_CAP_PPC_GET_CPU_CHAR */ 1229 1229 #define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)