| Message ID | 20240226093832.1468383-8-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | more migration enhancements and tests | expand |
On 26/02/2024 10.38, Nicholas Piggin wrote: > This test stores to a bunch of pages and verifies previous stores, > while being continually migrated. This can fail due to a QEMU TCG > physical memory dirty bitmap bug. Good idea, but could we then please drop "continuous" test from selftest-migration.c again? ... having two common tests to exercise the continuous migration that take quite a bunch of seconds to finish sounds like a waste of time in the long run to me. > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > common/memory-verify.c | 48 +++++++++++++++++++++++++++++++++++++++++ > powerpc/Makefile.common | 1 + > powerpc/memory-verify.c | 1 + > powerpc/unittests.cfg | 7 ++++++ > s390x/Makefile | 1 + > s390x/memory-verify.c | 1 + > s390x/unittests.cfg | 6 ++++++ > 7 files changed, 65 insertions(+) > create mode 100644 common/memory-verify.c > create mode 120000 powerpc/memory-verify.c > create mode 120000 s390x/memory-verify.c > > diff --git a/common/memory-verify.c b/common/memory-verify.c > new file mode 100644 > index 000000000..7c4ec087b > --- /dev/null > +++ b/common/memory-verify.c > @@ -0,0 +1,48 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Simple memory verification test, used to exercise dirty memory migration. > + * > + */ > +#include <libcflat.h> > +#include <migrate.h> > +#include <alloc.h> > +#include <asm/page.h> > +#include <asm/time.h> > + > +#define NR_PAGES 32 > + > +int main(int argc, char **argv) > +{ > + void *mem = malloc(NR_PAGES*PAGE_SIZE); > + bool success = true; > + uint64_t ms; > + long i; > + > + report_prefix_push("memory"); > + > + memset(mem, 0, NR_PAGES*PAGE_SIZE); > + > + migrate_begin_continuous(); > + ms = get_clock_ms(); > + i = 0; > + do { > + int j; > + > + for (j = 0; j < NR_PAGES*PAGE_SIZE; j += PAGE_SIZE) { > + if (*(volatile long *)(mem + j) != i) { > + success = false; > + goto out; > + } > + *(volatile long *)(mem + j) = i + 1; > + } > + i++; > + } while (get_clock_ms() - ms < 5000); Maybe add a parameter so that the user can use different values for the runtime than always doing 5 seconds? Thomas > +out: > + migrate_end_continuous(); > + > + report(success, "memory verification stress test"); > + > + report_prefix_pop(); > + > + return report_summary(); > +}
On Mon Mar 4, 2024 at 4:22 PM AEST, Thomas Huth wrote: > On 26/02/2024 10.38, Nicholas Piggin wrote: > > This test stores to a bunch of pages and verifies previous stores, > > while being continually migrated. This can fail due to a QEMU TCG > > physical memory dirty bitmap bug. > > Good idea, but could we then please drop "continuous" test from > selftest-migration.c again? ... having two common tests to exercise the > continuous migration that take quite a bunch of seconds to finish sounds > like a waste of time in the long run to me. Yeah if you like. I could shorten them up a bit. I did want to have the selftests for just purely testing the harness with as little "test" code as possible. > > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > > --- > > common/memory-verify.c | 48 +++++++++++++++++++++++++++++++++++++++++ > > powerpc/Makefile.common | 1 + > > powerpc/memory-verify.c | 1 + > > powerpc/unittests.cfg | 7 ++++++ > > s390x/Makefile | 1 + > > s390x/memory-verify.c | 1 + > > s390x/unittests.cfg | 6 ++++++ > > 7 files changed, 65 insertions(+) > > create mode 100644 common/memory-verify.c > > create mode 120000 powerpc/memory-verify.c > > create mode 120000 s390x/memory-verify.c > > > > diff --git a/common/memory-verify.c b/common/memory-verify.c > > new file mode 100644 > > index 000000000..7c4ec087b > > --- /dev/null > > +++ b/common/memory-verify.c > > @@ -0,0 +1,48 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * Simple memory verification test, used to exercise dirty memory migration. > > + * > > + */ > > +#include <libcflat.h> > > +#include <migrate.h> > > +#include <alloc.h> > > +#include <asm/page.h> > > +#include <asm/time.h> > > + > > +#define NR_PAGES 32 > > + > > +int main(int argc, char **argv) > > +{ > > + void *mem = malloc(NR_PAGES*PAGE_SIZE); > > + bool success = true; > > + uint64_t ms; > > + long i; > > + > > + report_prefix_push("memory"); > > + > > + memset(mem, 0, NR_PAGES*PAGE_SIZE); > > + > > + migrate_begin_continuous(); > > + ms = get_clock_ms(); > > + i = 0; > > + do { > > + int j; > > + > > + for (j = 0; j < NR_PAGES*PAGE_SIZE; j += PAGE_SIZE) { > > + if (*(volatile long *)(mem + j) != i) { > > + success = false; > > + goto out; > > + } > > + *(volatile long *)(mem + j) = i + 1; > > + } > > + i++; > > + } while (get_clock_ms() - ms < 5000); > > Maybe add a parameter so that the user can use different values for the > runtime than always doing 5 seconds? Sure. Thanks, Nick
On 05/03/2024 03.50, Nicholas Piggin wrote: > On Mon Mar 4, 2024 at 4:22 PM AEST, Thomas Huth wrote: >> On 26/02/2024 10.38, Nicholas Piggin wrote: >>> This test stores to a bunch of pages and verifies previous stores, >>> while being continually migrated. This can fail due to a QEMU TCG >>> physical memory dirty bitmap bug. >> >> Good idea, but could we then please drop "continuous" test from >> selftest-migration.c again? ... having two common tests to exercise the >> continuous migration that take quite a bunch of seconds to finish sounds >> like a waste of time in the long run to me. > > Yeah if you like. I could shorten them up a bit. I did want to have > the selftests for just purely testing the harness with as little > "test" code as possible. Ok, but then please shorten the selftest to ~ 2 seconds if possible, please. Thomas
diff --git a/common/memory-verify.c b/common/memory-verify.c new file mode 100644 index 000000000..7c4ec087b --- /dev/null +++ b/common/memory-verify.c @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Simple memory verification test, used to exercise dirty memory migration. + * + */ +#include <libcflat.h> +#include <migrate.h> +#include <alloc.h> +#include <asm/page.h> +#include <asm/time.h> + +#define NR_PAGES 32 + +int main(int argc, char **argv) +{ + void *mem = malloc(NR_PAGES*PAGE_SIZE); + bool success = true; + uint64_t ms; + long i; + + report_prefix_push("memory"); + + memset(mem, 0, NR_PAGES*PAGE_SIZE); + + migrate_begin_continuous(); + ms = get_clock_ms(); + i = 0; + do { + int j; + + for (j = 0; j < NR_PAGES*PAGE_SIZE; j += PAGE_SIZE) { + if (*(volatile long *)(mem + j) != i) { + success = false; + goto out; + } + *(volatile long *)(mem + j) = i + 1; + } + i++; + } while (get_clock_ms() - ms < 5000); +out: + migrate_end_continuous(); + + report(success, "memory verification stress test"); + + report_prefix_pop(); + + return report_summary(); +} diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index da4a7bbb8..1e181da69 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -7,6 +7,7 @@ tests-common = \ $(TEST_DIR)/selftest.elf \ $(TEST_DIR)/selftest-migration.elf \ + $(TEST_DIR)/memory-verify.elf \ $(TEST_DIR)/spapr_hcall.elf \ $(TEST_DIR)/rtas.elf \ $(TEST_DIR)/emulator.elf \ diff --git a/powerpc/memory-verify.c b/powerpc/memory-verify.c new file mode 120000 index 000000000..5985c730f --- /dev/null +++ b/powerpc/memory-verify.c @@ -0,0 +1 @@ +../common/memory-verify.c \ No newline at end of file diff --git a/powerpc/unittests.cfg b/powerpc/unittests.cfg index 89abf2095..fadd8dde6 100644 --- a/powerpc/unittests.cfg +++ b/powerpc/unittests.cfg @@ -46,6 +46,13 @@ machine = pseries groups = selftest migration extra_params = -append "skip" +# This fails due to a QEMU TCG bug so KVM-only until QEMU is fixed upstream +[migration-memory] +file = memory-verify.elf +accel = kvm +machine = pseries +groups = migration + [spapr_hcall] file = spapr_hcall.elf diff --git a/s390x/Makefile b/s390x/Makefile index 344d46d68..ddc0969f3 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -1,5 +1,6 @@ tests = $(TEST_DIR)/selftest.elf tests += $(TEST_DIR)/selftest-migration.elf +tests += $(TEST_DIR)/memory-verify.elf tests += $(TEST_DIR)/intercept.elf tests += $(TEST_DIR)/emulator.elf tests += $(TEST_DIR)/sieve.elf diff --git a/s390x/memory-verify.c b/s390x/memory-verify.c new file mode 120000 index 000000000..5985c730f --- /dev/null +++ b/s390x/memory-verify.c @@ -0,0 +1 @@ +../common/memory-verify.c \ No newline at end of file diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index f613602d3..a88fe9e79 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -33,6 +33,12 @@ file = selftest-migration.elf groups = selftest migration extra_params = -append "skip" +# This fails due to a QEMU TCG bug so KVM-only until QEMU is fixed upstream +[migration-memory] +file = memory-verify.elf +accel = kvm +groups = migration + [intercept] file = intercept.elf
This test stores to a bunch of pages and verifies previous stores, while being continually migrated. This can fail due to a QEMU TCG physical memory dirty bitmap bug. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- common/memory-verify.c | 48 +++++++++++++++++++++++++++++++++++++++++ powerpc/Makefile.common | 1 + powerpc/memory-verify.c | 1 + powerpc/unittests.cfg | 7 ++++++ s390x/Makefile | 1 + s390x/memory-verify.c | 1 + s390x/unittests.cfg | 6 ++++++ 7 files changed, 65 insertions(+) create mode 100644 common/memory-verify.c create mode 120000 powerpc/memory-verify.c create mode 120000 s390x/memory-verify.c