Skip to contentSkip to conversation

s390x: Dirty cc before executing tested instructions

PATCH Superseded Janosch Frank 2 participants 8 messages Jan 8, 2024 – Jan 17, 2024

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover s390x: Dirty cc before executing tested instructions

A recent s390 KVM fixpatch [1] showed us that checking the cc is not enough when emulation code forgets to set the cc. There might just be the correct cc in the PSW which would make the cc check succeed.

This series intentionally dirties the cc for sigp, uvc, some io instructions and sclp to make cc setting errors more apparent. I had a cursory look through the tested instructions and those are the most prominent ones with defined cc values.

Since the issue appeared in PQAP my AP test series is now dependent on this series.

[1] https://lore.kernel.org/kvm/[email protected]/

Janosch Frank (5):
lib: s390x: Add spm cc shift constant
lib: s390x: sigp: Dirty CC before sigp execution
lib: s390x: uv: Dirty CC before uvc execution
lib: s390x: css: Dirty CC before css instructions
s390x: sclp: Dirty CC before sclp execution

 lib/s390x/asm/arch_def.h |  2 ++
 lib/s390x/asm/sigp.h     |  6 +++++-
 lib/s390x/asm/uv.h       |  6 +++++-
 lib/s390x/css.h          | 18 ++++++++++++++----
 s390x/mvpg.c             |  6 ++++--
 s390x/sclp.c             |  5 ++++-
 6 files changed, 34 insertions(+), 9 deletions(-)
Signature · 1 line
2.40.1
#1 lore raw

PATCH 1/5 lib: s390x: Add spm cc shift constant

Set Program Mask expects the CC in bits 34 and 35 of a GPR. Adding a constant makes setting the CC in inline assembly a bit easier.

---
 lib/s390x/asm/arch_def.h | 2 ++
 1 file changed, 2 insertions(+)
lib/s390x/asm/arch_def.h +2 -0
index 745a3387..65ae1e93 100644
@@ -84,6 +84,8 @@ struct cpu {
 	bool in_interrupt_handler;
 };
 
+#define SPM_CC_SHIFT 28
+
 enum address_space {
 	AS_PRIM = 0,
 	AS_ACCR = 1,
Signature · 1 line
2.40.1
#2 lore raw

PATCH 2/5 lib: s390x: sigp: Dirty CC before sigp execution

In reply to Janosch Frank

Dirtying the CC allows us to find missing CC changes when sigp is emulated.

---
 lib/s390x/asm/sigp.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
lib/s390x/asm/sigp.h +5 -1
index 61d2c625..d73be1ef 100644
@@ -49,13 +49,17 @@ static inline int sigp(uint16_t addr, uint8_t order, unsigned long parm,
 		       uint32_t *status)
 {
 	register unsigned long reg1 asm ("1") = parm;
+	uint64_t spm_cc = SIGP_CC_NOT_OPERATIONAL << SPM_CC_SHIFT;
 	int cc;
 
 	asm volatile(
+		"	spm	%[spm_cc]\n"
 		"	sigp	%1,%2,0(%3)\n"
 		"	ipm	%0\n"
 		"	srl	%0,28\n"
-		: "=d" (cc), "+d" (reg1) : "d" (addr), "a" (order) : "cc");
+		: "=d" (cc), "+d" (reg1)
+		: "d" (addr), "a" (order), [spm_cc] "d" (spm_cc)
+		: "cc");
 	if (status)
 		*status = reg1;
 	return cc;
Signature · 1 line
2.40.1
#3 lore raw

PATCH 3/5 lib: s390x: uv: Dirty CC before uvc execution

In reply to Janosch Frank

Dirtying the CC allows us to find missing CC changes.

---
 lib/s390x/asm/uv.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
lib/s390x/asm/uv.h +5 -1
index e9fb19af..85f7b060 100644
@@ -9,6 +9,8 @@
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2.
  */
+#include <asm/arch_def.h>
+
 #ifndef _ASMS390X_UV_H_
 #define _ASMS390X_UV_H_
 
@@ -216,14 +218,16 @@ struct uv_cb_ssc {
 
 static inline int uv_call_once(unsigned long r1, unsigned long r2)
 {
+	uint64_t spm_cc = 1 << SPM_CC_SHIFT;
 	int cc;
 
 	asm volatile(
+		"	spm %[spm_cc]\n"
 		"0:	.insn rrf,0xB9A40000,%[r1],%[r2],0,0\n"
 		"		ipm	%[cc]\n"
 		"		srl	%[cc],28\n"
 		: [cc] "=d" (cc)
-		: [r1] "a" (r1), [r2] "a" (r2)
+		: [r1] "a" (r1), [r2] "a" (r2), [spm_cc] "d" (spm_cc)
 		: "memory", "cc");
 
 	if (UVC_ERR_DEBUG && cc == 1)
Signature · 1 line
2.40.1
#4 lore raw

PATCH 4/5 lib: s390x: css: Dirty CC before css instructions

In reply to Janosch Frank

Dirtying the CC allows us to find missing CC changes when css instructions are emulated.

---
 lib/s390x/css.h | 18 ++++++++++++++----
 s390x/mvpg.c    |  6 ++++--
 2 files changed, 18 insertions(+), 6 deletions(-)
lib/s390x/css.h +14 -4
index 0a19324b..47733d2d 100644
@@ -6,6 +6,8 @@
  * Author: Pierre Morel <[email protected]>
  */
 
+#include <asm/arch_def.h>
+
 #ifndef _S390X_CSS_H_
 #define _S390X_CSS_H_
 
@@ -147,14 +149,16 @@ static inline int ssch(unsigned long schid, struct orb *addr)
 static inline int stsch(unsigned long schid, struct schib *addr)
 {
 	register unsigned long reg1 asm ("1") = schid;
+	uint64_t spm_cc = 1 << SPM_CC_SHIFT;
 	int cc;
 
 	asm volatile(
+		"	spm	%[spm_cc]\n"
 		"	stsch	0(%3)\n"
 		"	ipm	%0\n"
 		"	srl	%0,28"
 		: "=d" (cc), "=m" (*addr)
-		: "d" (reg1), "a" (addr)
+		: "d" (reg1), "a" (addr), [spm_cc] "d" (spm_cc)
 		: "cc");
 	return cc;
 }
@@ -177,14 +181,16 @@ static inline int msch(unsigned long schid, struct schib *addr)
 static inline int tsch(unsigned long schid, struct irb *addr)
 {
 	register unsigned long reg1 asm ("1") = schid;
+	uint64_t spm_cc = 2 << SPM_CC_SHIFT;
 	int cc;
 
 	asm volatile(
+		"	spm	%[spm_cc]\n"
 		"	tsch	0(%3)\n"
 		"	ipm	%0\n"
 		"	srl	%0,28"
 		: "=d" (cc), "=m" (*addr)
-		: "d" (reg1), "a" (addr)
+		: "d" (reg1), "a" (addr), [spm_cc] "d" (spm_cc)
 		: "cc");
 	return cc;
 }
@@ -252,28 +258,32 @@ static inline int rsch(unsigned long schid)
 static inline int rchp(unsigned long chpid)
 {
 	register unsigned long reg1 asm("1") = chpid;
+	uint64_t spm_cc = 1 << SPM_CC_SHIFT;
 	int cc;
 
 	asm volatile(
+		"	spm	%[spm_cc]\n"
 		"	rchp\n"
 		"	ipm	%0\n"
 		"	srl	%0,28"
 		: "=d" (cc)
-		: "d" (reg1)
+		: "d" (reg1), [spm_cc] "d" (spm_cc)
 		: "cc");
 	return cc;
 }
 
 static inline int stcrw(uint32_t *crw)
 {
+	uint64_t spm_cc = 1 << SPM_CC_SHIFT;
 	int cc;
 
 	asm volatile(
+		"	spm	%[spm_cc]\n"
 		"	stcrw	%[crw]\n"
 		"	ipm	%[cc]\n"
 		"	srl	%[cc],28"
 		: [cc] "=d" (cc)
-		: [crw] "Q" (*crw)
+		: [crw] "Q" (*crw), [spm_cc] "d" (spm_cc)
 		: "cc", "memory");
 	return cc;
 }
s390x/mvpg.c +4 -2
index 296338d4..21e3ecc7 100644
@@ -40,12 +40,14 @@ static uint8_t *fresh;
 static inline int mvpg(unsigned long r0, void *dest, void *src)
 {
 	register unsigned long reg0 asm ("0") = r0;
+	uint64_t spm_cc = 3 << SPM_CC_SHIFT;
 	int cc;
 
-	asm volatile("	mvpg    %1,%2\n"
+	asm volatile("	spm	%[spm_cc]\n"
+		     "	mvpg    %1,%2\n"
 		     "	ipm     %0\n"
 		     "	srl     %0,28"
-		: "=&d" (cc) : "a" (dest), "a" (src), "d" (reg0)
+		: "=&d" (cc) : "a" (dest), "a" (src), "d" (reg0), [spm_cc] "d" (spm_cc)
 		: "memory", "cc");
 	return cc;
 }
Signature · 1 line
2.40.1
#5 lore raw

PATCH 5/5 s390x: sclp: Dirty CC before sclp execution

In reply to Janosch Frank

Dirtying the CC allows us to find missing CC changes when sclp is emulated.

---
 s390x/sclp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
s390x/sclp.c +4 -1
index 1abb9029..bc6477eb 100644
@@ -399,6 +399,7 @@ out:
 static void test_instbits(void)
 {
 	SCCBHeader *h = (SCCBHeader *)pagebuf;
+	uint64_t spm_cc = 1 << SPM_CC_SHIFT;
 	int cc;
 
 	sclp_mark_busy();
@@ -406,10 +407,12 @@ static void test_instbits(void)
 	sclp_setup_int();
 
 	asm volatile(
+		"       spm     %[spm_cc]\n"
 		"       .insn   rre,0xb2204200,%1,%2\n"  /* servc %1,%2 */
 		"       ipm     %0\n"
 		"       srl     %0,28"
-		: "=&d" (cc) : "d" (valid_code), "a" (__pa(pagebuf))
+		: "=&d" (cc)
+		: "d" (valid_code), "a" (__pa(pagebuf)), [spm_cc] "d" (spm_cc)
 		: "cc", "memory");
 	/* No exception, but also no command accepted, so no interrupt is
 	 * expected. We need to clear the flag manually otherwise we will
Signature · 1 line
2.40.1
#6 lore raw
In reply to Janosch Frank
Quoted 9 lines · Janosch Frank

A recent s390 KVM fixpatch [1] showed us that checking the cc is not enough when emulation code forgets to set the cc. There might just be the correct cc in the PSW which would make the cc check succeed.

This series intentionally dirties the cc for sigp, uvc, some io instructions and sclp to make cc setting errors more apparent. I had a cursory look through the tested instructions and those are the most prominent ones with defined cc values.

Quoted 4 lines

Since the issue appeared in PQAP my AP test series is now dependent on this series.

[1] https://lore.kernel.org/kvm/[email protected]/

Using SET PROGRAM MASK the way you're doing in this series will also set the program mask to 0, right?

In case you have some non zero register %[reg] and you want to set CC to 1 you could do:

or %[reg],%[reg] /* set CC to 1 */

In general, if I understand TEST UNDER MASK right, you could do:

tmll %[set_cc],3

to set the CC to the value in %[set_cc] (without any shifting).

#7 lore raw
Quoted 21 lines · Nina Schoetterl-Glausch
Quoted 9 lines · Janosch Frank

A recent s390 KVM fixpatch [1] showed us that checking the cc is not enough when emulation code forgets to set the cc. There might just be the correct cc in the PSW which would make the cc check succeed.

This series intentionally dirties the cc for sigp, uvc, some io instructions and sclp to make cc setting errors more apparent. I had a cursory look through the tested instructions and those are the most prominent ones with defined cc values.

Quoted 4 lines

Since the issue appeared in PQAP my AP test series is now dependent on this series.

[1] https://lore.kernel.org/kvm/[email protected]/

Using SET PROGRAM MASK the way you're doing in this series will also set the program mask to 0, right?

In case you have some non zero register %[reg] and you want to set CC to 1 you could do:

Quoted 7 lines

or %[reg],%[reg] /* set CC to 1 */

In general, if I understand TEST UNDER MASK right, you could do:

tmll %[set_cc],3

to set the CC to the value in %[set_cc] (without any shifting).

That is a wonderful solution to this problem. I'll send out a new version in the next couple of days.