Re: [kvm-unit-tests PATCH v2 4/4] s390x: add basic migration test

Thomas Huth
2022-04-20T11:16:44Z

On 13/04/2022 17.26, Nico Boehr wrote:
> Add a basic migration test for s390x. This tests the guarded-storage registers
> and vector registers are preserved on migration.
>
> Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
> ---
> s390x/Makefile | 1 +
> s390x/migration.c | 172 ++++++++++++++++++++++++++++++++++++++++++++
> s390x/unittests.cfg | 5 ++
> 3 files changed, 178 insertions(+)
> create mode 100644 s390x/migration.c
>
> diff --git a/s390x/Makefile b/s390x/Makefile
> index f38f442b9cb1..5336ed8ae0b4 100644
> --- a/s390x/Makefile
> +++ b/s390x/Makefile
> @@ -30,6 +30,7 @@ tests += $(TEST_DIR)/spec_ex-sie.elf
> tests += $(TEST_DIR)/firq.elf
> tests += $(TEST_DIR)/epsw.elf
> tests += $(TEST_DIR)/adtl-status.elf
> +tests += $(TEST_DIR)/migration.elf
>
> pv-tests += $(TEST_DIR)/pv-diags.elf
>
> diff --git a/s390x/migration.c b/s390x/migration.c
> new file mode 100644
> index 000000000000..cd9360bdadec
> --- /dev/null
> +++ b/s390x/migration.c
> @@ -0,0 +1,172 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Migration Test for s390x
> + *
> + * Copyright IBM Corp. 2022
> + *
> + * Authors:
> + * Nico Boehr <nrb@linux.ibm.com>
> + */
> +#include <libcflat.h>
> +#include <asm/arch_def.h>
> +#include <asm/vector.h>
> +#include <asm/barrier.h>
> +#include <gs.h>
> +#include <bitops.h>
> +#include <smp.h>
> +
> +static struct gs_cb gs_cb;
> +static struct gs_epl gs_epl;
> +
> +/* set by CPU1 to signal it has completed */
> +static int flag_thread_complete;
> +/* set by CPU0 to signal migration has completed */
> +static int flag_migration_complete;
> +
> +static void write_gs_regs(void)
> +{
> + const unsigned long gs_area = 0x2000000;
> + const unsigned long gsc = 25; /* align = 32 M, section size = 512K */
> +
> + gs_cb.gsd = gs_area | gsc;
> + gs_cb.gssm = 0xfeedc0ffe;
> + gs_cb.gs_epl_a = (uint64_t) &gs_epl;
> +
> + load_gs_cb(&gs_cb);
> +}
> +
> +static void check_gs_regs(void)
> +{
> + struct gs_cb gs_cb_after_migration;
> +
> + store_gs_cb(&gs_cb_after_migration);
> +
> + report_prefix_push("guarded-storage registers");
> +
> + report(gs_cb_after_migration.gsd == gs_cb.gsd, "gsd matches");
> + report(gs_cb_after_migration.gssm == gs_cb.gssm, "gssm matches");
> + report(gs_cb_after_migration.gs_epl_a == gs_cb.gs_epl_a, "gs_epl_a matches");
> +
> + report_prefix_pop();
> +}
> +
> +static void test_func(void)
> +{
> + uint8_t expected_vec_contents[VEC_REGISTER_NUM][VEC_REGISTER_SIZE];
> + uint8_t actual_vec_contents[VEC_REGISTER_NUM][VEC_REGISTER_SIZE];
> + uint8_t *vec_reg;
> + int i;
> + int vec_result = 0;
> +
> + for (i = 0; i < VEC_REGISTER_NUM; i++) {
> + vec_reg = &expected_vec_contents[i][0];
> + /* i+1 to avoid zero content */
> + memset(vec_reg, i + 1, VEC_REGISTER_SIZE);
> + }
> +
> + ctl_set_bit(0, CTL0_VECTOR);
> + ctl_set_bit(2, CTL2_GUARDED_STORAGE);
> +
> + write_gs_regs();
> +
> + /*
> + * It is important loading the loading point registers and comparing

s/loading point/floating point/

> + * their contents occurs in the same inline assembly block. Otherwise,
> + * the compiler is allowed to re-use the registers for something else in
> + * between.
> + * For this very reason, this also runs on a second CPU, so all the
> + * complex console stuff can be done in C on the first CPU and here we
> + * just need to wait for it to set the flag.
> + */
> + asm inline(
> + " .machine z13\n"
> + /* load vector registers: vlm handles at most 16 registers at a time */
> + " vlm 0,15, 0(%[expected_vec_reg])\n"
> + " vlm 16,31, 256(%[expected_vec_reg])\n"
> + /* inform CPU0 we are done, it will request migration */
> + " mvhi %[flag_thread_complete], 1\n"
> + /* wait for migration to finish */
> + "0: clfhsi %[flag_migration_complete], 1\n"
> + " jnz 0b\n"
> + /*
> + * store vector register contents in actual_vec_reg: vstm
> + * handles at most 16 registers at a time
> + */
> + " vstm 0,15, 0(%[actual_vec_reg])\n"
> + " vstm 16,31, 256(%[actual_vec_reg])\n"
> + /*
> + * compare the contents in expected_vec_reg with actual_vec_reg:
> + * clc handles at most 256 bytes at a time
> + */
> + " clc 0(256, %[expected_vec_reg]), 0(%[actual_vec_reg])\n"
> + " jnz 1f\n"
> + " clc 256(256, %[expected_vec_reg]), 256(%[actual_vec_reg])\n"
> + " jnz 1f\n"
> + /* success */
> + " mvhi %[vec_result], 1\n"
> + "1:"
> + :
> + : [expected_vec_reg] "a"(expected_vec_contents),
> + [actual_vec_reg] "a"(actual_vec_contents),
> + [flag_thread_complete] "Q"(flag_thread_complete),
> + [flag_migration_complete] "Q"(flag_migration_complete),
> + [vec_result] "Q"(vec_result)
> + : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9",
> + "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18",
> + "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27",
> + "v28", "v29", "v30", "v31", "cc", "memory"
> + );
> +
> + report(vec_result, "vector contents match");
> +
> + check_gs_regs();
> +
> + report(stctg(0) & BIT(CTL0_VECTOR), "ctl0 vector bit set");
> + report(stctg(2) & BIT(CTL2_GUARDED_STORAGE), "ctl2 guarded-storage bit set");
> +
> + ctl_clear_bit(0, CTL0_VECTOR);
> + ctl_clear_bit(2, CTL2_GUARDED_STORAGE);
> +
> + flag_thread_complete = 1;
> +}
> +
> +int main(void)
> +{
> + struct psw psw;
> +
> + /* don't say migrate here otherwise we will migrate right away */
> + report_prefix_push("migration");
> +
> + if (smp_query_num_cpus() == 1) {
> + report_skip("need at least 2 cpus for this test");
> + goto done;
> + }
> +
> + /* Second CPU does the actual tests */
> + psw.mask = extract_psw_mask();
> + psw.addr = (unsigned long)test_func;
> + smp_cpu_setup(1, psw);
> +
> + /* wait for thread setup */
> + while(!flag_thread_complete)
> + mb();
> + flag_thread_complete = 0;
> +
> + /* ask migrate_cmd to migrate (it listens for 'migrate') */
> + puts("Please migrate me\n");

Maybe say: "Please migrate me, then press 'return'" in case somebody runs
this test manually?

> + /* wait for migration to finish, we will read a newline */
> + (void)getchar();
> +
> + flag_migration_complete = 1;
> +
> + /* wait for thread to complete assertions */
> + while(!flag_thread_complete)
> + mb();
> +
> + smp_cpu_destroy(1);
> +
> +done:
> + report_prefix_pop();
> + return report_summary();
> +}
> diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg
> index 256c71691adc..b456b2881448 100644
> --- a/s390x/unittests.cfg
> +++ b/s390x/unittests.cfg
> @@ -171,3 +171,8 @@ file = adtl-status.elf
> smp = 2
> accel = tcg
> extra_params = -cpu qemu,gs=off,vx=off
> +
> +[migration]
> +file = migration.elf
> +groups = migration
> +smp = 2

Thanks, looks fine to me now (apart from the two nits)!

Reviewed-by: Thomas Huth <thuth@redhat.com>