Skip to contentSkip to conversation

s390x: add migration test for storage keys

PATCH Superseded Nico Boehr 3 participants 6 messages Jun 8, 2022 – Jun 13, 2022

Subsystems (2)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Nico Boehr

author
#0 lore raw

v4 cover s390x: add migration test for storage keys

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

PATCH v4 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 | 73 ++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg    |  4 +++
 3 files changed, 78 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 +73 -0

73 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
#2 lore raw
Quoted 54 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 | 73 ++++++++++++++++++++++++++++++++++++++++++
  s390x/unittests.cfg    |  4 +++
  3 files changed, 78 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 +20 -0
new file mode 100644
index 000000000000..323aa83202bb
@@ -0,0 +1,73 @@
+/* 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 line 30

Quoted 10 lines
s390x/migration-skey.c new file +10 -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
+		 * by iske
+		 */

Maybe add:
This loop will set all 7 bits which means we set fetch protection as well as reference and change indication for some keys.

s390x/migration-skey.c line 41

Quoted 11 lines
s390x/migration-skey.c new file +11 -0
+		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++) {
+		report_prefix_pushf("page %d", i);
+
+		actual_key.val = get_storage_key(pagebuf[i]);

iske is nice but I think it would also be interesting to check if the actual memory protection was carried over. The iske check is enough for now though.

s390x/migration-skey.c line 48

Quoted 7 lines
s390x/migration-skey.c new file +7 -0
+		expected_key.val = i * 2;
+
+		/* ignore reference bit */
+		actual_key.str.rf = 0;
+		expected_key.str.rf = 0;
+
+		report(actual_key.val == expected_key.val, "expected_key=0x%x actual_key=0x%x", expected_key.val, actual_key.val);

This spams the log with useless information and hence I generally try to avoid printing large loops.

Instead we should print all fails or a simple success message if all comparisons were successful.

Quoted 37 lines
s390x/migration-skey.c new file +25 -0
+
+		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.
+		 */
+		puts("Please migrate me, then press return\n");
+		(void)getchar();
+	} else {
+		test_migration();
+	}
+
+	report_prefix_pop();
+	return report_summary();
+}
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
#3 lore raw

On Fri, 10 Jun 2022 10:49:28 +0200
Janosch Frank <[email protected]> wrote:

[...]

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

s390x/migration-skey.c line 41

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

iske is nice but I think it would also be interesting to check if the actual memory protection was carried over. The iske check is enough for now though.

we had that in a previous version, but I think it's overkill, there are separate tests to check for key protection, I think?

also, under TCG the value of the storage keys is migrated, but there is no protection, this makes the test unnecessarily complex

[...]

author
#4 lore raw

Re: [kvm-unit-tests PATCH v4 1/1] s390x: add migration test for storage keys:q!

In reply to Janosch Frank
Quoted 4 lines · On Fri, 10 Jun 2022 10:49:28 +0200 Janosch Frank <[email protected]> wrote:
Quoted 3 lines · Nico Boehr
s390x/migration-skey.c new file +0 -0
new file mode 100644
index 000000000000..323aa83202bb

[...]

Quoted 6 lines
Quoted 6 lines
s390x/migration-skey.c new file +6 -0
+static void test_migration(void)
+{
+	union skey expected_key, actual_key;
+	int i, key_to_set;
+
+	for (i = 0; i < NUM_PAGES; i++) {
Quoted 8 lines

s390x/migration-skey.c line 30

Quoted 4 lines
s390x/migration-skey.c new file +4 -0
+		/*
+		 * Storage keys are 7 bit, lowest bit is always returned as zero
+		 * by iske
+		 */  

Maybe add:
This loop will set all 7 bits which means we set fetch protection as well as reference and change indication for some keys.

OK, done.

Quoted 16 lines

s390x/migration-skey.c line 41

Quoted 12 lines
s390x/migration-skey.c new file +11 -0
+		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++) {
+		report_prefix_pushf("page %d", i);
+
+		actual_key.val = get_storage_key(pagebuf[i]);  

iske is nice but I think it would also be interesting to check if the actual memory protection was carried over. The iske check is enough for now though.

OK, we can add an access check later on if we think it's needed.

Quoted 12 lines

s390x/migration-skey.c line 48

Quoted 8 lines
s390x/migration-skey.c new file +7 -0
+		expected_key.val = i * 2;
+
+		/* ignore reference bit */
+		actual_key.str.rf = 0;
+		expected_key.str.rf = 0;
+
+		report(actual_key.val == expected_key.val, "expected_key=0x%x actual_key=0x%x", expected_key.val, actual_key.val);  

This spams the log with useless information and hence I generally try to avoid printing large loops.

Quoted 2 lines

Instead we should print all fails or a simple success message if all comparisons were successful.

OK will be in the next version.

#5 lore raw
In reply to Nico Boehr

On Wed, 8 Jun 2022 15:13:27 +0200
Nico Boehr <[email protected]> wrote:

thanks, queued

Quoted 31 lines

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 | 73 ++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg    |  4 +++
 3 files changed, 78 insertions(+)
 create mode 100644 s390x/migration-skey.c