From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v1 2/2] tests/tcg: add a vtimer test for aarch64
Date: Fri, 10 Jan 2020 16:16:26 +0000 [thread overview]
Message-ID: <20200110161626.31943-3-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200110161626.31943-1-alex.bennee@linaro.org>
Bug: https://bugs.launchpad.net/bugs/1859021
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/aarch64/system/vtimer.c | 80 +++++++++++++++++++++++
tests/tcg/aarch64/Makefile.softmmu-target | 4 ++
2 files changed, 84 insertions(+)
create mode 100644 tests/tcg/aarch64/system/vtimer.c
diff --git a/tests/tcg/aarch64/system/vtimer.c b/tests/tcg/aarch64/system/vtimer.c
new file mode 100644
index 00000000000..2f6299b5d2c
--- /dev/null
+++ b/tests/tcg/aarch64/system/vtimer.c
@@ -0,0 +1,80 @@
+/*
+ * Simple Virtual Timer Tests
+ *
+ * Note: kvm-unit-tests has a much more comprehensive exercising of
+ * the timer sub-system. However this test case can tweak _EL2 values
+ * to trigger bugs which can't be done with that.
+ *
+ * Copyright (c) 2020 Linaro Ltd
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include <inttypes.h>
+#include <minilib.h>
+
+/* grabbed from Linux */
+#define __stringify_1(x...) #x
+#define __stringify(x...) __stringify_1(x)
+
+#define read_sysreg(r) ({ \
+ uint64_t __val; \
+ asm volatile("mrs %0, " __stringify(r) : "=r" (__val)); \
+ __val; \
+})
+
+#define write_sysreg(r, v) do { \
+ uint64_t __val = (uint64_t)(v); \
+ asm volatile("msr " __stringify(r) ", %x0" \
+ : : "rZ" (__val)); \
+} while (0)
+
+/* Physical Counter */
+static uint64_t last_pct;
+/* Timer Values */
+static uint32_t last_phys_tval;
+static uint32_t last_virt_tval;
+
+static void dump_status(void)
+{
+ uint64_t pct = read_sysreg(cntpct_el0);
+ uint32_t phys_tval = read_sysreg(cntp_tval_el0);
+ uint32_t virt_tval = read_sysreg(cntv_tval_el0);
+
+ ml_printf("timer values:\n");
+ /* the physical timer monotonically increments */
+ ml_printf("cntpct_el0=%ld (+%ld)\n", pct, pct - last_pct);
+ /* the various tvals decrement based on cval */
+ ml_printf("cntp_tval_el0=%ld (-%ld)\n", phys_tval,
+ last_phys_tval - phys_tval);
+ ml_printf("cntv_tval_el0=%ld (-%ld)\n", virt_tval,
+ last_virt_tval - virt_tval);
+
+ last_pct = pct;
+ last_phys_tval = phys_tval;
+ last_virt_tval = virt_tval;
+}
+
+int main(void)
+{
+ int i;
+
+ ml_printf("VTimer Tests\n");
+
+ dump_status();
+
+ ml_printf("Tweaking voff_el2 and cval\n");
+ write_sysreg(cntvoff_el2, 1);
+ write_sysreg(cntv_cval_el0, -1);
+
+ dump_status();
+
+ ml_printf("Enabling timer IRQs\n");
+ write_sysreg(cntv_ctl_el0, 1);
+ /* for bug 1859021 we hang here */
+
+ dump_status();
+
+ ml_printf("End of Vtimer test\n");
+ return 0;
+}
diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target
index 7b4eede3f07..62cdddbb215 100644
--- a/tests/tcg/aarch64/Makefile.softmmu-target
+++ b/tests/tcg/aarch64/Makefile.softmmu-target
@@ -62,3 +62,7 @@ run-memory-replay: memory-replay run-memory-record
"$< on $(TARGET_NAME)")
EXTRA_TESTS+=memory-record memory-replay
+
+# vtimer test
+QEMU_EL2_MACHINE=-machine virt,virtualization=on,gic-version=2 -cpu cortex-a57 -smp 4
+run-vtimer: QEMU_OPTS=$(QEMU_EL2_MACHINE) $(QEMU_SEMIHOST) -kernel
--
2.20.1
next prev parent reply other threads:[~2020-01-10 16:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 16:16 [PATCH v1 0/2] fix for bug 1859021 Alex Bennée
2020-01-10 16:16 ` [PATCH v1 1/2] target/arm: detect 64 bit overflow caused by high cval + voff Alex Bennée
2020-01-10 16:16 ` [Bug 1859021] " Alex Bennée
2020-01-16 18:45 ` Peter Maydell
2020-01-16 18:45 ` [Bug 1859021] " Peter Maydell
2020-01-17 11:50 ` Peter Maydell
2020-01-17 11:50 ` [Bug 1859021] " Peter Maydell
2020-01-10 16:16 ` Alex Bennée [this message]
2020-01-17 14:07 ` [PATCH v1 2/2] tests/tcg: add a vtimer test for aarch64 Peter Maydell
2020-02-06 17:00 ` Alex Bennée
-- strict thread matches above, loose matches on Subject: below --
2020-01-09 13:24 [Bug 1859021] [NEW] qemu-system-aarch64 (tcg): cval + voff overflow not handled, causes qemu to hang Alex Longwall
2020-01-09 14:44 ` [Bug 1859021] " Alex Bennée
2020-01-09 16:25 ` [RFC PATCH] tests/tcg: add a vtimer test for aarch64 Alex Bennée
2020-01-09 16:25 ` [Bug 1859021] Re: qemu-system-aarch64 (tcg): cval + voff overflow not handled, causes qemu to hang Alex Bennée
2020-07-28 14:44 ` Alex Bennée
2021-05-01 5:30 ` Thomas Huth
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=20200110161626.31943-3-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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;
as well as URLs for NNTP newsgroup(s).