a447edb5e5
- Include upstream patches targeted for the next stable release (bug fixes only) block-io-fix-bdrv_co_do_copy_on_readv.patch compat-disable-edid-on-correct-virtio-gp.patch target-ppc-Fix-rlwinm-on-ppc64.patch vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch - s390x Protected Virtualization support - start and control guest in secure mode. (note: binary patch from patch series dropped since for s390x we rebuild the patched binary anyways) (bsc#1167075 jsc#SLE-7407) s390-sclp-improve-special-wait-psw-logic.patch s390x-Add-missing-vcpu-reset-functions.patch s390x-Add-SIDA-memory-ops.patch s390x-Add-unpack-facility-feature-to-GA1.patch s390x-Beautify-diag308-handling.patch s390x-Don-t-do-a-normal-reset-on-the-ini.patch s390x-ipl-Consolidate-iplb-validity-chec.patch s390x-kvm-Make-kvm_sclp_service_call-voi.patch s390x-Move-clear-reset.patch s390x-Move-diagnose-308-subcodes-and-rcs.patch s390x-Move-initial-reset.patch s390x-Move-reset-normal-to-shared-reset-.patch s390x-protvirt-Add-migration-blocker.patch s390x-protvirt-Disable-address-checks-fo.patch s390x-protvirt-Handle-SIGP-store-status-.patch s390x-protvirt-Inhibit-balloon-when-swit.patch s390x-protvirt-KVM-intercept-changes.patch s390x-protvirt-Move-diag-308-data-over-S.patch s390x-protvirt-Move-IO-control-structure.patch s390x-protvirt-Move-STSI-data-over-SIDAD.patch s390x-protvirt-SCLP-interpretation.patch s390x-protvirt-Set-guest-IPL-PSW.patch s390x-protvirt-Support-unpack-facility.patch Sync-pv.patch OBS-URL: https://build.opensuse.org/request/show/787000 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=538
93 lines
2.7 KiB
Diff
93 lines
2.7 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Tue, 25 Feb 2020 06:09:23 -0500
|
|
Subject: Sync pv
|
|
|
|
References: bsc#1167075
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
(cherry picked from commit 6807f464961cfee1dd81c95e22ddd91fa352fcc4)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
linux-headers/linux/kvm.h | 50 +++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 48 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
index 3d9b18f7f871acd0d13a0c42f184..18c636070edaf09dd8cf33ddb400 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,8 @@ 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_S390_VCPU_RESETS 179
|
|
+#define KVM_CAP_S390_PROTECTED 180
|
|
|
|
#ifdef KVM_CAP_IRQ_ROUTING
|
|
|
|
@@ -1461,6 +1468,45 @@ 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_VM_SET_SEC_PARMS,
|
|
+ KVM_PV_VM_UNPACK,
|
|
+ KVM_PV_VM_VERIFY,
|
|
+ KVM_PV_VM_PREP_RESET,
|
|
+ KVM_PV_VM_UNSHARE_ALL,
|
|
+ KVM_PV_VCPU_CREATE,
|
|
+ KVM_PV_VCPU_DESTROY,
|
|
+};
|
|
+
|
|
+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 */
|