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

tools headers kvm: Sync linux/kvm.h with the kernel sources 



To pick up the changes from:

  9a5788c6 ("KVM: PPC: Book3S HV: Add a capability for enabling secure guests")
  3c9bd400 ("KVM: x86: enable dirty log gradually in small chunks")
  13da9ae1 ("KVM: s390: protvirt: introduce and enable KVM_CAP_S390_PROTECTED")
  e0d2773d ("KVM: s390: protvirt: UV calls in support of diag308 0, 1")
  19e12277 ("KVM: S390: protvirt: Introduce instruction data area bounce buffer")
  29b40f10 ("KVM: s390: protvirt: Add initial vm and cpu lifecycle handling")

So far we're ignoring those arch specific ioctls, we need to revisit
this at some time to have arch specific tables, etc:

  $ grep S390 tools/perf/trace/beauty/kvm_ioctl.sh
      egrep -v " ((ARM|PPC|S390)_|[GS]ET_(DEBUGREGS|PIT2|XSAVE|TSC_KHZ)|CREATE_SPAPR_TCE_64)" | \
  $

This addresses these tools/perf build warnings:

  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

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Janosch Frank <frankja@linux.ibm.com>
Cc: Jay Zhou <jianjay.zhou@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1abcb9d9

tools/include/uapi/linux/kvm.h

+45 −2
Original line number Diff line number Diff line
@@ -474,12 +474,17 @@ struct kvm_s390_mem_op { 
	__u32 size;		/* amount of bytes */

	__u32 op;		/* type of operation */

	__u64 buf;		/* buffer in userspace */

	union {

		__u8 ar;	/* the access register number */

	__u8 reserved[31];	/* should be set to 0 */

		__u32 sida_offset; /* offset into the sida */

		__u8 reserved[32]; /* should be set to 0 */

	};

};

/* types for kvm_s390_mem_op->op */

#define KVM_S390_MEMOP_LOGICAL_READ	0

#define KVM_S390_MEMOP_LOGICAL_WRITE	1

#define KVM_S390_MEMOP_SIDA_READ	2

#define KVM_S390_MEMOP_SIDA_WRITE	3

/* flags for kvm_s390_mem_op->flags */

#define KVM_S390_MEMOP_F_CHECK_ONLY		(1ULL << 0)

#define KVM_S390_MEMOP_F_INJECT_EXCEPTION	(1ULL << 1)
@@ -1010,6 +1015,8 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_ARM_NISV_TO_USER 177

#define KVM_CAP_ARM_INJECT_EXT_DABT 178

#define KVM_CAP_S390_VCPU_RESETS 179

#define KVM_CAP_S390_PROTECTED 180

#define KVM_CAP_PPC_SECURE_GUEST 181



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1478,6 +1485,39 @@ struct kvm_enc_region { 
#define KVM_S390_NORMAL_RESET	_IO(KVMIO,   0xc3)

#define KVM_S390_CLEAR_RESET	_IO(KVMIO,   0xc4)



struct kvm_s390_pv_sec_parm {

	__u64 origin;

	__u64 length;

};



struct kvm_s390_pv_unp {

	__u64 addr;

	__u64 size;

	__u64 tweak;

};



enum pv_cmd_id {

	KVM_PV_ENABLE,

	KVM_PV_DISABLE,

	KVM_PV_SET_SEC_PARMS,

	KVM_PV_UNPACK,

	KVM_PV_VERIFY,

	KVM_PV_PREP_RESET,

	KVM_PV_UNSHARE_ALL,

};



struct kvm_pv_cmd {

	__u32 cmd;	/* Command to be executed */

	__u16 rc;	/* Ultravisor return code */

	__u16 rrc;	/* Ultravisor return reason code */

	__u64 data;	/* Data or address */

	__u32 flags;    /* flags for future extensions. Must be 0 for now */

	__u32 reserved[3];

};



/* Available with KVM_CAP_S390_PROTECTED */

#define KVM_S390_PV_COMMAND		_IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)



/* Secure Encrypted Virtualization command */

enum sev_cmd_id {

	/* Guest initialization commands */
@@ -1628,4 +1668,7 @@ struct kvm_hyperv_eventfd { 
#define KVM_HYPERV_CONN_ID_MASK		0x00ffffff

#define KVM_HYPERV_EVENTFD_DEASSIGN	(1 << 0)



#define KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE    (1 << 0)

#define KVM_DIRTY_LOG_INITIALLY_SET            (1 << 1)



#endif /* __LINUX_KVM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE