Commit 21b7e35b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync kvm.h headers with the kernel sources 



To pick the changes in:

  d9a47eda ("KVM: PPC: Book3S HV: Introduce new capability for 2nd DAWR")
  8d4e7e80 ("KVM: x86: declare Xen HVM shared info capability and add test case")
  40da8ccd ("KVM: x86/xen: Add event channel interrupt vector upcall")

These new IOCTLs are now supported on 'perf trace':

  $ tools/perf/trace/beauty/kvm_ioctl.sh > before
  $ cp include/uapi/linux/kvm.h tools/include/uapi/linux/kvm.h
  $ tools/perf/trace/beauty/kvm_ioctl.sh > after
  $ diff -u before after
  --- before	2021-02-23 09:55:46.229058308 -0300
  +++ after	2021-02-23 09:55:57.509308058 -0300
  @@ -91,6 +91,10 @@
   	[0xc1] = "GET_SUPPORTED_HV_CPUID",
   	[0xc6] = "X86_SET_MSR_FILTER",
   	[0xc7] = "RESET_DIRTY_RINGS",
  +	[0xc8] = "XEN_HVM_GET_ATTR",
  +	[0xc9] = "XEN_HVM_SET_ATTR",
  +	[0xca] = "XEN_VCPU_GET_ATTR",
  +	[0xcb] = "XEN_VCPU_SET_ATTR",
   	[0xe0] = "CREATE_DEVICE",
   	[0xe1] = "SET_DEVICE_ATTR",
   	[0xe2] = "GET_DEVICE_ATTR",
  $

Addressing this perf build warning:
  Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h'
  diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h

Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 303550a4

tools/include/uapi/linux/kvm.h

+73 −0
Original line number Diff line number Diff line
@@ -216,6 +216,20 @@ struct kvm_hyperv_exit { 
	} u;

};



struct kvm_xen_exit {

#define KVM_EXIT_XEN_HCALL          1

	__u32 type;

	union {

		struct {

			__u32 longmode;

			__u32 cpl;

			__u64 input;

			__u64 result;

			__u64 params[6];

		} hcall;

	} u;

};



#define KVM_S390_GET_SKEYS_NONE   1

#define KVM_S390_SKEYS_MAX        1048576
@@ -252,6 +266,8 @@ struct kvm_hyperv_exit { 
#define KVM_EXIT_X86_WRMSR        30

#define KVM_EXIT_DIRTY_RING_FULL  31

#define KVM_EXIT_AP_RESET_HOLD    32

#define KVM_EXIT_X86_BUS_LOCK     33

#define KVM_EXIT_XEN              34



/* For KVM_EXIT_INTERNAL_ERROR */

/* Emulate instruction failed. */
@@ -428,6 +444,8 @@ struct kvm_run { 
			__u32 index; /* kernel -> user */

			__u64 data; /* kernel <-> user */

		} msr;

		/* KVM_EXIT_XEN */

		struct kvm_xen_exit xen;

		/* Fix the size of the union. */

		char padding[256];

	};
@@ -1058,6 +1076,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_ENFORCE_PV_FEATURE_CPUID 190

#define KVM_CAP_SYS_HYPERV_CPUID 191

#define KVM_CAP_DIRTY_LOG_RING 192

#define KVM_CAP_X86_BUS_LOCK_EXIT 193

#define KVM_CAP_PPC_DAWR1 194



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1132,6 +1151,10 @@ struct kvm_x86_mce { 
#endif



#ifdef KVM_CAP_XEN_HVM

#define KVM_XEN_HVM_CONFIG_HYPERCALL_MSR	(1 << 0)

#define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL	(1 << 1)

#define KVM_XEN_HVM_CONFIG_SHARED_INFO		(1 << 2)



struct kvm_xen_hvm_config {

	__u32 flags;

	__u32 msr;
@@ -1566,6 +1589,45 @@ struct kvm_pv_cmd { 
/* Available with KVM_CAP_DIRTY_LOG_RING */

#define KVM_RESET_DIRTY_RINGS		_IO(KVMIO, 0xc7)



/* Per-VM Xen attributes */

#define KVM_XEN_HVM_GET_ATTR	_IOWR(KVMIO, 0xc8, struct kvm_xen_hvm_attr)

#define KVM_XEN_HVM_SET_ATTR	_IOW(KVMIO,  0xc9, struct kvm_xen_hvm_attr)



struct kvm_xen_hvm_attr {

	__u16 type;

	__u16 pad[3];

	union {

		__u8 long_mode;

		__u8 vector;

		struct {

			__u64 gfn;

		} shared_info;

		__u64 pad[8];

	} u;

};



/* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_SHARED_INFO */

#define KVM_XEN_ATTR_TYPE_LONG_MODE		0x0

#define KVM_XEN_ATTR_TYPE_SHARED_INFO		0x1

#define KVM_XEN_ATTR_TYPE_UPCALL_VECTOR		0x2



/* Per-vCPU Xen attributes */

#define KVM_XEN_VCPU_GET_ATTR	_IOWR(KVMIO, 0xca, struct kvm_xen_vcpu_attr)

#define KVM_XEN_VCPU_SET_ATTR	_IOW(KVMIO,  0xcb, struct kvm_xen_vcpu_attr)



struct kvm_xen_vcpu_attr {

	__u16 type;

	__u16 pad[3];

	union {

		__u64 gpa;

		__u64 pad[8];

	} u;

};



/* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_SHARED_INFO */

#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO	0x0

#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO	0x1



/* Secure Encrypted Virtualization command */

enum sev_cmd_id {

	/* Guest initialization commands */
@@ -1594,6 +1656,8 @@ enum sev_cmd_id { 
	KVM_SEV_DBG_ENCRYPT,

	/* Guest certificates commands */

	KVM_SEV_CERT_EXPORT,

	/* Attestation report */

	KVM_SEV_GET_ATTESTATION_REPORT,



	KVM_SEV_NR_MAX,

};
@@ -1646,6 +1710,12 @@ struct kvm_sev_dbg { 
	__u32 len;

};



struct kvm_sev_attestation_report {

	__u8 mnonce[16];

	__u64 uaddr;

	__u32 len;

};



#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)

#define KVM_DEV_ASSIGN_PCI_2_3		(1 << 1)

#define KVM_DEV_ASSIGN_MASK_INTX	(1 << 2)
@@ -1767,4 +1837,7 @@ struct kvm_dirty_gfn { 
	__u64 offset;

};



#define KVM_BUS_LOCK_DETECTION_OFF             (1 << 0)

#define KVM_BUS_LOCK_DETECTION_EXIT            (1 << 1)



#endif /* __LINUX_KVM_H */