qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[kvm-unit-tests PATCH v8 12/13] arm/arm64: ITS: migration tests


From: Eric Auger
Subject: [kvm-unit-tests PATCH v8 12/13] arm/arm64: ITS: migration tests
Date: Thu, 2 Apr 2020 16:52:26 +0200

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 <address@hidden>
Reviewed-by: Zenghui Yu <address@hidden>

---

v7 -> v8:
- typo: s/en PE #3/on PE #3/
- added Zenghui's R-b

v4 -> v5:
- move stub from header to arm/gic.c

v3 -> v4:
- assert in its_get_device/collection if the id is not found
---
 arm/gic.c                  | 58 ++++++++++++++++++++++++++++++++++----
 arm/unittests.cfg          |  8 ++++++
 lib/arm64/asm/gic-v3-its.h |  3 ++
 lib/arm64/gic-v3-its.c     | 22 +++++++++++++++
 4 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/arm/gic.c b/arm/gic.c
index 54ae83d..6ae5515 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -592,6 +592,7 @@ static void gic_test_mmio(void)
 
 static void test_its_introspection(void) {}
 static void test_its_trigger(void) {}
+static void test_its_migration(void) {}
 
 #else /* __aarch64__ */
 
@@ -660,13 +661,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 */);
@@ -677,14 +684,10 @@ static void test_its_trigger(void)
        gicv3_lpi_set_config(8195, LPI_PROP_DEFAULT);
        gicv3_lpi_set_config(8196, LPI_PROP_DEFAULT);
 
-       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);
 
@@ -696,6 +699,22 @@ 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;
+       struct its_device *dev2, *dev7;
+
+       if (its_setup1())
+               return;
+
+       col3 = its_get_collection(3);
+       dev2 = its_get_device(2);
+       dev7 = its_get_device(7);
+
+       report_prefix_push("int");
 
        lpi_stats_expect(3, 8195);
        its_send_int(dev2, 20);
@@ -750,6 +769,29 @@ static void test_its_trigger(void)
        check_lpi_stats("no LPI after device 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 on 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)
@@ -787,6 +829,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/arm64/asm/gic-v3-its.h b/lib/arm64/asm/gic-v3-its.h
index c203293..0258daa 100644
--- a/lib/arm64/asm/gic-v3-its.h
+++ b/lib/arm64/asm/gic-v3-its.h
@@ -168,4 +168,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 ca91c3d..c22bda3 100644
--- a/lib/arm64/gic-v3-its.c
+++ b/lib/arm64/gic-v3-its.c
@@ -147,3 +147,25 @@ struct its_collection *its_create_collection(u16 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]