s390x: More emulation tests
v2 cover s390x: More emulation tests
The first patch allows for CECSIM booting via PSW restart. The other ones add diag288 and STSI tests.
v2:
* Tested under TCG
* Split out stsi into library
* Addressed review
Janosch Frank (4):
s390x: Support PSW restart boot
s390x: Diag288 test
s390x: Move stsi to library
s390x: STSI tests
lib/s390x/asm/arch_def.h | 17 +++++ s390x/Makefile | 2 + s390x/diag288.c | 131 +++++++++++++++++++++++++++++++++++++++ s390x/flat.lds | 14 +++-- s390x/skey.c | 18 ------ s390x/stsi.c | 84 +++++++++++++++++++++++++ s390x/unittests.cfg | 7 +++ 7 files changed, 250 insertions(+), 23 deletions(-) create mode 100644 s390x/diag288.c create mode 100644 s390x/stsi.c
Signature · 1 line
2.17.0
PATCH v2 1/4 s390x: Support PSW restart boot
Add a boot PSW to PSW restart new, so we can also boot via a PSW restart.
--- s390x/flat.lds | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
s390x/flat.lds +9 -5
@@ -1,14 +1,18 @@ SECTIONS { - /* - * Initial short psw for disk boot, with 31 bit addressing for - * non z/Arch environment compatibility and the instruction - * address 0x10000 (cstart64.S .init). - */ .lowcore : { + /* + * Initial short psw for disk boot, with 31 bit addressing for + * non z/Arch environment compatibility and the instruction + * address 0x10000 (cstart64.S .init). + */ . = 0; LONG(0x00080000) LONG(0x80010000) + /* Restart new PSW for booting via PSW restart. */ + . = 0x1a0; + QUAD(0x0000000180000000) + QUAD(0x0000000000010000) } . = 0x10000; .text : {
Signature · 1 line
2.17.0
Re: [kvm-unit-tests PATCH v2 1/4] s390x: Support PSW restart boot
Quoted 28 lines · Janosch Frank
Add a boot PSW to PSW restart new, so we can also boot via a PSW restart.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Thomas Huth <[email protected]>--- s390x/flat.lds | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)s390x/flat.lds +5
-5@@ -1,14 +1,18 @@ SECTIONS { - /* - * Initial short psw for disk boot, with 31 bit addressing for - * non z/Arch environment compatibility and the instruction - * address 0x10000 (cstart64.S .init). - */ .lowcore : { + /* + * Initial short psw for disk boot, with 31 bit addressing for + * non z/Arch environment compatibility and the instruction + * address 0x10000 (cstart64.S .init). + */
s390x/flat.lds line 18
Quoted 10 lines
s390x/flat.lds +4
-0. = 0; LONG(0x00080000) LONG(0x80010000) + /* Restart new PSW for booting via PSW restart. */ + . = 0x1a0; + QUAD(0x0000000180000000) + QUAD(0x0000000000010000) } . = 0x10000; .text : {
Signature · 3 lines
Thanks, David / dhildenb
Re: [kvm-unit-tests PATCH v2 1/4] s390x: Support PSW restart boot
In reply to Janosch FrankQuoted 28 lines · Janosch Frank
Add a boot PSW to PSW restart new, so we can also boot via a PSW restart.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Thomas Huth <[email protected]>--- s390x/flat.lds | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)s390x/flat.lds +5
-5@@ -1,14 +1,18 @@ SECTIONS { - /* - * Initial short psw for disk boot, with 31 bit addressing for - * non z/Arch environment compatibility and the instruction - * address 0x10000 (cstart64.S .init). - */ .lowcore : { + /* + * Initial short psw for disk boot, with 31 bit addressing for + * non z/Arch environment compatibility and the instruction + * address 0x10000 (cstart64.S .init). + */
s390x/flat.lds line 18
Quoted 10 lines
s390x/flat.lds +4
-0. = 0; LONG(0x00080000) LONG(0x80010000) + /* Restart new PSW for booting via PSW restart. */ + . = 0x1a0; + QUAD(0x0000000180000000) + QUAD(0x0000000000010000) } . = 0x10000; .text : {
Seems you missed my
Signature · 3 lines
Thanks, David / dhildenb
PATCH v2 2/4 s390x: Diag288 test
In reply to Janosch FrankA small test for the watchdog via diag288.
Minimum timer value is 15 (seconds) and the only supported action with QEMU is restart.
--- lib/s390x/asm/arch_def.h | 1 + s390x/Makefile | 1 + s390x/diag288.c | 131 +++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++ 4 files changed, 137 insertions(+) create mode 100644 s390x/diag288.c
lib/s390x/asm/arch_def.h +1 -0
@@ -15,6 +15,7 @@ struct psw {uint64_t addr; }; +#define PSW_MASK_EXT 0x0100000000000000UL#define PSW_MASK_DAT 0x0400000000000000UL#define PSW_MASK_PSTATE 0x0001000000000000UL
s390x/Makefile +1 -0
@@ -12,6 +12,7 @@ tests += $(TEST_DIR)/vector.elf tests += $(TEST_DIR)/gs.elf tests += $(TEST_DIR)/iep.elf tests += $(TEST_DIR)/cpumodel.elf +tests += $(TEST_DIR)/diag288.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary
s390x/diag288.c new file +131 -0
131 lines not on this page · raw message
s390x/unittests.cfg +4 -0
@@ -64,3 +64,7 @@ file = iep.elf [cpumodel] file = cpumodel.elf + +[diag288] +file = diag288.elf +extra_params=-device diag288,id=watchdog0 --watchdog-action inject-nmi
Signature · 1 line
2.17.0
Re: [kvm-unit-tests PATCH v2 2/4] s390x: Diag288 test
Quoted 43 lines · Janosch Frank
A small test for the watchdog via diag288.
Minimum timer value is 15 (seconds) and the only supported action with QEMU is restart.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/arch_def.h | 1 + s390x/Makefile | 1 + s390x/diag288.c | 131 +++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++ 4 files changed, 137 insertions(+) create mode 100644 s390x/diag288.clib/s390x/asm/arch_def.h +1
-0@@ -15,6 +15,7 @@ struct psw {uint64_t addr; }; +#define PSW_MASK_EXT 0x0100000000000000UL#define PSW_MASK_DAT 0x0400000000000000UL#define PSW_MASK_PSTATE 0x0001000000000000ULs390x/Makefile +1
-0@@ -12,6 +12,7 @@ tests += $(TEST_DIR)/vector.elf tests += $(TEST_DIR)/gs.elf tests += $(TEST_DIR)/iep.elf tests += $(TEST_DIR)/cpumodel.elf +tests += $(TEST_DIR)/diag288.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binarys390x/diag288.c new file +0
-0
[...]
s390x/diag288.c line 42
Quoted 7 lines
s390x/diag288.c new file +7
-0+static void test_specs (void ) +{ +report_prefix_push ("specification" ); + +report_prefix_push ("uneven" ); +expect_pgm_int (); + asmvolatile ("diag %r1,%r2,0x288" );
Don't you have to use "%%" in that case? ... well, if it also works without, I don't mind, but in case you respin better play safe:
asm volatile("diag %%r1,%%r2,0x288");Quoted 43 lines
s390x/diag288.c new file +43
-0+check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); + +report_prefix_push ("unsupported action" ); +expect_pgm_int (); +diag288 (CODE_INIT ,15 ,42 ); +check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); + +report_prefix_push ("unsupported function" ); +expect_pgm_int (); +diag288 (42 ,15 ,ACTION_RESTART ); +check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); + +report_prefix_push ("no init" ); +expect_pgm_int (); +diag288 (CODE_CANCEL ,15 ,ACTION_RESTART ); +check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); + +report_prefix_push ("min timer" ); +expect_pgm_int (); +diag288 (CODE_INIT ,14 ,ACTION_RESTART ); +check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); + +report_prefix_pop (); +} + +static void test_priv (void ) +{ +report_prefix_push ("privileged" ); +expect_pgm_int (); +enter_pstate (); +diag288 (CODE_INIT ,15 ,ACTION_RESTART ); +check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION ); +report_prefix_pop (); +} + +static inline void get_tod_clock_ext (char *clk) +{ +typedef struct {char _[16 ]; }addrtype ;
s390x/diag288.c line 95
Quoted 10 lines
s390x/diag288.c new file +10
-0+ + asmvolatile ("stcke %0" :"=Q" (*(addrtype *) clk) : :"cc" ); +} + +static inline unsigned long long get_tod_clock (void ) +{ +char clk[16 ]; + +get_tod_clock_ext (clk); +return *((unsigned long long *)&clk[1 ]);
You could use uint64_t instead of "unsigned long long".
Quoted 16 lines
s390x/diag288.c new file +16
-0+} + +static void test_bite (void ) +{ +unsigned long time; +uint64_t mask; + +/* If watchdog doesn't bite, the cpu timer does */ + time =get_tod_clock (); + time += (uint64_t )(16000 *1000 ) <<12 ; + asmvolatile ("sckc %0" : :"Q" (time)); +ctl_set_bit (0 ,11 ); + mask =extract_psw_mask (); + mask |=PSW_MASK_EXT ; +load_psw_mask (mask); +
s390x/diag288.c line 121
Quoted 10 lines
s390x/diag288.c new file +10
-0+/* Arm watchdog */ + lc->restart_new_psw.mask =extract_psw_mask () & ~PSW_MASK_EXT ; +diag288 (CODE_INIT ,15 ,ACTION_RESTART ); + asmvolatile (" larl %r0, 1f\n" +" stg %r0, 424\n" +"0: nop\n" +" j 0b\n" +"1:" ); +report ("restart" , true); +return ;
Superfluous return statement.
Quoted 16 lines
s390x/diag288.c new file +10
-0+} + +int main (void ) +{ +report_prefix_push ("diag288" ); +test_priv (); +test_specs (); +test_bite (); +return report_summary (); +}s390x/unittests.cfg +0
-0
s390x/unittests.cfg file = iep.elf · line 70
Quoted 7 lines
s390x/unittests.cfg +4
-0@@ -64,3 +64,7 @@ file = iep.elf [cpumodel] file = cpumodel.elf + +[diag288] +file = diag288.elf +extra_params=-device diag288,id=watchdog0 --watchdog-action inject-nmi
Apart from the cosmetic nits, looks fine to me.
PATCH v2 3/4 s390x: Move stsi to library
In reply to Janosch FrankIt's needed in multiple tests now.
--- lib/s390x/asm/arch_def.h | 16 ++++++++++++++++ s390x/skey.c | 18 ------------------ 2 files changed, 16 insertions(+), 18 deletions(-)
lib/s390x/asm/arch_def.h +16 -0
@@ -240,4 +240,20 @@ static inline void enter_pstate(void)load_psw_mask (mask); } +static inline int stsi (void *addr,int fc,int sel1,int sel2) +{ + register int r0 asm("0") = (fc << 28) | sel1; + register int r1 asm("1") = sel2; +int cc; + + asmvolatile ( +"stsi 0(%3)\n" +"ipm %[cc]\n" +"srl %[cc],28\n" + :"+d" (r0), [cc]"=d" (cc) + :"d" (r1),"a" (addr) + :"cc" ,"memory" ); + return cc; +} +#endif
s390x/skey.c +0 -18
@@ -70,24 +70,6 @@ static void test_set(void) skey.str.acc == ret.str.acc && skey.str.fp == ret.str.fp); } -static inline int stsi (void *addr,int fc,int sel1,int sel2) -{ - register int r0 asm("0") = (fc << 28) | sel1; - register int r1 asm("1") = sel2; -int rc =0 ; - - asmvolatile ( -" stsi 0(%3)\n" -" jz 0f\n" -" lhi %1,-1\n" -"0:\n" - :"+d" (r0),"+d" (rc) - :"d" (r1),"a" (addr) - :"cc" ,"memory" ); - -return rc; -} -/* Returns true if we are running under z/VM 6.x */ static bool check_for_zvm6 (void ) {
Signature · 1 line
2.17.0
Re: [kvm-unit-tests PATCH v2 3/4] s390x: Move stsi to library
Quoted 53 lines · Janosch Frank
It's needed in multiple tests now.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/arch_def.h | 16 ++++++++++++++++ s390x/skey.c | 18 ------------------ 2 files changed, 16 insertions(+), 18 deletions(-)lib/s390x/asm/arch_def.h +16
-0@@ -240,4 +240,20 @@ static inline void enter_pstate(void)load_psw_mask (mask); } +static inline int stsi (void *addr,int fc,int sel1,int sel2) +{ + register int r0 asm("0") = (fc << 28) | sel1; + register int r1 asm("1") = sel2; +int cc; + + asmvolatile ( +"stsi 0(%3)\n" +"ipm %[cc]\n" +"srl %[cc],28\n" + :"+d" (r0), [cc]"=d" (cc) + :"d" (r1),"a" (addr) + :"cc" ,"memory" ); + return cc; +} +#endif s390x/skey.c +0
-11@@ -70,24 +70,6 @@ static void test_set(void) skey.str.acc == ret.str.acc && skey.str.fp == ret.str.fp); } -static inline int stsi (void *addr,int fc,int sel1,int sel2) -{ - register int r0 asm("0") = (fc << 28) | sel1; - register int r1 asm("1") = sel2; -int rc =0 ; - - asmvolatile ( -" stsi 0(%3)\n" -" jz 0f\n" -" lhi %1,-1\n" - "0:\n"
s390x/skey.c static void test_set(void) · line 75
Quoted 10 lines
s390x/skey.c +0
-7- : "+d" (r0), "+d" (rc) - : "d" (r1), "a" (addr) - : "cc", "memory"); - -return rc; -} -/* Returns true if we are running under z/VM 6.x */ static bool check_for_zvm6 (void ) {
You don't simply move, you also modify and change the return value from o/-1 to cc. AFAIKs, this should be fine.
Signature · 3 lines
Thanks, David / dhildenb
Re: [kvm-unit-tests PATCH v2 3/4] s390x: Move stsi to library
In reply to Janosch FrankQuoted 20 lines · Janosch Frank
It's needed in multiple tests now.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/arch_def.h | 16 ++++++++++++++++ s390x/skey.c | 18 ------------------ 2 files changed, 16 insertions(+), 18 deletions(-)lib/s390x/asm/arch_def.h +4
-0@@ -240,4 +240,20 @@ static inline void enter_pstate(void)load_psw_mask (mask); } +static inline int stsi (void *addr,int fc,int sel1,int sel2) +{ + register int r0 asm("0") = (fc << 28) | sel1; + register int r1 asm("1") = sel2;
lib/s390x/asm/arch_def.h static inline void enter_pstate(void) · line 256
Quoted 10 lines
lib/s390x/asm/arch_def.h +10
-0+int cc; + + asmvolatile ( +"stsi 0(%3)\n" +"ipm %[cc]\n" +"srl %[cc],28\n" + :"+d" (r0), [cc]"=d" (cc) + :"d" (r1),"a" (addr) + :"cc" ,"memory" ); +return cc;
Maybe mention the changed return value in the patch description.
PATCH v2 4/4 s390x: STSI tests
In reply to Janosch FrankFor now let's concentrate on the error conditions.
--- s390x/Makefile | 1 + s390x/stsi.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 3 ++ 3 files changed, 88 insertions(+) create mode 100644 s390x/stsi.c
s390x/Makefile +1 -0
@@ -13,6 +13,7 @@ tests += $(TEST_DIR)/gs.elf tests += $(TEST_DIR)/iep.elf tests += $(TEST_DIR)/cpumodel.elf tests += $(TEST_DIR)/diag288.elf +tests += $(TEST_DIR)/stsi.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary
s390x/stsi.c new file +84 -0
84 lines not on this page · raw message
s390x/unittests.cfg +3 -0
@@ -68,3 +68,6 @@ file = cpumodel.elf [diag288] file = diag288.elf extra_params=-device diag288,id=watchdog0 --watchdog-action inject-nmi + +[stsi] +file = stsi.elf
Signature · 1 line
2.17.0
Re: [kvm-unit-tests PATCH v2 4/4] s390x: STSI tests
Quoted 28 lines · Janosch Frank
For now let's concentrate on the error conditions.
Signed-off-by Janosch Frank <[email protected]>--- s390x/Makefile | 1 + s390x/stsi.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 3 ++ 3 files changed, 88 insertions(+) create mode 100644 s390x/stsi.cs390x/Makefile +1
-0@@ -13,6 +13,7 @@ tests += $(TEST_DIR)/gs.elf tests += $(TEST_DIR)/iep.elf tests += $(TEST_DIR)/cpumodel.elf tests += $(TEST_DIR)/diag288.elf +tests += $(TEST_DIR)/stsi.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binarys390x/stsi.c new file +0
-0@@ -0,0 +1,84 @@
[...]
s390x/stsi.c line 61
Quoted 7 lines
s390x/stsi.c new file +7
-0+static inline unsigned long stsi_get_fc (void *addr) +{ + register unsigned long r0 asm("0") = 0; + register unsigned long r1 asm("1") = 0; +int cc; + + asm volatile("stsi 0(%2)\n"
Shouldn't that be %3 instead?
s390x/stsi.c line 74
Quoted 13 lines
s390x/stsi.c new file +13
-0+"ipm %[cc]\n" +"srl %[cc],28\n" + : "+d" (r0), [cc] "=d" (cc) + : "d" (r1), "a" (addr) + : "cc", "memory"); + assert(!cc); +return r0 >>28 ; +} + +static void test_fc (void ) +{ +report ("cc == 3" ,stsi (pagebuf,7 ,0 ,0 ) ==3 ); +report ("r0 == 3" ,stsi_get_fc (pagebuf) >=2 );
I'd like to suggest to change the string to "r0 >= 2", too.
Thomas
Re: [kvm-unit-tests PATCH v2 4/4] s390x: STSI tests
Quoted 30 lines · Thomas Huth
Quoted 28 lines · Janosch Frank
For now let's concentrate on the error conditions.
Signed-off-by Janosch Frank <[email protected]>--- s390x/Makefile | 1 + s390x/stsi.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 3 ++ 3 files changed, 88 insertions(+) create mode 100644 s390x/stsi.cs390x/Makefile +1
-0@@ -13,6 +13,7 @@ tests += $(TEST_DIR)/gs.elf tests += $(TEST_DIR)/iep.elf tests += $(TEST_DIR)/cpumodel.elf tests += $(TEST_DIR)/diag288.elf +tests += $(TEST_DIR)/stsi.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binarys390x/stsi.c new file +0
-0@@ -0,0 +1,84 @@[...]
Quoted 9 lines
s390x/stsi.c line 61
Quoted 7 lines
s390x/stsi.c new file +7
-0+static inline unsigned long stsi_get_fc (void *addr) +{ + register unsigned long r0 asm("0") = 0; + register unsigned long r1 asm("1") = 0; +int cc; + + asm volatile("stsi 0(%2)\n"Shouldn't that be %3 instead?
Yup, although it doesn't really matter, as the address is ignored.
Quoted 14 lines
Quoted 4 lines
s390x/stsi.c new file +3
-0+"ipm %[cc]\n" +"srl %[cc],28\n" + : "+d" (r0), [cc] "=d" (cc)s390x/stsi.c line 74
Quoted 10 lines
s390x/stsi.c new file +10
-0+ : "d" (r1), "a" (addr) + : "cc", "memory"); +assert (!cc); +return r0 >>28 ; +} + +static void test_fc (void ) +{ +report ("cc == 3" ,stsi (pagebuf,7 ,0 ,0 ) ==3 ); +report ("r0 == 3" ,stsi_get_fc (pagebuf) >=2 );
Just changed it to:
"invalid fc"
"query fc >= 2
Quoted 5 lines
I'd like to suggest to change the string to "r0 >= 2", too.
Thomas
PATCH 1/1 s390x: Add diag308 subcode 0 testing
In reply to Janosch FrankBy adding a load reset routine to cstart.S we can also test the clear reset done by subcode 0, as we now can restore our registers again.
---
I managed to extract this from another bigger test, so let's add it to the bunch. I'd be very happy about assembly review :-)
--- s390x/cstart64.S | 27 +++++++++++++++++++++++++++ s390x/diag308.c | 31 ++++++++++--------------------- 2 files changed, 37 insertions(+), 21 deletions(-)
s390x/cstart64.S +27 -0
@@ -145,6 +145,33 @@ memsetxc: .endm .section .text +/* + * load_reset calling convention: + * %r2 subcode (0 or 1) + */ +.globl load_reset +load_reset: + SAVE_REGS + /* Save the first PSW word to the IPL PSW */ + epsw %r0, %r1 + st %r0, 0 + /* Store the address and the bit for 31 bit addressing */ + larl %r0, 0f + oilh %r0, 0x8000 + st %r0, 0x4 + /* Do the reset */ + diag %r0,%r2,0x308 + /* Failure path */ + xgr %r2, %r2 + br %r14 + /* Success path */ + /* We lost cr0 due to the reset */ +0: larl %r1, initial_cr0 + lctlg %c0, %c0, 0(%r1) + RESTORE_REGS + lhi %r2, 1 + br %r14 + pgm_int: SAVE_REGS brasl %r14, handle_pgm_int
s390x/diag308.c +10 -21
@@ -21,32 +21,20 @@ static void test_priv(void)check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION ); } +/* -* Check that diag308 with subcode 1 loads the PSW at address 0, i.e. +* Check that diag308 with subcode 0 and 1 loads the PSW at address 0, i.e. * that we can put a pointer into address 4 which then gets executed. */ +extern int load_reset (u64 ); +static void test_subcode0 (void ) +{ +report ("load modified clear done" ,load_reset (0 )); +} +static void test_subcode1 (void ) { -uint64_t saved_psw = *(uint64_t *)0 ; -long subcode =1 ; -long ret, tmp; - - asmvolatile ( -" epsw %0,%1\n" -" st %0,0\n" -" larl %0,0f\n" -" oilh %0,0x8000\n" -" st %0,4\n" -" diag 0,%2,0x308\n" -" lghi %0,0\n" -" j 1f\n" -"0: lghi %0,1\n" -"1:" - :"=&d" (ret),"=&d" (tmp) :"d" (subcode) :"memory" ); - - *(uint64_t *)0 = saved_psw; - -report ("load normal reset done" , ret ==1 ); +report ("load normal reset done" ,load_reset (1 )); }/* Expect a specification exception when using an uneven register */
@@ -107,6 +95,7 @@ static struct {void (*func)(void ); } tests[] = { { "privileged", test_priv }, + { "subcode 0", test_subcode0 }, { "subcode 1", test_subcode1 }, { "subcode 5", test_subcode5 }, { "subcode 6", test_subcode6 },
Signature · 1 line
2.17.0
Re: [kvm-unit-tests PATCH] s390x: Add diag308 subcode 0 testing
Quoted 98 lines · Janosch Frank
By adding a load reset routine to
cstart.Swe can also test the clear reset done by subcode 0, as we now can restore our registers again.Signed-off-by Janosch Frank <[email protected]>---
I managed to extract this from another bigger test, so let's add it to the bunch. I'd be very happy about assembly review :-)--- s390x/cstart64.S | 27 +++++++++++++++++++++++++++ s390x/diag308.c | 31 ++++++++++--------------------- 2 files changed, 37 insertions(+), 21 deletions(-)s390x/cstart64.S +27
-0@@ -145,6 +145,33 @@ memsetxc: .endm .section .text +/* + * load_reset calling convention: + * %r2 subcode (0 or 1) + */ +.globl load_reset +load_reset: + SAVE_REGS + /* Save the first PSW word to the IPL PSW */ + epsw %r0, %r1 + st %r0, 0 + /* Store the address and the bit for 31 bit addressing */ + larl %r0, 0f + oilh %r0, 0x8000 + st %r0, 0x4 + /* Do the reset */ + diag %r0,%r2,0x308 + /* Failure path */ + xgr %r2, %r2 + br %r14 + /* Success path */ + /* We lost cr0 due to the reset */ +0: larl %r1, initial_cr0 + lctlg %c0, %c0, 0(%r1) + RESTORE_REGS + lhi %r2, 1 + br %r14 + pgm_int: SAVE_REGS brasl %r14, handle_pgm_ints390x/diag308.c +9
-21@@ -21,32 +21,20 @@ static void test_priv(void)check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION ); } +/* -* Check that diag308 with subcode 1 loads the PSW at address 0, i.e. +* Check that diag308 with subcode 0 and 1 loads the PSW at address 0, i.e. * that we can put a pointer into address 4 which then gets executed. */ +extern int load_reset (u64 ); +static void test_subcode0 (void ) +{ +report ("load modified clear done" ,load_reset (0 )); +} +static void test_subcode1 (void ) { -uint64_t saved_psw = *(uint64_t *)0 ; -long subcode =1 ; -long ret, tmp; - - asmvolatile ( -" epsw %0,%1\n" -" st %0,0\n" -" larl %0,0f\n" -" oilh %0,0x8000\n" -" st %0,4\n" -" diag 0,%2,0x308\n" -" lghi %0,0\n" -" j 1f\n" -"0: lghi %0,1\n" -"1:" - :"=&d" (ret),"=&d" (tmp) :"d" (subcode) :"memory" ); - - *(uint64_t *)0 = saved_psw; - -report ("load normal reset done" , ret ==1 ); +report ("load normal reset done" ,load_reset (1 )); }/* Expect a specification exception when using an uneven register */
s390x/diag308.c static struct { · line 101
Quoted 7 lines
s390x/diag308.c +1
-0@@ -107,6 +95,7 @@ static struct {void (*func)(void ); } tests[] = { { "privileged", test_priv }, + { "subcode 0", test_subcode0 }, { "subcode 1", test_subcode1 }, { "subcode 5", test_subcode5 }, { "subcode 6", test_subcode6 },
So, in general I am wondering if we should restore the original IPL_PSW after we used it - is there any chance we might require the old value again (I guess we're fine with cpu resets)?
Signature · 3 lines
Thanks, David / dhildenb
Re: [kvm-unit-tests PATCH] s390x: Add diag308 subcode 0 testing
Quoted 96 lines · David Hildenbrand
Quoted 95 lines · Janosch Frank
By adding a load reset routine to
cstart.Swe can also test the clear reset done by subcode 0, as we now can restore our registers again.Signed-off-by Janosch Frank <[email protected]>---
I managed to extract this from another bigger test, so let's add it to the bunch. I'd be very happy about assembly review :-)--- s390x/cstart64.S | 27 +++++++++++++++++++++++++++ s390x/diag308.c | 31 ++++++++++--------------------- 2 files changed, 37 insertions(+), 21 deletions(-)s390x/cstart64.S +27
-0@@ -145,6 +145,33 @@ memsetxc: .endm .section .text +/* + * load_reset calling convention: + * %r2 subcode (0 or 1) + */ +.globl load_reset +load_reset: + SAVE_REGS + /* Save the first PSW word to the IPL PSW */ + epsw %r0, %r1 + st %r0, 0 + /* Store the address and the bit for 31 bit addressing */ + larl %r0, 0f + oilh %r0, 0x8000 + st %r0, 0x4 + /* Do the reset */ + diag %r0,%r2,0x308 + /* Failure path */ + xgr %r2, %r2 + br %r14 + /* Success path */ + /* We lost cr0 due to the reset */ +0: larl %r1, initial_cr0 + lctlg %c0, %c0, 0(%r1) + RESTORE_REGS + lhi %r2, 1 + br %r14 + pgm_int: SAVE_REGS brasl %r14, handle_pgm_ints390x/diag308.c +9
-21@@ -21,32 +21,20 @@ static void test_priv(void)check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION ); } +/* -* Check that diag308 with subcode 1 loads the PSW at address 0, i.e. +* Check that diag308 with subcode 0 and 1 loads the PSW at address 0, i.e. * that we can put a pointer into address 4 which then gets executed. */ +extern int load_reset (u64 ); +static void test_subcode0 (void ) +{ +report ("load modified clear done" ,load_reset (0 )); +} +static void test_subcode1 (void ) { -uint64_t saved_psw = *(uint64_t *)0 ; -long subcode =1 ; -long ret, tmp; - - asmvolatile ( -" epsw %0,%1\n" -" st %0,0\n" -" larl %0,0f\n" -" oilh %0,0x8000\n" -" st %0,4\n" -" diag 0,%2,0x308\n" -" lghi %0,0\n" -" j 1f\n" -"0: lghi %0,1\n" -"1:" - :"=&d" (ret),"=&d" (tmp) :"d" (subcode) :"memory" ); - - *(uint64_t *)0 = saved_psw; - -report ("load normal reset done" , ret ==1 ); +report ("load normal reset done" ,load_reset (1 )); }
Quoted 14 lines
s390x/diag308.c static struct { · line 101
Quoted 10 lines
s390x/diag308.c +1
-0/* Expect a specification exception when using an uneven register */ @@ -107,6 +95,7 @@ static struct {void (*func)(void ); } tests[] = { { "privileged", test_priv }, + { "subcode 0", test_subcode0 }, { "subcode 1", test_subcode1 }, { "subcode 5", test_subcode5 }, { "subcode 6", test_subcode6 },So, in general I am wondering if we should restore the original
IPL_PSWafter we used it - is there any chance we might require the old value again (I guess we're fine with cpu resets)?
I currently don't see a need, but we could cache it in the restart old psw address. Or we just store back the two word constant.
Re: [kvm-unit-tests PATCH] s390x: Add diag308 subcode 0 testing
Quoted 112 lines · Janosch Frank
Quoted 96 lines · David Hildenbrand
Quoted 95 lines · Janosch Frank
By adding a load reset routine to
cstart.Swe can also test the clear reset done by subcode 0, as we now can restore our registers again.Signed-off-by Janosch Frank <[email protected]>---
I managed to extract this from another bigger test, so let's add it to the bunch. I'd be very happy about assembly review :-)--- s390x/cstart64.S | 27 +++++++++++++++++++++++++++ s390x/diag308.c | 31 ++++++++++--------------------- 2 files changed, 37 insertions(+), 21 deletions(-)s390x/cstart64.S +27
-0@@ -145,6 +145,33 @@ memsetxc: .endm .section .text +/* + * load_reset calling convention: + * %r2 subcode (0 or 1) + */ +.globl load_reset +load_reset: + SAVE_REGS + /* Save the first PSW word to the IPL PSW */ + epsw %r0, %r1 + st %r0, 0 + /* Store the address and the bit for 31 bit addressing */ + larl %r0, 0f + oilh %r0, 0x8000 + st %r0, 0x4 + /* Do the reset */ + diag %r0,%r2,0x308 + /* Failure path */ + xgr %r2, %r2 + br %r14 + /* Success path */ + /* We lost cr0 due to the reset */ +0: larl %r1, initial_cr0 + lctlg %c0, %c0, 0(%r1) + RESTORE_REGS + lhi %r2, 1 + br %r14 + pgm_int: SAVE_REGS brasl %r14, handle_pgm_ints390x/diag308.c +9
-21@@ -21,32 +21,20 @@ static void test_priv(void)check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION ); } +/* -* Check that diag308 with subcode 1 loads the PSW at address 0, i.e. +* Check that diag308 with subcode 0 and 1 loads the PSW at address 0, i.e. * that we can put a pointer into address 4 which then gets executed. */ +extern int load_reset (u64 ); +static void test_subcode0 (void ) +{ +report ("load modified clear done" ,load_reset (0 )); +} +static void test_subcode1 (void ) { -uint64_t saved_psw = *(uint64_t *)0 ; -long subcode =1 ; -long ret, tmp; - - asmvolatile ( -" epsw %0,%1\n" -" st %0,0\n" -" larl %0,0f\n" -" oilh %0,0x8000\n" -" st %0,4\n" -" diag 0,%2,0x308\n" -" lghi %0,0\n" -" j 1f\n" -"0: lghi %0,1\n" -"1:" - :"=&d" (ret),"=&d" (tmp) :"d" (subcode) :"memory" ); - - *(uint64_t *)0 = saved_psw; - -report ("load normal reset done" , ret ==1 ); +report ("load normal reset done" ,load_reset (1 )); }Quoted 14 lines
s390x/diag308.c static struct { · line 101
Quoted 10 lines
s390x/diag308.c +1
-0/* Expect a specification exception when using an uneven register */ @@ -107,6 +95,7 @@ static struct {void (*func)(void ); } tests[] = { { "privileged", test_priv }, + { "subcode 0", test_subcode0 }, { "subcode 1", test_subcode1 }, { "subcode 5", test_subcode5 }, { "subcode 6", test_subcode6 },So, in general I am wondering if we should restore the original
IPL_PSWafter we used it - is there any chance we might require the old value again (I guess we're fine with cpu resets)?
Quoted 3 lines
I currently don't see a need, but we could cache it in the restart old psw address. Or we just store back the two word constant.
If there's no need right no, I guess we can skip that. Was just wondering.
Signature · 3 lines
Thanks, David / dhildenb
Re: [kvm-unit-tests PATCH] s390x: Add diag308 subcode 0 testing
In reply to Janosch FrankQuoted 7 lines · Janosch Frank
By adding a load reset routine to
cstart.Swe can also test the clear reset done by subcode 0, as we now can restore our registers again.Signed-off-by Janosch Frank <[email protected]>---
I managed to extract this from another bigger test, so let's add it to the bunch. I'd be very happy about assembly review :-)
FWIW, the assembly code looks fine to me.
Quoted 10 lines
--- s390x/cstart64.S | 27 +++++++++++++++++++++++++++ s390x/diag308.c | 31 ++++++++++--------------------- 2 files changed, 37 insertions(+), 21 deletions(-)s390x/cstart64.S +0
-0
s390x/cstart64.S memsetxc: · line 153
Quoted 9 lines
s390x/cstart64.S +6
-0@@ -145,6 +145,33 @@ memsetxc: .endm .section .text +/* + * load_reset calling convention: + * %r2 subcode (0 or 1) + */ +.globl load_reset +load_reset:
Maybe rather name the function diag308_load_reset so that it is clear that it belongs to the diag308 test?
Or are you going to re-use this function in other tests later?
Anyway,
Re: [kvm-unit-tests PATCH] s390x: Add diag308 subcode 0 testing
Quoted 23 lines · Thomas Huth
Quoted 7 lines · Janosch Frank
By adding a load reset routine to
cstart.Swe can also test the clear reset done by subcode 0, as we now can restore our registers again.Signed-off-by Janosch Frank <[email protected]>---
I managed to extract this from another bigger test, so let's add it to the bunch. I'd be very happy about assembly review :-)FWIW, the assembly code looks fine to me.
Quoted 12 lines
--- s390x/cstart64.S | 27 +++++++++++++++++++++++++++ s390x/diag308.c | 31 ++++++++++--------------------- 2 files changed, 37 insertions(+), 21 deletions(-)s390x/cstart64.S +0
-0@@ -145,6 +145,33 @@ memsetxc: .endm
Quoted 10 lines
s390x/cstart64.S memsetxc: · line 153
Quoted 7 lines
s390x/cstart64.S +6
-0.section .text +/* + * load_reset calling convention: + * %r2 subcode (0 or 1) + */ +.globl load_reset +load_reset:Maybe rather name the function
diag308_load_resetso that it is clear that it belongs to the diag308 test?
Sure
Quoted 1 line
Or are you going to re-use this function in other tests later?
I currently have no such plans
But I'm thinking about a way to check the CPU registers in combination with smp. So it might be extended.
Quoted 4 lines
Anyway,
Reviewed-by Thomas Huth <[email protected]>
Thanks!