s390x: add migration test for storage keys
v6 cover s390x: add migration test for storage keys
v5->v6:
----
* add comment to explain why reference bit is ignored (thanks Janosch)
v4->v5:
----
* don't print message on every skey tested (thanks Janosch)
* extend some comments (Thanks Janosch)
v3->v4:
----
* remove useless goto (Thanks Thomas)
v2->v3:
----
* remove some useless variables, style suggestions, improve commit description (thanks Janis)
* reverse christmas tree (thanks Claudio)
v1->v2:
----
* As per discussion with Janis and Claudio, remove the actual access check from the test. This also allows us to remove the check_pgm_int_code_xfail() patch.
* Typos/Style suggestions (thanks Janis)
Upon migration, we expect storage keys set by the guest to be preserved, so add a test for it.
We keep 128 pages and set predictable storage keys. Then, we migrate and check they can be read back.
Nico Boehr (1):
s390x: add migration test for storage keys
s390x/Makefile | 1 + s390x/migration-skey.c | 83 ++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++ 3 files changed, 88 insertions(+) create mode 100644 s390x/migration-skey.c
Signature · 1 line
2.36.1
PATCH v6 1/1 s390x: add migration test for storage keys
Upon migration, we expect storage keys set by the guest to be preserved, so add a test for it.
We keep 128 pages and set predictable storage keys. Then, we migrate and check that they can be read back and match the value originally set.
--- s390x/Makefile | 1 + s390x/migration-skey.c | 83 ++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++ 3 files changed, 88 insertions(+) create mode 100644 s390x/migration-skey.c
s390x/Makefile +1 -0
@@ -33,6 +33,7 @@ tests += $(TEST_DIR)/adtl-status.elf tests += $(TEST_DIR)/migration.elf tests += $(TEST_DIR)/pv-attest.elf tests += $(TEST_DIR)/migration-cmm.elf +tests += $(TEST_DIR)/migration-skey.elf pv-tests += $(TEST_DIR)/pv-diags.elf
s390x/migration-skey.c new file +83 -0
83 lines not on this page · raw message
s390x/unittests.cfg +4 -0
@@ -180,3 +180,7 @@ smp = 2 [migration-cmm] file = migration-cmm.elf groups = migration + +[migration-skey] +file = migration-skey.elf +groups = migration
Signature · 1 line
2.36.1
Quoted 9 lines · Nico Boehr
Upon migration, we expect storage keys set by the guest to be preserved, so add a test for it.
We keep 128 pages and set predictable storage keys. Then, we migrate and check that they can be read back and match the value originally set.
Signed-off-by Nico Boehr <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Thomas Huth <[email protected]>
Quoted 120 lines
--- s390x/Makefile | 1 + s390x/migration-skey.c | 83 ++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++ 3 files changed, 88 insertions(+)create mode 100644
s390x/migration-skey.cs390x/Makefile +1
-0@@ -33,6 +33,7 @@ tests += $(TEST_DIR)/adtl-status.elf tests += $(TEST_DIR)/migration.elf tests += $(TEST_DIR)/pv-attest.elf tests += $(TEST_DIR)/migration-cmm.elf +tests += $(TEST_DIR)/migration-skey.elf pv-tests += $(TEST_DIR)/pv-diags.elfs390x/migration-skey.c new file +83
-0@@ -0,0 +1,83 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Storage Key migration tests +* +* Copyright IBM Corp. 2022 +* +* Authors: +* Nico Boehr <[email protected]> +*/ + +#include <libcflat.h> +#include <asm/facility.h> +#include <asm/page.h> +#include <asm/mem.h> +#include <asm/interrupt.h> +#include <hardware.h> + +#define NUM_PAGES 128 +static uint8_t pagebuf[NUM_PAGES][PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); + +static void test_migration (void ) +{ +union skey expected_key, actual_key; +int i, key_to_set, key_mismatches =0 ; + +for (i =0 ; i <NUM_PAGES ; i++) { +/* +* Storage keys are 7 bit, lowest bit is always returned as zero +* by iske. +* This loop will set all 7 bits which means we set fetch +* 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 ); + } + +puts ("Please migrate me, then press return\n" ); + (void )getchar (); + +for (i =0 ; i <NUM_PAGES ; i++) { + actual_key.val =get_storage_key (pagebuf[i]); + expected_key.val = i *2 ; + +/* +* The PoP neither gives a guarantee that the reference bit is +* accurate nor that it won't be cleared by hardware. Hence we +* don't rely on it and just clear the bits to avoid compare +* errors. +*/ + 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); + } + } + +report (!key_mismatches,"skeys after migration match" ); +} + +int main (void ) +{ +report_prefix_push ("migration-skey" ); +if (test_facility (169 )) { +report_skip ("storage key removal facility is active" ); + +/* +* If we just exit and don't ask migrate_cmd to migrate us, it +* will just hang forever. Hence, also ask for migration when we +* skip this test altogether. +*/ +puts ("Please migrate me, then press return\n" ); + (void )getchar (); + }else { +test_migration (); + } + +report_prefix_pop (); +return report_summary (); +}s390x/unittests.cfg +4
-0@@ -180,3 +180,7 @@ smp = 2 [migration-cmm] file = migration-cmm.elf groups = migration + +[migration-skey] +file = migration-skey.elf +groups = migration