120 lines
3.8 KiB
Diff
120 lines
3.8 KiB
Diff
From 9d1b94d3739567245578f30866facc13edb3be92 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Fri, 29 May 2020 05:53:44 -0400
|
|
Subject: [PATCH 02/42] linux-headers: update kvm.h
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
Message-id: <20200529055420.16855-3-thuth@redhat.com>
|
|
Patchwork-id: 97020
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 02/38] linux-headers: update kvm.h
|
|
Bugzilla: 1828317
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
|
Upstream-status: n/a
|
|
|
|
Update kvm.h for the upcoming new s390x reset and protected virtualization
|
|
ioctls. This patch is based on commit ddda37483dd17c9936fdde9ebf8f6ca2692b3842
|
|
and commit dc6f8d458a4ccc360723993f31d310d06469f55f, but I dropped all
|
|
(unrequired) changes to the other linux-header files.
|
|
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
linux-headers/linux/kvm.h | 55 +++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 53 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
index 3d9b18f7f8..578cd97c0d 100644
|
|
--- a/linux-headers/linux/kvm.h
|
|
+++ b/linux-headers/linux/kvm.h
|
|
@@ -468,12 +468,17 @@ struct kvm_s390_mem_op {
|
|
__u32 size; /* amount of bytes */
|
|
__u32 op; /* type of operation */
|
|
__u64 buf; /* buffer in userspace */
|
|
- __u8 ar; /* the access register number */
|
|
- __u8 reserved[31]; /* should be set to 0 */
|
|
+ union {
|
|
+ __u8 ar; /* the access register number */
|
|
+ __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)
|
|
@@ -1000,6 +1005,12 @@ 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
|
|
+#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
|
|
|
|
@@ -1461,6 +1472,43 @@ struct kvm_enc_region {
|
|
/* Available with KVM_CAP_ARM_SVE */
|
|
#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int)
|
|
|
|
+/* Available with KVM_CAP_S390_VCPU_RESETS */
|
|
+#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 */
|
|
@@ -1611,4 +1659,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 */
|
|
--
|
|
2.27.0
|
|
|