[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[kvm-unit-tests PATCH v3 14/14] arm/arm64: ITS: pending table migration
From: |
Eric Auger |
Subject: |
[kvm-unit-tests PATCH v3 14/14] arm/arm64: ITS: pending table migration test |
Date: |
Tue, 28 Jan 2020 11:34:59 +0100 |
Add two new migration tests. One testing the migration of
a topology where collection were unmapped. The second test
checks the migration of the pending table.
Signed-off-by: Eric Auger <address@hidden>
---
v2 -> v3:
- tests belong to both its and migration groups
---
arm/gic.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++
arm/unittests.cfg | 16 +++++
2 files changed, 166 insertions(+)
diff --git a/arm/gic.c b/arm/gic.c
index fa8626a..ec3dd3a 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -195,6 +195,7 @@ static void lpi_handler(struct pt_regs *regs __unused)
smp_rmb(); /* pairs with wmb in lpi_stats_expect */
lpi_stats.observed.cpu_id = smp_processor_id();
lpi_stats.observed.lpi_id = irqnr;
+ acked[lpi_stats.observed.cpu_id]++;
smp_wmb(); /* pairs with rmb in check_lpi_stats */
}
@@ -239,6 +240,18 @@ static void secondary_lpi_test(void)
while (1)
wfi();
}
+
+static void check_lpi_hits(int *expected)
+{
+ int i;
+
+ for (i = 0; i < nr_cpus; i++) {
+ if (acked[i] != expected[i])
+ report(false, "expected %d LPIs on PE #%d, %d observed",
+ expected[i], i, acked[i]);
+ }
+ report(true, "check LPI on all vcpus");
+}
#endif
static void gicv2_ipi_send_self(void)
@@ -594,6 +607,8 @@ static void gic_test_mmio(void)
static void test_its_introspection(void) {}
static void test_its_trigger(void) {}
static void test_its_migration(void) {}
+static void test_migrate_unmapped_collection(void) {}
+static void test_its_pending_migration(void) {}
#else /* __arch64__ */
@@ -666,6 +681,18 @@ static bool its_prerequisites(int nb_cpus)
return false;
}
+static void set_lpi(struct its_device *dev, u32 eventid, u32 physid,
+ struct its_collection *col)
+{
+ if (!dev || !col)
+ report_abort("wrong device or collection");
+
+ its_send_mapti(dev, physid, eventid, col);
+
+ gicv3_lpi_set_config(physid, LPI_PROP_DEFAULT);
+ its_send_invall(col);
+}
+
/*
* Setup the configuration for those mappings:
* dev_id=2 event=20 -> vcpu 3, intid=8195
@@ -806,6 +833,121 @@ static void test_its_migration(void)
its_send_int(dev7, 255);
check_lpi_stats();
}
+
+static void test_migrate_unmapped_collection(void)
+{
+ struct its_collection *col;
+ struct its_device *dev2, *dev7;
+ u8 config;
+
+ if (its_setup1())
+ return;
+
+ col = its_create_collection(nr_cpus - 1, nr_cpus - 1);
+ dev2 = its_get_device(2);
+ dev7 = its_get_device(7);
+
+ /* MAPTI with the collection unmapped */
+ set_lpi(dev2, 0, 8192, col);
+
+ puts("Now migrate the VM, then press a key to continue...\n");
+ (void)getchar();
+ report(true, "Migration complete");
+
+ /* on the destination, map the collection */
+ its_send_mapc(col, true);
+
+ lpi_stats_expect(2, 8196);
+ its_send_int(dev7, 255);
+ check_lpi_stats();
+
+ config = gicv3_lpi_get_config(8192);
+ report(config == LPI_PROP_DEFAULT,
+ "Config of LPI 8192 was properly migrated");
+
+ lpi_stats_expect(nr_cpus - 1, 8192);
+ its_send_int(dev2, 0);
+ check_lpi_stats();
+
+ /* unmap the collection */
+ its_send_mapc(col, false);
+
+ lpi_stats_expect(-1, -1);
+ its_send_int(dev2, 0);
+ check_lpi_stats();
+
+ /* remap event 0 onto lpiid 8193 */
+ set_lpi(dev2, 0, 8193, col);
+ lpi_stats_expect(-1, -1);
+ its_send_int(dev2, 0);
+ check_lpi_stats();
+
+ /* remap the collection */
+ its_send_mapc(col, true);
+ lpi_stats_expect(nr_cpus - 1, 8193);
+}
+
+static void test_its_pending_migration(void)
+{
+ struct its_device *dev;
+ struct its_collection *collection[2];
+ int expected[NR_CPUS];
+ u64 pendbaser;
+ void *ptr;
+ int i;
+
+ if (its_prerequisites(4))
+ return;
+
+ dev = its_create_device(2 /* dev id */, 8 /* nb_ites */);
+ its_send_mapd(dev, true);
+
+ collection[0] = its_create_collection(nr_cpus - 1, nr_cpus - 1);
+ collection[1] = its_create_collection(nr_cpus - 2, nr_cpus - 2);
+ its_send_mapc(collection[0], true);
+ its_send_mapc(collection[1], true);
+
+ /* disable lpi at redist level */
+ gicv3_lpi_rdist_ctrl(nr_cpus - 1, false);
+ gicv3_lpi_rdist_ctrl(nr_cpus - 2, false);
+
+ /* even lpis are assigned to even cpu */
+ for (i = 0; i < 256; i++) {
+ struct its_collection *col = i % 2 ? collection[0] :
+ collection[1];
+ int vcpu = col->target_address >> 16;
+
+ its_send_mapti(dev, 8192 + i, i, col);
+ gicv3_lpi_set_config(8192 + i, LPI_PROP_DEFAULT);
+ gicv3_lpi_set_pending_table_bit(vcpu, 8192 + i, true);
+ }
+ its_send_invall(collection[0]);
+ its_send_invall(collection[1]);
+
+ /* Set the PTZ bit on each pendbaser */
+
+ expected[nr_cpus - 1] = 128;
+ expected[nr_cpus - 2] = 128;
+
+ ptr = gicv3_data.redist_base[nr_cpus - 1] + GICR_PENDBASER;
+ pendbaser = readq(ptr);
+ writeq(pendbaser & ~GICR_PENDBASER_PTZ, ptr);
+
+ ptr = gicv3_data.redist_base[nr_cpus - 2] + GICR_PENDBASER;
+ pendbaser = readq(ptr);
+ writeq(pendbaser & ~GICR_PENDBASER_PTZ, ptr);
+
+ gicv3_lpi_rdist_ctrl(nr_cpus - 1, true);
+ gicv3_lpi_rdist_ctrl(nr_cpus - 2, true);
+
+ puts("Now migrate the VM, then press a key to continue...\n");
+ (void)getchar();
+ report(true, "Migration complete");
+
+ mdelay(1000);
+
+ check_lpi_hits(expected);
+}
#endif
int main(int argc, char **argv)
@@ -847,6 +989,14 @@ int main(int argc, char **argv)
report_prefix_push(argv[1]);
test_its_migration();
report_prefix_pop();
+ } else if (!strcmp(argv[1], "its-pending-migration")) {
+ report_prefix_push(argv[1]);
+ test_its_pending_migration();
+ report_prefix_pop();
+ } else if (!strcmp(argv[1], "its-migrate-unmapped-collection")) {
+ 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 8b8ec79..d917157 100644
--- a/arm/unittests.cfg
+++ b/arm/unittests.cfg
@@ -144,6 +144,22 @@ extra_params = -machine gic-version=3 -append
'its-migration'
groups = its migration
arch = arm64
+[its-pending-migration]
+file = gic.flat
+smp = $MAX_SMP
+accel = kvm
+extra_params = -machine gic-version=3 -append 'its-pending-migration'
+groups = its migration
+arch = arm64
+
+[its-migrate-unmapped-collection]
+file = gic.flat
+smp = $MAX_SMP
+accel = kvm
+extra_params = -machine gic-version=3 -append 'its-migrate-unmapped-collection'
+groups = its migration
+arch = arm64
+
# Test PSCI emulation
[psci]
file = psci.flat
--
2.20.1
- [kvm-unit-tests PATCH v3 03/14] arm/arm64: gic: Introduce setup_irq() helper, (continued)
- [kvm-unit-tests PATCH v3 03/14] arm/arm64: gic: Introduce setup_irq() helper, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 05/14] arm/arm64: ITS: Introspection tests, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 06/14] arm/arm64: gicv3: Set the LPI config and pending tables, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 08/14] arm/arm64: ITS: its_enable_defaults, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 07/14] arm/arm64: gicv3: Enable/Disable LPIs at re-distributor level, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 09/14] arm/arm64: ITS: Device and collection Initialization, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 10/14] arm/arm64: ITS: commands, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 11/14] arm/arm64: ITS: INT functional tests, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 12/14] arm/run: Allow Migration tests, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 13/14] arm/arm64: ITS: migration tests, Eric Auger, 2020/01/28
- [kvm-unit-tests PATCH v3 14/14] arm/arm64: ITS: pending table migration test,
Eric Auger <=