From: Thomas Huth <thuth@redhat.com>
To: kvm@vger.kernel.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>
Cc: David Hildenbrand <david@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>
Subject: [kvm-unit-tests PULL 16/17] s390x: SMP test
Date: Wed, 25 Sep 2019 18:37:13 +0200 [thread overview]
Message-ID: <20190925163714.27519-17-thuth@redhat.com> (raw)
In-Reply-To: <20190925163714.27519-1-thuth@redhat.com>
From: Janosch Frank <frankja@linux.ibm.com>
Testing SIGP emulation for the following order codes:
* start
* stop
* restart
* set prefix
* store status
* stop and store status
* reset
* initial reset
* external call
* emegergency call
restart and set prefix are part of the library and needed to start
other cpus.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Message-Id: <20190920080356.1948-7-frankja@linux.ibm.com>
[thuth: Replaced a report_abort() with report_skip()]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
s390x/Makefile | 1 +
s390x/smp.c | 242 ++++++++++++++++++++++++++++++++++++++++++++
s390x/unittests.cfg | 4 +
3 files changed, 247 insertions(+)
create mode 100644 s390x/smp.c
diff --git a/s390x/Makefile b/s390x/Makefile
index d83dd0b..3744372 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -15,6 +15,7 @@ tests += $(TEST_DIR)/cpumodel.elf
tests += $(TEST_DIR)/diag288.elf
tests += $(TEST_DIR)/stsi.elf
tests += $(TEST_DIR)/skrf.elf
+tests += $(TEST_DIR)/smp.elf
tests_binary = $(patsubst %.elf,%.bin,$(tests))
all: directories test_cases test_cases_binary
diff --git a/s390x/smp.c b/s390x/smp.c
new file mode 100644
index 0000000..8782cfc
--- /dev/null
+++ b/s390x/smp.c
@@ -0,0 +1,242 @@
+/*
+ * Tests sigp emulation
+ *
+ * Copyright 2019 IBM Corp.
+ *
+ * Authors:
+ * Janosch Frank <frankja@linux.ibm.com>
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2.
+ */
+#include <libcflat.h>
+#include <asm/asm-offsets.h>
+#include <asm/interrupt.h>
+#include <asm/page.h>
+#include <asm/facility.h>
+#include <asm-generic/barrier.h>
+#include <asm/sigp.h>
+
+#include <smp.h>
+#include <alloc_page.h>
+
+static int testflag = 0;
+
+static void cpu_loop(void)
+{
+ for (;;) {}
+}
+
+static void test_func(void)
+{
+ testflag = 1;
+ mb();
+ cpu_loop();
+}
+
+static void test_start(void)
+{
+ struct psw psw;
+ psw.mask = extract_psw_mask();
+ psw.addr = (unsigned long)test_func;
+
+ smp_cpu_setup(1, psw);
+ while (!testflag) {
+ mb();
+ }
+ report("start", 1);
+}
+
+static void test_stop(void)
+{
+ smp_cpu_stop(1);
+ /*
+ * The smp library waits for the CPU to shut down, but let's
+ * also do it here, so we don't rely on the library
+ * implementation
+ */
+ while (!smp_cpu_stopped(1)) {}
+ report("stop", 1);
+}
+
+static void test_stop_store_status(void)
+{
+ struct cpu *cpu = smp_cpu_from_addr(1);
+ struct lowcore *lc = (void *)0x0;
+
+ report_prefix_push("stop store status");
+ lc->prefix_sa = 0;
+ lc->grs_sa[15] = 0;
+ smp_cpu_stop_store_status(1);
+ mb();
+ report("prefix", lc->prefix_sa == (uint32_t)(uintptr_t)cpu->lowcore);
+ report("stack", lc->grs_sa[15]);
+ report_prefix_pop();
+}
+
+static void test_store_status(void)
+{
+ struct cpu_status *status = alloc_pages(1);
+ uint32_t r;
+
+ report_prefix_push("store status at address");
+ memset(status, 0, PAGE_SIZE * 2);
+
+ report_prefix_push("running");
+ smp_cpu_restart(1);
+ sigp(1, SIGP_STORE_STATUS_AT_ADDRESS, (uintptr_t)status, &r);
+ report("incorrect state", r == SIGP_STATUS_INCORRECT_STATE);
+ report("status not written", !memcmp(status, (void*)status + PAGE_SIZE, PAGE_SIZE));
+ report_prefix_pop();
+
+ memset(status, 0, PAGE_SIZE);
+ report_prefix_push("stopped");
+ smp_cpu_stop(1);
+ sigp(1, SIGP_STORE_STATUS_AT_ADDRESS, (uintptr_t)status, NULL);
+ while (!status->prefix) { mb(); }
+ report("status written", 1);
+ free_pages(status, PAGE_SIZE * 2);
+ report_prefix_pop();
+
+ report_prefix_pop();
+}
+
+static void ecall(void)
+{
+ unsigned long mask;
+ struct lowcore *lc = (void *)0x0;
+
+ expect_ext_int();
+ ctl_set_bit(0, 13);
+ mask = extract_psw_mask();
+ mask |= PSW_MASK_EXT;
+ load_psw_mask(mask);
+ testflag = 1;
+ while (lc->ext_int_code != 0x1202) { mb(); }
+ report("ecall", 1);
+ testflag= 1;
+}
+
+static void test_ecall(void)
+{
+ struct psw psw;
+ psw.mask = extract_psw_mask();
+ psw.addr = (unsigned long)ecall;
+
+ report_prefix_push("ecall");
+ testflag= 0;
+ smp_cpu_destroy(1);
+
+ smp_cpu_setup(1, psw);
+ while (!testflag) { mb(); }
+ testflag= 0;
+ sigp(1, SIGP_EXTERNAL_CALL, 0, NULL);
+ while(!testflag) {mb();}
+ smp_cpu_stop(1);
+ report_prefix_pop();
+}
+
+static void emcall(void)
+{
+ unsigned long mask;
+ struct lowcore *lc = (void *)0x0;
+
+ expect_ext_int();
+ ctl_set_bit(0, 14);
+ mask = extract_psw_mask();
+ mask |= PSW_MASK_EXT;
+ load_psw_mask(mask);
+ testflag= 1;
+ while (lc->ext_int_code != 0x1201) { mb(); }
+ report("ecall", 1);
+ testflag = 1;
+}
+
+static void test_emcall(void)
+{
+ struct psw psw;
+ psw.mask = extract_psw_mask();
+ psw.addr = (unsigned long)emcall;
+
+ report_prefix_push("emcall");
+ testflag= 0;
+ smp_cpu_destroy(1);
+
+ smp_cpu_setup(1, psw);
+ while (!testflag) { mb(); }
+ testflag= 0;
+ sigp(1, SIGP_EMERGENCY_SIGNAL, 0, NULL);
+ while(!testflag) { mb(); }
+ smp_cpu_stop(1);
+ report_prefix_pop();
+}
+
+static void test_reset_initial(void)
+{
+ struct cpu_status *status = alloc_pages(0);
+ struct psw psw;
+
+ psw.mask = extract_psw_mask();
+ psw.addr = (unsigned long)test_func;
+
+ report_prefix_push("reset initial");
+ smp_cpu_setup(1, psw);
+
+ sigp_retry(1, SIGP_INITIAL_CPU_RESET, 0, NULL);
+ sigp(1, SIGP_STORE_STATUS_AT_ADDRESS, (uintptr_t)status, NULL);
+
+ report_prefix_push("clear");
+ report("psw", !status->psw.mask && !status->psw.addr);
+ report("prefix", !status->prefix);
+ report("fpc", !status->fpc);
+ report("cpu timer", !status->cputm);
+ report("todpr", !status->todpr);
+ report_prefix_pop();
+
+ report_prefix_push("initialized");
+ report("cr0 == 0xE0", status->crs[0] == 0xE0UL);
+ report("cr14 == 0xC2000000", status->crs[14] == 0xC2000000UL);
+ report_prefix_pop();
+
+ report("cpu stopped", smp_cpu_stopped(1));
+ free_pages(status, PAGE_SIZE);
+ report_prefix_pop();
+}
+
+static void test_reset(void)
+{
+ struct psw psw;
+
+ psw.mask = extract_psw_mask();
+ psw.addr = (unsigned long)test_func;
+
+ report_prefix_push("cpu reset");
+ smp_cpu_setup(1, psw);
+
+ sigp_retry(1, SIGP_CPU_RESET, 0, NULL);
+ report("cpu stopped", smp_cpu_stopped(1));
+ report_prefix_pop();
+}
+
+int main(void)
+{
+ report_prefix_push("smp");
+
+ if (smp_query_num_cpus() == 1) {
+ report_skip("need at least 2 cpus for this test");
+ goto done;
+ }
+
+ test_start();
+ test_stop();
+ test_stop_store_status();
+ test_store_status();
+ test_ecall();
+ test_emcall();
+ test_reset();
+ test_reset_initial();
+
+done:
+ report_prefix_pop();
+ return report_summary();
+}
diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg
index cc79a4e..f1b07cd 100644
--- a/s390x/unittests.cfg
+++ b/s390x/unittests.cfg
@@ -71,3 +71,7 @@ extra_params=-device diag288,id=watchdog0 --watchdog-action inject-nmi
[stsi]
file = stsi.elf
+
+[smp]
+file = smp.elf
+extra_params =-smp 2
--
2.18.1
next prev parent reply other threads:[~2019-09-25 16:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 16:36 [kvm-unit-tests PULL 00/17] New s390x kvm-unit-tests and some fixes Thomas Huth
2019-09-25 16:36 ` [kvm-unit-tests PULL 01/17] s390x: Support PSW restart boot Thomas Huth
2019-09-25 16:36 ` [kvm-unit-tests PULL 02/17] s390x: Diag288 test Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 03/17] s390x: Move stsi to library Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 04/17] s390x: STSI tests Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 05/17] s390x: Add diag308 subcode 0 testing Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 06/17] s390x: Move pfmf to lib and make address void Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 07/17] s390x: Storage key library functions now take void ptr addresses Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 08/17] s390x: Bump march to zEC12 Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 09/17] s390x: Add storage key removal facility Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 10/17] s390x: Fix stsi unaligned test and add selector tests Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 11/17] s390x: Use interrupts in SCLP and add locking Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 12/17] s390x: Add linemode console Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 13/17] s390x: Add linemode buffer to fix newline on every print Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 14/17] s390x: Add initial smp code Thomas Huth
2019-09-25 16:37 ` [kvm-unit-tests PULL 15/17] s390x: Prepare for external calls Thomas Huth
2019-09-25 16:37 ` Thomas Huth [this message]
2019-09-25 16:37 ` [kvm-unit-tests PULL 17/17] s390x: Free allocated page in iep test Thomas Huth
2019-09-25 16:39 ` [kvm-unit-tests PULL 00/17] New s390x kvm-unit-tests and some fixes Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190925163714.27519-17-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox