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

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

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

  dd53f610 ("Merge tag 'kvmarm-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD")
  59c5c58c ("Merge tag 'kvm-ppc-next-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD")
  d7547c55 ("KVM: Introduce KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2")
  6520ca64 ("KVM: PPC: Book3S HV: XIVE: Add a mapping for the source ESB pages")
  39e9af3d ("KVM: PPC: Book3S HV: XIVE: Add a TIMA mapping")
  e4945b9d ("KVM: PPC: Book3S HV: XIVE: Add get/set accessors for the VP XIVE state")
  e6714bd1 ("KVM: PPC: Book3S HV: XIVE: Add a control to dirty the XIVE EQ pages")
  7b46b616 ("KVM: PPC: Book3S HV: XIVE: Add a control to sync the sources")
  5ca80647 ("KVM: PPC: Book3S HV: XIVE: Add a global reset control")
  13ce3297 ("KVM: PPC: Book3S HV: XIVE: Add controls for the EQ configuration")
  e8676ce5 ("KVM: PPC: Book3S HV: XIVE: Add a control to configure a source")
  4131f83c ("KVM: PPC: Book3S HV: XIVE: add a control to initialize a source")
  eacc56bb ("KVM: PPC: Book3S HV: XIVE: Introduce a new capability KVM_CAP_PPC_IRQ_XIVE")
  90c73795 ("KVM: PPC: Book3S HV: Add a new KVM device for the XIVE native exploitation mode")
  4f45b90e ("KVM: s390: add deflate conversion facilty to cpu model")
  a243c16d ("KVM: arm64: Add capability to advertise ptrauth for guest")
  a22fa321 ("KVM: arm64: Add userspace flag to enable pointer authentication")
  4bd774e5 ("KVM: arm64/sve: Simplify KVM_REG_ARM64_SVE_VLS array sizing")
  8ae6efdd ("KVM: arm64/sve: Clean up UAPI register ID definitions")
  173aec2d ("KVM: s390: add enhanced sort facilty to cpu model")
  555f3d03 ("KVM: arm64: Add a capability to advertise SVE support")
  9033bba4 ("KVM: arm64/sve: Add pseudo-register for the guest's vector lengths")
  7dd32a0d ("KVM: arm/arm64: Add KVM_ARM_VCPU_FINALIZE ioctl")
  e1c9c983 ("KVM: arm64/sve: Add SVE support to register access ioctl interface")
  2b953ea3 ("KVM: Allow 2048-bit register access via ioctl interface")

None entails changes in tooling, the closest to that were some new arch
specific ioctls, that are still not handled by the tools/perf/trace/beauty/
library, that needs to create per-arch tables to convert ioctl cmd->string (and
back).

From a quick look the arch specific kvm-stat.c files at:

  $ ls -1 tools/perf/arch/*/util/kvm-stat.c
  tools/perf/arch/powerpc/util/kvm-stat.c
  tools/perf/arch/s390/util/kvm-stat.c
  tools/perf/arch/x86/util/kvm-stat.c
  $

Are not affected.

This silences these perf building 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/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/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: Amit Daniel Kachhap <amit.kachhap@arm.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Cédric Le Goater <clg@kaod.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Dave Martin <Dave.Martin@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Peter Xu <peterx@redhat.com>
Link: https://lkml.kernel.org/n/tip-3msmqjenlmb7eygcdnmlqaq1@git.kernel.org


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

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

+43 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/psci.h>

#include <linux/psci.h>

#include <linux/types.h>

#include <linux/types.h>

#include <asm/ptrace.h>

#include <asm/ptrace.h>

#include <asm/sve_context.h>





#define __KVM_HAVE_GUEST_DEBUG

#define __KVM_HAVE_GUEST_DEBUG

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_IRQ_LINE
@@ -102,6 +103,9 @@ struct kvm_regs { 
#define KVM_ARM_VCPU_EL1_32BIT		1 /* CPU running a 32bit VM */

#define KVM_ARM_VCPU_EL1_32BIT		1 /* CPU running a 32bit VM */

#define KVM_ARM_VCPU_PSCI_0_2		2 /* CPU uses PSCI v0.2 */

#define KVM_ARM_VCPU_PSCI_0_2		2 /* CPU uses PSCI v0.2 */

#define KVM_ARM_VCPU_PMU_V3		3 /* Support guest PMUv3 */

#define KVM_ARM_VCPU_PMU_V3		3 /* Support guest PMUv3 */

#define KVM_ARM_VCPU_SVE		4 /* enable SVE for this CPU */

#define KVM_ARM_VCPU_PTRAUTH_ADDRESS	5 /* VCPU uses address authentication */

#define KVM_ARM_VCPU_PTRAUTH_GENERIC	6 /* VCPU uses generic authentication */





struct kvm_vcpu_init {

struct kvm_vcpu_init {

	__u32 target;

	__u32 target;
@@ -226,6 +230,45 @@ struct kvm_vcpu_events { 
					 KVM_REG_ARM_FW | ((r) & 0xffff))

					 KVM_REG_ARM_FW | ((r) & 0xffff))

#define KVM_REG_ARM_PSCI_VERSION	KVM_REG_ARM_FW_REG(0)

#define KVM_REG_ARM_PSCI_VERSION	KVM_REG_ARM_FW_REG(0)





/* SVE registers */

#define KVM_REG_ARM64_SVE		(0x15 << KVM_REG_ARM_COPROC_SHIFT)



/* Z- and P-regs occupy blocks at the following offsets within this range: */

#define KVM_REG_ARM64_SVE_ZREG_BASE	0

#define KVM_REG_ARM64_SVE_PREG_BASE	0x400

#define KVM_REG_ARM64_SVE_FFR_BASE	0x600



#define KVM_ARM64_SVE_NUM_ZREGS		__SVE_NUM_ZREGS

#define KVM_ARM64_SVE_NUM_PREGS		__SVE_NUM_PREGS



#define KVM_ARM64_SVE_MAX_SLICES	32



#define KVM_REG_ARM64_SVE_ZREG(n, i)					\

	(KVM_REG_ARM64 | KVM_REG_ARM64_SVE | KVM_REG_ARM64_SVE_ZREG_BASE | \

	 KVM_REG_SIZE_U2048 |						\

	 (((n) & (KVM_ARM64_SVE_NUM_ZREGS - 1)) << 5) |			\

	 ((i) & (KVM_ARM64_SVE_MAX_SLICES - 1)))



#define KVM_REG_ARM64_SVE_PREG(n, i)					\

	(KVM_REG_ARM64 | KVM_REG_ARM64_SVE | KVM_REG_ARM64_SVE_PREG_BASE | \

	 KVM_REG_SIZE_U256 |						\

	 (((n) & (KVM_ARM64_SVE_NUM_PREGS - 1)) << 5) |			\

	 ((i) & (KVM_ARM64_SVE_MAX_SLICES - 1)))



#define KVM_REG_ARM64_SVE_FFR(i)					\

	(KVM_REG_ARM64 | KVM_REG_ARM64_SVE | KVM_REG_ARM64_SVE_FFR_BASE | \

	 KVM_REG_SIZE_U256 |						\

	 ((i) & (KVM_ARM64_SVE_MAX_SLICES - 1)))



#define KVM_ARM64_SVE_VQ_MIN __SVE_VQ_MIN

#define KVM_ARM64_SVE_VQ_MAX __SVE_VQ_MAX



/* Vector lengths pseudo-register: */

#define KVM_REG_ARM64_SVE_VLS		(KVM_REG_ARM64 | KVM_REG_ARM64_SVE | \

					 KVM_REG_SIZE_U512 | 0xffff)

#define KVM_ARM64_SVE_VLS_WORDS	\

	((KVM_ARM64_SVE_VQ_MAX - KVM_ARM64_SVE_VQ_MIN) / 64 + 1)



/* Device Control API: ARM VGIC */

/* Device Control API: ARM VGIC */

#define KVM_DEV_ARM_VGIC_GRP_ADDR	0

#define KVM_DEV_ARM_VGIC_GRP_ADDR	0

#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS	1

#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS	1

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

+46 −0
Original line number Original line Diff line number Diff line
@@ -482,6 +482,8 @@ struct kvm_ppc_cpu_char { 
#define  KVM_REG_PPC_ICP_PPRI_SHIFT	16	/* pending irq priority */

#define  KVM_REG_PPC_ICP_PPRI_SHIFT	16	/* pending irq priority */

#define  KVM_REG_PPC_ICP_PPRI_MASK	0xff

#define  KVM_REG_PPC_ICP_PPRI_MASK	0xff





#define KVM_REG_PPC_VP_STATE	(KVM_REG_PPC | KVM_REG_SIZE_U128 | 0x8d)



/* Device control API: PPC-specific devices */

/* Device control API: PPC-specific devices */

#define KVM_DEV_MPIC_GRP_MISC		1

#define KVM_DEV_MPIC_GRP_MISC		1

#define   KVM_DEV_MPIC_BASE_ADDR	0	/* 64-bit */

#define   KVM_DEV_MPIC_BASE_ADDR	0	/* 64-bit */
@@ -677,4 +679,48 @@ struct kvm_ppc_cpu_char { 
#define  KVM_XICS_PRESENTED		(1ULL << 43)

#define  KVM_XICS_PRESENTED		(1ULL << 43)

#define  KVM_XICS_QUEUED		(1ULL << 44)

#define  KVM_XICS_QUEUED		(1ULL << 44)





/* POWER9 XIVE Native Interrupt Controller */

#define KVM_DEV_XIVE_GRP_CTRL		1

#define   KVM_DEV_XIVE_RESET		1

#define   KVM_DEV_XIVE_EQ_SYNC		2

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

#define KVM_DEV_XIVE_GRP_SOURCE_SYNC	5       /* 64-bit source identifier */



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

#define KVM_XIVE_LEVEL_SENSITIVE	(1ULL << 0)

#define KVM_XIVE_LEVEL_ASSERTED		(1ULL << 1)



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

#define KVM_XIVE_SOURCE_PRIORITY_SHIFT	0

#define KVM_XIVE_SOURCE_PRIORITY_MASK	0x7

#define KVM_XIVE_SOURCE_SERVER_SHIFT	3

#define KVM_XIVE_SOURCE_SERVER_MASK	0xfffffff8ULL

#define KVM_XIVE_SOURCE_MASKED_SHIFT	32

#define KVM_XIVE_SOURCE_MASKED_MASK	0x100000000ULL

#define KVM_XIVE_SOURCE_EISN_SHIFT	33

#define KVM_XIVE_SOURCE_EISN_MASK	0xfffffffe00000000ULL



/* Layout of 64-bit EQ identifier */

#define KVM_XIVE_EQ_PRIORITY_SHIFT	0

#define KVM_XIVE_EQ_PRIORITY_MASK	0x7

#define KVM_XIVE_EQ_SERVER_SHIFT	3

#define KVM_XIVE_EQ_SERVER_MASK		0xfffffff8ULL



/* Layout of EQ configuration values (64 bytes) */

struct kvm_ppc_xive_eq {

	__u32 flags;

	__u32 qshift;

	__u64 qaddr;

	__u32 qtoggle;

	__u32 qindex;

	__u8  pad[40];

};



#define KVM_XIVE_EQ_ALWAYS_NOTIFY	0x00000001



#define KVM_XIVE_TIMA_PAGE_OFFSET	0

#define KVM_XIVE_ESB_PAGE_OFFSET	4



#endif /* __LINUX_KVM_POWERPC_H */
 
#endif /* __LINUX_KVM_POWERPC_H */

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -153,7 +153,9 @@ struct kvm_s390_vm_cpu_subfunc { 
	__u8 ppno[16];		/* with MSA5 */

	__u8 ppno[16];		/* with MSA5 */

	__u8 kma[16];		/* with MSA8 */

	__u8 kma[16];		/* with MSA8 */

	__u8 kdsa[16];		/* with MSA9 */

	__u8 kdsa[16];		/* with MSA9 */

	__u8 reserved[1792];

	__u8 sortl[32];		/* with STFLE.150 */

	__u8 dfltcc[32];	/* with STFLE.151 */

	__u8 reserved[1728];

};

};





/* kvm attributes for crypto */

/* kvm attributes for crypto */

tools/include/uapi/linux/kvm.h

+13 −2
Original line number Original line Diff line number Diff line
@@ -986,8 +986,13 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163

#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163

#define KVM_CAP_EXCEPTION_PAYLOAD 164

#define KVM_CAP_EXCEPTION_PAYLOAD 164

#define KVM_CAP_ARM_VM_IPA_SIZE 165

#define KVM_CAP_ARM_VM_IPA_SIZE 165

#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166

#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166 /* Obsolete */

#define KVM_CAP_HYPERV_CPUID 167

#define KVM_CAP_HYPERV_CPUID 167

#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 168

#define KVM_CAP_PPC_IRQ_XIVE 169

#define KVM_CAP_ARM_SVE 170

#define KVM_CAP_ARM_PTRAUTH_ADDRESS 171

#define KVM_CAP_ARM_PTRAUTH_GENERIC 172





#ifdef KVM_CAP_IRQ_ROUTING

#ifdef KVM_CAP_IRQ_ROUTING
@@ -1145,6 +1150,7 @@ struct kvm_dirty_tlb { 
#define KVM_REG_SIZE_U256	0x0050000000000000ULL

#define KVM_REG_SIZE_U256	0x0050000000000000ULL

#define KVM_REG_SIZE_U512	0x0060000000000000ULL

#define KVM_REG_SIZE_U512	0x0060000000000000ULL

#define KVM_REG_SIZE_U1024	0x0070000000000000ULL

#define KVM_REG_SIZE_U1024	0x0070000000000000ULL

#define KVM_REG_SIZE_U2048	0x0080000000000000ULL





struct kvm_reg_list {

struct kvm_reg_list {

	__u64 n; /* number of regs */

	__u64 n; /* number of regs */
@@ -1211,6 +1217,8 @@ enum kvm_device_type { 
#define KVM_DEV_TYPE_ARM_VGIC_V3	KVM_DEV_TYPE_ARM_VGIC_V3

#define KVM_DEV_TYPE_ARM_VGIC_V3	KVM_DEV_TYPE_ARM_VGIC_V3

	KVM_DEV_TYPE_ARM_VGIC_ITS,

	KVM_DEV_TYPE_ARM_VGIC_ITS,

#define KVM_DEV_TYPE_ARM_VGIC_ITS	KVM_DEV_TYPE_ARM_VGIC_ITS

#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_MAX,

	KVM_DEV_TYPE_MAX,

};

};
@@ -1434,12 +1442,15 @@ struct kvm_enc_region { 
#define KVM_GET_NESTED_STATE         _IOWR(KVMIO, 0xbe, struct kvm_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)

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





/* Available with KVM_CAP_MANUAL_DIRTY_LOG_PROTECT */

/* Available with KVM_CAP_MANUAL_DIRTY_LOG_PROTECT_2 */

#define KVM_CLEAR_DIRTY_LOG          _IOWR(KVMIO, 0xc0, struct kvm_clear_dirty_log)

#define KVM_CLEAR_DIRTY_LOG          _IOWR(KVMIO, 0xc0, struct kvm_clear_dirty_log)





/* Available with KVM_CAP_HYPERV_CPUID */

/* Available with KVM_CAP_HYPERV_CPUID */

#define KVM_GET_SUPPORTED_HV_CPUID _IOWR(KVMIO, 0xc1, struct kvm_cpuid2)

#define KVM_GET_SUPPORTED_HV_CPUID _IOWR(KVMIO, 0xc1, struct kvm_cpuid2)





/* Available with KVM_CAP_ARM_SVE */

#define KVM_ARM_VCPU_FINALIZE	  _IOW(KVMIO,  0xc2, int)



/* Secure Encrypted Virtualization command */

/* Secure Encrypted Virtualization command */

enum sev_cmd_id {

enum sev_cmd_id {

	/* Guest initialization commands */

	/* Guest initialization commands */