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
79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Wed, 31 Jul 2019 17:49:08 +0200
|
|
Subject: s390x: protvirt: Move diag 308 data over SIDA
|
|
|
|
References: bsc#1167075
|
|
|
|
For protected guests the IPIB is written/read to/from the SIDA, so we
|
|
need those accesses to go through s390_cpu_pv_mem_read/write().
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
(cherry picked from commit 258da1c7736d3aa4604ceea6cce00995c6f30058)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
target/s390x/diag.c | 25 ++++++++++++++++++++-----
|
|
1 file changed, 20 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
|
|
index b2cbefb8cfe4e5a244219e761fb4..1a4842956402e308426c0ed5ce5c 100644
|
|
--- a/target/s390x/diag.c
|
|
+++ b/target/s390x/diag.c
|
|
@@ -75,6 +75,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
|
|
{
|
|
bool valid;
|
|
CPUState *cs = env_cpu(env);
|
|
+ S390CPU *cpu = S390_CPU(cs);
|
|
uint64_t addr = env->regs[r1];
|
|
uint64_t subcode = env->regs[r3];
|
|
IplParameterBlock *iplb;
|
|
@@ -111,13 +112,22 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
|
|
return;
|
|
}
|
|
iplb = g_new0(IplParameterBlock, 1);
|
|
- cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
|
|
+ if (!s390_is_pv()) {
|
|
+ cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
|
|
+ } else {
|
|
+ s390_cpu_pv_mem_read(cpu, 0, iplb, sizeof(iplb->len));
|
|
+ }
|
|
+
|
|
if (!iplb_valid_len(iplb)) {
|
|
env->regs[r1 + 1] = DIAG_308_RC_INVALID;
|
|
goto out;
|
|
}
|
|
|
|
- cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
|
|
+ if (!s390_is_pv()) {
|
|
+ cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
|
|
+ } else {
|
|
+ s390_cpu_pv_mem_read(cpu, 0, iplb, be32_to_cpu(iplb->len));
|
|
+ }
|
|
|
|
valid = subcode == DIAG308_PV_SET ? iplb_valid_pv(iplb) : iplb_valid(iplb);
|
|
if (!valid) {
|
|
@@ -140,12 +150,17 @@ out:
|
|
} else {
|
|
iplb = s390_ipl_get_iplb();
|
|
}
|
|
- if (iplb) {
|
|
+ if (!iplb) {
|
|
+ env->regs[r1 + 1] = DIAG_308_RC_NO_CONF;
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (!s390_is_pv()) {
|
|
cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->len));
|
|
- env->regs[r1 + 1] = DIAG_308_RC_OK;
|
|
} else {
|
|
- env->regs[r1 + 1] = DIAG_308_RC_NO_CONF;
|
|
+ s390_cpu_pv_mem_write(cpu, 0, iplb, be32_to_cpu(iplb->len));
|
|
}
|
|
+ env->regs[r1 + 1] = DIAG_308_RC_OK;
|
|
return;
|
|
case DIAG308_PV_START:
|
|
iplb = s390_ipl_get_iplb_pv();
|