s390x: storage key migration tests, snippets and linker cleanups
Hi Paolo and/or Thomas,
please merge the following changes:
* storage key concurrent migration test
* new utility macros for PSWs
* linker and snippets cleanups
* fix backtrace when exceptions happen during VM execution
MERGE: https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/merge_requests/40
PIPELINE: https://gitlab.com/imbrenda/kvm-unit-tests/-/pipelines/780085043
PULL: https://gitlab.com/imbrenda/kvm-unit-tests.git s390x-next-2023-02
Claudio Imbrenda (2):
lib: s390x: add PSW and PSW_WITH_CUR_MASK macros
s390x: use the new PSW and PSW_WITH_CUR_MASK macros
Janosch Frank (7):
s390x: Cleanup flat.lds
s390x: snippets: c: Cleanup flat.lds
s390x: Add a linker script to assembly snippets
s390x: snippets: Fix SET_PSW_NEW_ADDR macro
lib: s390x: sie: Set guest memory pointer
s390x: Clear first stack frame and end backtrace early
lib: s390x: Handle debug prints for SIE exceptions correctly
Nico Boehr (1):
s390x: add parallel skey migration test
s390x/Makefile | 5 +- lib/s390x/asm/arch_def.h | 4 + lib/s390x/sie.h | 2 + lib/s390x/snippet.h | 3 +- lib/s390x/interrupt.c | 46 +++++++- lib/s390x/sie.c | 1 + lib/s390x/stack.c | 2 + s390x/flat.lds | 19 +--- s390x/snippets/asm/flat.lds | 41 +++++++ s390x/snippets/c/flat.lds | 28 ++--- s390x/cpu.S | 6 +- s390x/cstart64.S | 2 + s390x/snippets/asm/macros.S | 2 +- s390x/adtl-status.c | 24 +--- s390x/firq.c | 5 +- s390x/migration-skey.c | 218 ++++++++++++++++++++++++++++++++---- s390x/migration.c | 6 +- s390x/mvpg-sie.c | 2 +- s390x/pv-diags.c | 6 +- s390x/skrf.c | 7 +- s390x/smp.c | 53 ++------- s390x/uv-host.c | 5 +- s390x/unittests.cfg | 15 ++- 23 files changed, 348 insertions(+), 154 deletions(-) create mode 100644 s390x/snippets/asm/flat.lds
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 05/10] s390x: snippets: c: Cleanup flat.lds
From: Janosch Frank <[email protected]>
There are a lot of things in there which we don't need for snippets and the alignments can be switched from 64K to 4K since that's the s390 page size.
Message-Id: <[email protected]>
--- s390x/snippets/c/flat.lds | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)
s390x/snippets/c/flat.lds +9 -19
@@ -16,27 +16,22 @@ SECTIONS QUAD(0x0000000000004000) } . = 0x4000; + /* + * The stack grows down from 0x4000 to 0x2000, we pre-allocoate + * a frame via the -160. + */ stackptr = . - 160; stacktop = .; + /* Start text 0x4000 */ .text : { *(.init) *(.text) *(.text.*) } - . = ALIGN(64K); + . = ALIGN(4K); etext = .; - .opd : { *(.opd) } - . = ALIGN(16); - .dynamic : { - dynamic_start = .; - *(.dynamic) - } - .dynsym : { - dynsym_start = .; - *(.dynsym) - } - .rela.dyn : { *(.rela*) } - . = ALIGN(16); + /* End text */ + /* Start data */ .data : { *(.data) *(.data.rel*)
@@ -44,11 +39,6 @@ SECTIONS . = ALIGN(16); .rodata : { *(.rodata) *(.rodata.*) } . = ALIGN(16); - __bss_start = .; .bss : { *(.bss) } - __bss_end = .; - . = ALIGN(64K); - edata = .; - . += 64K; - . = ALIGN(64K); + /* End data */ }
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 04/10] s390x: Cleanup flat.lds
In reply to Claudio ImbrendaFrom: Janosch Frank <[email protected]>
It seems like the loader file was copied over from another architecture which has a different page size (64K) than s390 (4K).
Let's use a 4k alignment instead of the 64k one and remove unneeded entries.
Message-Id: <[email protected]>
--- s390x/flat.lds | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
s390x/flat.lds +4 -15
@@ -24,20 +24,8 @@ SECTIONS *(.text) *(.text.*) } - . = ALIGN(64K); + . = ALIGN(4K); etext = .; - .opd : { *(.opd) } - . = ALIGN(16); - .dynamic : { - dynamic_start = .; - *(.dynamic) - } - .dynsym : { - dynsym_start = .; - *(.dynsym) - } - .rela.dyn : { *(.rela*) } - . = ALIGN(16); .data : { *(.data) *(.data.rel*)
@@ -48,10 +36,11 @@ SECTIONS __bss_start = .; .bss : { *(.bss) } __bss_end = .; - . = ALIGN(64K); + . = ALIGN(4K); edata = .; + /* Reserve 64K for the stack */ . += 64K; - . = ALIGN(64K); + . = ALIGN(4K); /* * stackptr set with initial stack frame preallocated */
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 01/10] lib: s390x: add PSW and PSW_WITH_CUR_MASK macros
In reply to Claudio ImbrendaSince a lot of code starts new CPUs using the current PSW mask, add two macros to streamline the creation of generic PSWs and PSWs with the current program mask.
Message-Id: <[email protected]>
--- lib/s390x/asm/arch_def.h | 4 ++++ 1 file changed, 4 insertions(+)
lib/s390x/asm/arch_def.h +4 -0
@@ -41,6 +41,8 @@ struct psw {uint64_t addr; }; +#define PSW (m, a) ((struct psw){ .mask = (m), .addr = (uint64_t)(a) }) +struct short_psw {uint32_t mask;uint32_t addr;
@@ -321,6 +323,8 @@ static inline uint64_t extract_psw_mask(void)return (uint64_t ) mask_upper <<32 | mask_lower; } +#define PSW_WITH_CUR_MASK (addr) PSW(extract_psw_mask(), (addr)) +static inline void load_psw_mask (uint64_t mask) {struct psw psw = {
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 02/10] s390x: use the new PSW and PSW_WITH_CUR_MASK macros
In reply to Claudio ImbrendaUse the new macros in the existing code. No functional changes intended.
Message-Id: <[email protected]>
--- s390x/adtl-status.c | 24 ++++---------------- s390x/firq.c | 5 +---- s390x/migration.c | 6 +---- s390x/skrf.c | 7 +----- s390x/smp.c | 53 ++++++++++----------------------------------- s390x/uv-host.c | 5 +---- 6 files changed, 19 insertions(+), 81 deletions(-)
s390x/adtl-status.c +4 -20
@@ -205,16 +205,11 @@ static void restart_write_vector(void)static void cpu_write_magic_to_vector_regs (uint16_t cpu_idx) { -struct psw new_psw; -smp_cpu_stop (cpu_idx); - new_psw.mask =extract_psw_mask (); - new_psw.addr = (unsigned long )restart_write_vector; -set_flag (0 ); -smp_cpu_start (cpu_idx, new_psw); +smp_cpu_start (cpu_idx,PSW_WITH_CUR_MASK (restart_write_vector));wait_for_flag (); }
@@ -241,7 +236,6 @@ static int adtl_status_check_unmodified_fields_for_lc(unsigned long lc)static void __store_adtl_status_vector_lc (unsigned long lc) {uint32_t status =-1 ; -struct psw psw;int cc;report_prefix_pushf ("LC %lu" , lc);
@@ -274,9 +268,7 @@ static void __store_adtl_status_vector_lc(unsigned long lc)* Destroy and re-initalize the CPU to fix that. */ smp_cpu_destroy (1 ); - psw.mask =extract_psw_mask (); - psw.addr = (unsigned long )test_func; -smp_cpu_setup (1 , psw); +smp_cpu_setup (1 ,PSW_WITH_CUR_MASK (test_func)); out:report_prefix_pop ();
@@ -325,16 +317,11 @@ static void restart_write_gs_regs(void)static void cpu_write_to_gs_regs (uint16_t cpu_idx) { -struct psw new_psw; -smp_cpu_stop (cpu_idx); - new_psw.mask =extract_psw_mask (); - new_psw.addr = (unsigned long )restart_write_gs_regs; -set_flag (0 ); -smp_cpu_start (cpu_idx, new_psw); +smp_cpu_start (cpu_idx,PSW_WITH_CUR_MASK (restart_write_gs_regs));wait_for_flag (); }
@@ -382,7 +369,6 @@ out:int main (void ) { -struct psw psw;report_prefix_push ("adtl_status" );if (smp_query_num_cpus () ==1 ) {
@@ -391,9 +377,7 @@ int main(void) }/* Setting up the cpu to give it a stack and lowcore */ - psw.mask =extract_psw_mask (); - psw.addr = (unsigned long )test_func; -smp_cpu_setup (1 , psw); +smp_cpu_setup (1 ,PSW_WITH_CUR_MASK (test_func));smp_cpu_stop (1 );test_store_adtl_status_unavail ();
s390x/firq.c +1 -4
@@ -33,7 +33,6 @@ static void wait_for_sclp_int(void)*/ static void test_wait_state_delivery (void ) { -struct psw psw;SCCBHeader *h;int ret;
@@ -55,9 +54,7 @@ static void test_wait_state_delivery(void)sclp_mark_busy ();/* Start CPU #1 and let it wait for the interrupt. */ - psw.mask =extract_psw_mask (); - psw.addr = (unsigned long )wait_for_sclp_int; - ret =smp_cpu_setup (1 , psw); + ret =smp_cpu_setup (1 ,PSW_WITH_CUR_MASK (wait_for_sclp_int));/* This must not fail because we have at least 3 CPUs */ assert (!ret);
s390x/migration.c +1 -5
@@ -159,8 +159,6 @@ static void test_func(void)int main (void ) { -struct psw psw; -/* don't say migrate here otherwise we will migrate right away */ report_prefix_push ("migration" );
@@ -170,9 +168,7 @@ int main(void) }/* Second CPU does the actual tests */ - psw.mask =extract_psw_mask (); - psw.addr = (unsigned long )test_func; -smp_cpu_setup (1 , psw); +smp_cpu_setup (1 ,PSW_WITH_CUR_MASK (test_func));/* wait for thread setup */ while (!flag_thread_complete)
s390x/skrf.c +1 -6
@@ -151,11 +151,6 @@ static void ecall_setup(void)static void test_exception_ext_new (void ) { -struct psw psw = { - .mask =extract_psw_mask (), - .addr = (unsigned long )ecall_setup - }; -report_prefix_push ("exception external new" );if (smp_query_num_cpus () <2 ) {report_skip ("Need second cpu for exception external new test." );
@@ -163,7 +158,7 @@ static void test_exception_ext_new(void)return ; } -smp_cpu_setup (1 , psw); +smp_cpu_setup (1 ,PSW_WITH_CUR_MASK (ecall_setup));wait_for_flag ();set_flag (0 );
s390x/smp.c +11 -42
150 lines not on this page · raw message
s390x/uv-host.c +1 -4
@@ -501,7 +501,6 @@ static void test_init(void) {int rc;uint64_t mem; -struct psw psw;/* Donated storage needs to be over 2GB */ mem = (uint64_t )memalign_pages_flags (SZ_1M , uvcb_qui.uv_base_stor_len,AREA_NORMAL );
@@ -547,9 +546,7 @@ static void test_init(void) "storage below 2GB"); uvcb_init.stor_origin = mem; - psw.mask =extract_psw_mask (); - psw.addr = (unsigned long )cpu_loop; -smp_cpu_setup (1 , psw); +smp_cpu_setup (1 ,PSW_WITH_CUR_MASK (cpu_loop)); rc =uv_call (0 , (uint64_t )&uvcb_init);report (rc ==1 && uvcb_init.header.rc ==0x102 ,"too many running cpus" );
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 07/10] s390x: snippets: Fix SET_PSW_NEW_ADDR macro
In reply to Claudio ImbrendaFrom: Janosch Frank <[email protected]>
Let's store the psw mask instead of the address of the location where we should load the mask from.
Message-Id: <[email protected]>
--- s390x/snippets/asm/macros.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/snippets/asm/macros.S +1 -1
@@ -18,7 +18,7 @@ */ .macro SET_PSW_NEW_ADDR reg, psw_new_addr, addr_psw larl \reg, psw_mask_64 -stg \reg, \addr_psw +mvc \addr_psw(8,%r0), 0(\reg) larl \reg, \psw_new_addr stg \reg, \addr_psw + 8 .endm
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 09/10] s390x: Clear first stack frame and end backtrace early
In reply to Claudio ImbrendaFrom: Janosch Frank <[email protected]>
When setting the first stack frame to 0, we can check for a 0 backchain pointer when doing backtraces to know when to stop.
Message-Id: <[email protected]>
--- lib/s390x/stack.c | 2 ++ s390x/cstart64.S | 2 ++ 2 files changed, 4 insertions(+)
lib/s390x/stack.c +2 -0
@@ -22,6 +22,8 @@ int backtrace_frame(const void *frame, const void **return_addrs, int max_depth)for (depth =0 ; stack && depth < max_depth; depth++) { return_addrs[depth] = (void *)stack->grs[8 ]; stack = stack->back_chain; +if (!stack) +break ; }return depth;
s390x/cstart64.S +2 -0
@@ -37,6 +37,8 @@ start: sam64 # Set addressing mode to 64 bit /* setup stack */ larl %r15, stackptr + /* Clear first stack frame */ + xc 0(160,%r15), 0(%r15) /* setup initial PSW mask + control registers*/ larl %r1, initial_psw lpswe 0(%r1)
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 08/10] lib: s390x: sie: Set guest memory pointer
In reply to Claudio ImbrendaFrom: Janosch Frank <[email protected]>
Seems like it was introduced but never set. It's nicer to have a pointer than to cast the MSO of a VM.
Message-Id: <[email protected]>
--- lib/s390x/sie.c | 1 + 1 file changed, 1 insertion(+)
lib/s390x/sie.c +1 -0
@@ -93,6 +93,7 @@ void sie_guest_create(struct vm *vm, uint64_t guest_mem, uint64_t guest_mem_len)/* Guest memory chunks are always 1MB */ assert (!(guest_mem_len & ~HPAGE_MASK )); + vm->guest_mem = (uint8_t *)guest_mem;/* For non-PV guests we re-use the host's ASCE for ease of use */ vm->save_area.guest.asce =stctg (1 );/* Currently MSO/MSL is the easiest option */
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 06/10] s390x: Add a linker script to assembly snippets
In reply to Claudio ImbrendaFrom: Janosch Frank <[email protected]>
A linker script has a few benefits:
- Random data doesn't end up in the binary breaking tests
- We can easily define a lowcore and load the snippet from 0x0 instead of 0x4000 which makes asm snippets behave like c snippets
- We can easily define an invalid PGM new PSW to ensure an exit on a guest PGM
Message-Id: <[email protected]>
--- s390x/Makefile | 5 +++-- lib/s390x/snippet.h | 3 +-- s390x/snippets/asm/flat.lds | 41 +++++++++++++++++++++++++++++++++++++ s390x/mvpg-sie.c | 2 +- s390x/pv-diags.c | 6 +++--- 5 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 s390x/snippets/asm/flat.lds
s390x/Makefile +3 -2
@@ -136,7 +136,8 @@ $(SNIPPET_DIR)/c/%.o: $(SNIPPET_DIR)/c/%.c $(asm-offsets) $(CC) $(CFLAGS) -c -nostdlib -o $@ $< $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o - $(OBJCOPY) -O binary -j ".rodata" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $(patsubst %.gbin,%.o,$@) $@ + $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/asm/flat.lds $< + $(OBJCOPY) -O binary -j ".rodata" -j ".lowcore" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $@ $@ truncate -s '%4096' $@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS)
@@ -145,7 +146,7 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) truncate -s '%4096' $@ $(SNIPPET_DIR)/asm/%.hdr: $(SNIPPET_DIR)/asm/%.gbin $(HOST_KEY_DOCUMENT) - $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x4000,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@ + $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x0,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@ $(SNIPPET_DIR)/c/%.hdr: $(SNIPPET_DIR)/c/%.gbin $(HOST_KEY_DOCUMENT) $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x0,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@
lib/s390x/snippet.h +1 -2
@@ -32,8 +32,7 @@#define SNIPPET_PV_TWEAK0 0x42UL#define SNIPPET_PV_TWEAK1 0UL -#define SNIPPET_OFF_C 0 -#define SNIPPET_OFF_ASM 0x4000 +#define SNIPPET_UNPACK_OFF 0/*
s390x/snippets/asm/flat.lds new file +41 -0
41 lines not on this page · raw message
s390x/mvpg-sie.c +1 -1
@@ -87,7 +87,7 @@ static void setup_guest(void)snippet_setup_guest (&vm, false);snippet_init (&vm,SNIPPET_NAME_START (c, mvpg_snippet), -SNIPPET_LEN (c, mvpg_snippet),SNIPPET_OFF_C ); +SNIPPET_LEN (c, mvpg_snippet),SNIPPET_UNPACK_OFF );/* Enable MVPG interpretation as we want to test KVM and not ourselves */ vm.sblk->eca =ECA_MVPGI ;
s390x/pv-diags.c +3 -3
@@ -28,7 +28,7 @@ static void test_diag_500(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_500), SNIPPET_HDR_START(asm, snippet_pv_diag_500), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );sie (&vm); report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 &&
@@ -83,7 +83,7 @@ static void test_diag_288(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_288), SNIPPET_HDR_START(asm, snippet_pv_diag_288), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );sie (&vm); report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 &&
@@ -124,7 +124,7 @@ static void test_diag_yield(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_yield), SNIPPET_HDR_START(asm, snippet_pv_diag_yield), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );/* 0x44 */ report_prefix_push ("0x44" );
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 03/10] s390x: add parallel skey migration test
In reply to Claudio ImbrendaFrom: Nico Boehr <[email protected]>
Right now, we have a test which sets storage keys, then migrates the VM and - after migration finished - verifies the skeys are still there.
Add a new version of the test which changes storage keys while the migration is in progress. This is achieved by adding a command line argument to the existing migration-skey test.
Message-Id: <[email protected]>
--- s390x/migration-skey.c | 218 +++++++++++++++++++++++++++++++++++++---- s390x/unittests.cfg | 15 ++- 2 files changed, 210 insertions(+), 23 deletions(-)
s390x/migration-skey.c +199 -19
@@ -2,6 +2,12 @@/* * Storage Key migration tests * +* There are two variants of this test: +* - sequential: set storage keys on some pages, migrates the VM and then +* verifies that the storage keys are still as we expect. +* - parallel: start migration and set and check storage keys on some +* pages while migration is in process. +* * Copyright IBM Corp. 2022 * * Authors:
@@ -13,16 +19,45 @@#include <asm/facility.h> #include <asm/page.h> #include <asm/mem.h> -#include <asm/interrupt.h> +#include <asm/barrier.h> #include <hardware.h> +#include <smp.h> + +struct verify_result { +bool verify_failed; +union skey expected_key; +union skey actual_key; +unsigned long page_mismatch_idx; +unsigned long page_mismatch_addr; +};#define NUM_PAGES 128 -static uint8_t pagebuf[NUM_PAGES][PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); +static uint8_t pagebuf[NUM_PAGES * PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); + +static struct verify_result result; + +static unsigned int thread_iters; +static bool thread_should_exit; +static bool thread_exited; + +static enum { +TEST_INVALID , +TEST_SEQUENTIAL , +TEST_PARALLEL +} arg_test_to_run; -static void test_migration (void ) +/* +* Set storage key test pattern on pagebuf with a seed for the storage keys. +* +* Each page's storage key is generated by taking the page's index in pagebuf, +* XOR-ing that with the given seed and then multipling the result with two. +* +* Only the lower seven bits of the seed are considered. +*/ +static void set_test_pattern (unsigned char seed) { -union skey expected_key, actual_key; -int i, key_to_set, key_mismatches =0 ; +unsigned char key_to_set; +unsigned long i;for (i =0 ; i <NUM_PAGES ; i++) {/*
@@ -32,15 +67,34 @@ static void test_migration(void)* protection as well as reference and change indication for * some keys. */ - key_to_set = i *2 ; -set_storage_key (pagebuf[i], key_to_set,1 ); + key_to_set = (i ^ seed) *2 ; +set_storage_key (pagebuf + i *PAGE_SIZE , key_to_set,1 ); } +} -migrate_once (); +/* +* Verify storage keys on pagebuf. +* Storage keys must have been set by set_test_pattern on pagebuf before. +* set_test_pattern must have been called with the same seed value. +* +* If storage keys match the expected result, will return a verify_result +* with verify_failed false. All other fields are then invalid. +* If there is a mismatch, returned struct will have verify_failed true and will +* be filled with the details on the first mismatch encountered. +*/ +static struct verify_result verify_test_pattern (unsigned char seed) +{ +union skey expected_key, actual_key; +struct verify_result result = { + .verify_failed = true + }; +uint8_t *cur_page; +unsigned long i;for (i =0 ; i <NUM_PAGES ; i++) { - actual_key.val =get_storage_key (pagebuf[i]); - expected_key.val = i *2 ; + cur_page = pagebuf + i *PAGE_SIZE ; + actual_key.val =get_storage_key (cur_page); + expected_key.val = (i ^ seed) *2 ;/* * The PoP neither gives a guarantee that the reference bit is
@@ -51,27 +105,153 @@ static void test_migration(void) actual_key.str.rf =0 ; expected_key.str.rf =0 ; -/* don't log anything when key matches to avoid spamming the log */ if (actual_key.val != expected_key.val) { - key_mismatches++; -report_fail ("page %d expected_key=0x%x actual_key=0x%x" , i, expected_key.val, actual_key.val); + result.expected_key.val = expected_key.val; + result.actual_key.val = actual_key.val; + result.page_mismatch_idx = i; + result.page_mismatch_addr = (unsigned long )cur_page; +return result; } } -report (!key_mismatches,"skeys after migration match" ); + result.verify_failed = false; +return result; +} + +static void report_verify_result (const struct verify_result * result) +{ +if (result->verify_failed) +report_fail ("page skey mismatch: first page idx = %lu, addr = 0x%lx, " +"expected_key = 0x%02x, actual_key = 0x%02x" , + result->page_mismatch_idx, result->page_mismatch_addr, + result->expected_key.val, result->actual_key.val); +else +report_pass ("skeys match" ); +} + +static void test_skey_migration_sequential (void ) +{ +report_prefix_push ("sequential" ); + +set_test_pattern (0 ); + +migrate_once (); + + result =verify_test_pattern (0 ); +report_verify_result (&result); + +report_prefix_pop (); +} + +static void set_skeys_thread (void ) +{ +while (!READ_ONCE (thread_should_exit)) { +set_test_pattern (thread_iters); + + result =verify_test_pattern (thread_iters); + +/* +* Always increment even if the verify fails. This ensures primary CPU knows where +* we left off and can do an additional verify round after migration finished. +*/ + thread_iters++; + +if (result.verify_failed) +break ; + } + +WRITE_ONCE (thread_exited,1 ); +} + +static void test_skey_migration_parallel (void ) +{ +report_prefix_push ("parallel" ); + +if (smp_query_num_cpus () ==1 ) { +report_skip ("need at least 2 cpus for this test" ); + goto error; + } + +smp_cpu_setup (1 ,PSW_WITH_CUR_MASK (set_skeys_thread)); + +migrate_once (); + +WRITE_ONCE (thread_should_exit,1 ); + +while (!READ_ONCE (thread_exited)) + ; + +/* Ensure we read result and thread_iters below from memory after thread exited */ +mb (); +report_info ("thread completed %u iterations" , thread_iters); + +report_prefix_push ("during migration" ); +report_verify_result (&result); +report_prefix_pop (); + +/* +* Verification of skeys occurs on the thread. We don't know if we +* were still migrating during the verification. +* To be sure, make another verification round after the migration +* finished to catch skeys which might not have been migrated +* correctly. +*/ +report_prefix_push ("after migration" ); +assert (thread_iters >0 ); + result =verify_test_pattern (thread_iters -1 ); +report_verify_result (&result); +report_prefix_pop (); + +error: +report_prefix_pop (); +} + +static void print_usage (void ) +{ +report_info ("Usage: migration-skey [--parallel|--sequential]" ); +} + +static void parse_args (int argc,char **argv) +{ +if (argc <2 ) { +/* default to sequential since it only needs one cpu */ + arg_test_to_run =TEST_SEQUENTIAL ; +return ; + } + +if (!strcmp ("--parallel" , argv[1 ])) + arg_test_to_run =TEST_PARALLEL ; +else if (!strcmp ("--sequential" , argv[1 ])) + arg_test_to_run =TEST_SEQUENTIAL ; +else + arg_test_to_run =TEST_INVALID ; } -int main (void ) +int main (int argc,char **argv) {report_prefix_push ("migration-skey" ); -if (test_facility (169 )) +if (test_facility (169 )) {report_skip ("storage key removal facility is active" ); -else -test_migration (); + goto error; + } -migrate_once (); +parse_args (argc, argv); + +switch (arg_test_to_run) { +case TEST_SEQUENTIAL : +test_skey_migration_sequential (); +break ; +case TEST_PARALLEL : +test_skey_migration_parallel (); +break ; +default : +print_usage (); +break ; + } +error: +migrate_once ();report_prefix_pop ();return report_summary (); }
s390x/unittests.cfg +11 -4
@@ -185,10 +185,6 @@ smp = 2 file = migration-cmm.elf groups = migration -[migration-skey] -file = migration-skey.elf -groups = migration - [panic-loop-extint] file = panic-loop-extint.elf groups = panic
@@ -208,3 +204,14 @@ groups = migration [exittime] file = exittime.elf smp = 2 + +[migration-skey-sequential] +file = migration-skey.elf +groups = migration +extra_params = -append '--sequential' + +[migration-skey-parallel] +file = migration-skey.elf +smp = 2 +groups = migration +extra_params = -append '--parallel'
Signature · 1 line
2.39.1
[kvm-unit-tests GIT PULL 10/10] lib: s390x: Handle debug prints for SIE exceptions correctly
In reply to Claudio ImbrendaFrom: Janosch Frank <[email protected]>
When we leave SIE due to an exception, we'll still have guest values in registers 0 - 13 and that's not clearly portraied in our debug prints. So let's fix that.
Message-Id: <[email protected]>
--- lib/s390x/sie.h | 2 ++ lib/s390x/interrupt.c | 46 ++++++++++++++++++++++++++++++++++++++----- s390x/cpu.S | 6 ++++-- 3 files changed, 47 insertions(+), 7 deletions(-)
lib/s390x/sie.h +2 -0
@@ -273,6 +273,8 @@ struct vm {extern void sie_entry (void );extern void sie_exit (void ); +extern void sie_entry_gregs (void ); +extern void sie_exit_gregs (void );extern void sie64a (struct kvm_s390_sie_block *sblk,struct vm_save_area *save_area);void sie (struct vm *vm);void sie_expect_validity (struct vm *vm);
lib/s390x/interrupt.c +41 -5
80 lines not on this page · raw message
s390x/cpu.S +4 -2
@@ -82,7 +82,8 @@ sie64a: # Store scb and save_area pointer into stack frame stg %r2,__SF_SIE_CONTROL(%r15) # save control block pointer stg %r3,__SF_SIE_SAVEAREA(%r15) # save guest register save area - +.globl sie_entry_gregs +sie_entry_gregs: # Load guest's gprs, fprs and fpc .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ld \i, \i * 8 + SIE_SAVEAREA_GUEST_FPRS(%r3)
@@ -121,7 +122,8 @@ sie_exit: .endr lfpc SIE_SAVEAREA_HOST_FPC(%r14) lmg %r0,%r14,SIE_SAVEAREA_HOST_GRS(%r14) # restore kernel registers - +.globl sie_exit_gregs +sie_exit_gregs: br %r14 .align 8
Signature · 1 line
2.39.1