Skip to contentSkip to conversation

s390x: add migration test for storage keys

PATCH Superseded Nico Boehr 2 participants 5 messages May 31, 2022 – Jun 1, 2022

Subsystems (2)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Nico Boehr

author
#0 lore raw

v3 cover s390x: add migration test for storage keys

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 | 76 ++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg    |  4 +++
 3 files changed, 81 insertions(+)
 create mode 100644 s390x/migration-skey.c
Signature · 1 line
2.36.1
author
#1 lore raw

PATCH v3 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 | 76 ++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg    |  4 +++
 3 files changed, 81 insertions(+)
 create mode 100644 s390x/migration-skey.c
s390x/Makefile +1 -0
index 25802428fa13..94fc5c1a3527 100644
@@ -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 +76 -0

76 lines not on this page · raw message

s390x/unittests.cfg +4 -0
index 9b97d0471bcf..8e52f560bb1e 100644
@@ -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
Reviewed-by on v3 1/1
#2 lore raw
Quoted 69 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.

---
  s390x/Makefile         |  1 +
  s390x/migration-skey.c | 76 ++++++++++++++++++++++++++++++++++++++++++
  s390x/unittests.cfg    |  4 +++
  3 files changed, 81 insertions(+)

create mode 100644 s390x/migration-skey.c

s390x/Makefile +1 -0
index 25802428fa13..94fc5c1a3527 100644
@@ -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 +36 -0
new file mode 100644
index 000000000000..f846ac435836
@@ -0,0 +1,76 @@
+/* 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;
+
+	for (i = 0; i < NUM_PAGES; i++) {
+		/*
+		 * Storage keys are 7 bit, lowest bit is always returned as zero
+		 * by iske
+		 */
+		key_to_set = i * 2;
+		set_storage_key(pagebuf[i], key_to_set, 1);
+	}
+
+	puts("Please migrate me, then press return\n");
+	(void)getchar();

s390x/migration-skey.c line 46

Quoted 10 lines
s390x/migration-skey.c new file +10 -0
+
+	for (i = 0; i < NUM_PAGES; i++) {
+		report_prefix_pushf("page %d", i);
+
+		actual_key.val = get_storage_key(pagebuf[i]);
+		expected_key.val = i * 2;
+
+		/* ignore reference bit */
+		actual_key.str.rf = 0;
+		expected_key.str.rf = 0;

If the reference bit gets always ignored, testing 64 pages should be enough? OTOH this will complicate the for-loop / creation of the key value, so I don't mind too much if we keep it this way.

Quoted 16 lines
s390x/migration-skey.c new file +16 -0
+		report(actual_key.val == expected_key.val, "expected_key=0x%x actual_key=0x%x", expected_key.val, actual_key.val);
+
+		report_prefix_pop();
+	}
+}
+
+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.

s390x/migration-skey.c line 73

Quoted 10 lines
s390x/migration-skey.c new file +10 -0
+		 */
+		puts("Please migrate me, then press return\n");
+		(void)getchar();
+
+		goto done;
+	}
+
+	test_migration();
+
+done:
	} else {
		test_migration();
	}

to get rid of the goto?

s390x/migration-skey.c line 76

Quoted 3 lines
s390x/migration-skey.c new file +3 -0
+	report_prefix_pop();
+	return report_summary();
+}

Either way:

author
#3 lore raw
Quoted 130 lines · On Tue, 31 May 2022 10:55:27 +0200 Thomas Huth <[email protected]> wrote:
Quoted 71 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.

---
  s390x/Makefile         |  1 +
  s390x/migration-skey.c | 76

++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg |
4 +++ 3 files changed, 81 insertions(+)
create mode 100644 s390x/migration-skey.c

s390x/Makefile +1 -0
index 25802428fa13..94fc5c1a3527 100644
@@ -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 +19 -0
new file mode 100644
index 000000000000..f846ac435836
@@ -0,0 +1,76 @@
+/* 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))); +

s390x/migration-skey.c new file +8 -0
+static void test_migration(void)
+{
+	union skey expected_key, actual_key;
+	int i, key_to_set;
+
+	for (i = 0; i < NUM_PAGES; i++) {
+		/*
+		 * Storage keys are 7 bit, lowest bit is always

returned as zero

s390x/migration-skey.c new file +8 -0
+		 * by iske
+		 */
+		key_to_set = i * 2;
+		set_storage_key(pagebuf[i], key_to_set, 1);
+	}
+
+	puts("Please migrate me, then press return\n");
+	(void)getchar();

s390x/migration-skey.c line 46

Quoted 10 lines
s390x/migration-skey.c new file +10 -0
+
+	for (i = 0; i < NUM_PAGES; i++) {
+		report_prefix_pushf("page %d", i);
+
+		actual_key.val = get_storage_key(pagebuf[i]);
+		expected_key.val = i * 2;
+
+		/* ignore reference bit */
+		actual_key.str.rf = 0;
+		expected_key.str.rf = 0;  

If the reference bit gets always ignored, testing 64 pages should be enough? OTOH this will complicate the for-loop / creation of the key value, so I don't mind too much if we keep it this way.

Quoted 19 lines
s390x/migration-skey.c new file +1 -0
+		report(actual_key.val == expected_key.val,

"expected_key=0x%x actual_key=0x%x", expected_key.val, actual_key.val); +

s390x/migration-skey.c new file +9 -0
+		report_prefix_pop();
+	}
+}
+
+int main(void)
+{
+	report_prefix_push("migration-skey");
+	if (test_facility(169)) {
+		report_skip("storage key removal facility is

active"); +

s390x/migration-skey.c new file +2 -0
+		/*
+		 * If we just exit and don't ask migrate_cmd to

migrate us, it

s390x/migration-skey.c new file +1 -0
+		 * will just hang forever. Hence, also ask for

migration when we

s390x/migration-skey.c new file +1 -0
+		 * skip this test altogether.

s390x/migration-skey.c line 73

Quoted 10 lines
s390x/migration-skey.c new file +10 -0
+		 */
+		puts("Please migrate me, then press return\n");
+		(void)getchar();
+
+		goto done;
+	}
+
+	test_migration();
+
+done:  
	} else {
		test_migration();
	}

to get rid of the goto?

s390x/migration-skey.c line 76

Quoted 3 lines
s390x/migration-skey.c new file +3 -0
+	report_prefix_pop();
+	return report_summary();
+}  

Either way:

author
#4 lore raw
In reply to Thomas Huth

Ooops, I just realized I accidentally sent an empty message this morning. Sorry!

On Tue, 31 May 2022 10:55:27 +0200
Thomas Huth <[email protected]> wrote:

[...]

Quoted 5 lines
Quoted 5 lines
s390x/migration-skey.c new file +0 -0
new file mode 100644
index 000000000000..f846ac435836

[...]

Quoted 5 lines
Quoted 5 lines
s390x/migration-skey.c new file +5 -0
+	for (i = 0; i < NUM_PAGES; i++) {
+		report_prefix_pushf("page %d", i);
+
+		actual_key.val = get_storage_key(pagebuf[i]);
+		expected_key.val = i * 2;
Quoted 8 lines

s390x/migration-skey.c line 46

Quoted 4 lines
s390x/migration-skey.c new file +4 -0
+
+		/* ignore reference bit */
+		actual_key.str.rf = 0;
+		expected_key.str.rf = 0;  

If the reference bit gets always ignored, testing 64 pages should be enough? OTOH this will complicate the for-loop / creation of the key value, so I don't mind too much if we keep it this way.

Since it would make this thing more complex, I think I would just leave it as-is, 64 additional pages don't cost much.

[...]

Quoted 24 lines
Quoted 9 lines
s390x/migration-skey.c new file +2 -0
+	if (test_facility(169)) {
+		report_skip("storage key removal facility is

active"); +

s390x/migration-skey.c new file +2 -0
+		/*
+		 * If we just exit and don't ask migrate_cmd to

migrate us, it

s390x/migration-skey.c new file +1 -0
+		 * will just hang forever. Hence, also ask for

migration when we

s390x/migration-skey.c new file +1 -0
+		 * skip this test altogether.

s390x/migration-skey.c line 73

Quoted 10 lines
s390x/migration-skey.c new file +10 -0
+		 */
+		puts("Please migrate me, then press return\n");
+		(void)getchar();
+
+		goto done;
+	}
+
+	test_migration();
+
+done:  
	} else {
		test_migration();
	}
Quoted 1 line

to get rid of the goto?

Yes, makes sense, thank you.

[...]

Quoted 2 lines

Either way:

Thanks.