Add a ppc64 pseries test. IO in SLOF is very slow when running in
record-replay modes, so this this uses guestfish to extract the
kernel and initrd and boot them directly.
Cc: qemu-...@nongnu.org
Signed-off-by: Nicholas Piggin <npig...@gmail.com>
---
The test takes about double the length of time of aarch64 and
x86 tests (800s to 400s) for some reason. Not profiled it yet.
tests/avocado/replay_linux.py | 78 ++++++++++++++++++++++++++++++++++-
1 file changed, 77 insertions(+), 1 deletion(-)
diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py
index c0e50bb52b..1c11e48043 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,11 +56,14 @@ 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):
self.require_netdev('user')
vm = self.get_vm()
+ vm.add_args('-s')
vm.add_args('-smp', '1')
vm.add_args('-m', '1024')
vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
@@ -207,3 +211,75 @@ 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
+
+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))
+
+ # minimise the number of tests run by default because they are slow
+ # SLOF block IO is extremely slow when going through the blkreplay driver
+ @skipUnless(os.getenv('SPEED') == 'slow', 'runtime limited')
+ def test_pseries_slof(self):
+ self.run_rr(shift=3, args=("-device", "spapr-vscsi"))
--
2.42.0
