s390x: Add skey removal facility test
v2 cover s390x: Add skey removal facility test
The storage key removal facility (skrf) is an anti-facility, which makes skey related instructions result in a special operation exception when they handle storage keys. E.g. pfmf in clearing mode does not result in an exception, but pfmf key setting does.
The skrf is always active in protected virtualization guests and can be emulated by KVM (expected to be upstreamed with the remaining hpage patches).
v2:
* Added march z12 bump patch
* Addressed review
Janosch Frank (4):
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
lib/s390x/asm/mem.h | 40 +++++++++++--- s390x/Makefile | 3 +- s390x/pfmf.c | 71 +++++++++--------------- s390x/skey.c | 29 +++++----- s390x/skrf.c | 128 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 205 insertions(+), 66 deletions(-) create mode 100644 s390x/skrf.c
Signature · 1 line
2.17.0
PATCH v2 1/4 s390x: Move pfmf to lib and make address void
It's needed by other tests soon.
--- 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.17.0
Re: [kvm-unit-tests PATCH v2 1/4] s390x: Move pfmf to lib and make address void
Quoted 7 lines · Janosch Frank
It's needed by other tests soon.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/mem.h | 31 ++++++++++++++++++++++++ s390x/pfmf.c | 57 +++++++++++---------------------------------- 2 files changed, 44 insertions(+), 44 deletions(-)
PATCH v2 2/4 s390x: Storage key library functions now take void ptr addresses
In reply to Janosch FrankNow all mem.h functions are consistent in how they take a memory address. Also we have less casting in the future.
--- 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.17.0
PATCH v2 3/4 s390x: Bump march to zEC12
In reply to Janosch FrankTCG has majored a lot and can now support many newer instructions, so there's no need to compile with the ancient march z900.
--- 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.17.0
Re: [kvm-unit-tests PATCH v2 3/4] s390x: Bump march to zEC12
Quoted 13 lines · Janosch Frank
TCG has majored a lot and can now support many newer instructions, so there's no need to compile with the ancient march z900.
Signed-off-by Janosch Frank <[email protected]>--- s390x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)s390x/Makefile +0
-0
s390x/Makefile CFLAGS += -std=gnu99 · line 30
Quoted 7 lines
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
Works with the QEMU in the gitlab-ci, so:
PATCH v2 4/4 s390x: Add storage key removal facility
In reply to Janosch FrankThe 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.
--- 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.17.0
Re: [kvm-unit-tests PATCH v2 4/4] s390x: Add storage key removal facility
Quoted 18 lines · Janosch Frank
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.
Signed-off-by Janosch Frank <[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/skrf.c line 84
Quoted 13 lines
s390x/skrf.c new file +13
-0+static void test_mvcos (void ) +{ +uint64_t r3 =64 ; +uint8_t *src = pagebuf; +uint8_t *dst = pagebuf +PAGE_SIZE ; +/* K bit set, as well as keys */ + register unsigned long oac asm("0") = 0xf002f002; + +report_prefix_push ("mvcos" ); +expect_pgm_int (); + asmvolatile ("mvcos %[dst],%[src],%[len]" + : [dst]"+Q" (*(dst)) + : [src] "Q" (*(src)), [len] "d" (r3), "d" (oac)
Just a nit: I think you could write "*dst" instead of "*(dst)" and "*src" instead of "*(src)".
Quoted 34 lines
s390x/skrf.c new file +34
-0+ : "cc", "memory"); +check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION ); +report_prefix_pop (); +} + +static void test_spka (void ) +{ +report_prefix_push ("spka" ); +expect_pgm_int (); + asmvolatile ("spka 0xf0(0)\n" ); +check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION ); +report_prefix_pop (); +} + +static void test_tprot (void ) +{ +report_prefix_push ("tprot" ); +expect_pgm_int (); + asmvolatile ("tprot %[addr],0xf0(0)\n" + : : [addr]"a" (pagebuf) : ); +check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION ); +report_prefix_pop (); +} + +int main (void ) +{ +report_prefix_push ("skrf" ); +if (!test_facility (169 )) { +report_skip ("storage key removal facility not available\n" ); + goto done; + } + +test_facilities (); +test_skey ();
s390x/skrf.c line 128
Quoted 10 lines
s390x/skrf.c new file +10
-0+test_pfmf (); +test_psw_key (); +test_mvcos (); +test_spka (); +test_tprot (); + +done: +report_prefix_pop (); +return report_summary (); +}
I can't say much about the technical details here (since I don't have the doc for that "removal facility"), but apart from that, the patch looks fine to me now.
(and I'll wait one or two more days for additional reviews before queuing the patches)
Re: [kvm-unit-tests PATCH v2 4/4] s390x: Add storage key removal facility
Quoted 86 lines · Thomas Huth
Quoted 18 lines · Janosch Frank
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.
Signed-off-by Janosch Frank <[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/skrf.c line 84
Quoted 13 lines
s390x/skrf.c new file +13
-0+static void test_mvcos (void ) +{ +uint64_t r3 =64 ; +uint8_t *src = pagebuf; +uint8_t *dst = pagebuf +PAGE_SIZE ; +/* K bit set, as well as keys */ + register unsigned long oac asm("0") = 0xf002f002; + +report_prefix_push ("mvcos" ); +expect_pgm_int (); + asmvolatile ("mvcos %[dst],%[src],%[len]" + : [dst]"+Q" (*(dst)) + : [src] "Q" (*(src)), [len] "d" (r3), "d" (oac)Just a nit: I think you could write "*dst" instead of "*(dst)" and "*src" instead of "*(src)".
Quoted 34 lines
s390x/skrf.c new file +34
-0+ : "cc", "memory"); +check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION ); +report_prefix_pop (); +} + +static void test_spka (void ) +{ +report_prefix_push ("spka" ); +expect_pgm_int (); + asmvolatile ("spka 0xf0(0)\n" ); +check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION ); +report_prefix_pop (); +} + +static void test_tprot (void ) +{ +report_prefix_push ("tprot" ); +expect_pgm_int (); + asmvolatile ("tprot %[addr],0xf0(0)\n" + : : [addr]"a" (pagebuf) : ); +check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION ); +report_prefix_pop (); +} + +int main (void ) +{ +report_prefix_push ("skrf" ); +if (!test_facility (169 )) { +report_skip ("storage key removal facility not available\n" ); + goto done; + } + +test_facilities (); +test_skey ();s390x/skrf.c line 128
Quoted 10 lines
s390x/skrf.c new file +10
-0+test_pfmf (); +test_psw_key (); +test_mvcos (); +test_spka (); +test_tprot (); + +done: +report_prefix_pop (); +return report_summary (); +}I can't say much about the technical details here (since I don't have the doc for that "removal facility"), but apart from that, the patch looks fine to me now.
Quoted 5 lines
Acked-by Thomas Huth <[email protected]>(and I'll wait one or two more days for additional reviews before queuing the patches)
Great, thank you!