tools arch kvm: Sync kvm headers with the kernel sources
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: c499d1f483a99e86a5f712277de7c8fa33a9ec0a Gitweb: https://git.kernel.org/tip/c499d1f483a99e86a5f712277de7c8fa33a9ec0a Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 6 Jul 2019 14:26:40 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Sat, 6 Jul 2019 14:26:40 -0300
tools arch kvm: Sync kvm headers with the kernel sources
To pick up the changes from:
41040cf7c5f0 ("arm64/sve: Fix missing SVE/FPSIMD endianness conversions") 6ca00dfafda7 ("KVM: x86: Modify struct kvm_nested_state to have explicit fields for data")
None entail changes in tooling.
This silences these tools/perf build warnings:
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs from latest version at 'arch/x86/include/uapi/asm/kvm.h' diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h
Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm64/include/uapi/asm/kvm.h' diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi/asm/kvm.h
--- tools/arch/arm64/include/uapi/asm/kvm.h | 7 +++++++ tools/arch/x86/include/uapi/asm/kvm.h | 31 +++++++++++++++++++++---------- 2 files changed, 28 insertions(+), 10 deletions(-)
tools/arch/arm64/include/uapi/asm/kvm.h +7 -0
@@ -260,6 +260,13 @@ struct kvm_vcpu_events { KVM_REG_SIZE_U256 | \ ((i) & (KVM_ARM64_SVE_MAX_SLICES - 1))) +/* +* Register values for KVM_REG_ARM64_SVE_ZREG(), KVM_REG_ARM64_SVE_PREG() and +* KVM_REG_ARM64_SVE_FFR() are represented in memory in an endianness- +* invariant layout which differs from the layout used for the FPSIMD +* V-registers on big-endian systems: see sigcontext.h for more explanation. +*/ +#define KVM_ARM64_SVE_VQ_MIN __SVE_VQ_MIN#define KVM_ARM64_SVE_VQ_MAX __SVE_VQ_MAX
tools/arch/x86/include/uapi/asm/kvm.h +21 -10
@@ -383,6 +383,9 @@ struct kvm_sync_regs {#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2)#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3) +#define KVM_STATE_NESTED_FORMAT_VMX 0 +#define KVM_STATE_NESTED_FORMAT_SVM 1/* unused */ +#define KVM_STATE_NESTED_GUEST_MODE 0x00000001#define KVM_STATE_NESTED_RUN_PENDING 0x00000002#define KVM_STATE_NESTED_EVMCS 0x00000004
@@ -390,7 +393,14 @@ struct kvm_sync_regs {#define KVM_STATE_NESTED_SMM_GUEST_MODE 0x00000001#define KVM_STATE_NESTED_SMM_VMXON 0x00000002 -struct kvm_vmx_nested_state { +#define KVM_STATE_NESTED_VMX_VMCS_SIZE 0x1000 + +struct kvm_vmx_nested_state_data { +__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE ]; +__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE ]; +}; + +struct kvm_vmx_nested_state_hdr {__u64 vmxon_pa;__u64 vmcs12_pa;
@@ -401,24 +411,25 @@ struct kvm_vmx_nested_state {/* for KVM_CAP_NESTED_STATE */ struct kvm_nested_state { -/* KVM_STATE_* flags */ __u16 flags; - -/* 0 for VMX, 1 for SVM. */ __u16 format; - -/* 128 for SVM, 128 + VMCS size for VMX. */ __u32 size;union { -/* VMXON, VMCS */ -struct kvm_vmx_nested_state vmx; +struct kvm_vmx_nested_state_hdr vmx;/* Pad the header to 128 bytes. */ __u8 pad[120 ]; - }; + } hdr; -__u8 data[0 ]; +/* +* Define data region as 0 bytes to preserve backwards-compatability +* to old definition of kvm_nested_state in order to avoid changing +* KVM_{GET,PUT}_NESTED_STATE ioctl values. +*/ +union { +struct kvm_vmx_nested_state_data vmx[0 ]; + } data; };#endif /* _ASM_X86_KVM_H */