| Message ID | 20200128103459.19413-14-eric.auger@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm/arm64: Add ITS tests | expand |
On Tue, Jan 28, 2020 at 11:34:58AM +0100, Eric Auger wrote: > 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> > --- > arm/gic.c | 59 ++++++++++++++++++++++++++++++++++++---- > arm/unittests.cfg | 8 ++++++ > lib/arm/asm/gic-v3-its.h | 2 ++ > lib/arm/gic-v3-its.c | 22 +++++++++++++++ > 4 files changed, 85 insertions(+), 6 deletions(-) > > diff --git a/arm/gic.c b/arm/gic.c > index 50104b1..fa8626a 100644 > --- a/arm/gic.c > +++ b/arm/gic.c > @@ -593,6 +593,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 /* __arch64__ */ > > @@ -665,13 +666,19 @@ static bool its_prerequisites(int nb_cpus) > return false; > } > > -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; Why not make its_setup1 a bool? Where true means success and false mean failure? > > dev2 = its_create_device(2 /* dev id */, 8 /* nb_ites */); > dev7 = its_create_device(7 /* dev id */, 8 /* nb_ites */); > @@ -685,14 +692,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); > > @@ -703,6 +706,23 @@ static void test_its_trigger(void) > 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); > @@ -763,6 +783,29 @@ static void test_its_trigger(void) > check_lpi_stats(); > 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(true, "Migration complete"); This seems more like a report_info place. If migration fails and we don't complete we'll never get the report FAIL anyway. > + > + lpi_stats_expect(3, 8195); > + its_send_int(dev2, 20); > + check_lpi_stats(); > + > + lpi_stats_expect(2, 8196); > + its_send_int(dev7, 255); > + check_lpi_stats(); > +} > #endif > > int main(int argc, char **argv) > @@ -800,6 +843,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 bfafec5..8b8ec79 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 0e5c5b6..febc2b2 100644 > --- a/lib/arm/asm/gic-v3-its.h > +++ b/lib/arm/asm/gic-v3-its.h > @@ -151,6 +151,8 @@ extern void its_send_invall(struct its_collection *col); > extern void its_send_movi(struct its_device *dev, > struct its_collection *col, u32 id); > extern void its_send_sync(struct its_collection *col); > +extern struct its_device *its_get_device(u32 id); > +extern struct its_collection *its_get_collection(u32 id); > > #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) > #define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) > diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c > index c2dcd01..099940e 100644 > --- a/lib/arm/gic-v3-its.c > +++ b/lib/arm/gic-v3-its.c > @@ -219,3 +219,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]; > + } > + return NULL; > +} > + > +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]; > + } > + return NULL; > +} The callers aren't checking for NULL. Should we assert here or in the caller? Thanks, drew > -- > 2.20.1 >
Hi Drew, On 2/7/20 2:49 PM, Andrew Jones wrote: > On Tue, Jan 28, 2020 at 11:34:58AM +0100, Eric Auger wrote: >> 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> >> --- >> arm/gic.c | 59 ++++++++++++++++++++++++++++++++++++---- >> arm/unittests.cfg | 8 ++++++ >> lib/arm/asm/gic-v3-its.h | 2 ++ >> lib/arm/gic-v3-its.c | 22 +++++++++++++++ >> 4 files changed, 85 insertions(+), 6 deletions(-) >> >> diff --git a/arm/gic.c b/arm/gic.c >> index 50104b1..fa8626a 100644 >> --- a/arm/gic.c >> +++ b/arm/gic.c >> @@ -593,6 +593,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 /* __arch64__ */ >> >> @@ -665,13 +666,19 @@ static bool its_prerequisites(int nb_cpus) >> return false; >> } >> >> -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; > > Why not make its_setup1 a bool? Where true means success and false mean > failure? I tend to prefer the std error return value convention that the bool return value. I aligned its_prerequisites accordingly. > >> >> dev2 = its_create_device(2 /* dev id */, 8 /* nb_ites */); >> dev7 = its_create_device(7 /* dev id */, 8 /* nb_ites */); >> @@ -685,14 +692,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); >> >> @@ -703,6 +706,23 @@ static void test_its_trigger(void) >> 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); >> @@ -763,6 +783,29 @@ static void test_its_trigger(void) >> check_lpi_stats(); >> 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(true, "Migration complete"); > > This seems more like a report_info place. If migration fails and > we don't complete we'll never get the report FAIL anyway. OK > >> + >> + lpi_stats_expect(3, 8195); >> + its_send_int(dev2, 20); >> + check_lpi_stats(); >> + >> + lpi_stats_expect(2, 8196); >> + its_send_int(dev7, 255); >> + check_lpi_stats(); >> +} >> #endif >> >> int main(int argc, char **argv) >> @@ -800,6 +843,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 bfafec5..8b8ec79 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 0e5c5b6..febc2b2 100644 >> --- a/lib/arm/asm/gic-v3-its.h >> +++ b/lib/arm/asm/gic-v3-its.h >> @@ -151,6 +151,8 @@ extern void its_send_invall(struct its_collection *col); >> extern void its_send_movi(struct its_device *dev, >> struct its_collection *col, u32 id); >> extern void its_send_sync(struct its_collection *col); >> +extern struct its_device *its_get_device(u32 id); >> +extern struct its_collection *its_get_collection(u32 id); >> >> #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) >> #define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) >> diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c >> index c2dcd01..099940e 100644 >> --- a/lib/arm/gic-v3-its.c >> +++ b/lib/arm/gic-v3-its.c >> @@ -219,3 +219,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]; >> + } >> + return NULL; >> +} >> + >> +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]; >> + } >> + return NULL; >> +} > > The callers aren't checking for NULL. Should we assert here > or in the caller? Added the assert here. Thanks Eric > > Thanks, > drew > > >> -- >> 2.20.1 >>
diff --git a/arm/gic.c b/arm/gic.c index 50104b1..fa8626a 100644 --- a/arm/gic.c +++ b/arm/gic.c @@ -593,6 +593,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 /* __arch64__ */ @@ -665,13 +666,19 @@ static bool its_prerequisites(int nb_cpus) return false; } -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 */); @@ -685,14 +692,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); @@ -703,6 +706,23 @@ static void test_its_trigger(void) 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); @@ -763,6 +783,29 @@ static void test_its_trigger(void) check_lpi_stats(); 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(true, "Migration complete"); + + lpi_stats_expect(3, 8195); + its_send_int(dev2, 20); + check_lpi_stats(); + + lpi_stats_expect(2, 8196); + its_send_int(dev7, 255); + check_lpi_stats(); +} #endif int main(int argc, char **argv) @@ -800,6 +843,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 bfafec5..8b8ec79 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 0e5c5b6..febc2b2 100644 --- a/lib/arm/asm/gic-v3-its.h +++ b/lib/arm/asm/gic-v3-its.h @@ -151,6 +151,8 @@ extern void its_send_invall(struct its_collection *col); extern void its_send_movi(struct its_device *dev, struct its_collection *col, u32 id); extern void its_send_sync(struct its_collection *col); +extern struct its_device *its_get_device(u32 id); +extern struct its_collection *its_get_collection(u32 id); #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) #define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c index c2dcd01..099940e 100644 --- a/lib/arm/gic-v3-its.c +++ b/lib/arm/gic-v3-its.c @@ -219,3 +219,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]; + } + return NULL; +} + +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]; + } + return NULL; +}
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> --- arm/gic.c | 59 ++++++++++++++++++++++++++++++++++++---- arm/unittests.cfg | 8 ++++++ lib/arm/asm/gic-v3-its.h | 2 ++ lib/arm/gic-v3-its.c | 22 +++++++++++++++ 4 files changed, 85 insertions(+), 6 deletions(-)