All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
	"Pavel Dovgalyuk" <Pavel.Dovgalyuk@ispras.ru>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"John Snow" <jsnow@redhat.com>, "Cleber Rosa" <crosa@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Michael Tokarev" <mjt@tls.msk.ru>
Subject: [PATCH v5 24/24] tests/avocado: replay_linux.py add ppc64 pseries test
Date: Tue, 19 Mar 2024 01:46:21 +1000	[thread overview]
Message-ID: <20240318154621.2361161-25-npiggin@gmail.com> (raw)
In-Reply-To: <20240318154621.2361161-1-npiggin@gmail.com>

Add a ppc64 pseries test. IO in SLOF is very slow when running in
record-replay modes, so this test uses guestfish to extract the
kernel and initrd and boot them directly, bypassing SLOF.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 tests/avocado/replay_linux.py | 72 ++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py
index b3b74a367c..565a600130 100644
--- a/tests/avocado/replay_linux.py
+++ b/tests/avocado/replay_linux.py
@@ -11,8 +11,9 @@
 import os
 import logging
 import time
+import subprocess
 
-from avocado import skipUnless
+from avocado import skipIf, skipUnless
 from avocado_qemu import BUILD_DIR
 from avocado.utils import cloudinit
 from avocado.utils import network
@@ -55,6 +56,8 @@ def vm_add_disk(self, vm, path, id, device):
             '%s,drive=disk%s-rr%s' % (device, id, bus_string))
 
     def vm_add_cdrom(self, vm, path, id, device):
+        vm.add_args('-device',
+            '%s,drive=disk%s' % (device, id))
         vm.add_args('-drive', 'file=%s,id=disk%s,if=none,media=cdrom' % (path, id))
 
     def launch_and_wait(self, record, args, shift):
@@ -208,3 +211,70 @@ def test_virt_gicv3(self):
         self.run_rr(shift=3,
                     args=(*self.get_common_args(),
                           "-machine", "virt,gic-version=3"))
+
+# ppc64 pseries test.
+#
+# This machine tends to fail replay and hang very close to the end of the
+# trace, with missing events, which is still an open issue.
+#
+# spapr-scsi IO driven by SLOF/grub is extremely slow in record/replay mode,
+# so jump through some hoops to boot the kernel directly. With this, the test
+# runs in about 5 minutes (modulo hang), which suggests other machines may
+# have similar issues and could benefit from bypassing bootloaders.
+#
+ppc_deps = ["guestfish"] # dependent tools needed in the test setup/box.
+
+def which(tool):
+    """ looks up the full path for @tool, returns None if not found
+        or if @tool does not have executable permissions.
+    """
+    paths=os.getenv('PATH')
+    for p in paths.split(os.path.pathsep):
+        p = os.path.join(p, tool)
+        if os.path.exists(p) and os.access(p, os.X_OK):
+            return p
+    return None
+
+def ppc_missing_deps():
+    """ returns True if any of the test dependent tools are absent.
+    """
+    for dep in ppc_deps:
+        if which(dep) is None:
+            return True
+    return False
+
+@skipUnless(os.getenv('SPEED') == 'slow', 'runtime limited')
+class ReplayLinuxPPC64(ReplayLinux):
+    """
+    :avocado: tags=arch:ppc64
+    :avocado: tags=accel:tcg
+    """
+
+    hdd = 'virtio-blk-pci'
+    cd = 'scsi-cd'
+    bus = None
+
+    def setUp(self):
+        super().setUp()
+
+        if not ppc_missing_deps():
+            # kernel, initramfs, and kernel cmdline are all taken by hand from
+            # the Fedora image.
+            self.kernel="vmlinuz-5.3.7-301.fc31.ppc64le"
+            self.initramfs="initramfs-5.3.7-301.fc31.ppc64le.img"
+            cmd = "guestfish --ro -a %s run " ": mount /dev/sda2 / " ": copy-out /boot/%s %s " ": copy-out /boot/%s %s " % (self.boot_path, self.kernel, self.workdir, self.initramfs, self.workdir)
+            subprocess.run(cmd.split())
+
+    @skipIf(ppc_missing_deps(), 'dependencies (%s) not installed' % ','.join(ppc_deps))
+    def test_pseries(self):
+        """
+        :avocado: tags=machine:pseries
+        """
+        kernel=os.path.normpath(os.path.join(self.workdir, self.kernel))
+        initramfs=os.path.normpath(os.path.join(self.workdir, self.initramfs))
+        cmdline="root=UUID=8a409ee6-3cb3-4b06-a266-39e2dae3e5fa ro no_timer_check net.fnames=0 console=tty1 console=ttyS0,115200n8"
+        self.run_rr(shift=3, args=("-device", "spapr-vscsi",
+                                   "-machine", "x-vof=on",
+                                   "-kernel", kernel,
+                                   "-initrd", initramfs,
+                                   "-append", cmdline))
-- 
2.42.0



      parent reply	other threads:[~2024-03-18 15:49 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-18 15:45 [PATCH v5 00/24] replay: fixes and new test cases Nicholas Piggin
2024-03-18 15:45 ` [PATCH v5 01/24] scripts/replay-dump.py: Update to current rr record format Nicholas Piggin
2024-03-18 15:45 ` [PATCH v5 02/24] scripts/replay-dump.py: rejig decoders in event number order Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 03/24] tests/avocado: excercise scripts/replay-dump.py in replay tests Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 04/24] replay: allow runstate shutdown->running when replaying trace Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 05/24] Revert "replay: stop us hanging in rr_wait_io_event" Nicholas Piggin
2024-03-19 17:58   ` Alex Bennée
2024-03-18 15:46 ` [PATCH v5 06/24] tests/avocado: replay_kernel.py add x86-64 q35 machine test Nicholas Piggin
2024-03-19 17:58   ` Alex Bennée
2024-03-18 15:46 ` [PATCH v5 07/24] chardev: set record/replay on the base device of a muxed device Nicholas Piggin
2024-03-19 19:17   ` Alex Bennée
2024-03-18 15:46 ` [PATCH v5 08/24] replay: Fix migration use of clock Nicholas Piggin
2024-03-19 20:40   ` Alex Bennée
2024-03-20  4:48     ` Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 09/24] replay: Fix migration replay_mutex locking Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 10/24] virtio-net: Use replay_schedule_bh_event for bhs that affect machine state Nicholas Piggin
2024-03-19 20:41   ` Alex Bennée
2024-04-05  6:53   ` Pavel Dovgalyuk
2024-03-18 15:46 ` [PATCH v5 11/24] virtio-net: Use virtual time for RSC timers Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 12/24] savevm: Fix load_snapshot error path crash Nicholas Piggin
2024-03-19 20:49   ` Alex Bennée
2024-03-18 15:46 ` [PATCH v5 13/24] tests/avocado: replay_linux.py remove the timeout expected guards Nicholas Piggin
2024-03-19 17:57   ` Alex Bennée
2024-03-20  4:34     ` Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 14/24] tests/avocado: reverse_debugging.py mark aarch64 and pseries as not flaky Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 15/24] tests/avocado: reverse_debugging.py add test for x86-64 q35 machine Nicholas Piggin
2024-03-19 20:50   ` Alex Bennée
2024-03-18 15:46 ` [PATCH v5 16/24] tests/avocado: reverse_debugging.py verify addresses between record and replay Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 17/24] tests/avocado: reverse_debugging.py stop VM before sampling icount Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 18/24] tests/avocado: reverse_debugging reverse-step at the end of the trace Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 19/24] tests/avocado: reverse_debugging.py add snapshot testing Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 20/24] replay: simple auto-snapshot mode for record Nicholas Piggin
2024-04-05  6:56   ` Pavel Dovgalyuk
2024-03-18 15:46 ` [PATCH v5 21/24] tests/avocado: reverse_debugging.py test auto-snapshot mode Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 22/24] target/ppc: fix timebase register reset state Nicholas Piggin
2024-03-18 15:46 ` [PATCH v5 23/24] spapr: Fix vpa dispatch count for record-replay Nicholas Piggin
2024-03-18 15:46 ` Nicholas Piggin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240318154621.2361161-25-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=Pavel.Dovgalyuk@ispras.ru \
    --cc=alex.bennee@linaro.org \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.