Re: [kvm-unit-tests PATCH v7 07/35] common: add memory dirtying vs migration test
On Fri Mar 29, 2024 at 3:37 AM AEST, Thomas Huth wrote:
> On 19/03/2024 08.58, Nicholas Piggin wrote:
> > This test stores to a bunch of pages and verifies previous stores,
> > while being continually migrated. Default runtime is 5 seconds.
> >
> > Add this test to ppc64 and s390x builds. This can fail due to a QEMU
> > TCG physical memory dirty bitmap bug, so it is not enabled in unittests
> > for TCG yet.
> >
> > The selftest-migration test time is reduced significantly because
> > this test
> >
> > Signed-off-by: Nicholas Piggin
> > ---
> > common/memory-verify.c | 67 +
> > common/selftest-migration.c | 8 ++---
> > 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
> > 8 files changed, 88 insertions(+), 4 deletions(-)
> > create mode 100644 common/memory-verify.c
> > create mode 12 powerpc/memory-verify.c
> > create mode 12 s390x/memory-verify.c
> >
> > diff --git a/common/memory-verify.c b/common/memory-verify.c
> > new file mode 100644
> > index 0..e78fb4338
> > --- /dev/null
> > +++ b/common/memory-verify.c
> > @@ -0,0 +1,67 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/*
> > + * Simple memory verification test, used to exercise dirty memory
> > migration.
> > + */
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +
> > +#define NR_PAGES 32
> > +
> > +static unsigned time_sec = 5;
> > +
> > +static void do_getopts(int argc, char **argv)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < argc; ++i) {
> > + if (strcmp(argv[i], "-t") == 0) {
> > + i++;
> > + if (i == argc)
> > + break;
> > + time_sec = atol(argv[i]);
> > + }
> > + }
> > +
> > + printf("running for %d secs\n", time_sec);
> > +}
> > +
> > +int main(int argc, char **argv)
> > +{
> > + void *mem = malloc(NR_PAGES*PAGE_SIZE);
>
> Use alloc_pages(5) instead ? Or add at least some white spaces around "*".
Hmm, alloc_pages is physical? Maybe I should use memalign instead (and
I'll fix the space). Even though it's not using VM, we might change
that.
> Apart from that this patch looks sane to me, so with that line fixed:
> Reviewed-by: Thomas Huth
I'll keep your R-B with the memalign change if that's okay.
Thanks,
Nick
Re: [kvm-unit-tests PATCH v7 07/35] common: add memory dirtying vs migration test
On 19/03/2024 08.58, Nicholas Piggin wrote:
This test stores to a bunch of pages and verifies previous stores,
while being continually migrated. Default runtime is 5 seconds.
Add this test to ppc64 and s390x builds. This can fail due to a QEMU
TCG physical memory dirty bitmap bug, so it is not enabled in unittests
for TCG yet.
The selftest-migration test time is reduced significantly because
this test
Signed-off-by: Nicholas Piggin
---
common/memory-verify.c | 67 +
common/selftest-migration.c | 8 ++---
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
8 files changed, 88 insertions(+), 4 deletions(-)
create mode 100644 common/memory-verify.c
create mode 12 powerpc/memory-verify.c
create mode 12 s390x/memory-verify.c
diff --git a/common/memory-verify.c b/common/memory-verify.c
new file mode 100644
index 0..e78fb4338
--- /dev/null
+++ b/common/memory-verify.c
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Simple memory verification test, used to exercise dirty memory migration.
+ */
+#include
+#include
+#include
+#include
+#include
+
+#define NR_PAGES 32
+
+static unsigned time_sec = 5;
+
+static void do_getopts(int argc, char **argv)
+{
+ int i;
+
+ for (i = 0; i < argc; ++i) {
+ if (strcmp(argv[i], "-t") == 0) {
+ i++;
+ if (i == argc)
+ break;
+ time_sec = atol(argv[i]);
+ }
+ }
+
+ printf("running for %d secs\n", time_sec);
+}
+
+int main(int argc, char **argv)
+{
+ void *mem = malloc(NR_PAGES*PAGE_SIZE);
Use alloc_pages(5) instead ? Or add at least some white spaces around "*".
Apart from that this patch looks sane to me, so with that line fixed:
Reviewed-by: Thomas Huth
[kvm-unit-tests PATCH v7 07/35] common: add memory dirtying vs migration test
This test stores to a bunch of pages and verifies previous stores,
while being continually migrated. Default runtime is 5 seconds.
Add this test to ppc64 and s390x builds. This can fail due to a QEMU
TCG physical memory dirty bitmap bug, so it is not enabled in unittests
for TCG yet.
The selftest-migration test time is reduced significantly because
this test
Signed-off-by: Nicholas Piggin
---
common/memory-verify.c | 67 +
common/selftest-migration.c | 8 ++---
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
8 files changed, 88 insertions(+), 4 deletions(-)
create mode 100644 common/memory-verify.c
create mode 12 powerpc/memory-verify.c
create mode 12 s390x/memory-verify.c
diff --git a/common/memory-verify.c b/common/memory-verify.c
new file mode 100644
index 0..e78fb4338
--- /dev/null
+++ b/common/memory-verify.c
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Simple memory verification test, used to exercise dirty memory migration.
+ */
+#include
+#include
+#include
+#include
+#include
+
+#define NR_PAGES 32
+
+static unsigned time_sec = 5;
+
+static void do_getopts(int argc, char **argv)
+{
+ int i;
+
+ for (i = 0; i < argc; ++i) {
+ if (strcmp(argv[i], "-t") == 0) {
+ i++;
+ if (i == argc)
+ break;
+ time_sec = atol(argv[i]);
+ }
+ }
+
+ printf("running for %d secs\n", time_sec);
+}
+
+int main(int argc, char **argv)
+{
+ void *mem = malloc(NR_PAGES*PAGE_SIZE);
+ bool success = true;
+ uint64_t ms;
+ long i;
+
+ do_getopts(argc, argv);
+
+ 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 < time_sec * 1000);
+out:
+ migrate_end_continuous();
+
+ report(success, "memory verification stress test");
+
+ report_prefix_pop();
+
+ return report_summary();
+}
diff --git a/common/selftest-migration.c b/common/selftest-migration.c
index 9a9b61835..3693148aa 100644
--- a/common/selftest-migration.c
+++ b/common/selftest-migration.c
@@ -11,7 +11,7 @@
#include
#include
-#define NR_MIGRATIONS 15
+#define NR_MIGRATIONS 5
int main(int argc, char **argv)
{
@@ -28,11 +28,11 @@ int main(int argc, char **argv)
report(true, "cooperative migration");
migrate_begin_continuous();
- mdelay(2000);
- migrate_end_continuous();
mdelay(1000);
+ migrate_end_continuous();
+ mdelay(500);
migrate_begin_continuous();
- mdelay(2000);
+ mdelay(1000);
migrate_end_continuous();
report(true, "continuous migration");
}
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 12
index 0..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 cae4949e8..e65217c18 100644
--- a/powerpc/unittests.cfg
+++ b/powerpc/unittests.cfg
@@ -49,6 +49,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
