Commit 88e52051 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync kvm headers with the kernel sources 

To pick the changes in:

  4af663c2 ("KVM: SEV: Allow per-guest configuration of GHCB protocol version")
  4f5defae ("KVM: SEV: introduce KVM_SEV_INIT2 operation")
  26c44aa9 ("KVM: SEV: define VM types for SEV and SEV-ES")
  ac5c4802 ("KVM: SEV: publish supported VMSA features")
  651d61bc ("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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ac4b0690

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

+20 −2
Original line number Diff line number Diff line
@@ -457,9 +457,14 @@ struct kvm_sync_regs { 


#define KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE	0x00000001



/* attributes for system fd (group 0) */

/* vendor-independent attributes for system fd (group 0) */

#define KVM_X86_GRP_SYSTEM		0

#  define KVM_X86_XCOMP_GUEST_SUPP	0



/* vendor-specific groups and attributes for system fd */

#define KVM_X86_GRP_SEV			1

#  define KVM_X86_SEV_VMSA_FEATURES	0



struct kvm_vmx_nested_state_data {

	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

	__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
@@ -689,6 +694,9 @@ enum sev_cmd_id { 
	/* Guest Migration Extension */

	KVM_SEV_SEND_CANCEL,



	/* Second time is the charm; improved versions of the above ioctls.  */

	KVM_SEV_INIT2,



	KVM_SEV_NR_MAX,

};
@@ -700,6 +708,14 @@ struct kvm_sev_cmd { 
	__u32 sev_fd;

};



struct kvm_sev_init {

	__u64 vmsa_features;

	__u32 flags;

	__u16 ghcb_version;

	__u16 pad1;

	__u32 pad2[8];

};



struct kvm_sev_launch_start {

	__u32 handle;

	__u32 policy;
@@ -856,5 +872,7 @@ struct kvm_hyperv_eventfd { 


#define KVM_X86_DEFAULT_VM	0

#define KVM_X86_SW_PROTECTED_VM	1

#define KVM_X86_SEV_VM		2

#define KVM_X86_SEV_ES_VM	3



#endif /* _ASM_X86_KVM_H */

tools/include/uapi/linux/kvm.h

+2 −2
Original line number Diff line number Diff line
@@ -1221,9 +1221,9 @@ struct kvm_vfio_spapr_tce { 
/* Available with KVM_CAP_SPAPR_RESIZE_HPT */

#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)

#define KVM_PPC_RESIZE_HPT_COMMIT  _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)

/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_MMU_HASH_V3 */

/* Available with KVM_CAP_PPC_MMU_RADIX or KVM_CAP_PPC_MMU_HASH_V3 */

#define KVM_PPC_CONFIGURE_V3_MMU  _IOW(KVMIO,  0xaf, struct kvm_ppc_mmuv3_cfg)

/* Available with KVM_CAP_PPC_RADIX_MMU */

/* Available with KVM_CAP_PPC_MMU_RADIX */

#define KVM_PPC_GET_RMMU_INFO	  _IOW(KVMIO,  0xb0, struct kvm_ppc_rmmu_info)

/* Available with KVM_CAP_PPC_GET_CPU_CHAR */

#define KVM_PPC_GET_CPU_CHAR	  _IOR(KVMIO,  0xb1, struct kvm_ppc_cpu_char)