* [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64
@ 2024-05-30 7:44 Nicholas Piggin
2024-05-30 7:44 ` [PATCH v3 1/4] tests/qtest: Move common define from libqos-spapr.h to new ppc-util.h Nicholas Piggin
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Nicholas Piggin @ 2024-05-30 7:44 UTC (permalink / raw)
To: qemu-devel
Cc: Nicholas Piggin, Peter Xu, Fabiano Rosas, Thomas Huth,
Laurent Vivier, Paolo Bonzini, qemu-ppc
Since v2:
- Fixed subject typo noticed by Thomas.
- Drop the non-ppc patches from the series.
Thanks,
Nick
Nicholas Piggin (4):
tests/qtest: Move common define from libqos-spapr.h to new ppc-util.h
tests/qtest/migration-test: Quieten ppc64 QEMU warnings
tests/qtest/migration-test: Enable on ppc64 TCG
tests/qtest/migration-test: Use custom asm bios for ppc64
tests/migration/migration-test.h | 1 +
tests/migration/ppc64/a-b-kernel.h | 42 +++++++++++++++++++
tests/qtest/libqos/libqos-spapr.h | 7 ----
tests/qtest/ppc-util.h | 19 +++++++++
tests/qtest/boot-serial-test.c | 2 +-
tests/qtest/migration-test.c | 53 +++++-------------------
tests/qtest/prom-env-test.c | 2 +-
tests/qtest/pxe-test.c | 2 +-
tests/migration/Makefile | 2 +-
tests/migration/ppc64/Makefile | 15 +++++++
tests/migration/ppc64/a-b-kernel.S | 66 ++++++++++++++++++++++++++++++
11 files changed, 157 insertions(+), 54 deletions(-)
create mode 100644 tests/migration/ppc64/a-b-kernel.h
create mode 100644 tests/qtest/ppc-util.h
create mode 100644 tests/migration/ppc64/Makefile
create mode 100644 tests/migration/ppc64/a-b-kernel.S
--
2.43.0
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v3 1/4] tests/qtest: Move common define from libqos-spapr.h to new ppc-util.h 2024-05-30 7:44 [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Nicholas Piggin @ 2024-05-30 7:44 ` Nicholas Piggin 2024-05-30 7:44 ` [PATCH v3 2/4] tests/qtest/migration-test: Quieten ppc64 QEMU warnings Nicholas Piggin ` (3 subsequent siblings) 4 siblings, 0 replies; 8+ messages in thread From: Nicholas Piggin @ 2024-05-30 7:44 UTC (permalink / raw) To: qemu-devel Cc: Nicholas Piggin, Peter Xu, Fabiano Rosas, Thomas Huth, Laurent Vivier, Paolo Bonzini, qemu-ppc The spapr QEMU machine defaults is useful outside libqos, so create a new header for ppc specific qtests and move it there. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- tests/qtest/libqos/libqos-spapr.h | 7 ------- tests/qtest/ppc-util.h | 19 +++++++++++++++++++ tests/qtest/boot-serial-test.c | 2 +- tests/qtest/prom-env-test.c | 2 +- tests/qtest/pxe-test.c | 2 +- 5 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 tests/qtest/ppc-util.h diff --git a/tests/qtest/libqos/libqos-spapr.h b/tests/qtest/libqos/libqos-spapr.h index e4483c14f8..a446276416 100644 --- a/tests/qtest/libqos/libqos-spapr.h +++ b/tests/qtest/libqos/libqos-spapr.h @@ -9,11 +9,4 @@ QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...) G_GNUC_PRINTF(1, 2); void qtest_spapr_shutdown(QOSState *qs); -/* List of capabilities needed to silence warnings with TCG */ -#define PSERIES_DEFAULT_CAPABILITIES \ - "cap-cfpc=broken," \ - "cap-sbbc=broken," \ - "cap-ibs=broken," \ - "cap-ccf-assist=off," - #endif diff --git a/tests/qtest/ppc-util.h b/tests/qtest/ppc-util.h new file mode 100644 index 0000000000..f68ee93520 --- /dev/null +++ b/tests/qtest/ppc-util.h @@ -0,0 +1,19 @@ +/* + * PowerPC misc useful things + * + * Copyright (c) 2024, IBM Corporation. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef PPC_UTIL_H +#define PPC_UTIL_H + +/* List of capabilities needed to silence warnings with TCG */ +#define PSERIES_DEFAULT_CAPABILITIES \ + "cap-cfpc=broken," \ + "cap-sbbc=broken," \ + "cap-ibs=broken," \ + "cap-ccf-assist=off," + +#endif /* PPC_UTIL_H */ diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index df389adeeb..3b92fa5d50 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/libqos-spapr.h" +#include "ppc-util.h" static const uint8_t bios_avr[] = { 0x88, 0xe0, /* ldi r24, 0x08 */ diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c index 39ccb59797..14705105ad 100644 --- a/tests/qtest/prom-env-test.c +++ b/tests/qtest/prom-env-test.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/libqos-spapr.h" +#include "ppc-util.h" #define MAGIC 0xcafec0de #define ADDRESS 0x4000 diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c index e4b48225a5..a3f900fbea 100644 --- a/tests/qtest/pxe-test.c +++ b/tests/qtest/pxe-test.c @@ -16,7 +16,7 @@ #include <glib/gstdio.h> #include "libqtest.h" #include "boot-sector.h" -#include "libqos/libqos-spapr.h" +#include "ppc-util.h" #define NETNAME "net0" -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/4] tests/qtest/migration-test: Quieten ppc64 QEMU warnings 2024-05-30 7:44 [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Nicholas Piggin 2024-05-30 7:44 ` [PATCH v3 1/4] tests/qtest: Move common define from libqos-spapr.h to new ppc-util.h Nicholas Piggin @ 2024-05-30 7:44 ` Nicholas Piggin 2024-05-31 7:31 ` Prasad Pandit 2024-05-30 7:44 ` [PATCH v3 3/4] tests/qtest/migration-test: Enable on ppc64 TCG Nicholas Piggin ` (2 subsequent siblings) 4 siblings, 1 reply; 8+ messages in thread From: Nicholas Piggin @ 2024-05-30 7:44 UTC (permalink / raw) To: qemu-devel Cc: Nicholas Piggin, Peter Xu, Fabiano Rosas, Thomas Huth, Laurent Vivier, Paolo Bonzini, qemu-ppc Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- tests/qtest/migration-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index b7e3406471..48f59822f4 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -21,6 +21,7 @@ #include "chardev/char.h" #include "crypto/tlscredspsk.h" #include "qapi/qmp/qlist.h" +#include "ppc-util.h" #include "migration-helpers.h" #include "tests/migration/migration-test.h" @@ -742,7 +743,8 @@ static int test_migrate_start(QTestState **from, QTestState **to, "until'", end_address, start_address); machine_alias = "pseries"; machine_opts = "vsmt=8"; - arch_opts = g_strdup("-nodefaults"); + arch_opts = g_strdup("-nodefaults " + "-machine " PSERIES_DEFAULT_CAPABILITIES); } else if (strcmp(arch, "aarch64") == 0) { memory_size = "150M"; machine_alias = "virt"; -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/4] tests/qtest/migration-test: Quieten ppc64 QEMU warnings 2024-05-30 7:44 ` [PATCH v3 2/4] tests/qtest/migration-test: Quieten ppc64 QEMU warnings Nicholas Piggin @ 2024-05-31 7:31 ` Prasad Pandit 0 siblings, 0 replies; 8+ messages in thread From: Prasad Pandit @ 2024-05-31 7:31 UTC (permalink / raw) To: Nicholas Piggin Cc: qemu-devel, Peter Xu, Fabiano Rosas, Thomas Huth, Laurent Vivier, Paolo Bonzini, qemu-ppc On Thu, 30 May 2024 at 13:17, Nicholas Piggin <npiggin@gmail.com> wrote: > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- * No commit log message? --- - Prasad ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 3/4] tests/qtest/migration-test: Enable on ppc64 TCG 2024-05-30 7:44 [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Nicholas Piggin 2024-05-30 7:44 ` [PATCH v3 1/4] tests/qtest: Move common define from libqos-spapr.h to new ppc-util.h Nicholas Piggin 2024-05-30 7:44 ` [PATCH v3 2/4] tests/qtest/migration-test: Quieten ppc64 QEMU warnings Nicholas Piggin @ 2024-05-30 7:44 ` Nicholas Piggin 2024-05-31 7:28 ` Prasad Pandit 2024-05-30 7:44 ` [PATCH v3 4/4] tests/qtest/migration-test: Use custom asm bios for ppc64 Nicholas Piggin 2024-06-04 21:03 ` [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Fabiano Rosas 4 siblings, 1 reply; 8+ messages in thread From: Nicholas Piggin @ 2024-05-30 7:44 UTC (permalink / raw) To: qemu-devel Cc: Nicholas Piggin, Peter Xu, Fabiano Rosas, Thomas Huth, Laurent Vivier, Paolo Bonzini, qemu-ppc ppc64 with TCG seems to no longer be failing this test, perhaps since commit 03bfc2188f061 ("physmem: Fix migration dirty bitmap coherency with TCG memory access") which is not ppc specific but was seen to hit ppc64 quite easily. Let's enable it again. The s390x problem has been identified so mention it while we are adjusting the comment. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- tests/qtest/migration-test.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 48f59822f4..ef9ddef1c8 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -3454,19 +3454,9 @@ int main(int argc, char **argv) #endif /* - * On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG - * is touchy due to race conditions on dirty bits (especially on PPC for - * some reason) - */ - if (g_str_equal(arch, "ppc64") && - (!has_kvm || access("/sys/module/kvm_hv", F_OK))) { - g_test_message("Skipping tests: kvm_hv not available"); - goto test_add_done; - } - - /* - * Similar to ppc64, s390x seems to be touchy with TCG, so disable it - * there until the problems are resolved + * On s390x with TCG, migration is observed to hang due to the 'pending' + * state of the flic interrupt controller not being migrated or + * reconstructed post-migration. Disable it until the problem is resolved. */ if (g_str_equal(arch, "s390x") && !has_kvm) { g_test_message("Skipping tests: s390x host with KVM is required"); -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 3/4] tests/qtest/migration-test: Enable on ppc64 TCG 2024-05-30 7:44 ` [PATCH v3 3/4] tests/qtest/migration-test: Enable on ppc64 TCG Nicholas Piggin @ 2024-05-31 7:28 ` Prasad Pandit 0 siblings, 0 replies; 8+ messages in thread From: Prasad Pandit @ 2024-05-31 7:28 UTC (permalink / raw) To: Nicholas Piggin Cc: qemu-devel, Peter Xu, Fabiano Rosas, Thomas Huth, Laurent Vivier, Paolo Bonzini, qemu-ppc On Thu, 30 May 2024 at 13:17, Nicholas Piggin <npiggin@gmail.com> wrote: > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > /* > - * On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG > - * is touchy due to race conditions on dirty bits (especially on PPC for > - * some reason) > - */ > - if (g_str_equal(arch, "ppc64") && > - (!has_kvm || access("/sys/module/kvm_hv", F_OK))) { > - g_test_message("Skipping tests: kvm_hv not available"); > - goto test_add_done; > - } > - > - /* > - * Similar to ppc64, s390x seems to be touchy with TCG, so disable it > - * there until the problems are resolved > + * On s390x with TCG, migration is observed to hang due to the 'pending' > + * state of the flic interrupt controller not being migrated or > + * reconstructed post-migration. Disable it until the problem is resolved. > */ > if (g_str_equal(arch, "s390x") && !has_kvm) { > g_test_message("Skipping tests: s390x host with KVM is required"); > -- > 2.43.0 Reviewed-by: Prasad Pandit <pjp@fedoraproject.org> Thank you. --- - Prasad ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 4/4] tests/qtest/migration-test: Use custom asm bios for ppc64 2024-05-30 7:44 [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Nicholas Piggin ` (2 preceding siblings ...) 2024-05-30 7:44 ` [PATCH v3 3/4] tests/qtest/migration-test: Enable on ppc64 TCG Nicholas Piggin @ 2024-05-30 7:44 ` Nicholas Piggin 2024-06-04 21:03 ` [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Fabiano Rosas 4 siblings, 0 replies; 8+ messages in thread From: Nicholas Piggin @ 2024-05-30 7:44 UTC (permalink / raw) To: qemu-devel Cc: Nicholas Piggin, Peter Xu, Fabiano Rosas, Thomas Huth, Laurent Vivier, Paolo Bonzini, qemu-ppc Similar to other archs, build a custom bios memory updater. Running the test with OF code is a cool trick, but SLOF takes a long time to boot. This reduces test time by around 3x (150s to 50s). Reviewed-by: Fabiano Rosas <farosas@suse.de> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- tests/migration/migration-test.h | 1 + tests/migration/ppc64/a-b-kernel.h | 42 +++++++++++++++++++ tests/qtest/migration-test.c | 37 +++-------------- tests/migration/Makefile | 2 +- tests/migration/ppc64/Makefile | 15 +++++++ tests/migration/ppc64/a-b-kernel.S | 66 ++++++++++++++++++++++++++++++ 6 files changed, 131 insertions(+), 32 deletions(-) create mode 100644 tests/migration/ppc64/a-b-kernel.h create mode 100644 tests/migration/ppc64/Makefile create mode 100644 tests/migration/ppc64/a-b-kernel.S diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h index 68512c0b1b..194df7df6f 100644 --- a/tests/migration/migration-test.h +++ b/tests/migration/migration-test.h @@ -22,6 +22,7 @@ /* PPC */ #define PPC_TEST_MEM_START (1 * 1024 * 1024) #define PPC_TEST_MEM_END (100 * 1024 * 1024) +#define PPC_H_PUT_TERM_CHAR 0x58 /* ARM */ #define ARM_TEST_MEM_START (0x40000000 + 1 * 1024 * 1024) diff --git a/tests/migration/ppc64/a-b-kernel.h b/tests/migration/ppc64/a-b-kernel.h new file mode 100644 index 0000000000..673317efdb --- /dev/null +++ b/tests/migration/ppc64/a-b-kernel.h @@ -0,0 +1,42 @@ +/* This file is automatically generated from the assembly file in + * tests/migration/ppc64. Edit that file and then run "make all" + * inside tests/migration to update, and then remember to send both + * the header and the assembler differences in your patch submission. + */ +unsigned char ppc64_kernel[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x7d, 0x20, 0x00, 0xa6, 0x39, 0x40, 0xff, 0xff, + 0x79, 0x49, 0xf8, 0x0e, 0x7d, 0x20, 0x01, 0x64, 0x3e, 0x80, 0x00, 0x10, + 0x62, 0x94, 0x00, 0x00, 0x3d, 0x20, 0x06, 0x40, 0x61, 0x29, 0x00, 0x00, + 0x7e, 0xb4, 0x48, 0x50, 0x39, 0x40, 0x10, 0x00, 0x7e, 0xb5, 0x53, 0xd2, + 0x38, 0x60, 0x00, 0x58, 0x38, 0x80, 0x00, 0x00, 0x38, 0xa0, 0x00, 0x01, + 0x38, 0xc0, 0x00, 0x41, 0x78, 0xc6, 0xc1, 0xc6, 0x44, 0x00, 0x00, 0x22, + 0x38, 0x60, 0x00, 0x00, 0x7e, 0x89, 0xa3, 0x78, 0x7e, 0xa9, 0x03, 0xa6, + 0x98, 0x69, 0x00, 0x00, 0x39, 0x29, 0x10, 0x00, 0x42, 0x00, 0xff, 0xf8, + 0x7e, 0x89, 0xa3, 0x78, 0x7e, 0xa9, 0x03, 0xa6, 0x88, 0x69, 0x00, 0x00, + 0x38, 0x63, 0x00, 0x01, 0x98, 0x69, 0x00, 0x00, 0x39, 0x29, 0x10, 0x00, + 0x42, 0x00, 0xff, 0xf0, 0x38, 0x60, 0x00, 0x58, 0x38, 0x80, 0x00, 0x00, + 0x38, 0xa0, 0x00, 0x01, 0x38, 0xc0, 0x00, 0x42, 0x78, 0xc6, 0xc1, 0xc6, + 0x44, 0x00, 0x00, 0x22, 0x4b, 0xff, 0xff, 0xcc +}; + diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index ef9ddef1c8..d6f5ceed80 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -128,6 +128,7 @@ static char *bootpath; */ #include "tests/migration/i386/a-b-bootblock.h" #include "tests/migration/aarch64/a-b-kernel.h" +#include "tests/migration/ppc64/a-b-kernel.h" #include "tests/migration/s390x/a-b-bios.h" static void bootfile_create(char *dir, bool suspend_me) @@ -147,10 +148,8 @@ static void bootfile_create(char *dir, bool suspend_me) content = s390x_elf; len = sizeof(s390x_elf); } else if (strcmp(arch, "ppc64") == 0) { - /* - * sane architectures can be programmed at the boot prompt - */ - return; + content = ppc64_kernel; + len = sizeof(ppc64_kernel); } else if (strcmp(arch, "aarch64") == 0) { content = aarch64_kernel; len = sizeof(aarch64_kernel); @@ -181,29 +180,10 @@ static void wait_for_serial(const char *side) { g_autofree char *serialpath = g_strdup_printf("%s/%s", tmpfs, side); FILE *serialfile = fopen(serialpath, "r"); - const char *arch = qtest_get_arch(); - int started = (strcmp(side, "src_serial") == 0 && - strcmp(arch, "ppc64") == 0) ? 0 : 1; do { int readvalue = fgetc(serialfile); - if (!started) { - /* SLOF prints its banner before starting test, - * to ignore it, mark the start of the test with '_', - * ignore all characters until this marker - */ - switch (readvalue) { - case '_': - started = 1; - break; - case EOF: - fseek(serialfile, 0, SEEK_SET); - usleep(1000); - break; - } - continue; - } switch (readvalue) { case 'A': /* Fine */ @@ -215,8 +195,6 @@ static void wait_for_serial(const char *side) return; case EOF: - started = (strcmp(side, "src_serial") == 0 && - strcmp(arch, "ppc64") == 0) ? 0 : 1; fseek(serialfile, 0, SEEK_SET); usleep(1000); break; @@ -737,14 +715,11 @@ static int test_migrate_start(QTestState **from, QTestState **to, memory_size = "256M"; start_address = PPC_TEST_MEM_START; end_address = PPC_TEST_MEM_END; - arch_source = g_strdup_printf("-prom-env 'use-nvramrc?=true' -prom-env " - "'nvramrc=hex .\" _\" begin %x %x " - "do i c@ 1 + i c! 1000 +loop .\" B\" 0 " - "until'", end_address, start_address); machine_alias = "pseries"; machine_opts = "vsmt=8"; - arch_opts = g_strdup("-nodefaults " - "-machine " PSERIES_DEFAULT_CAPABILITIES); + arch_opts = g_strdup_printf( + "-nodefaults -machine " PSERIES_DEFAULT_CAPABILITIES " " + "-bios %s", bootpath); } else if (strcmp(arch, "aarch64") == 0) { memory_size = "150M"; machine_alias = "virt"; diff --git a/tests/migration/Makefile b/tests/migration/Makefile index 13e99b1692..2c5ee287ec 100644 --- a/tests/migration/Makefile +++ b/tests/migration/Makefile @@ -5,7 +5,7 @@ # See the COPYING file in the top-level directory. # -TARGET_LIST = i386 aarch64 s390x +TARGET_LIST = i386 aarch64 s390x ppc64 SRC_PATH = ../.. diff --git a/tests/migration/ppc64/Makefile b/tests/migration/ppc64/Makefile new file mode 100644 index 0000000000..a3a2d98ac8 --- /dev/null +++ b/tests/migration/ppc64/Makefile @@ -0,0 +1,15 @@ +.PHONY: all clean +all: a-b-kernel.h + +a-b-kernel.h: ppc64.kernel + echo "$$__note" > $@ + xxd -i $< | sed -e 's/.*int.*//' >> $@ + +ppc64.kernel: ppc64.elf + $(CROSS_PREFIX)objcopy -O binary -S $< $@ + +ppc64.elf: a-b-kernel.S + $(CROSS_PREFIX)gcc -static -o $@ -nostdlib -Wl,--build-id=none $< + +clean: + $(RM) *.kernel *.elf diff --git a/tests/migration/ppc64/a-b-kernel.S b/tests/migration/ppc64/a-b-kernel.S new file mode 100644 index 0000000000..0613a8d18e --- /dev/null +++ b/tests/migration/ppc64/a-b-kernel.S @@ -0,0 +1,66 @@ +# +# Copyright (c) 2024 IBM, Inc +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. + +#include "../migration-test.h" + +.section .text + +.macro print ch + li %r3,PPC_H_PUT_TERM_CHAR + li %r4,0 + li %r5,1 + li %r6,\ch + sldi %r6,%r6,56 + sc 1 +.endm + + .globl _start +_start: +. = 0x100 + /* + * Enter 64-bit mode. Not necessary because the test uses 32-bit + * addresses, but those constants could easily be changed and break + * in 32-bit mode. + */ + mfmsr %r9 + li %r10,-1 + rldimi %r9,%r10,63,0 + mtmsrd %r9 + + /* + * Set up test memory region. Non-volatiles are used because the + * hcall can clobber regs. + * r20 - start address + * r21 - number of pages + */ + lis %r20,PPC_TEST_MEM_START@h + ori %r20,%r20,PPC_TEST_MEM_START@l + lis %r9,PPC_TEST_MEM_END@h + ori %r9,%r9,PPC_TEST_MEM_END@l + subf %r21,%r20,%r9 + li %r10,TEST_MEM_PAGE_SIZE + divd %r21,%r21,%r10 + + print 'A' + + li %r3,0 + mr %r9,%r20 + mtctr %r21 +1: stb %r3,0(%r9) + addi %r9,%r9,TEST_MEM_PAGE_SIZE + bdnz 1b + +loop: + mr %r9,%r20 + mtctr %r21 +1: lbz %r3,0(%r9) + addi %r3,%r3,1 + stb %r3,0(%r9) + addi %r9,%r9,TEST_MEM_PAGE_SIZE + bdnz 1b + + print 'B' + b loop -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 2024-05-30 7:44 [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Nicholas Piggin ` (3 preceding siblings ...) 2024-05-30 7:44 ` [PATCH v3 4/4] tests/qtest/migration-test: Use custom asm bios for ppc64 Nicholas Piggin @ 2024-06-04 21:03 ` Fabiano Rosas 4 siblings, 0 replies; 8+ messages in thread From: Fabiano Rosas @ 2024-06-04 21:03 UTC (permalink / raw) To: qemu-devel, Nicholas Piggin Cc: Peter Xu, Thomas Huth, Laurent Vivier, Paolo Bonzini, qemu-ppc On Thu, 30 May 2024 17:44:48 +1000, Nicholas Piggin wrote: > Since v2: > - Fixed subject typo noticed by Thomas. > - Drop the non-ppc patches from the series. > > Thanks, > Nick > > [...] Queued, thanks! ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-06-04 21:04 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-05-30 7:44 [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Nicholas Piggin 2024-05-30 7:44 ` [PATCH v3 1/4] tests/qtest: Move common define from libqos-spapr.h to new ppc-util.h Nicholas Piggin 2024-05-30 7:44 ` [PATCH v3 2/4] tests/qtest/migration-test: Quieten ppc64 QEMU warnings Nicholas Piggin 2024-05-31 7:31 ` Prasad Pandit 2024-05-30 7:44 ` [PATCH v3 3/4] tests/qtest/migration-test: Enable on ppc64 TCG Nicholas Piggin 2024-05-31 7:28 ` Prasad Pandit 2024-05-30 7:44 ` [PATCH v3 4/4] tests/qtest/migration-test: Use custom asm bios for ppc64 Nicholas Piggin 2024-06-04 21:03 ` [PATCH v3 0/4] tests/qtest/migration-test: Improve and enable on ppc64 Fabiano Rosas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).