[PATCH 0/2] tests/migration: add support for ppc64le in guestperf.py

[PATCH 0/2] tests/migration: add support for ppc64le in guestperf.py

[Murilo Opsfelder Araujo]

The first patch adds sysprof-capture-4 dependency when building stress binary in
order to fix a build error.

The second patch adds support for ppc64le in guestperf.py.

Murilo Opsfelder Araujo (2):
  tests/migration: add sysprof-capture-4 as dependency for stress binary
  tests/migration: add support for ppc64le for guestperf.py

 tests/migration/guestperf/engine.py | 28 +++++++++++++++++++++++++---
 tests/migration/meson.build         |  4 +++-
 2 files changed, 28 insertions(+), 4 deletions(-)

--
2.37.1

[PATCH 1/2] tests/migration: add sysprof-capture-4 as dependency for stress binary

[Murilo Opsfelder Araujo]

`make tests/migration/stress` fails with:

    FAILED: tests/migration/stress
    cc -m64 -mlittle-endian  -o tests/migration/stress tests/migration/stress.p/stress.c.o -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -fstack-protector-strong -static -pthread -Wl,--start-group -lgthread-2.0 -lglib-2.0 -Wl,--end-group
    /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gutils.c.o): in function `.annobin_gutils.c':
    (.text+0x3b4): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
    /usr/bin/ld: (.text+0x178): warning: Using 'getpwnam_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
    /usr/bin/ld: (.text+0x1bc): warning: Using 'getpwuid_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
    /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gthread.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
    /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `.annobin_gtrace.c':
    (.text+0x24): undefined reference to `sysprof_collector_mark_vprintf'
    /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_define_int64_counter':
    (.text+0x8c): undefined reference to `sysprof_collector_request_counters'
    /usr/bin/ld: (.text+0x108): undefined reference to `sysprof_collector_define_counters'
    /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_set_int64_counter':
    (.text+0x23c): undefined reference to `sysprof_collector_set_counters'
    /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gspawn.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
    /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gmain.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
    collect2: error: ld returned 1 exit status
    ninja: build stopped: subcommand failed.
    make: *** [Makefile:162: run-ninja] Error 1

Add sysprof-capture-4 as dependency for stress binary.

Tested on:
  - CentOS Stream 9 ppc64le
  - Fedora 36 x86_64

Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
---
 tests/migration/meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/migration/meson.build b/tests/migration/meson.build
index f215ee7d3a..3fd87f7849 100644
--- a/tests/migration/meson.build
+++ b/tests/migration/meson.build
@@ -1,7 +1,9 @@
+sysprof = dependency('sysprof-capture-4')
+
 stress = executable(
   'stress',
   files('stress.c'),
-  dependencies: [glib],
+  dependencies: [glib, sysprof],
   link_args: ['-static'],
   build_by_default: false,
 )
-- 
2.37.1

Re: [PATCH 1/2] tests/migration: add sysprof-capture-4 as dependency for stress binary

[Daniel Henrique Barboza]

Until it's upstream or rejected, no patch will be left behind.


I wasn't able to compile tests/migration/stress at all without this patch,
regardless of having sysprof-4 libraries installed in the host.


Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>


Juan/Dr.David, if  you don't mind I'll take this via ppc-next since
there's a PPC only change that depends on it.



Daniel


On 8/8/22 21:24, Murilo Opsfelder Araujo wrote:
> `make tests/migration/stress` fails with:
> 
>      FAILED: tests/migration/stress
>      cc -m64 -mlittle-endian  -o tests/migration/stress tests/migration/stress.p/stress.c.o -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -fstack-protector-strong -static -pthread -Wl,--start-group -lgthread-2.0 -lglib-2.0 -Wl,--end-group
>      /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gutils.c.o): in function `.annobin_gutils.c':
>      (.text+0x3b4): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
>      /usr/bin/ld: (.text+0x178): warning: Using 'getpwnam_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
>      /usr/bin/ld: (.text+0x1bc): warning: Using 'getpwuid_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
>      /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gthread.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
>      /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `.annobin_gtrace.c':
>      (.text+0x24): undefined reference to `sysprof_collector_mark_vprintf'
>      /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_define_int64_counter':
>      (.text+0x8c): undefined reference to `sysprof_collector_request_counters'
>      /usr/bin/ld: (.text+0x108): undefined reference to `sysprof_collector_define_counters'
>      /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_set_int64_counter':
>      (.text+0x23c): undefined reference to `sysprof_collector_set_counters'
>      /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gspawn.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
>      /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gmain.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
>      collect2: error: ld returned 1 exit status
>      ninja: build stopped: subcommand failed.
>      make: *** [Makefile:162: run-ninja] Error 1
> 
> Add sysprof-capture-4 as dependency for stress binary.
> 
> Tested on:
>    - CentOS Stream 9 ppc64le
>    - Fedora 36 x86_64
> 
> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
> ---
>   tests/migration/meson.build | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/migration/meson.build b/tests/migration/meson.build
> index f215ee7d3a..3fd87f7849 100644
> --- a/tests/migration/meson.build
> +++ b/tests/migration/meson.build
> @@ -1,7 +1,9 @@
> +sysprof = dependency('sysprof-capture-4')
> +
>   stress = executable(
>     'stress',
>     files('stress.c'),
> -  dependencies: [glib],
> +  dependencies: [glib, sysprof],
>     link_args: ['-static'],
>     build_by_default: false,
>   )

Re: [PATCH 1/2] tests/migration: add sysprof-capture-4 as dependency for stress binary

[Juan Quintela]

Murilo Opsfelder Araujo <muriloo@linux.ibm.com> wrote:
> `make tests/migration/stress` fails with:
>
>     FAILED: tests/migration/stress
>     cc -m64 -mlittle-endian  -o tests/migration/stress tests/migration/stress.p/stress.c.o -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -fstack-protector-strong -static -pthread -Wl,--start-group -lgthread-2.0 -lglib-2.0 -Wl,--end-group
>     /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gutils.c.o): in function `.annobin_gutils.c':
>     (.text+0x3b4): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
>     /usr/bin/ld: (.text+0x178): warning: Using 'getpwnam_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
>     /usr/bin/ld: (.text+0x1bc): warning: Using 'getpwuid_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
>     /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gthread.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
>     /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `.annobin_gtrace.c':
>     (.text+0x24): undefined reference to `sysprof_collector_mark_vprintf'
>     /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_define_int64_counter':
>     (.text+0x8c): undefined reference to `sysprof_collector_request_counters'
>     /usr/bin/ld: (.text+0x108): undefined reference to `sysprof_collector_define_counters'
>     /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_set_int64_counter':
>     (.text+0x23c): undefined reference to `sysprof_collector_set_counters'
>     /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gspawn.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
>     /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gmain.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
>     collect2: error: ld returned 1 exit status
>     ninja: build stopped: subcommand failed.
>     make: *** [Makefile:162: run-ninja] Error 1
>
> Add sysprof-capture-4 as dependency for stress binary.
>
> Tested on:
>   - CentOS Stream 9 ppc64le
>   - Fedora 36 x86_64
>
> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

If fixes the build for me also.

[PATCH 2/2] tests/migration: add support for ppc64le for guestperf.py

[Murilo Opsfelder Araujo]

Add support for ppc64le for guestperf.py. On ppc, console is usually
hvc0 and serial device for pseries machine is spapr-vty.

Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
---
 tests/migration/guestperf/engine.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index 87a6ab2009..88da516899 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -282,6 +282,26 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
                 resp = src.command("stop")
                 paused = True
 
+    def _is_ppc64le(self):
+        _, _, _, _, machine = os.uname()
+        if machine == "ppc64le":
+            return True
+        return False
+
+    def _get_guest_console_args(self):
+        if self._is_ppc64le():
+            return "console=hvc0"
+        else:
+            return "console=ttyS0"
+
+    def _get_qemu_serial_args(self):
+        if self._is_ppc64le():
+            return ["-chardev", "stdio,id=cdev0",
+                    "-device", "spapr-vty,chardev=cdev0"]
+        else:
+            return ["-chardev", "stdio,id=cdev0",
+                    "-device", "isa-serial,chardev=cdev0"]
+
     def _get_common_args(self, hardware, tunnelled=False):
         args = [
             "noapic",
@@ -290,8 +310,10 @@ def _get_common_args(self, hardware, tunnelled=False):
             "noreplace-smp",
             "cgroup_disable=memory",
             "pci=noearly",
-            "console=ttyS0",
         ]
+
+        args.append(self._get_guest_console_args())
+
         if self._debug:
             args.append("debug")
         else:
@@ -309,12 +331,12 @@ def _get_common_args(self, hardware, tunnelled=False):
             "-kernel", self._kernel,
             "-initrd", self._initrd,
             "-append", cmdline,
-            "-chardev", "stdio,id=cdev0",
-            "-device", "isa-serial,chardev=cdev0",
             "-m", str((hardware._mem * 1024) + 512),
             "-smp", str(hardware._cpus),
         ]
 
+        argv.extend(self._get_qemu_serial_args())
+
         if self._debug:
             argv.extend(["-device", "sga"])
 
-- 
2.37.1

Re: [PATCH 2/2] tests/migration: add support for ppc64le for guestperf.py

[Daniel Henrique Barboza]

On 8/8/22 21:24, Murilo Opsfelder Araujo wrote:
> Add support for ppc64le for guestperf.py. On ppc, console is usually
> hvc0 and serial device for pseries machine is spapr-vty.
> 
> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

>   tests/migration/guestperf/engine.py | 28 +++++++++++++++++++++++++---
>   1 file changed, 25 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
> index 87a6ab2009..88da516899 100644
> --- a/tests/migration/guestperf/engine.py
> +++ b/tests/migration/guestperf/engine.py
> @@ -282,6 +282,26 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
>                   resp = src.command("stop")
>                   paused = True
>   
> +    def _is_ppc64le(self):
> +        _, _, _, _, machine = os.uname()
> +        if machine == "ppc64le":
> +            return True
> +        return False
> +
> +    def _get_guest_console_args(self):
> +        if self._is_ppc64le():
> +            return "console=hvc0"
> +        else:
> +            return "console=ttyS0"
> +
> +    def _get_qemu_serial_args(self):
> +        if self._is_ppc64le():
> +            return ["-chardev", "stdio,id=cdev0",
> +                    "-device", "spapr-vty,chardev=cdev0"]
> +        else:
> +            return ["-chardev", "stdio,id=cdev0",
> +                    "-device", "isa-serial,chardev=cdev0"]
> +
>       def _get_common_args(self, hardware, tunnelled=False):
>           args = [
>               "noapic",
> @@ -290,8 +310,10 @@ def _get_common_args(self, hardware, tunnelled=False):
>               "noreplace-smp",
>               "cgroup_disable=memory",
>               "pci=noearly",
> -            "console=ttyS0",
>           ]
> +
> +        args.append(self._get_guest_console_args())
> +
>           if self._debug:
>               args.append("debug")
>           else:
> @@ -309,12 +331,12 @@ def _get_common_args(self, hardware, tunnelled=False):
>               "-kernel", self._kernel,
>               "-initrd", self._initrd,
>               "-append", cmdline,
> -            "-chardev", "stdio,id=cdev0",
> -            "-device", "isa-serial,chardev=cdev0",
>               "-m", str((hardware._mem * 1024) + 512),
>               "-smp", str(hardware._cpus),
>           ]
>   
> +        argv.extend(self._get_qemu_serial_args())
> +
>           if self._debug:
>               argv.extend(["-device", "sga"])
>   

Re: [PATCH 2/2] tests/migration: add support for ppc64le for guestperf.py

[Juan Quintela]

Murilo Opsfelder Araujo <muriloo@linux.ibm.com> wrote:
> Add support for ppc64le for guestperf.py. On ppc, console is usually
> hvc0 and serial device for pseries machine is spapr-vty.
>
> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH 0/2] tests/migration: add support for ppc64le in guestperf.py

[Daniel Henrique Barboza]

Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,


Daniel

On 8/8/22 21:24, Murilo Opsfelder Araujo wrote:
> The first patch adds sysprof-capture-4 dependency when building stress binary in
> order to fix a build error.
> 
> The second patch adds support for ppc64le in guestperf.py.
> 
> Murilo Opsfelder Araujo (2):
>    tests/migration: add sysprof-capture-4 as dependency for stress binary
>    tests/migration: add support for ppc64le for guestperf.py
> 
>   tests/migration/guestperf/engine.py | 28 +++++++++++++++++++++++++---
>   tests/migration/meson.build         |  4 +++-
>   2 files changed, 28 insertions(+), 4 deletions(-)
> 
> --
> 2.37.1

Re: [PATCH 0/2] tests/migration: add support for ppc64le in guestperf.py

[BALATON Zoltan]

On Sat, 21 Jan 2023, Daniel Henrique Barboza wrote:
> Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,

Unrelated to this patch but just so you won't miss it, can you please take 
care of this patch too?

https://patchew.org/QEMU/20230118164512.1BCFB745706@zero.eik.bme.hu/

Thank you,
BALATON Zoltan

Re: [PATCH 0/2] tests/migration: add support for ppc64le in guestperf.py

[Daniel Henrique Barboza]

On 1/21/23 08:57, BALATON Zoltan wrote:
> On Sat, 21 Jan 2023, Daniel Henrique Barboza wrote:
>> Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,
> 
> Unrelated to this patch but just so you won't miss it, can you please take care of this patch too?
> 
> https://patchew.org/QEMU/20230118164512.1BCFB745706@zero.eik.bme.hu/

Already did when I queued this one. I was running some CIs first :D


Daniel

> 
> Thank you,
> BALATON Zoltan