From: Nico Boehr <nrb@linux.ibm.com>
To: kvm@vger.kernel.org, linux-s390@vger.kernel.org
Cc: frankja@linux.ibm.com, imbrenda@linux.ibm.com, thuth@redhat.com
Subject: [kvm-unit-tests PATCH v1 2/3] s390x: add extint loop test
Date: Thu, 30 Jun 2022 13:30:58 +0200 [thread overview]
Message-ID: <20220630113059.229221-3-nrb@linux.ibm.com> (raw)
In-Reply-To: <20220630113059.229221-1-nrb@linux.ibm.com>
The CPU timer interrupt stays pending as long as the CPU timer value is
negative. This can lead to interruption loops when the ext_new_psw mask
has external interrupts enabled.
QEMU is able to detect this situation and panic the guest, so add a test
for it.
Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
---
s390x/Makefile | 1 +
s390x/extint-loop.c | 64 +++++++++++++++++++++++++++++++++++++++++++++
s390x/unittests.cfg | 4 +++
3 files changed, 69 insertions(+)
create mode 100644 s390x/extint-loop.c
diff --git a/s390x/Makefile b/s390x/Makefile
index efd5e0c13102..92a020234c9f 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -34,6 +34,7 @@ tests += $(TEST_DIR)/migration.elf
tests += $(TEST_DIR)/pv-attest.elf
tests += $(TEST_DIR)/migration-cmm.elf
tests += $(TEST_DIR)/migration-skey.elf
+tests += $(TEST_DIR)/extint-loop.elf
pv-tests += $(TEST_DIR)/pv-diags.elf
diff --git a/s390x/extint-loop.c b/s390x/extint-loop.c
new file mode 100644
index 000000000000..5276d86a156f
--- /dev/null
+++ b/s390x/extint-loop.c
@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * External interrupt loop test
+ *
+ * Copyright IBM Corp. 2022
+ *
+ * Authors:
+ * Nico Boehr <nrb@linux.ibm.com>
+ */
+#include <libcflat.h>
+#include <asm/interrupt.h>
+#include <asm/barrier.h>
+#include <asm/time.h>
+
+static void ext_int_handler(void)
+{
+ /*
+ * return to ext_old_psw. This gives us the chance to print the return_fail
+ * in case something goes wrong.
+ */
+ asm volatile (
+ "lpswe %[ext_old_psw]\n"
+ :
+ : [ext_old_psw] "Q"(lowcore.ext_old_psw)
+ : "memory"
+ );
+}
+
+static void start_cpu_timer(int64_t timeout_ms)
+{
+#define CPU_TIMER_US_SHIFT 12
+ int64_t timer_value = (timeout_ms * 1000) << CPU_TIMER_US_SHIFT;
+ asm volatile (
+ "spt %[timer_value]\n"
+ :
+ : [timer_value] "Q" (timer_value)
+ );
+}
+
+int main(void)
+{
+ struct psw ext_new_psw_orig;
+
+ report_prefix_push("extint-loop");
+
+ ext_new_psw_orig = lowcore.ext_new_psw;
+ lowcore.ext_new_psw.addr = (uint64_t)ext_int_handler;
+ lowcore.ext_new_psw.mask |= PSW_MASK_EXT;
+
+ load_psw_mask(extract_psw_mask() | PSW_MASK_EXT);
+ ctl_set_bit(0, CTL0_CLOCK_COMPARATOR);
+
+ start_cpu_timer(1);
+
+ mdelay(2000);
+
+ /* restore previous ext_new_psw so QEMU can properly terminate */
+ lowcore.ext_new_psw = ext_new_psw_orig;
+
+ report_fail("survived extint loop");
+
+ report_prefix_pop();
+ return report_summary();
+}
diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg
index 8e52f560bb1e..7d408f2d5310 100644
--- a/s390x/unittests.cfg
+++ b/s390x/unittests.cfg
@@ -184,3 +184,7 @@ groups = migration
[migration-skey]
file = migration-skey.elf
groups = migration
+
+[extint-loop]
+file = extint-loop.elf
+groups = panic
--
2.36.1
next prev parent reply other threads:[~2022-06-30 11:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 11:30 [kvm-unit-tests PATCH v1 0/3] Add panic test support Nico Boehr
2022-06-30 11:30 ` [kvm-unit-tests PATCH v1 1/3] runtime: add support for panic tests Nico Boehr
2022-06-30 17:49 ` Thomas Huth
2022-07-01 7:02 ` Nico Boehr
2022-06-30 11:30 ` Nico Boehr [this message]
2022-06-30 17:55 ` [kvm-unit-tests PATCH v1 2/3] s390x: add extint loop test Thomas Huth
2022-07-04 8:32 ` Janosch Frank
2022-06-30 11:30 ` [kvm-unit-tests PATCH v1 3/3] s390x: add pgm spec interrupt " Nico Boehr
2022-06-30 14:38 ` Janis Schoetterl-Glausch
2022-06-30 17:11 ` Thomas Huth
2022-07-01 10:49 ` Janis Schoetterl-Glausch
2022-07-01 8:10 ` Nico Boehr
2022-06-30 17:25 ` Thomas Huth
2022-07-01 8:17 ` Nico Boehr
2022-07-04 9:06 ` Janosch Frank
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=20220630113059.229221-3-nrb@linux.ibm.com \
--to=nrb@linux.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=thuth@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