s390x: Properly fetch the short psw on diag308 subc 0/1
PATCH v2 1/1 s390x: Properly fetch the short psw on diag308 subc 0/1
We need to actually fetch the cpu mask and set it. As we invert the short psw indication in the mask, SIE will report a specification exception, if it wasn't present in the reset psw.
--- target/s390x/cpu.c | 12 ++++++++++-- target/s390x/cpu.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-)
target/s390x/cpu.c +10 -2
@@ -76,8 +76,16 @@ static bool s390_cpu_has_work(CPUState *cs)static void s390_cpu_load_normal (CPUState *s) {S390CPU *cpu =S390_CPU (s); - cpu->env.psw.addr =ldl_phys (s->as,4 ) &PSW_MASK_ESA_ADDR ; - cpu->env.psw.mask =PSW_MASK_32 |PSW_MASK_64 ; +uint64_t spsw =ldq_phys (s->as,0 ); + + cpu->env.psw.mask = spsw &0xffffffff80000000UL ; +/* +* Invert short psw indication, so SIE will report a specification +* exception if it was not set. +*/ + cpu->env.psw.mask ^=PSW_MASK_SHORTPSW ; + cpu->env.psw.addr = spsw &0x7fffffffUL ; +s390_cpu_set_state (S390_CPU_STATE_OPERATING , cpu); }#endif
target/s390x/cpu.h +1 -0
@@ -261,6 +261,7 @@ extern const struct VMStateDescription vmstate_s390_cpu;#define PSW_MASK_EXT 0x0100000000000000ULL#define PSW_MASK_KEY 0x00F0000000000000ULL#define PSW_SHIFT_KEY 52 +#define PSW_MASK_SHORTPSW 0x0008000000000000ULL#define PSW_MASK_MCHECK 0x0004000000000000ULL#define PSW_MASK_WAIT 0x0002000000000000ULL#define PSW_MASK_PSTATE 0x0001000000000000ULL
Signature · 1 line
2.20.1
Quoted 19 lines
Am 11.11.2019 um 16:28 schrieb Janosch Frank <[email protected]>:
We need to actually fetch the cpu mask and set it. As we invert the short psw indication in the mask, SIE will report a specification exception, if it wasn't present in the reset psw.
Signed-off-by Janosch Frank <[email protected]>---
target/s390x/cpu.c| 12 ++++++++++--target/s390x/cpu.h| 1 +2 files changed, 11 insertions(+), 2 deletions(-)target/s390x/cpu.c +0
-0
target/s390x/cpu.c static bool s390_cpu_has_work(CPUState *cs) · line 81
Quoted 8 lines
target/s390x/cpu.c +3
-2@@ -76,8 +76,16 @@ static bool s390_cpu_has_work(CPUState *cs)static void s390_cpu_load_normal (CPUState *s) {S390CPU *cpu =S390_CPU (s); - cpu->env.psw.addr =ldl_phys (s->as,4 ) &PSW_MASK_ESA_ADDR ; - cpu->env.psw.mask =PSW_MASK_32 |PSW_MASK_64 ; +uint64_t spsw =ldq_phys (s->as,0 ); + + cpu->env.psw.mask = spsw &0xffffffff80000000UL ;
ULL
target/s390x/cpu.c static bool s390_cpu_has_work(CPUState *cs) · line 85
Quoted 4 lines
target/s390x/cpu.c +4
-0+/* +* Invert short psw indication, so SIE will report a specification +* exception if it was not set. +*/
It would be interesting to know how the PSW mask in the PGM old PSW looks like on LPAR. IOW, „you forgot to set the short indication, here is an exception. see, the short indication is set now.“ Sounds weird, most probably nobody cares.
target/s390x/cpu.c static bool s390_cpu_has_work(CPUState *cs) · line 87
Quoted 2 lines
target/s390x/cpu.c +2
-0+ cpu->env.psw.mask ^=PSW_MASK_SHORTPSW ; + cpu->env.psw.addr = spsw &0x7fffffffUL ;
Eventually also ULL
Quoted 19 lines
target/s390x/cpu.c +1
-0+ s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); }#endif target/s390x/cpu.h +1
-0@@ -261,6 +261,7 @@ extern const struct VMStateDescription vmstate_s390_cpu;#define PSW_MASK_EXT 0x0100000000000000ULL#define PSW_MASK_KEY 0x00F0000000000000ULL#define PSW_SHIFT_KEY 52 +#define PSW_MASK_SHORTPSW 0x0008000000000000ULL#define PSW_MASK_MCHECK 0x0004000000000000ULL#define PSW_MASK_WAIT 0x0002000000000000ULL#define PSW_MASK_PSTATE 0x0001000000000000ULLSignature · 1 line
2.20.1
Looks good to me
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH v2] s390x: Properly fetch the short psw on diag308 subc 0/1
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test'
74d60dc s390x: Properly fetch the short psw on diag308 subc 0/1
=== OUTPUT BEGIN ===
ERROR: code indent should never use tabs #46: FILE: target/s390x/cpu.h:268:
+#define PSW_MASK_SHORTPSW^I0x0008000000000000ULL$
total: 1 errors, 0 warnings, 25 lines checked
Commit 74d60dc486a0 (s390x: Properly fetch the short psw on diag308 subc 0/1) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 9 lines · On Mon, 11 Nov 2019 10:28:08 -0500 Janosch Frank <[email protected]> wrote:
We need to actually fetch the cpu mask and set it. As we invert the short psw indication in the mask, SIE will report a specification exception, if it wasn't present in the reset psw.
Signed-off-by Janosch Frank <[email protected]>--- target/s390x/cpu.c | 12 ++++++++++-- target/s390x/cpu.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-)
So, is this change -rc material, or should it go in during the next release? I'm a bit confused here.
[Also, does this need a change in the tcg code, or is that something that should just be done eventually? Sorry, drowning a bit in mails here...]
Quoted 11 lines
Am 12.11.2019 um 17:58 schrieb Cornelia Huck <[email protected]>:
On Mon, 11 Nov 2019 10:28:08 -0500
Quoted 4 lines · Janosch Frank
We need to actually fetch the cpu mask and set it. As we invert the short psw indication in the mask, SIE will report a specification exception, if it wasn't present in the reset psw.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Janosch Frank <[email protected]>---
target/s390x/cpu.c| 12 ++++++++++--target/s390x/cpu.h| 1 +2 files changed, 11 insertions(+), 2 deletions(-)So, is this change -rc material, or should it go in during the next release? I'm a bit confused here.
IMHO, this is not urgent and can wait.
Quoted 4 lines
[Also, does this need a change in the tcg code, or is that something that should just be done eventually? Sorry, drowning a bit in mails here...]
We‘re missing many checks when loading/running a new PSW for TCG, not just this scenario. So this should be done at one point but is not urgent at all.