Skip to content

Commit 7ceda0c

Browse files
committed
tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in: 6d84919 ("KVM: x86: Introduce KVM_CAP_DISABLE_QUIRKS2") ef11c94 ("KVM: s390: Add vm IOCTL for key checked guest absolute memory access") e9e9fee ("KVM: s390: Add optional storage key checking to MEMOP IOCTL") That just rebuilds perf, as these patches don't add any new KVM ioctl to be harvested for the the 'perf trace' ioctl syscall argument beautifiers. This is also by now used by tools/testing/selftests/kvm/, a simple test build succeeded. This silences this perf build warning: 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 Cc: Christian Borntraeger <borntraeger@linux.ibm.com> Cc: Janis Schoetterl-Glausch <scgl@linux.ibm.com> Cc: Oliver Upton <oupton@google.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Link: http://lore.kernel.org/lkml/YkSCOWHQdir1lhdJ@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 8db38af commit 7ceda0c

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

  • tools/include/uapi/linux

tools/include/uapi/linux/kvm.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,19 +562,25 @@ struct kvm_s390_mem_op {
562562
__u32 op; /* type of operation */
563563
__u64 buf; /* buffer in userspace */
564564
union {
565-
__u8 ar; /* the access register number */
565+
struct {
566+
__u8 ar; /* the access register number */
567+
__u8 key; /* access key, ignored if flag unset */
568+
};
566569
__u32 sida_offset; /* offset into the sida */
567-
__u8 reserved[32]; /* should be set to 0 */
570+
__u8 reserved[32]; /* ignored */
568571
};
569572
};
570573
/* types for kvm_s390_mem_op->op */
571574
#define KVM_S390_MEMOP_LOGICAL_READ 0
572575
#define KVM_S390_MEMOP_LOGICAL_WRITE 1
573576
#define KVM_S390_MEMOP_SIDA_READ 2
574577
#define KVM_S390_MEMOP_SIDA_WRITE 3
578+
#define KVM_S390_MEMOP_ABSOLUTE_READ 4
579+
#define KVM_S390_MEMOP_ABSOLUTE_WRITE 5
575580
/* flags for kvm_s390_mem_op->flags */
576581
#define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)
577582
#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)
583+
#define KVM_S390_MEMOP_F_SKEY_PROTECTION (1ULL << 2)
578584

579585
/* for KVM_INTERRUPT */
580586
struct kvm_interrupt {
@@ -1137,6 +1143,7 @@ struct kvm_ppc_resize_hpt {
11371143
#define KVM_CAP_PPC_AIL_MODE_3 210
11381144
#define KVM_CAP_S390_MEM_OP_EXTENSION 211
11391145
#define KVM_CAP_PMU_CAPABILITY 212
1146+
#define KVM_CAP_DISABLE_QUIRKS2 213
11401147

11411148
#ifdef KVM_CAP_IRQ_ROUTING
11421149

0 commit comments

Comments
 (0)