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

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

To pick the changes in:

  86bdf3eb ("KVM: Support dirty ring in conjunction with bitmap")

That just rebuilds perf, as these patches don't add any new KVM ioctl to
be harvested for the the 'perf trace' ioctl syscall argument
beautifiers.

This is also by now used by tools/testing/selftests/kvm/, a simple test
build didn't succeed, but for another reason:

  lib/kvm_util.c: In function ‘vm_enable_dirty_ring’:
  lib/kvm_util.c:125:30: error: ‘KVM_CAP_DIRTY_LOG_RING_ACQ_REL’ undeclared (first use in this function); did you mean ‘KVM_CAP_DIRTY_LOG_RING’?
    125 |         if (vm_check_cap(vm, KVM_CAP_DIRTY_LOG_RING_ACQ_REL))
        |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        |                              KVM_CAP_DIRTY_LOG_RING

I'll send a separate patch for that.

This silences 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: Adrian Hunter <adrian.hunter@intel.com>
Cc: Gavin Shan <gshan@redhat.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: http://lore.kernel.org/lkml/Y6H3b1Q4Msjy5Yz3@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6d5edd15

tools/include/uapi/linux/kvm.h

+12 −1
Original line number Diff line number Diff line
@@ -477,6 +477,9 @@ struct kvm_run { 
#define KVM_MSR_EXIT_REASON_INVAL	(1 << 0)

#define KVM_MSR_EXIT_REASON_UNKNOWN	(1 << 1)

#define KVM_MSR_EXIT_REASON_FILTER	(1 << 2)

#define KVM_MSR_EXIT_REASON_VALID_MASK	(KVM_MSR_EXIT_REASON_INVAL   |	\

					 KVM_MSR_EXIT_REASON_UNKNOWN |	\

					 KVM_MSR_EXIT_REASON_FILTER)

			__u32 reason; /* kernel -> user */

			__u32 index; /* kernel -> user */

			__u64 data; /* kernel <-> user */
@@ -1170,6 +1173,8 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_S390_ZPCI_OP 221

#define KVM_CAP_S390_CPU_TOPOLOGY 222

#define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223

#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224

#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1259,6 +1264,7 @@ struct kvm_x86_mce { 
#define KVM_XEN_HVM_CONFIG_RUNSTATE		(1 << 3)

#define KVM_XEN_HVM_CONFIG_EVTCHN_2LEVEL	(1 << 4)

#define KVM_XEN_HVM_CONFIG_EVTCHN_SEND		(1 << 5)

#define KVM_XEN_HVM_CONFIG_RUNSTATE_UPDATE_FLAG	(1 << 6)



struct kvm_xen_hvm_config {

	__u32 flags;
@@ -1726,6 +1732,8 @@ enum pv_cmd_id { 
	KVM_PV_UNSHARE_ALL,

	KVM_PV_INFO,

	KVM_PV_DUMP,

	KVM_PV_ASYNC_CLEANUP_PREPARE,

	KVM_PV_ASYNC_CLEANUP_PERFORM,

};



struct kvm_pv_cmd {
@@ -1756,6 +1764,7 @@ struct kvm_xen_hvm_attr { 
	union {

		__u8 long_mode;

		__u8 vector;

		__u8 runstate_update_flag;

		struct {

			__u64 gfn;

		} shared_info;
@@ -1796,6 +1805,8 @@ struct kvm_xen_hvm_attr { 
/* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_EVTCHN_SEND */

#define KVM_XEN_ATTR_TYPE_EVTCHN		0x3

#define KVM_XEN_ATTR_TYPE_XEN_VERSION		0x4

/* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_RUNSTATE_UPDATE_FLAG */

#define KVM_XEN_ATTR_TYPE_RUNSTATE_UPDATE_FLAG	0x5



/* Per-vCPU Xen attributes */

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