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
114 lines
4.1 KiB
Diff
114 lines
4.1 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Wed, 27 Nov 2019 12:50:45 -0500
|
|
Subject: s390x: Beautify diag308 handling
|
|
|
|
References: bsc#1167075
|
|
|
|
Let's improve readability by:
|
|
* Using constants for the subcodes
|
|
* Moving parameter checking into a function
|
|
* Removing subcode > 6 check as the default case catches that
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Message-Id: <20191127175046.4911-6-frankja@linux.ibm.com>
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
(cherry picked from commit 0b7fd817e0f383760e37ca9286150d5816cf0594)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
target/s390x/diag.c | 54 +++++++++++++++++++++++++++------------------
|
|
1 file changed, 32 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
|
|
index 0c81d8e1efbfe37a384199488a72..54e5670b3fd6d960bd3fb4baca8b 100644
|
|
--- a/target/s390x/diag.c
|
|
+++ b/target/s390x/diag.c
|
|
@@ -53,6 +53,29 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
|
|
#define DIAG_308_RC_NO_CONF 0x0102
|
|
#define DIAG_308_RC_INVALID 0x0402
|
|
|
|
+#define DIAG308_RESET_MOD_CLR 0
|
|
+#define DIAG308_RESET_LOAD_NORM 1
|
|
+#define DIAG308_LOAD_CLEAR 3
|
|
+#define DIAG308_LOAD_NORMAL_DUMP 4
|
|
+#define DIAG308_SET 5
|
|
+#define DIAG308_STORE 6
|
|
+
|
|
+static int diag308_parm_check(CPUS390XState *env, uint64_t r1, uint64_t addr,
|
|
+ uintptr_t ra, bool write)
|
|
+{
|
|
+ if ((r1 & 1) || (addr & ~TARGET_PAGE_MASK)) {
|
|
+ s390_program_interrupt(env, PGM_SPECIFICATION, ra);
|
|
+ return -1;
|
|
+ }
|
|
+ if (!address_space_access_valid(&address_space_memory, addr,
|
|
+ sizeof(IplParameterBlock), write,
|
|
+ MEMTXATTRS_UNSPECIFIED)) {
|
|
+ s390_program_interrupt(env, PGM_ADDRESSING, ra);
|
|
+ return -1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
|
|
{
|
|
CPUState *cs = env_cpu(env);
|
|
@@ -65,30 +88,24 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
|
|
return;
|
|
}
|
|
|
|
- if ((subcode & ~0x0ffffULL) || (subcode > 6)) {
|
|
+ if (subcode & ~0x0ffffULL) {
|
|
s390_program_interrupt(env, PGM_SPECIFICATION, ra);
|
|
return;
|
|
}
|
|
|
|
switch (subcode) {
|
|
- case 0:
|
|
+ case DIAG308_RESET_MOD_CLR:
|
|
s390_ipl_reset_request(cs, S390_RESET_MODIFIED_CLEAR);
|
|
break;
|
|
- case 1:
|
|
+ case DIAG308_RESET_LOAD_NORM:
|
|
s390_ipl_reset_request(cs, S390_RESET_LOAD_NORMAL);
|
|
break;
|
|
- case 3:
|
|
+ case DIAG308_LOAD_CLEAR:
|
|
+ /* Well we still lack the clearing bit... */
|
|
s390_ipl_reset_request(cs, S390_RESET_REIPL);
|
|
break;
|
|
- case 5:
|
|
- if ((r1 & 1) || (addr & 0x0fffULL)) {
|
|
- s390_program_interrupt(env, PGM_SPECIFICATION, ra);
|
|
- return;
|
|
- }
|
|
- if (!address_space_access_valid(&address_space_memory, addr,
|
|
- sizeof(IplParameterBlock), false,
|
|
- MEMTXATTRS_UNSPECIFIED)) {
|
|
- s390_program_interrupt(env, PGM_ADDRESSING, ra);
|
|
+ case DIAG308_SET:
|
|
+ if (diag308_parm_check(env, r1, addr, ra, false)) {
|
|
return;
|
|
}
|
|
iplb = g_new0(IplParameterBlock, 1);
|
|
@@ -110,15 +127,8 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
|
|
out:
|
|
g_free(iplb);
|
|
return;
|
|
- case 6:
|
|
- if ((r1 & 1) || (addr & 0x0fffULL)) {
|
|
- s390_program_interrupt(env, PGM_SPECIFICATION, ra);
|
|
- return;
|
|
- }
|
|
- if (!address_space_access_valid(&address_space_memory, addr,
|
|
- sizeof(IplParameterBlock), true,
|
|
- MEMTXATTRS_UNSPECIFIED)) {
|
|
- s390_program_interrupt(env, PGM_ADDRESSING, ra);
|
|
+ case DIAG308_STORE:
|
|
+ if (diag308_parm_check(env, r1, addr, ra, true)) {
|
|
return;
|
|
}
|
|
iplb = s390_ipl_get_iplb();
|