Commit 1fc3d0ee 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 up the changes from:

  14edff88 Merge tag 'kvmarm-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
  a4b28f5c Merge remote-tracking branch 'kvmarm/kvm-arm64/stolen-time' into kvmarm-master/next
  58772e9a ("KVM: arm64: Provide VCPU attributes for stolen time")
  da345174 ("KVM: arm/arm64: Allow user injection of external data aborts")
  c726200d ("KVM: arm/arm64: Allow reporting non-ISV data aborts to userspace")
  efe5ddca ("KVM: PPC: Book3S HV: XIVE: Allow userspace to set the # of VPs")

No tools changes are caused by this, as the only defines so far used
from these files are for syscall arg pretty printing are:

  $ grep KVM tools/perf/trace/beauty/*.sh
  tools/perf/trace/beauty/kvm_ioctl.sh:regex='^#[[:space:]]*define[[:space:]]+KVM_(\w+)[[:space:]]+_IO[RW]*\([[:space:]]*KVMIO[[:space:]]*,[[:space:]]*(0x[[:xdigit:]]+).*'
  $

Some are also include by:

  tools/perf/arch/x86/util/kvm-stat.c
  tools/perf/arch/powerpc/util/kvm-stat.c

This addresses these tools/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/powerpc/include/uapi/asm/kvm.h' differs from latest version at 'arch/powerpc/include/uapi/asm/kvm.h'
  diff -u tools/arch/powerpc/include/uapi/asm/kvm.h arch/powerpc/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: Christoffer Dall <christoffer.dall@arm.com>
Cc: Fabiano Rosas <farosas@linux.ibm.com>
Cc: Greg Kurz <groug@kaod.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Steven Price <steven.price@arm.com>
Link: https://lkml.kernel.org/n/tip-qrjdudhq25mk5bfnhveofbm4@git.kernel.org


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

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

+2 −1
Original line number Diff line number Diff line
@@ -131,8 +131,9 @@ struct kvm_vcpu_events { 
	struct {

		__u8 serror_pending;

		__u8 serror_has_esr;

		__u8 ext_dabt_pending;

		/* Align it to 8 bytes */

		__u8 pad[6];

		__u8 pad[5];

		__u64 serror_esr;

	} exception;

	__u32 reserved[12];

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

+4 −1
Original line number Diff line number Diff line
@@ -164,8 +164,9 @@ struct kvm_vcpu_events { 
	struct {

		__u8 serror_pending;

		__u8 serror_has_esr;

		__u8 ext_dabt_pending;

		/* Align it to 8 bytes */

		__u8 pad[6];

		__u8 pad[5];

		__u64 serror_esr;

	} exception;

	__u32 reserved[12];
@@ -323,6 +324,8 @@ struct kvm_vcpu_events { 
#define KVM_ARM_VCPU_TIMER_CTRL		1

#define   KVM_ARM_VCPU_TIMER_IRQ_VTIMER		0

#define   KVM_ARM_VCPU_TIMER_IRQ_PTIMER		1

#define KVM_ARM_VCPU_PVTIME_CTRL	2

#define   KVM_ARM_VCPU_PVTIME_IPA	0



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_VCPU2_SHIFT		28

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

+3 −0
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ struct kvm_ppc_cpu_char { 


/* PPC64 eXternal Interrupt Controller Specification */

#define KVM_DEV_XICS_GRP_SOURCES	1	/* 64-bit source attributes */

#define KVM_DEV_XICS_GRP_CTRL		2

#define   KVM_DEV_XICS_NR_SERVERS	1



/* Layout of 64-bit source attribute values */

#define  KVM_XICS_DESTINATION_SHIFT	0
@@ -683,6 +685,7 @@ struct kvm_ppc_cpu_char { 
#define KVM_DEV_XIVE_GRP_CTRL		1

#define   KVM_DEV_XIVE_RESET		1

#define   KVM_DEV_XIVE_EQ_SYNC		2

#define   KVM_DEV_XIVE_NR_SERVERS	3

#define KVM_DEV_XIVE_GRP_SOURCE		2	/* 64-bit source identifier */

#define KVM_DEV_XIVE_GRP_SOURCE_CONFIG	3	/* 64-bit source identifier */

#define KVM_DEV_XIVE_GRP_EQ_CONFIG	4	/* 64-bit EQ identifier */

tools/include/uapi/linux/kvm.h

+11 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ struct kvm_hyperv_exit { 
#define KVM_EXIT_S390_STSI        25

#define KVM_EXIT_IOAPIC_EOI       26

#define KVM_EXIT_HYPERV           27

#define KVM_EXIT_ARM_NISV         28



/* For KVM_EXIT_INTERNAL_ERROR */

/* Emulate instruction failed. */
@@ -394,6 +395,11 @@ struct kvm_run { 
		} eoi;

		/* KVM_EXIT_HYPERV */

		struct kvm_hyperv_exit hyperv;

		/* KVM_EXIT_ARM_NISV */

		struct {

			__u64 esr_iss;

			__u64 fault_ipa;

		} arm_nisv;

		/* Fix the size of the union. */

		char padding[256];

	};
@@ -1000,6 +1006,9 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_PMU_EVENT_FILTER 173

#define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174

#define KVM_CAP_HYPERV_DIRECT_TLBFLUSH 175

#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 176

#define KVM_CAP_ARM_NISV_TO_USER 177

#define KVM_CAP_ARM_INJECT_EXT_DABT 178



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1227,6 +1236,8 @@ enum kvm_device_type { 
#define KVM_DEV_TYPE_ARM_VGIC_ITS	KVM_DEV_TYPE_ARM_VGIC_ITS

	KVM_DEV_TYPE_XIVE,

#define KVM_DEV_TYPE_XIVE		KVM_DEV_TYPE_XIVE

	KVM_DEV_TYPE_ARM_PV_TIME,

#define KVM_DEV_TYPE_ARM_PV_TIME	KVM_DEV_TYPE_ARM_PV_TIME

	KVM_DEV_TYPE_MAX,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE