From: Andrew Jones <drjones@redhat.com> To: pbonzini@redhat.com Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, Eric Auger <eric.auger@redhat.com>, Zenghui Yu <yuzenghui@huawei.com> Subject: [PULL kvm-unit-tests 38/39] arm/arm64: ITS: migration tests Date: Sat, 4 Apr 2020 16:37:30 +0200 [thread overview] Message-ID: <20200404143731.208138-39-drjones@redhat.com> (raw) In-Reply-To: <20200404143731.208138-1-drjones@redhat.com> From: Eric Auger <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> Reviewed-by: Zenghui Yu <yuzenghui@huawei.com> [ Complete migration even when the test is skipped. Otherwise the migration scripts hang. ] Signed-off-by: Andrew Jones <drjones@redhat.com> --- arm/gic.c | 64 ++++++++++++++++++++++++++++++++++---- arm/unittests.cfg | 8 +++++ lib/arm64/asm/gic-v3-its.h | 3 ++ lib/arm64/gic-v3-its.c | 22 +++++++++++++ 4 files changed, 91 insertions(+), 6 deletions(-) diff --git a/arm/gic.c b/arm/gic.c index 54ae83d26eb9..d98d70a5d9e9 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,35 @@ 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; + bool test_skipped = false; + + if (its_setup1()) { + test_skipped = true; + goto do_migrate; + } + + dev2 = its_get_device(2); + dev7 = its_get_device(7); + +do_migrate: + puts("Now migrate the VM, then press a key to continue...\n"); + (void)getchar(); + report_info("Migration complete"); + if (test_skipped) + return; + + 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 +835,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 47f9446adcc3..20a1ae269571 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -191,6 +191,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 c203293a7838..0258daa15709 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 ca91c3dd1108..c22bda3a8ba2 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.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <drjones@redhat.com> To: pbonzini@redhat.com Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PULL kvm-unit-tests 38/39] arm/arm64: ITS: migration tests Date: Sat, 4 Apr 2020 16:37:30 +0200 [thread overview] Message-ID: <20200404143731.208138-39-drjones@redhat.com> (raw) In-Reply-To: <20200404143731.208138-1-drjones@redhat.com> From: Eric Auger <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> Reviewed-by: Zenghui Yu <yuzenghui@huawei.com> [ Complete migration even when the test is skipped. Otherwise the migration scripts hang. ] Signed-off-by: Andrew Jones <drjones@redhat.com> --- arm/gic.c | 64 ++++++++++++++++++++++++++++++++++---- arm/unittests.cfg | 8 +++++ lib/arm64/asm/gic-v3-its.h | 3 ++ lib/arm64/gic-v3-its.c | 22 +++++++++++++ 4 files changed, 91 insertions(+), 6 deletions(-) diff --git a/arm/gic.c b/arm/gic.c index 54ae83d26eb9..d98d70a5d9e9 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,35 @@ 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; + bool test_skipped = false; + + if (its_setup1()) { + test_skipped = true; + goto do_migrate; + } + + dev2 = its_get_device(2); + dev7 = its_get_device(7); + +do_migrate: + puts("Now migrate the VM, then press a key to continue...\n"); + (void)getchar(); + report_info("Migration complete"); + if (test_skipped) + return; + + 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 +835,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 47f9446adcc3..20a1ae269571 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -191,6 +191,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 c203293a7838..0258daa15709 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 ca91c3dd1108..c22bda3a8ba2 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.25.1 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2020-04-04 14:39 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-04 14:36 [PULL kvm-unit-tests 00/39] arm/arm64: The old and new Andrew Jones 2020-04-04 14:36 ` Andrew Jones 2020-04-04 14:36 ` [PULL kvm-unit-tests 01/39] Makefile: Use no-stack-protector compiler options Andrew Jones 2020-04-04 14:36 ` Andrew Jones 2020-04-04 14:36 ` [PULL kvm-unit-tests 02/39] arm/arm64: psci: Don't run C code without stack or vectors Andrew Jones 2020-04-04 14:36 ` Andrew Jones 2020-04-04 14:36 ` [PULL kvm-unit-tests 03/39] arm64: timer: Add ISB after register writes Andrew Jones 2020-04-04 14:36 ` Andrew Jones 2020-04-04 14:36 ` [PULL kvm-unit-tests 04/39] arm64: timer: Add ISB before reading the counter value Andrew Jones 2020-04-04 14:36 ` Andrew Jones 2020-04-04 14:36 ` [PULL kvm-unit-tests 05/39] arm64: timer: Make irq_received volatile Andrew Jones 2020-04-04 14:36 ` Andrew Jones 2020-04-04 14:36 ` [PULL kvm-unit-tests 06/39] arm64: timer: EOIR the interrupt after masking the timer Andrew Jones 2020-04-04 14:36 ` Andrew Jones 2020-04-04 14:36 ` [PULL kvm-unit-tests 07/39] arm64: timer: Wait for the GIC to sample timer interrupt state Andrew Jones 2020-04-04 14:36 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 08/39] arm64: timer: Check the " Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 09/39] arm64: timer: Test behavior when timer disabled or masked Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 10/39] arm/arm64: Perform dcache clean + invalidate after turning MMU off Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 11/39] arm/arm64: gic: Move gic_state enumeration to asm/gic.h Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 12/39] arm64: timer: Use the proper RDist register name in GICv3 Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 13/39] arm64: timer: Use existing helpers to access counter/timers Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 14/39] arm64: timer: Speed up gic-timer-state check Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 15/39] arm64: Provide read/write_sysreg_s Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 16/39] arm: pmu: Let pmu tests take a sub-test parameter Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 17/39] arm: pmu: Don't check PMCR.IMP anymore Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 18/39] arm: pmu: Add a pmu struct Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 19/39] arm: pmu: Introduce defines for PMU versions Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 20/39] arm: pmu: Check Required Event Support Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 21/39] arm: pmu: Basic event counter Tests Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 22/39] arm: pmu: Test SW_INCR event count Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 23/39] arm: pmu: Test chained counters Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 24/39] arm: pmu: test 32-bit <-> 64-bit transitions Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 25/39] arm: gic: Introduce gic_irq_set_clr_enable() helper Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 26/39] arm: pmu: Test overflow interrupts Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 27/39] libcflat: Add other size defines Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 28/39] page_alloc: Introduce get_order() Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 29/39] arm/arm64: gic: Introduce setup_irq() helper Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 30/39] arm/arm64: gicv3: Add some re-distributor defines Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 31/39] arm/arm64: gicv3: Set the LPI config and pending tables Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 32/39] arm/arm64: ITS: Introspection tests Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 33/39] arm/arm64: ITS: its_enable_defaults Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 34/39] arm/arm64: ITS: Device and collection Initialization Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 35/39] arm/arm64: ITS: Commands Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 36/39] arm/arm64: ITS: INT functional tests Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 37/39] arm/run: Allow Migration tests Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-04 14:37 ` Andrew Jones [this message] 2020-04-04 14:37 ` [PULL kvm-unit-tests 38/39] arm/arm64: ITS: migration tests Andrew Jones 2020-04-04 14:37 ` [PULL kvm-unit-tests 39/39] arm/arm64: ITS: pending table migration test Andrew Jones 2020-04-04 14:37 ` Andrew Jones 2020-04-07 15:28 ` [PULL kvm-unit-tests 00/39] arm/arm64: The old and new Paolo Bonzini 2020-04-07 15:28 ` Paolo Bonzini
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=20200404143731.208138-39-drjones@redhat.com \ --to=drjones@redhat.com \ --cc=eric.auger@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=pbonzini@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.