New s390x kvm-unit-tests and some fixes
Hi Paolo, hi Radim,
the following changes since commit 5eb7ccf658f29642ca6c197fd086f4da0d8d8a73:
x86: VMX: INVEPT after modifying PA mapping in ept_untwiddle (2019-09-11 17:45:28 +0200)
are available in the Git repository at:
https://gitlab.com/huth/kvm-unit-tests.git tags/s390x-2019-09-25
for you to fetch changes up to 2d8b2d367ed9f545fbf0fca25cb1cbc4fbfe3f00:
s390x: Free allocated page in iep test (2019-09-25 18:20:37 +0200)
Please note that this supersedes my unmerged pull request from last week.
----------------------------------------------------------------
New s390x kvm-unit-tests and some fixes from Janosch Frank
----------------------------------------------------------------
Janosch Frank (17):
s390x: Support PSW restart boot
s390x: Diag288 test
s390x: Move stsi to library
s390x: STSI tests
s390x: Add diag308 subcode 0 testing
s390x: Move pfmf to lib and make address void
s390x: Storage key library functions now take void ptr addresses
s390x: Bump march to zEC12
s390x: Add storage key removal facility
s390x: Fix stsi unaligned test and add selector tests
s390x: Use interrupts in SCLP and add locking
s390x: Add linemode console
s390x: Add linemode buffer to fix newline on every print
s390x: Add initial smp code
s390x: Prepare for external calls
s390x: SMP test
s390x: Free allocated page in iep testlib/s390x/asm/arch_def.h | 30 ++++++ lib/s390x/asm/interrupt.h | 5 + lib/s390x/asm/mem.h | 40 ++++++-- lib/s390x/asm/sigp.h | 28 +++++- lib/s390x/interrupt.c | 27 ++++- lib/s390x/io.c | 5 +- lib/s390x/sclp-console.c | 216 ++++++++++++++++++++++++++++++++++++--- lib/s390x/sclp.c | 55 +++++++++- lib/s390x/sclp.h | 59 ++++++++++- lib/s390x/smp.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++ lib/s390x/smp.h | 53 ++++++++++ s390x/Makefile | 7 +- s390x/cstart64.S | 34 +++++++ s390x/diag288.c | 114 +++++++++++++++++++++ s390x/diag308.c | 31 ++---- s390x/flat.lds | 14 ++- s390x/iep.c | 1 + s390x/pfmf.c | 71 +++++-------- s390x/skey.c | 47 +++------ s390x/skrf.c | 128 +++++++++++++++++++++++ s390x/smp.c | 242 ++++++++++++++++++++++++++++++++++++++++++++ s390x/stsi.c | 86 ++++++++++++++++ s390x/unittests.cfg | 11 ++ 23 files changed, 1419 insertions(+), 137 deletions(-) create mode 100644 lib/s390x/smp.c create mode 100644 lib/s390x/smp.h create mode 100644 s390x/diag288.c create mode 100644 s390x/skrf.c create mode 100644 s390x/smp.c create mode 100644 s390x/stsi.c
[kvm-unit-tests PULL 01/17] s390x: Support PSW restart boot
From: Janosch Frank <[email protected]>
Add a boot PSW to PSW restart new, so we can also boot via a PSW restart.
Message-Id: <[email protected]>
--- 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.18.1
[kvm-unit-tests PULL 02/17] s390x: Diag288 test
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
A small test for the watchdog via diag288.
Minimum timer value is 15 (seconds) and the only supported action with QEMU is restart.
Message-Id: <[email protected]>
--- lib/s390x/asm/arch_def.h | 1 + s390x/Makefile | 1 + s390x/diag288.c | 114 +++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++ 4 files changed, 120 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 +114 -0
114 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.18.1
[kvm-unit-tests PULL 03/17] s390x: Move stsi to library
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
It's needed in multiple tests now.
Return value changes from 0/-1 to the cc.
Message-Id: <[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 -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.18.1
[kvm-unit-tests PULL 04/17] s390x: STSI tests
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
For now let's concentrate on the error conditions.
Message-Id: <[email protected]>
--- 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.18.1
[kvm-unit-tests PULL 05/17] s390x: Add diag308 subcode 0 testing
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
By 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.
Message-Id: <[email protected]>
--- 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 diag308_load_reset +diag308_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 diag308_load_reset (u64 ); +static void test_subcode0 (void ) +{ +report ("load modified clear done" ,diag308_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" ,diag308_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.18.1
[kvm-unit-tests PULL 06/17] s390x: Move pfmf to lib and make address void
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
It's needed by other tests soon.
Message-Id: <[email protected]>
--- lib/s390x/asm/mem.h | 31 ++++++++++++++++++++++++ s390x/pfmf.c | 57 +++++++++++---------------------------------- 2 files changed, 44 insertions(+), 44 deletions(-)
lib/s390x/asm/mem.h +31 -0
@@ -54,4 +54,35 @@ static inline unsigned char get_storage_key(unsigned long addr) asmvolatile ("iske %0,%1" :"=d" (skey) :"a" (addr));return skey; } + +#define PFMF_FSC_4K 0 +#define PFMF_FSC_1M 1 +#define PFMF_FSC_2G 2 + +union pfmf_r1 { +struct { +unsigned long pad0 :32 ; +unsigned long pad1 :12 ; +unsigned long pad_fmfi :2 ; +unsigned long sk :1 ;/* set key*/ +unsigned long cf :1 ;/* clear frame */ +unsigned long ui :1 ;/* usage indication */ +unsigned long fsc :3 ; +unsigned long pad2 :1 ; +unsigned long mr :1 ; +unsigned long mc :1 ; +unsigned long pad3 :1 ; +unsigned long key :8 ;/* storage keys */ + } reg; +unsigned long val; +}; + +static inline void *pfmf (unsigned long r1,void *paddr) +{ + register void * addr asm("1") = paddr; + + asmvolatile (".insn rre,0xb9af0000,%[r1],%[addr]" + : [addr]"+a" (addr) : [r1]"d" (r1) :"memory" ); +return addr; +}#endif
s390x/pfmf.c +13 -44
119 lines not on this page · raw message
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 07/17] s390x: Storage key library functions now take void ptr addresses
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
Now all mem.h functions are consistent in how they take a memory address. Also we have less casting in the future.
Message-Id: <[email protected]>
--- lib/s390x/asm/mem.h | 9 +++------ s390x/pfmf.c | 4 ++-- s390x/skey.c | 24 +++++++++++------------- 3 files changed, 16 insertions(+), 21 deletions(-)
lib/s390x/asm/mem.h +3 -6
@@ -26,9 +26,7 @@ union skey {uint8_t val; }; -static inline void set_storage_key (unsigned long addr, -unsigned char skey, -int nq) +static inline void set_storage_key (void *addr,unsigned char skey,int nq) {if (nq) asm volatile(".insn rrf,0xb22b0000,%0,%1,8,0"
@@ -37,8 +35,7 @@ static inline void set_storage_key(unsigned long addr, asmvolatile ("sske %0,%1" : :"d" (skey),"a" (addr)); } -static inline unsigned long set_storage_key_mb (unsigned long addr, -unsigned char skey) +static inline void *set_storage_key_mb (void *addr,unsigned char skey) {assert (test_facility (8 ));
@@ -47,7 +44,7 @@ static inline unsigned long set_storage_key_mb(unsigned long addr,return addr; } -static inline unsigned char get_storage_key (unsigned long addr) +static inline unsigned char get_storage_key (void *addr) {unsigned char skey;
s390x/pfmf.c +2 -2
@@ -39,7 +39,7 @@ static void test_4k_key(void) r1.reg.fsc =PFMF_FSC_4K ; r1.reg.key =0x30 ;pfmf (r1.val, pagebuf); - skey.val =get_storage_key ((unsigned long ) pagebuf); + skey.val =get_storage_key (pagebuf); skey.val &=SKEY_ACC |SKEY_FP ;report ("set storage keys" , skey.val ==0x30 );report_prefix_pop ();
@@ -59,7 +59,7 @@ static void test_1m_key(void) r1.reg.key =0x30 ;pfmf (r1.val, pagebuf);for (i =0 ; i <256 ; i++) { - skey.val =get_storage_key ((unsigned long ) pagebuf + i *PAGE_SIZE ); + skey.val =get_storage_key (pagebuf + i *PAGE_SIZE ); skey.val &=SKEY_ACC |SKEY_FP ;if (skey.val !=0x30 ) { rp = false;
s390x/skey.c +11 -13
@@ -18,14 +18,12 @@ static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); -const unsigned long page0 = (unsigned long )pagebuf; -const unsigned long page1 = (unsigned long )(pagebuf +PAGE_SIZE );static void test_set_mb (void ) {union skey skey, ret1, ret2; -unsigned long addr =0x10000 -2 *PAGE_SIZE ; -unsigned long end =0x10000 ; +void *addr = (void *)0x10000 -2 *PAGE_SIZE ; +void *end = (void *)0x10000 ;/* Multi block support came with EDAT 1 */ if (!test_facility (8 ))
@@ -46,10 +44,10 @@ static void test_chg(void)union skey skey1, skey2; skey1.val =0x30 ; -set_storage_key (page0, skey1.val,0 ); - skey1.val =get_storage_key (page0); +set_storage_key (pagebuf, skey1.val,0 ); + skey1.val =get_storage_key (pagebuf); pagebuf[0 ] =3 ; - skey2.val =get_storage_key (page0); + skey2.val =get_storage_key (pagebuf);report ("chg bit test" , !skey1.str.ch && skey2.str.ch); }
@@ -58,9 +56,9 @@ static void test_set(void)union skey skey, ret; skey.val =0x30 ; - ret.val =get_storage_key (page0); -set_storage_key (page0, skey.val,0 ); - ret.val =get_storage_key (page0); + ret.val =get_storage_key (pagebuf); +set_storage_key (pagebuf, skey.val,0 ); + ret.val =get_storage_key (pagebuf);/* * For all set tests we only test the ACC and FP bits. RF and * CH are set by the machine for memory references and changes
@@ -103,11 +101,11 @@ static void test_priv(void)report_prefix_push ("sske" );expect_pgm_int ();enter_pstate (); -set_storage_key (page0,0x30 ,0 ); +set_storage_key (pagebuf,0x30 ,0 );check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION );report_prefix_pop (); - skey.val =get_storage_key (page0); + skey.val =get_storage_key (pagebuf);report ("skey did not change on exception" , skey.str.acc !=3 );report_prefix_push ("iske" );
@@ -117,7 +115,7 @@ static void test_priv(void) }else {expect_pgm_int ();enter_pstate (); -get_storage_key (page0); +get_storage_key (pagebuf);check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION ); }report_prefix_pop ();
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 08/17] s390x: Bump march to zEC12
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
TCG has majored a lot and can now support many newer instructions, so there's no need to compile with the ancient march z900.
Message-Id: <[email protected]>
--- s390x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/Makefile +1 -1
@@ -25,7 +25,7 @@ CFLAGS += -std=gnu99 CFLAGS += -ffreestanding CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/s390x -I lib CFLAGS += -O2 -CFLAGS += -march=z900 +CFLAGS += -march=zEC12 CFLAGS += -fno-delete-null-pointer-checks LDFLAGS += -nostdlib -Wl,--build-id=none
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 09/17] s390x: Add storage key removal facility
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
The storage key removal facility (stfle bit 169) makes all key related instructions result in a special operation exception if they handle a key.
Let's make sure that the skey and pfmf tests only run non key code (pfmf) or not at all (skey).
Also let's test this new facility. As lots of instructions are affected by this, only some of them are tested for now.
Message-Id: <[email protected]>
--- s390x/Makefile | 1 + s390x/pfmf.c | 10 ++++ s390x/skey.c | 5 ++ s390x/skrf.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+) create mode 100644 s390x/skrf.c
s390x/Makefile +1 -0
@@ -14,6 +14,7 @@ tests += $(TEST_DIR)/iep.elf tests += $(TEST_DIR)/cpumodel.elf tests += $(TEST_DIR)/diag288.elf tests += $(TEST_DIR)/stsi.elf +tests += $(TEST_DIR)/skrf.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary
s390x/pfmf.c +10 -0
@@ -34,6 +34,10 @@ static void test_4k_key(void)union skey skey;report_prefix_push ("4K" ); +if (test_facility (169 )) { +report_skip ("storage key removal facility is active" ); + goto out; + } r1.val =0 ; r1.reg.sk =1 ; r1.reg.fsc =PFMF_FSC_4K ;
@@ -42,6 +46,7 @@ static void test_4k_key(void) skey.val =get_storage_key (pagebuf); skey.val &=SKEY_ACC |SKEY_FP ;report ("set storage keys" , skey.val ==0x30 ); +out:report_prefix_pop (); }
@@ -53,6 +58,10 @@ static void test_1m_key(void)union skey skey;report_prefix_push ("1M" ); +if (test_facility (169 )) { +report_skip ("storage key removal facility is active" ); + goto out; + } r1.val =0 ; r1.reg.sk =1 ; r1.reg.fsc =PFMF_FSC_1M ;
@@ -67,6 +76,7 @@ static void test_1m_key(void) } }report ("set storage keys" , rp); +out:report_prefix_pop (); }
s390x/skey.c +5 -0
@@ -126,10 +126,15 @@ static void test_priv(void)int main (void ) {report_prefix_push ("skey" ); +if (test_facility (169 )) { +report_skip ("storage key removal facility is active" ); + goto done; + }test_priv ();test_set ();test_set_mb ();test_chg (); +done:report_prefix_pop ();return report_summary (); }
s390x/skrf.c new file +128 -0
128 lines not on this page · raw message
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 10/17] s390x: Fix stsi unaligned test and add selector tests
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
Alignment and selectors test order is not specified and so, if you have an unaligned address and invalid selectors it's up to the hypervisor to decide which error is presented.
Let's add valid selectors to the unalignmnet test and add selector tests.
--- s390x/stsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
s390x/stsi.c +3 -1
@@ -35,7 +35,7 @@ static void test_specs(void)report_prefix_push ("unaligned" );expect_pgm_int (); -stsi (pagebuf +42 ,1 ,0 ,0 ); +stsi (pagebuf +42 ,1 ,1 ,1 );check_pgm_int_code (PGM_INT_CODE_SPECIFICATION );report_prefix_pop ();
@@ -71,6 +71,8 @@ static inline unsigned long stsi_get_fc(void *addr)static void test_fc (void ) {report ("invalid fc" ,stsi (pagebuf,7 ,0 ,0 ) ==3 ); +report ("invalid selector 1" ,stsi (pagebuf,1 ,0 ,1 ) ==3 ); +report ("invalid selector 2" ,stsi (pagebuf,1 ,1 ,0 ) ==3 );report ("query fc >= 2" ,stsi_get_fc (pagebuf) >=2 ); }
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 11/17] s390x: Use interrupts in SCLP and add locking
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
We need to properly implement interrupt handling for SCLP, because on z/VM and LPAR SCLP calls are not synchronous!
Also with smp CPUs have to compete for sclp. Let's add some locking, so they execute sclp calls in an orderly fashion and don't compete for the data buffer.
Message-Id: <[email protected]>
--- lib/s390x/asm/interrupt.h | 2 ++ lib/s390x/interrupt.c | 12 +++++++-- lib/s390x/sclp-console.c | 2 ++ lib/s390x/sclp.c | 55 +++++++++++++++++++++++++++++++++++++-- lib/s390x/sclp.h | 3 +++ 5 files changed, 70 insertions(+), 4 deletions(-)
lib/s390x/asm/interrupt.h +2 -0
@@ -11,6 +11,8 @@#define _ASMS390X_IRQ_H_#include <asm/arch_def.h> +#define EXT_IRQ_SERVICE_SIG 0x2401 +void handle_pgm_int (void );void handle_ext_int (void );void handle_mcck_int (void );
lib/s390x/interrupt.c +10 -2
@@ -12,6 +12,7 @@#include <libcflat.h> #include <asm/interrupt.h> #include <asm/barrier.h> +#include <sclp.h> static bool pgm_int_expected;static struct lowcore *lc;
@@ -107,8 +108,15 @@ void handle_pgm_int(void)void handle_ext_int (void ) { -report_abort ("Unexpected external call interrupt: at %#lx" , - lc->ext_old_psw.addr); +if (lc->ext_int_code !=EXT_IRQ_SERVICE_SIG ) { +report_abort ("Unexpected external call interrupt: at %#lx" , + lc->ext_old_psw.addr); + }else { + lc->ext_old_psw.mask &= ~PSW_MASK_EXT ; + lc->sw_int_cr0 &= ~(1UL <<9 ); +sclp_handle_ext (); + lc->ext_int_code =0 ; + } }void handle_mcck_int (void )
lib/s390x/sclp-console.c +2 -0
@@ -17,6 +17,7 @@ static void sclp_set_write_mask(void) {WriteEventMask *sccb = (void *)_sccb; +sclp_mark_busy (); sccb->h.length =sizeof (WriteEventMask); sccb->mask_length =sizeof (unsigned int ); sccb->receive_mask =SCLP_EVENT_MASK_MSG_ASCII ;
@@ -37,6 +38,7 @@ void sclp_print(const char *str)int len =strlen (str);WriteEventData *sccb = (void *)_sccb; +sclp_mark_busy (); sccb->h.length =sizeof (WriteEventData) + len; sccb->h.function_code =SCLP_FC_NORMAL_WRITE ; sccb->ebh.length =sizeof (EventBufferHeader) + len;
lib/s390x/sclp.c +53 -2
94 lines not on this page · raw message
lib/s390x/sclp.h +3 -0
@@ -213,6 +213,9 @@ typedef struct ReadEventData { } __attribute__((packed)) ReadEventData;extern char _sccb[]; +void sclp_handle_ext (void ); +void sclp_wait_busy (void ); +void sclp_mark_busy (void );void sclp_console_setup (void );void sclp_print (const char *str);int sclp_service_call (unsigned int command,void *sccb);
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 12/17] s390x: Add linemode console
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
z/VM isn't fond of vt220, so we need line mode when running under z/VM.
Message-Id: <[email protected]>
--- lib/s390x/sclp-console.c | 181 +++++++++++++++++++++++++++++++++++---- lib/s390x/sclp.h | 55 +++++++++++- 2 files changed, 218 insertions(+), 18 deletions(-)
lib/s390x/sclp-console.c +164 -17
@@ -11,21 +11,165 @@#include <libcflat.h> #include <string.h> #include <asm/page.h> +#include <asm/arch_def.h> +#include <asm/io.h> #include "sclp.h" +/* +* ASCII (IBM PC 437) -> EBCDIC 037 +*/ +static uint8_t _ascebc[256 ] = { +/*00 NUL SOH STX ETX EOT ENQ ACK BEL */ +0x00 ,0x01 ,0x02 ,0x03 ,0x37 ,0x2D ,0x2E ,0x2F , +/*08 BS HT LF VT FF CR SO SI */ +/* ->NL */ +0x16 ,0x05 ,0x15 ,0x0B ,0x0C ,0x0D ,0x0E ,0x0F , +/*10 DLE DC1 DC2 DC3 DC4 NAK SYN ETB */ +0x10 ,0x11 ,0x12 ,0x13 ,0x3C ,0x3D ,0x32 ,0x26 , +/*18 CAN EM SUB ESC FS GS RS US */ +/* ->IGS ->IRS ->IUS */ +0x18 ,0x19 ,0x3F ,0x27 ,0x22 ,0x1D ,0x1E ,0x1F , +/*20 SP ! " # $ % & ' */ +0x40 ,0x5A ,0x7F ,0x7B ,0x5B ,0x6C ,0x50 ,0x7D , +/*28 ( ) * + , - . / */ +0x4D ,0x5D ,0x5C ,0x4E ,0x6B ,0x60 ,0x4B ,0x61 , +/*30 0 1 2 3 4 5 6 7 */ +0xF0 ,0xF1 ,0xF2 ,0xF3 ,0xF4 ,0xF5 ,0xF6 ,0xF7 , +/*38 8 9 : ; < = > ? */ +0xF8 ,0xF9 ,0x7A ,0x5E ,0x4C ,0x7E ,0x6E ,0x6F , +/*40 @ A B C D E F G */ +0x7C ,0xC1 ,0xC2 ,0xC3 ,0xC4 ,0xC5 ,0xC6 ,0xC7 , +/*48 H I J K L M N O */ +0xC8 ,0xC9 ,0xD1 ,0xD2 ,0xD3 ,0xD4 ,0xD5 ,0xD6 , +/*50 P Q R S T U V W */ +0xD7 ,0xD8 ,0xD9 ,0xE2 ,0xE3 ,0xE4 ,0xE5 ,0xE6 , +/*58 X Y Z [ \ ] ^ _ */ +0xE7 ,0xE8 ,0xE9 ,0xBA ,0xE0 ,0xBB ,0xB0 ,0x6D , +/*60 ` a b c d e f g */ +0x79 ,0x81 ,0x82 ,0x83 ,0x84 ,0x85 ,0x86 ,0x87 , +/*68 h i j k l m n o */ +0x88 ,0x89 ,0x91 ,0x92 ,0x93 ,0x94 ,0x95 ,0x96 , +/*70 p q r s t u v w */ +0x97 ,0x98 ,0x99 ,0xA2 ,0xA3 ,0xA4 ,0xA5 ,0xA6 , +/*78 x y z { | } ~ DL */ +0xA7 ,0xA8 ,0xA9 ,0xC0 ,0x4F ,0xD0 ,0xA1 ,0x07 , +/*80*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*88*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*90*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*98*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*A0*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*A8*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*B0*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*B8*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*C0*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*C8*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*D0*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*D8*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*E0 sz */ +0x3F ,0x59 ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*E8*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*F0*/ +0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F ,0x3F , +/*F8*/ +0x90 ,0x3F ,0x3F ,0x3F ,0x3F ,0xEA ,0x3F ,0xFF +}; + +static void sclp_print_ascii (const char *str) +{ +int len =strlen (str); +WriteEventData *sccb = (void *)_sccb; + +sclp_mark_busy (); +memset (sccb,0 ,sizeof (*sccb)); + sccb->h.length = offsetof(WriteEventData , msg) + len; + sccb->h.function_code =SCLP_FC_NORMAL_WRITE ; + sccb->ebh.length =sizeof (EventBufferHeader) + len; + sccb->ebh.type =SCLP_EVENT_ASCII_CONSOLE_DATA ; +memcpy (&sccb->msg, str, len); + +sclp_service_call (SCLP_CMD_WRITE_EVENT_DATA , sccb); +} + +static void sclp_print_lm (const char *str) +{ +unsigned char *ptr, *end, ch; +unsigned int count, offset, len; +struct WriteEventData *sccb; +struct mdb *mdb; +struct mto *mto; +struct go *go; + +sclp_mark_busy (); + sccb = (struct WriteEventData *) _sccb; + end = (unsigned char *) sccb +4096 -1 ; +memset (sccb,0 ,sizeof (*sccb)); + ptr = (unsigned char *) &sccb->msg.mdb.mto; + len =strlen (str); + offset =0 ; +do { +for (count =sizeof (*mto); offset < len; count++) { + ch = str[offset++]; +if (ch ==0x0a || ptr + count > end) +break ; + ptr[count] = _ascebc[ch]; + } + mto = (struct mto *) ptr; + mto->length = count; + mto->type =4 ; + mto->line_type_flags =LNTPFLGS_ENDTEXT ; + ptr += count; + }while (offset < len && ptr +sizeof (*mto) <= end); + len = ptr - (unsigned char *) sccb; + sccb->h.length = len - offsetof(struct WriteEventData , h); + sccb->h.function_code =SCLP_FC_NORMAL_WRITE ; + sccb->ebh.type =EVTYP_MSG ; + sccb->ebh.length = len - offsetof(struct WriteEventData , ebh); + mdb = &sccb->msg.mdb; + mdb->header.type =1 ; + mdb->header.tag =0xD4C4C240 ; + mdb->header.revision_code =1 ; + mdb->header.length = len - offsetof(struct WriteEventData, msg.mdb.header); + go = &mdb->go; + go->length =sizeof (*go); + go->type =1 ; +sclp_service_call (SCLP_CMD_WRITE_EVENT_DATA , sccb); +} + +/* +* SCLP needs to be initialized by setting a send and receive mask, +* indicating which messages the control program (we) want(s) to +* send/receive. +*/ static void sclp_set_write_mask (void ) {WriteEventMask *sccb = (void *)_sccb;sclp_mark_busy (); +memset (_sccb,0 ,sizeof (*sccb)); sccb->h.length =sizeof (WriteEventMask); - sccb->mask_length =sizeof (unsigned int ); - sccb->receive_mask =SCLP_EVENT_MASK_MSG_ASCII ; - sccb->cp_receive_mask =SCLP_EVENT_MASK_MSG_ASCII ; - sccb->send_mask =SCLP_EVENT_MASK_MSG_ASCII ; - sccb->cp_send_mask =SCLP_EVENT_MASK_MSG_ASCII ; + sccb->h.function_code =SCLP_FC_NORMAL_WRITE ; + sccb->mask_length =sizeof (sccb_mask_t); + +/* For now we don't process sclp input. */ + sccb->cp_receive_mask =0 ; +/* We send ASCII and line mode. */ + sccb->cp_send_mask =SCLP_EVENT_MASK_MSG_ASCII |SCLP_EVENT_MASK_MSG ;sclp_service_call (SCLP_CMD_WRITE_EVENT_MASK , sccb); +assert (sccb->h.response_code ==SCLP_RC_NORMAL_COMPLETION ); }void sclp_console_setup (void )
@@ -35,16 +179,19 @@ void sclp_console_setup(void)void sclp_print (const char *str) { -int len =strlen (str); -WriteEventData *sccb = (void *)_sccb; - -sclp_mark_busy (); - sccb->h.length =sizeof (WriteEventData) + len; - sccb->h.function_code =SCLP_FC_NORMAL_WRITE ; - sccb->ebh.length =sizeof (EventBufferHeader) + len; - sccb->ebh.type =SCLP_EVENT_ASCII_CONSOLE_DATA ; - sccb->ebh.flags =0 ; -memcpy (sccb->data, str, len); - -sclp_service_call (SCLP_CMD_WRITE_EVENT_DATA , sccb); +/* +* z/VM advertises a vt220 console which is not functional: +* (response code 05F0, "not active because of the state of +* the machine"). Hence testing the masks would only work if +* we also use stsi data to distinguish z/VM. +* +* Let's rather print on all available consoles. +*/ +if (strlen (str) > (PAGE_SIZE /2 )) { +sclp_print_ascii ("Warning: Printing is limited to 2KB of data." ); +sclp_print_lm ("Warning: Printing is limited to 2KB of data." ); +return ; + } +sclp_print_ascii (str); +sclp_print_lm (str); }
lib/s390x/sclp.h +54 -1
73 lines not on this page · raw message
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 13/17] s390x: Add linemode buffer to fix newline on every print
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
Linemode seems to add a newline for each sent message which makes reading rather hard. Hence we add a small buffer and only print if it's full or a newline is encountered.
Message-Id: <[email protected]>
--- lib/s390x/sclp-console.c | 43 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-)
lib/s390x/sclp-console.c +39 -4
@@ -13,6 +13,7 @@#include <asm/page.h> #include <asm/arch_def.h> #include <asm/io.h> +#include <asm/spinlock.h> #include "sclp.h" /*
@@ -87,6 +88,10 @@ static uint8_t _ascebc[256] = { 0x90, 0x3F, 0x3F, 0x3F, 0x3F, 0xEA, 0x3F, 0xFF }; +static char lm_buff[120 ]; +static unsigned char lm_buff_off; +static struct spinlock lm_buff_lock; +static void sclp_print_ascii (const char *str) {int len =strlen (str);
@@ -103,10 +108,10 @@ static void sclp_print_ascii(const char *str)sclp_service_call (SCLP_CMD_WRITE_EVENT_DATA , sccb); } -static void sclp_print_lm (const char *str) +static void lm_print (const char *buff,int len) {unsigned char *ptr, *end, ch; -unsigned int count, offset, len; +unsigned int count, offset;struct WriteEventData *sccb;struct mdb *mdb;struct mto *mto;
@@ -117,11 +122,10 @@ static void sclp_print_lm(const char *str) end = (unsigned char *) sccb +4096 -1 ;memset (sccb,0 ,sizeof (*sccb)); ptr = (unsigned char *) &sccb->msg.mdb.mto; - len =strlen (str); offset =0 ; do { for (count = sizeof(*mto); offset < len; count++) { - ch = str[offset++]; + ch = buff[offset++]; if (ch == 0x0a || ptr + count > end) break; ptr[count] = _ascebc[ch];
@@ -148,6 +152,37 @@ static void sclp_print_lm(const char *str)sclp_service_call (SCLP_CMD_WRITE_EVENT_DATA , sccb); } + +/* +* In contrast to the ascii console, linemode produces a new +* line with every write of data. The report() function uses +* several printf() calls to generate a line of data which +* would all end up on different lines. +* +* Hence we buffer here until we encounter a \n or the buffer +* is full. That means that linemode output can look a bit +* different from ascii and that it takes a bit longer for +* lines to appear. +*/ +static void sclp_print_lm (const char *str) +{ +int i; +const int len =strlen (str); + +spin_lock (&lm_buff_lock); + +for (i =0 ; i < len; i++) { + lm_buff[lm_buff_off++] = str[i]; + +/* Buffer full or newline? */ +if (str[i] =='\n' || lm_buff_off == (ARRAY_SIZE (lm_buff) -1 )) { +lm_print (lm_buff, lm_buff_off); + lm_buff_off =0 ; + } + } +spin_unlock (&lm_buff_lock); +} +/* * SCLP needs to be initialized by setting a send and receive mask, * indicating which messages the control program (we) want(s) to
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 14/17] s390x: Add initial smp code
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
Let's add a rudimentary SMP library, which will scan for cpus and has helper functions that manage the cpu state.
Message-Id: <[email protected]>
--- lib/s390x/asm/arch_def.h | 8 ++ lib/s390x/asm/sigp.h | 28 ++++- lib/s390x/io.c | 5 +- lib/s390x/sclp.h | 1 + lib/s390x/smp.c | 252 +++++++++++++++++++++++++++++++++++++++ lib/s390x/smp.h | 53 ++++++++ s390x/Makefile | 1 + s390x/cstart64.S | 7 ++ 8 files changed, 349 insertions(+), 6 deletions(-) create mode 100644 lib/s390x/smp.c create mode 100644 lib/s390x/smp.h
lib/s390x/asm/arch_def.h +8 -0
@@ -157,6 +157,14 @@ struct cpuid { uint64_t reserved : 15; }; +static inline unsigned short stap (void ) +{ +unsigned short cpu_address; + + asmvolatile ("stap %0" :"=Q" (cpu_address)); +return cpu_address; +} +static inline int tprot (unsigned long addr) {int cc;
lib/s390x/asm/sigp.h +23 -5
@@ -46,14 +46,32 @@#ifndef __ASSEMBLER__ -static inline void sigp_stop (void ) + +static inline int sigp (uint16_t addr,uint8_t order,unsigned long parm, +uint32_t *status) { - register unsigned long status asm ("1") = 0; - register unsigned long cpu asm ("2") = 0; + register unsigned long reg1 asm ("1") = parm; +int cc; asmvolatile ( -" sigp %0,%1,0(%2)\n" - :"+d" (status) :"d" (cpu),"d" (SIGP_STOP ) :"cc" ); +" sigp %1,%2,0(%3)\n" +" ipm %0\n" +" srl %0,28\n" + :"=d" (cc),"+d" (reg1) :"d" (addr),"a" (order) :"cc" ); +if (status) + *status = reg1; +return cc; +} + +static inline int sigp_retry (uint16_t addr,uint8_t order,unsigned long parm, +uint32_t *status) +{ +int cc; + +do { + cc =sigp (addr, order, parm, status); + }while (cc ==2 ); +return cc; }#endif /* __ASSEMBLER__ */
lib/s390x/io.c +4 -1
@@ -16,6 +16,7 @@#include <asm/facility.h> #include <asm/sigp.h> #include "sclp.h" +#include "smp.h" extern char ipl_args[]; uint8_t stfl_bytes[NR_STFL_BYTES] __attribute__((aligned(8)));
@@ -37,12 +38,14 @@ void setup(void)setup_facilities ();sclp_console_setup ();sclp_memory_setup (); +smp_setup (); }void exit (int code) { +smp_teardown ();printf ("\nEXIT: STATUS=%d\n" , ((code) <<1 ) |1 );while (1 ) { -sigp_stop (); +sigp (0 ,SIGP_STOP ,0 ,NULL ); } }
lib/s390x/sclp.h +1 -0
@@ -19,6 +19,7 @@#define SCLP_CMD_CODE_MASK 0xffff00ff/* SCLP command codes */ +#define SCLP_READ_CPU_INFO 0x00010001#define SCLP_CMDW_READ_SCP_INFO 0x00020001#define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001#define SCLP_READ_STORAGE_ELEMENT_INFO 0x00040001
lib/s390x/smp.c new file +252 -0
252 lines not on this page · raw message
lib/s390x/smp.h new file +53 -0
53 lines not on this page · raw message
s390x/Makefile +1 -0
@@ -48,6 +48,7 @@ cflatobjs += lib/s390x/sclp.o cflatobjs += lib/s390x/sclp-console.o cflatobjs += lib/s390x/interrupt.o cflatobjs += lib/s390x/mmu.o +cflatobjs += lib/s390x/smp.o OBJDIRS += lib/s390x
s390x/cstart64.S +7 -0
@@ -172,6 +172,13 @@ diag308_load_reset: lhi %r2, 1 br %r14 +.globl smp_cpu_setup_state +smp_cpu_setup_state: + xgr %r1, %r1 + lmg %r0, %r15, GEN_LC_SW_INT_GRS + lctlg %c0, %c0, GEN_LC_SW_INT_CR0 + br %r14 + pgm_int: SAVE_REGS brasl %r14, handle_pgm_int
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 15/17] s390x: Prepare for external calls
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
With SMP we also get new external interrupts like external call and emergency call. Let's make them known.
Message-Id: <[email protected]>
--- lib/s390x/asm/arch_def.h | 5 +++++ lib/s390x/asm/interrupt.h | 3 +++ lib/s390x/interrupt.c | 23 +++++++++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-)
lib/s390x/asm/arch_def.h +5 -0
@@ -19,6 +19,11 @@ struct psw {#define PSW_MASK_DAT 0x0400000000000000UL#define PSW_MASK_PSTATE 0x0001000000000000UL +#define CR0_EXTM_SCLP 0X0000000000000200UL +#define CR0_EXTM_EXTC 0X0000000000002000UL +#define CR0_EXTM_EMGC 0X0000000000004000UL +#define CR0_EXTM_MASK 0X0000000000006200UL +struct lowcore {uint8_t pad_0x0000[0x0080 -0x0000 ];/* 0x0000 */ uint32_t ext_int_param;/* 0x0080 */
lib/s390x/asm/interrupt.h +3 -0
@@ -11,6 +11,8 @@#define _ASMS390X_IRQ_H_#include <asm/arch_def.h> +#define EXT_IRQ_EMERGENCY_SIG 0x1201 +#define EXT_IRQ_EXTERNAL_CALL 0x1202#define EXT_IRQ_SERVICE_SIG 0x2401void handle_pgm_int (void );
@@ -19,6 +21,7 @@ void handle_mcck_int(void);void handle_io_int (void );void handle_svc_int (void );void expect_pgm_int (void ); +void expect_ext_int (void );uint16_t clear_pgm_int (void );void check_pgm_int_code (uint16_t code);
lib/s390x/interrupt.c +19 -4
@@ -15,6 +15,7 @@#include <sclp.h> static bool pgm_int_expected; +static bool ext_int_expected;static struct lowcore *lc;void expect_pgm_int (void )
@@ -24,6 +25,13 @@ void expect_pgm_int(void)mb (); } +void expect_ext_int (void ) +{ + ext_int_expected = true; + lc->ext_int_code =0 ; +mb (); +} +uint16_t clear_pgm_int (void ) {uint16_t code;
@@ -108,15 +116,22 @@ void handle_pgm_int(void)void handle_ext_int (void ) { -if (lc->ext_int_code !=EXT_IRQ_SERVICE_SIG ) { +if (!ext_int_expected && + lc->ext_int_code !=EXT_IRQ_SERVICE_SIG ) {report_abort ("Unexpected external call interrupt: at %#lx" , lc->ext_old_psw.addr); - }else { - lc->ext_old_psw.mask &= ~PSW_MASK_EXT ; +return ; + } + +if (lc->ext_int_code ==EXT_IRQ_SERVICE_SIG ) { lc->sw_int_cr0 &= ~(1UL <<9 );sclp_handle_ext (); - lc->ext_int_code =0 ; + }else { + ext_int_expected = false; } + +if (!(lc->sw_int_cr0 &CR0_EXTM_MASK )) + lc->ext_old_psw.mask &= ~PSW_MASK_EXT ; }void handle_mcck_int (void )
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 16/17] s390x: SMP test
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
Testing SIGP emulation for the following order codes:
* start
* stop
* restart
* set prefix
* store status
* stop and store status
* reset
* initial reset
* external call
* emegergency call
restart and set prefix are part of the library and needed to start other cpus.
Message-Id: <[email protected]>
--- s390x/Makefile | 1 + s390x/smp.c | 242 ++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 + 3 files changed, 247 insertions(+) create mode 100644 s390x/smp.c
s390x/Makefile +1 -0
@@ -15,6 +15,7 @@ tests += $(TEST_DIR)/cpumodel.elf tests += $(TEST_DIR)/diag288.elf tests += $(TEST_DIR)/stsi.elf tests += $(TEST_DIR)/skrf.elf +tests += $(TEST_DIR)/smp.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary
s390x/smp.c new file +242 -0
242 lines not on this page · raw message
s390x/unittests.cfg +4 -0
@@ -71,3 +71,7 @@ extra_params=-device diag288,id=watchdog0 --watchdog-action inject-nmi [stsi] file = stsi.elf + +[smp] +file = smp.elf +extra_params =-smp 2
Signature · 1 line
2.18.1
[kvm-unit-tests PULL 17/17] s390x: Free allocated page in iep test
In reply to Thomas HuthFrom: Janosch Frank <[email protected]>
Let's also clean up
Message-Id: <[email protected]>
--- s390x/iep.c | 1 + 1 file changed, 1 insertion(+)
s390x/iep.c +1 -0
@@ -43,6 +43,7 @@ static void test_iep(void)report_prefix_pop ();unprotect_page (iepbuf,PAGE_ENTRY_IEP );ctl_clear_bit (0 ,20 ); +free_page (iepbuf); }int main (void )
Signature · 1 line
2.18.1
Paolo Bonzini
maintainerQuoted 1 line · Thomas Huth
https://gitlab.com/huth/kvm-unit-tests.git tags/s390x-2019-09-25
Pulled, thanks.
Paolo