From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: peter.maydell@linaro.org, drjones@redhat.com,
andre.przywara@arm.com, thuth@redhat.com, yuzenghui@huawei.com,
alexandru.elisei@arm.com
Subject: [kvm-unit-tests PATCH v4 12/13] arm/arm64: ITS: migration tests
Date: Mon, 9 Mar 2020 11:24:19 +0100 [thread overview]
Message-ID: <20200309102420.24498-13-eric.auger@redhat.com> (raw)
In-Reply-To: <20200309102420.24498-1-eric.auger@redhat.com>
This test maps LPIs (populates the device table, the collection table,
interrupt translation tables, configuration table), migrates and make
sure the translation is correct on the destination.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v3 -> v4:
- assert in its_get_device/collection if the id is not found
---
arm/gic.c | 58 ++++++++++++++++++++++++++++++++++----
arm/unittests.cfg | 8 ++++++
lib/arm/asm/gic-v3-its.h | 4 +++
lib/arm64/asm/gic-v3-its.h | 3 ++
lib/arm64/gic-v3-its.c | 22 +++++++++++++++
5 files changed, 89 insertions(+), 6 deletions(-)
diff --git a/arm/gic.c b/arm/gic.c
index 3ac90be..96f0fd6 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -653,13 +653,19 @@ static int its_prerequisites(int nb_cpus)
return 0;
}
-static void test_its_trigger(void)
+/*
+ * Setup the configuration for those mappings:
+ * dev_id=2 event=20 -> vcpu 3, intid=8195
+ * dev_id=7 event=255 -> vcpu 2, intid=8196
+ * LPIs ready to hit
+ */
+static int its_setup1(void)
{
struct its_collection *col3, *col2;
struct its_device *dev2, *dev7;
if (its_prerequisites(4))
- return;
+ return -1;
dev2 = its_create_device(2 /* dev id */, 8 /* nb_ites */);
dev7 = its_create_device(7 /* dev id */, 8 /* nb_ites */);
@@ -673,14 +679,10 @@ static void test_its_trigger(void)
its_send_invall(col2);
its_send_invall(col3);
- report_prefix_push("int");
/*
* dev=2, eventid=20 -> lpi= 8195, col=3
* dev=7, eventid=255 -> lpi= 8196, col=2
- * Trigger dev2, eventid=20 and dev7, eventid=255
- * Check both LPIs hit
*/
-
its_send_mapd(dev2, true);
its_send_mapd(dev7, true);
@@ -689,6 +691,23 @@ static void test_its_trigger(void)
its_send_mapti(dev2, 8195 /* lpi id */, 20 /* event id */, col3);
its_send_mapti(dev7, 8196 /* lpi id */, 255 /* event id */, col2);
+ return 0;
+}
+
+static void test_its_trigger(void)
+{
+ struct its_collection *col3, *col2;
+ struct its_device *dev2, *dev7;
+
+ if (its_setup1())
+ return;
+
+ col3 = its_get_collection(3);
+ col2 = its_get_collection(2);
+ dev2 = its_get_device(2);
+ dev7 = its_get_device(7);
+
+ report_prefix_push("int");
lpi_stats_expect(3, 8195);
its_send_int(dev2, 20);
@@ -751,6 +770,29 @@ static void test_its_trigger(void)
check_lpi_stats("no LPI after collection unmap");
report_prefix_pop();
}
+
+static void test_its_migration(void)
+{
+ struct its_device *dev2, *dev7;
+
+ if (its_setup1())
+ return;
+
+ dev2 = its_get_device(2);
+ dev7 = its_get_device(7);
+
+ puts("Now migrate the VM, then press a key to continue...\n");
+ (void)getchar();
+ report_info("Migration complete");
+
+ lpi_stats_expect(3, 8195);
+ its_send_int(dev2, 20);
+ check_lpi_stats("dev2/eventid=20 triggers LPI 8195 en PE #3 after migration");
+
+ lpi_stats_expect(2, 8196);
+ its_send_int(dev7, 255);
+ check_lpi_stats("dev7/eventid=255 triggers LPI 8196 on PE #2 after migration");
+}
#endif
int main(int argc, char **argv)
@@ -788,6 +830,10 @@ int main(int argc, char **argv)
report_prefix_push(argv[1]);
test_its_trigger();
report_prefix_pop();
+ } else if (!strcmp(argv[1], "its-migration")) {
+ report_prefix_push(argv[1]);
+ test_its_migration();
+ 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 b9a7a2c..480adec 100644
--- a/arm/unittests.cfg
+++ b/arm/unittests.cfg
@@ -136,6 +136,14 @@ extra_params = -machine gic-version=3 -append 'its-trigger'
groups = its
arch = arm64
+[its-migration]
+file = gic.flat
+smp = $MAX_SMP
+accel = kvm
+extra_params = -machine gic-version=3 -append 'its-migration'
+groups = its migration
+arch = arm64
+
# Test PSCI emulation
[psci]
file = psci.flat
diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h
index 956d7b8..4d849c4 100644
--- a/lib/arm/asm/gic-v3-its.h
+++ b/lib/arm/asm/gic-v3-its.h
@@ -22,5 +22,9 @@ static inline void test_its_trigger(void)
{
report_abort("not supported on 32-bit");
}
+static inline void test_its_migration(void)
+{
+ report_abort("not supported on 32-bit");
+}
#endif /* _ASMARM_GICv3_ITS */
diff --git a/lib/arm64/asm/gic-v3-its.h b/lib/arm64/asm/gic-v3-its.h
index 889d6ce..e9f89c1 100644
--- a/lib/arm64/asm/gic-v3-its.h
+++ b/lib/arm64/asm/gic-v3-its.h
@@ -166,4 +166,7 @@ extern void __its_send_sync(struct its_collection *col, bool verbose);
#define its_send_movi_nv(dev, col, id) __its_send_movi(dev, col, id, false)
#define its_send_sync_nv(col) __its_send_sync(col, false)
+extern struct its_device *its_get_device(u32 id);
+extern struct its_collection *its_get_collection(u32 id);
+
#endif /* _ASMARM64_GIC_V3_ITS_H_ */
diff --git a/lib/arm64/gic-v3-its.c b/lib/arm64/gic-v3-its.c
index fa84c00..d817a7d 100644
--- a/lib/arm64/gic-v3-its.c
+++ b/lib/arm64/gic-v3-its.c
@@ -148,3 +148,25 @@ struct its_collection *its_create_collection(u32 col_id, u32 pe)
its_data.nr_collections++;
return new;
}
+
+struct its_device *its_get_device(u32 id)
+{
+ int i;
+
+ for (i = 0; i < GITS_MAX_DEVICES; i++) {
+ if (its_data.devices[i].device_id == id)
+ return &its_data.devices[i];
+ }
+ assert(0);
+}
+
+struct its_collection *its_get_collection(u32 id)
+{
+ int i;
+
+ for (i = 0; i < GITS_MAX_COLLECTIONS; i++) {
+ if (its_data.collections[i].col_id == id)
+ return &its_data.collections[i];
+ }
+ assert(0);
+}
--
2.20.1
next prev parent reply other threads:[~2020-03-09 10:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-09 10:24 [kvm-unit-tests PATCH v4 00/13] arm/arm64: Add ITS tests Eric Auger
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 01/13] libcflat: Add other size defines Eric Auger
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 02/13] page_alloc: Introduce get_order() Eric Auger
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 03/13] arm/arm64: gic: Introduce setup_irq() helper Eric Auger
2020-03-09 10:56 ` Andrew Jones
2020-03-10 11:00 ` Auger Eric
2020-03-10 11:56 ` Andrew Jones
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 04/13] arm/arm64: gicv3: Add some re-distributor defines Eric Auger
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 05/13] arm/arm64: gicv3: Set the LPI config and pending tables Eric Auger
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 06/13] arm/arm64: ITS: Introspection tests Eric Auger
2020-03-09 11:19 ` Andrew Jones
2020-03-09 11:47 ` Auger Eric
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 07/13] arm/arm64: ITS: its_enable_defaults Eric Auger
2020-03-09 11:27 ` Andrew Jones
2020-03-09 11:39 ` Andrew Jones
2020-03-09 11:45 ` Auger Eric
2020-03-09 11:52 ` Andrew Jones
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 08/13] arm/arm64: ITS: Device and collection Initialization Eric Auger
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 09/13] arm/arm64: ITS: Commands Eric Auger
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 10/13] arm/arm64: ITS: INT functional tests Eric Auger
2020-03-09 11:43 ` Andrew Jones
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 11/13] arm/run: Allow Migration tests Eric Auger
2020-03-09 10:24 ` Eric Auger [this message]
2020-03-09 10:24 ` [kvm-unit-tests PATCH v4 13/13] arm/arm64: ITS: pending table migration test Eric Auger
2020-03-09 11:57 ` [kvm-unit-tests PATCH v4 00/13] arm/arm64: Add ITS tests Andrew Jones
2020-03-09 12:00 ` Andrew Jones
2020-03-10 10:18 ` Zenghui Yu
2020-03-10 14:56 ` Auger Eric
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=20200309102420.24498-13-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=drjones@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=maz@kernel.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=yuzenghui@huawei.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;
as well as URLs for NNTP newsgroup(s).