From: Nicholas Piggin <npiggin@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
qemu-ppc@nongnu.org
Subject: [PATCH 4/9] tests/avocado: Enable replay_linux.py on ppc64 pseries
Date: Mon, 8 Jan 2024 03:01:14 +1000 [thread overview]
Message-ID: <20240107170119.82222-5-npiggin@gmail.com> (raw)
In-Reply-To: <20240107170119.82222-1-npiggin@gmail.com>
Add a ppc64 pseries test. This tends to hang in the replay phase near
the end of the trace due to a missing event, so it is marked flaky.
spapr-vscsi IO is extremely slow when running in record-replay modes,
particularly when driven by SLOF. This causes tests to time-out even
after an hour, so this uses guestfish to extract the kernel and initrd
and boot them directly.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
tests/avocado/replay_linux.py | 76 ++++++++++++++++++++++++++++++++++-
1 file changed, 75 insertions(+), 1 deletion(-)
diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py
index 270ccc1eae..82daba9f3f 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
@@ -191,3 +192,76 @@ 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
+
+@skipIf(ppc_missing_deps(), 'dependencies (%s) not installed' % ','.join(ppc_deps))
+@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'known failure in trace replay')
+class ReplayLinuxPPC64(ReplayLinux):
+ """
+ :avocado: tags=arch:ppc64
+ :avocado: tags=accel:tcg
+ """
+
+ hdd = 'scsi-hd'
+ cd = 'scsi-cd'
+ bus = None
+
+ def setUp(self):
+ super().setUp()
+
+ # 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())
+
+ 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.ifnames=0 console=tty1 "
+ "console=ttyS0,115200n8"
+ self.run_rr(shift=1, args=("-device", "spapr-vscsi",
+ "-machine", "x-vof=on",
+ "-kernel", kernel,
+ "-initrd", initramfs,
+ "-append", cmdline))
--
2.42.0
next prev parent reply other threads:[~2024-01-07 17:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-07 17:01 [PATCH 0/9] tests/avocado: ppc additions and other fixes Nicholas Piggin
2024-01-07 17:01 ` [PATCH 1/9] gitlab: fix s390x tag for avocado-system-centos Nicholas Piggin
2024-01-08 9:45 ` Cédric Le Goater
2024-01-08 11:35 ` Philippe Mathieu-Daudé
2024-01-24 13:11 ` Philippe Mathieu-Daudé
2024-01-07 17:01 ` [PATCH 2/9] tests/avocado: mark boot_linux.py long runtime instead of flaky Nicholas Piggin
2024-01-08 10:12 ` Cédric Le Goater
2024-01-08 11:56 ` Thomas Huth
2024-01-07 17:01 ` [PATCH 3/9] tests/avocado: Mark x86-64 boot_linux.py TCG tests as long runtime Nicholas Piggin
2024-01-07 17:01 ` Nicholas Piggin [this message]
2024-01-07 17:01 ` [PATCH 5/9] tests/avocado: ppc add powernv10 boot_linux_console test Nicholas Piggin
2024-01-08 10:53 ` Cédric Le Goater
2024-01-07 17:01 ` [PATCH 6/9] tests/avocado: Add ppc pseries and powernv hash MMU tests Nicholas Piggin
2024-01-07 17:01 ` [PATCH 7/9] tests/avocado: Add pseries KVM boot_linux test Nicholas Piggin
2024-01-08 10:53 ` Cédric Le Goater
2024-01-07 17:01 ` [PATCH 8/9] tests/avocado: ppc add hypervisor tests Nicholas Piggin
2024-01-08 14:37 ` Cédric Le Goater
2024-01-07 17:01 ` [PATCH 9/9] tests/avocado: Add FreeBSD distro boot tests for ppc Nicholas Piggin
2024-01-08 12:16 ` Cédric Le Goater
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=20240107170119.82222-5-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--cc=danielhb413@gmail.com \
--cc=harshpb@linux.ibm.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=thuth@redhat.com \
--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 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).