From: "Alex Bennée" <alex.bennee@linaro.org>
To: kvm@vger.kernel.org
Cc: shashi.mallela@linaro.org, alexandru.elisei@arm.com,
eric.auger@redhat.com, qemu-arm@nongnu.org,
linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, christoffer.dall@arm.com,
maz@kernel.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [kvm-unit-tests PATCH v2 4/4] arm64: split its-migrate-unmapped-collection into KVM and TCG variants
Date: Tue, 25 May 2021 18:26:28 +0100 [thread overview]
Message-ID: <20210525172628.2088-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210525172628.2088-1-alex.bennee@linaro.org>
When running the test in TCG we are basically running on bare metal so
don't rely on having a particular kernel errata applied.
You might wonder why we handle this with a totally new test name
instead of adjusting the append to take an extra parameter? Well the
run_migration shell script uses eval "$@" which unwraps the -append
leading to any second parameter being split and leaving QEMU very
confused and the test hanging. This seemed simpler than re-writing all
the test running logic in something sane ;-)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Shashi Mallela <shashi.mallela@linaro.org>
---
arm/gic.c | 8 +++++++-
arm/unittests.cfg | 10 +++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/arm/gic.c b/arm/gic.c
index bef061a..0fce2a4 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -36,6 +36,7 @@ static struct gic *gic;
static int acked[NR_CPUS], spurious[NR_CPUS];
static int irq_sender[NR_CPUS], irq_number[NR_CPUS];
static cpumask_t ready;
+static bool under_tcg;
static void nr_cpu_check(int nr)
{
@@ -834,7 +835,7 @@ static void test_migrate_unmapped_collection(void)
goto do_migrate;
}
- if (!errata(ERRATA_UNMAPPED_COLLECTIONS)) {
+ if (!errata(ERRATA_UNMAPPED_COLLECTIONS) && !under_tcg) {
report_skip("Skipping test, as this test hangs without the fix. "
"Set %s=y to enable.", ERRATA_UNMAPPED_COLLECTIONS);
test_skipped = true;
@@ -1005,6 +1006,11 @@ int main(int argc, char **argv)
report_prefix_push(argv[1]);
test_migrate_unmapped_collection();
report_prefix_pop();
+ } else if (!strcmp(argv[1], "its-migrate-unmapped-collection-tcg")) {
+ under_tcg = true;
+ report_prefix_push(argv[1]);
+ test_migrate_unmapped_collection();
+ report_prefix_pop();
} else if (strcmp(argv[1], "its-introspection") == 0) {
report_prefix_push(argv[1]);
test_its_introspection();
diff --git a/arm/unittests.cfg b/arm/unittests.cfg
index 1a39428..adc1bbf 100644
--- a/arm/unittests.cfg
+++ b/arm/unittests.cfg
@@ -205,7 +205,7 @@ extra_params = -machine gic-version=3 -append 'its-pending-migration'
groups = its migration
arch = arm64
-[its-migrate-unmapped-collection]
+[its-migrate-unmapped-collection-kvm]
file = gic.flat
smp = $MAX_SMP
accel = kvm
@@ -213,6 +213,14 @@ extra_params = -machine gic-version=3 -append 'its-migrate-unmapped-collection'
groups = its migration
arch = arm64
+[its-migrate-unmapped-collection-tcg]
+file = gic.flat
+smp = $MAX_SMP
+accel = tcg
+extra_params = -machine gic-version=3 -append 'its-migrate-unmapped-collection-tcg'
+groups = its migration
+arch = arm64
+
# Test PSCI emulation
[psci]
file = psci.flat
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-25 17:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 17:26 [kvm-unit-tests PATCH v2 0/4] enable LPI and ITS for TCG Alex Bennée
2021-05-25 17:26 ` [kvm-unit-tests PATCH v2 1/4] arm64: remove invalid check from its-trigger test Alex Bennée
2021-05-26 15:06 ` Auger Eric
2021-05-25 17:26 ` [kvm-unit-tests PATCH v2 2/4] scripts/arch-run: don't use deprecated server/nowait options Alex Bennée
2021-05-26 14:23 ` Zenghui Yu
2021-05-26 15:05 ` Auger Eric
2021-06-01 12:27 ` Andrew Jones
2021-07-13 20:47 ` Andrew Jones
2021-05-25 17:26 ` [kvm-unit-tests PATCH v2 3/4] arm64: enable its-migration tests for TCG Alex Bennée
2021-05-26 15:05 ` Auger Eric
2021-06-01 13:23 ` Andrew Jones
2021-05-25 17:26 ` Alex Bennée [this message]
2021-05-26 16:33 ` [kvm-unit-tests PATCH v2 4/4] arm64: split its-migrate-unmapped-collection into KVM and TCG variants Auger Eric
2021-06-01 16:49 ` Alex Bennée
2021-06-01 19:46 ` Andrew Jones
2021-06-01 21:50 ` Alex Bennée
2021-06-01 13:21 ` Andrew Jones
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=20210525172628.2088-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=alexandru.elisei@arm.com \
--cc=christoffer.dall@arm.com \
--cc=eric.auger@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=qemu-arm@nongnu.org \
--cc=shashi.mallela@linaro.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).