Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools headers kvm: Sync kvm headers with the kernel sources

To pick the changes in:

200824f55eef ("KVM: s390: Disallow invalid bits in kvm_valid_regs and kvm_dirty_regs")
4a53d99dd0c2 ("KVM: VMX: Introduce exit reason for receiving INIT signal on guest-mode")
7396d337cfad ("KVM: x86: Return to userspace with internal error on unexpected exit reason")
92f35b751c71 ("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: Arnaldo Carvalho de Melo <acme@redhat.com>

+17 -2
+3 -1
tools/arch/arm/include/uapi/asm/kvm.h
··· 266 266 #define KVM_DEV_ARM_ITS_CTRL_RESET 4 267 267 268 268 /* KVM_IRQ_LINE irq field index values */ 269 + #define KVM_ARM_IRQ_VCPU2_SHIFT 28 270 + #define KVM_ARM_IRQ_VCPU2_MASK 0xf 269 271 #define KVM_ARM_IRQ_TYPE_SHIFT 24 270 - #define KVM_ARM_IRQ_TYPE_MASK 0xff 272 + #define KVM_ARM_IRQ_TYPE_MASK 0xf 271 273 #define KVM_ARM_IRQ_VCPU_SHIFT 16 272 274 #define KVM_ARM_IRQ_VCPU_MASK 0xff 273 275 #define KVM_ARM_IRQ_NUM_SHIFT 0
+3 -1
tools/arch/arm64/include/uapi/asm/kvm.h
··· 325 325 #define KVM_ARM_VCPU_TIMER_IRQ_PTIMER 1 326 326 327 327 /* KVM_IRQ_LINE irq field index values */ 328 + #define KVM_ARM_IRQ_VCPU2_SHIFT 28 329 + #define KVM_ARM_IRQ_VCPU2_MASK 0xf 328 330 #define KVM_ARM_IRQ_TYPE_SHIFT 24 329 - #define KVM_ARM_IRQ_TYPE_MASK 0xff 331 + #define KVM_ARM_IRQ_TYPE_MASK 0xf 330 332 #define KVM_ARM_IRQ_VCPU_SHIFT 16 331 333 #define KVM_ARM_IRQ_VCPU_MASK 0xff 332 334 #define KVM_ARM_IRQ_NUM_SHIFT 0
+6
tools/arch/s390/include/uapi/asm/kvm.h
··· 231 231 #define KVM_SYNC_GSCB (1UL << 9) 232 232 #define KVM_SYNC_BPBC (1UL << 10) 233 233 #define KVM_SYNC_ETOKEN (1UL << 11) 234 + 235 + #define KVM_SYNC_S390_VALID_FIELDS \ 236 + (KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \ 237 + KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \ 238 + KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN) 239 + 234 240 /* length and alignment of the sdnx as a power of two */ 235 241 #define SDNXC 8 236 242 #define SDNXL (1UL << SDNXC)
+2
tools/arch/x86/include/uapi/asm/vmx.h
··· 31 31 #define EXIT_REASON_EXCEPTION_NMI 0 32 32 #define EXIT_REASON_EXTERNAL_INTERRUPT 1 33 33 #define EXIT_REASON_TRIPLE_FAULT 2 34 + #define EXIT_REASON_INIT_SIGNAL 3 34 35 35 36 #define EXIT_REASON_PENDING_INTERRUPT 7 36 37 #define EXIT_REASON_NMI_WINDOW 8 ··· 91 90 { EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \ 92 91 { EXIT_REASON_EXTERNAL_INTERRUPT, "EXTERNAL_INTERRUPT" }, \ 93 92 { EXIT_REASON_TRIPLE_FAULT, "TRIPLE_FAULT" }, \ 93 + { EXIT_REASON_INIT_SIGNAL, "INIT_SIGNAL" }, \ 94 94 { EXIT_REASON_PENDING_INTERRUPT, "PENDING_INTERRUPT" }, \ 95 95 { EXIT_REASON_NMI_WINDOW, "NMI_WINDOW" }, \ 96 96 { EXIT_REASON_TASK_SWITCH, "TASK_SWITCH" }, \
+3
tools/include/uapi/linux/kvm.h
··· 243 243 #define KVM_INTERNAL_ERROR_SIMUL_EX 2 244 244 /* Encounter unexpected vm-exit due to delivery event. */ 245 245 #define KVM_INTERNAL_ERROR_DELIVERY_EV 3 246 + /* Encounter unexpected vm-exit reason */ 247 + #define KVM_INTERNAL_ERROR_UNEXPECTED_EXIT_REASON 4 246 248 247 249 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ 248 250 struct kvm_run { ··· 998 996 #define KVM_CAP_ARM_PTRAUTH_ADDRESS 171 999 997 #define KVM_CAP_ARM_PTRAUTH_GENERIC 172 1000 998 #define KVM_CAP_PMU_EVENT_FILTER 173 999 + #define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174 1001 1000 1002 1001 #ifdef KVM_CAP_IRQ_ROUTING 1003 1002