Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

tools headers uapi: Update tools's copies of kvm headers 

To get the changes in:

	a4499382 ("KVM: s390: Add huge page enablement control")
	8fcc4b59 ("kvm: nVMX: Introduce KVM_CAP_NESTED_STATE")
	be26b3a7 ("arm64: KVM: export the capability to set guest SError syndrome")
	b7b27fac ("arm/arm64: KVM: Add KVM_GET/SET_VCPU_EVENTS")
	b0960b95 ("KVM: arm: Add 32bit get/set events support")
	a3da7b4a ("KVM: s390: add etoken support for guests")

This makes 'perf trace' automagically get aware of these new ioctls:

  $ cp include/uapi/linux/kvm.h tools/include/uapi/linux/kvm.h
  $ tools/perf/trace/beauty/kvm_ioctl.sh  > /tmp/after
  $ diff -u /tmp/before /tmp/after
  --- /tmp/before	2018-09-11 11:18:29.173207586 -0300
  +++ /tmp/after	2018-09-11 11:18:38.488200446 -0300
  @@ -84,6 +84,8 @@
        [0xbb] = "MEMORY_ENCRYPT_REG_REGION",
        [0xbc] = "MEMORY_ENCRYPT_UNREG_REGION",
        [0xbd] = "HYPERV_EVENTFD",
  +     [0xbe] = "GET_NESTED_STATE",
  +     [0xbf] = "SET_NESTED_STATE",
        [0xe0] = "CREATE_DEVICE",
        [0xe1] = "SET_DEVICE_ATTR",
        [0xe2] = "G

And cures the following warning during perf's build:

	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: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Dongjiu Geng <gengdongjiu@huawei.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: James Morse <james.morse@arm.com>
Cc: Janosch Frank <frankja@linux.ibm.com>
Cc: Jim Mattson <jmattson@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-2vvwh2o19orn56di0ksrtgzr@git.kernel.org


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

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

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

+13 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define __KVM_HAVE_GUEST_DEBUG

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM

#define __KVM_HAVE_VCPU_EVENTS



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -125,6 +126,18 @@ struct kvm_sync_regs { 
struct kvm_arch_memory_slot {

};



/* for KVM_GET/SET_VCPU_EVENTS */

struct kvm_vcpu_events {

	struct {

		__u8 serror_pending;

		__u8 serror_has_esr;

		/* Align it to 8 bytes */

		__u8 pad[6];

		__u64 serror_esr;

	} exception;

	__u32 reserved[12];

};



/* If you need to interpret the index values, here is the key: */

#define KVM_REG_ARM_COPROC_MASK		0x000000000FFF0000

#define KVM_REG_ARM_COPROC_SHIFT	16

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

+13 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define __KVM_HAVE_GUEST_DEBUG

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM

#define __KVM_HAVE_VCPU_EVENTS



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -154,6 +155,18 @@ struct kvm_sync_regs { 
struct kvm_arch_memory_slot {

};



/* for KVM_GET/SET_VCPU_EVENTS */

struct kvm_vcpu_events {

	struct {

		__u8 serror_pending;

		__u8 serror_has_esr;

		/* Align it to 8 bytes */

		__u8 pad[6];

		__u64 serror_esr;

	} exception;

	__u32 reserved[12];

};



/* If you need to interpret the index values, here is the key: */

#define KVM_REG_ARM_COPROC_MASK		0x000000000FFF0000

#define KVM_REG_ARM_COPROC_SHIFT	16

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

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
/*

 * KVM s390 specific structures and definitions

 *

 * Copyright IBM Corp. 2008

 * Copyright IBM Corp. 2008, 2018

 *

 *    Author(s): Carsten Otte <cotte@de.ibm.com>

 *               Christian Borntraeger <borntraeger@de.ibm.com>
@@ -225,6 +225,7 @@ struct kvm_guest_debug_arch { 
#define KVM_SYNC_FPRS   (1UL << 8)

#define KVM_SYNC_GSCB   (1UL << 9)

#define KVM_SYNC_BPBC   (1UL << 10)

#define KVM_SYNC_ETOKEN (1UL << 11)

/* length and alignment of the sdnx as a power of two */

#define SDNXC 8

#define SDNXL (1UL << SDNXC)
@@ -258,6 +259,8 @@ struct kvm_sync_regs { 
		struct {

			__u64 reserved1[2];

			__u64 gscb[4];

			__u64 etoken;

			__u64 etoken_extension;

		};

	};

};

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

+37 −0
Original line number Diff line number Diff line
@@ -378,4 +378,41 @@ struct kvm_sync_regs { 
#define KVM_X86_QUIRK_LINT0_REENABLED	(1 << 0)

#define KVM_X86_QUIRK_CD_NW_CLEARED	(1 << 1)



#define KVM_STATE_NESTED_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_RUN_PENDING	0x00000002



#define KVM_STATE_NESTED_SMM_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_SMM_VMXON	0x00000002



struct kvm_vmx_nested_state {

	__u64 vmxon_pa;

	__u64 vmcs_pa;



	struct {

		__u16 flags;

	} smm;

};



/* 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;



		/* Pad the header to 128 bytes.  */

		__u8 pad[120];

	};



	__u8 data[0];

};



#endif /* _ASM_X86_KVM_H */

tools/include/uapi/linux/kvm.h

+6 −0
Original line number Diff line number Diff line
@@ -949,6 +949,9 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_GET_MSR_FEATURES 153

#define KVM_CAP_HYPERV_EVENTFD 154

#define KVM_CAP_HYPERV_TLBFLUSH 155

#define KVM_CAP_S390_HPAGE_1M 156

#define KVM_CAP_NESTED_STATE 157

#define KVM_CAP_ARM_INJECT_SERROR_ESR 158



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1391,6 +1394,9 @@ struct kvm_enc_region { 
/* Available with KVM_CAP_HYPERV_EVENTFD */

#define KVM_HYPERV_EVENTFD        _IOW(KVMIO,  0xbd, struct kvm_hyperv_eventfd)



/* Available with KVM_CAP_NESTED_STATE */

#define KVM_GET_NESTED_STATE         _IOWR(KVMIO, 0xbe, struct kvm_nested_state)

#define KVM_SET_NESTED_STATE         _IOW(KVMIO,  0xbf, struct kvm_nested_state)



/* Secure Encrypted Virtualization command */

enum sev_cmd_id {