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

tools headers kvm: Sync kvm headers with the kernel sources 

To pick the changes in:

  200824f5 ("KVM: s390: Disallow invalid bits in kvm_valid_regs and kvm_dirty_regs")
  4a53d99d ("KVM: VMX: Introduce exit reason for receiving INIT signal on guest-mode")
  7396d337 ("KVM: x86: Return to userspace with internal error on unexpected exit reason")
  92f35b75 ("KVM: arm/arm64: vgic: Allow more than 256 vcpus for KVM_IRQ_LINE")

None of them trigger any changes in tooling, this time this is just to silence
these perf build warnings:

  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
  Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/vmx.h' differs from latest version at 'arch/x86/include/uapi/asm/vmx.h'
  diff -u tools/arch/x86/include/uapi/asm/vmx.h arch/x86/include/uapi/asm/vmx.h
  Warning: Kernel ABI header at 'tools/arch/s390/include/uapi/asm/kvm.h' differs from latest version at 'arch/s390/include/uapi/asm/kvm.h'
  diff -u tools/arch/s390/include/uapi/asm/kvm.h arch/s390/include/uapi/asm/kvm.h
  Warning: Kernel ABI header at 'tools/arch/arm/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm/include/uapi/asm/kvm.h'
  diff -u tools/arch/arm/include/uapi/asm/kvm.h arch/arm/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

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Janosch Frank <frankja@linux.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Liran Alon <liran.alon@oracle.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Link: https://lkml.kernel.org/n/tip-akuugvvjxte26kzv23zp5d2z@git.kernel.org


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

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

+3 −1
Original line number Diff line number Diff line
@@ -266,8 +266,10 @@ struct kvm_vcpu_events { 
#define   KVM_DEV_ARM_ITS_CTRL_RESET		4



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_VCPU2_SHIFT		28

#define KVM_ARM_IRQ_VCPU2_MASK		0xf

#define KVM_ARM_IRQ_TYPE_SHIFT		24

#define KVM_ARM_IRQ_TYPE_MASK		0xff

#define KVM_ARM_IRQ_TYPE_MASK		0xf

#define KVM_ARM_IRQ_VCPU_SHIFT		16

#define KVM_ARM_IRQ_VCPU_MASK		0xff

#define KVM_ARM_IRQ_NUM_SHIFT		0

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

+3 −1
Original line number Diff line number Diff line
@@ -325,8 +325,10 @@ struct kvm_vcpu_events { 
#define   KVM_ARM_VCPU_TIMER_IRQ_PTIMER		1



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_VCPU2_SHIFT		28

#define KVM_ARM_IRQ_VCPU2_MASK		0xf

#define KVM_ARM_IRQ_TYPE_SHIFT		24

#define KVM_ARM_IRQ_TYPE_MASK		0xff

#define KVM_ARM_IRQ_TYPE_MASK		0xf

#define KVM_ARM_IRQ_VCPU_SHIFT		16

#define KVM_ARM_IRQ_VCPU_MASK		0xff

#define KVM_ARM_IRQ_NUM_SHIFT		0

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

+6 −0
Original line number Diff line number Diff line
@@ -231,6 +231,12 @@ struct kvm_guest_debug_arch { 
#define KVM_SYNC_GSCB   (1UL << 9)

#define KVM_SYNC_BPBC   (1UL << 10)

#define KVM_SYNC_ETOKEN (1UL << 11)



#define KVM_SYNC_S390_VALID_FIELDS \

	(KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \

	 KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \

	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN)



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

#define SDNXC 8

#define SDNXL (1UL << SDNXC)

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

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define EXIT_REASON_EXCEPTION_NMI       0

#define EXIT_REASON_EXTERNAL_INTERRUPT  1

#define EXIT_REASON_TRIPLE_FAULT        2

#define EXIT_REASON_INIT_SIGNAL			3



#define EXIT_REASON_PENDING_INTERRUPT   7

#define EXIT_REASON_NMI_WINDOW          8
@@ -90,6 +91,7 @@ 
	{ EXIT_REASON_EXCEPTION_NMI,         "EXCEPTION_NMI" }, \

	{ EXIT_REASON_EXTERNAL_INTERRUPT,    "EXTERNAL_INTERRUPT" }, \

	{ EXIT_REASON_TRIPLE_FAULT,          "TRIPLE_FAULT" }, \

	{ EXIT_REASON_INIT_SIGNAL,           "INIT_SIGNAL" }, \

	{ EXIT_REASON_PENDING_INTERRUPT,     "PENDING_INTERRUPT" }, \

	{ EXIT_REASON_NMI_WINDOW,            "NMI_WINDOW" }, \

	{ EXIT_REASON_TASK_SWITCH,           "TASK_SWITCH" }, \

tools/include/uapi/linux/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ struct kvm_hyperv_exit { 
#define KVM_INTERNAL_ERROR_SIMUL_EX	2

/* Encounter unexpected vm-exit due to delivery event. */

#define KVM_INTERNAL_ERROR_DELIVERY_EV	3

/* Encounter unexpected vm-exit reason */

#define KVM_INTERNAL_ERROR_UNEXPECTED_EXIT_REASON	4



/* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */

struct kvm_run {
@@ -996,6 +998,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_ARM_PTRAUTH_ADDRESS 171

#define KVM_CAP_ARM_PTRAUTH_GENERIC 172

#define KVM_CAP_PMU_EVENT_FILTER 173

#define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174



#ifdef KVM_CAP_IRQ_ROUTING

CRA Git | Maintained and supported by SUSTech CRA and CCSE