tests/functional: Convert the multiprocess avocado test into a standalone test
This test handles both, aarch64 and x86_64, with the same test code (apart from some initial setup), so don't split this file by target but add a check for self.arch in the main test function. Message-ID: <20240903051333.102494-1-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth
parent
3a07875fd3
commit
69e4fbd0ea
@ -307,16 +307,6 @@ class QemuSystemTest(QemuBaseTest):
|
||||
if netdevhelp.find('\n' + netdevname + '\n') < 0:
|
||||
self.cancel('no support for user networking')
|
||||
|
||||
def require_multiprocess(self):
|
||||
"""
|
||||
Test for the presence of the x-pci-proxy-dev which is required
|
||||
to support multiprocess.
|
||||
"""
|
||||
devhelp = run_cmd([self.qemu_bin,
|
||||
'-M', 'none', '-device', 'help'])[0];
|
||||
if devhelp.find('x-pci-proxy-dev') < 0:
|
||||
self.cancel('no support for multiprocess device emulation')
|
||||
|
||||
def _new_vm(self, name, *args):
|
||||
self._sd = tempfile.TemporaryDirectory(prefix="qemu_")
|
||||
vm = QEMUMachine(self.qemu_bin, base_temp_dir=self.workdir,
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
# Test for multiprocess qemu
|
||||
#
|
||||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||
# later. See the COPYING file in the top-level directory.
|
||||
|
||||
|
||||
import os
|
||||
import socket
|
||||
|
||||
from avocado_qemu import QemuSystemTest
|
||||
from avocado_qemu import wait_for_console_pattern
|
||||
from avocado_qemu import exec_command
|
||||
from avocado_qemu import exec_command_and_wait_for_pattern
|
||||
|
||||
class Multiprocess(QemuSystemTest):
|
||||
"""
|
||||
:avocado: tags=multiprocess
|
||||
"""
|
||||
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
||||
|
||||
def do_test(self, kernel_url, kernel_hash, initrd_url, initrd_hash,
|
||||
kernel_command_line, machine_type):
|
||||
"""Main test method"""
|
||||
self.require_accelerator('kvm')
|
||||
self.require_multiprocess()
|
||||
|
||||
# Create socketpair to connect proxy and remote processes
|
||||
proxy_sock, remote_sock = socket.socketpair(socket.AF_UNIX,
|
||||
socket.SOCK_STREAM)
|
||||
os.set_inheritable(proxy_sock.fileno(), True)
|
||||
os.set_inheritable(remote_sock.fileno(), True)
|
||||
|
||||
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
||||
initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
|
||||
|
||||
# Create remote process
|
||||
remote_vm = self.get_vm()
|
||||
remote_vm.add_args('-machine', 'x-remote')
|
||||
remote_vm.add_args('-nodefaults')
|
||||
remote_vm.add_args('-device', 'lsi53c895a,id=lsi1')
|
||||
remote_vm.add_args('-object', 'x-remote-object,id=robj1,'
|
||||
'devid=lsi1,fd='+str(remote_sock.fileno()))
|
||||
remote_vm.launch()
|
||||
|
||||
# Create proxy process
|
||||
self.vm.set_console()
|
||||
self.vm.add_args('-machine', machine_type)
|
||||
self.vm.add_args('-accel', 'kvm')
|
||||
self.vm.add_args('-cpu', 'host')
|
||||
self.vm.add_args('-object',
|
||||
'memory-backend-memfd,id=sysmem-file,size=2G')
|
||||
self.vm.add_args('--numa', 'node,memdev=sysmem-file')
|
||||
self.vm.add_args('-m', '2048')
|
||||
self.vm.add_args('-kernel', kernel_path,
|
||||
'-initrd', initrd_path,
|
||||
'-append', kernel_command_line)
|
||||
self.vm.add_args('-device',
|
||||
'x-pci-proxy-dev,'
|
||||
'id=lsi1,fd='+str(proxy_sock.fileno()))
|
||||
self.vm.launch()
|
||||
wait_for_console_pattern(self, 'as init process',
|
||||
'Kernel panic - not syncing')
|
||||
exec_command(self, 'mount -t sysfs sysfs /sys')
|
||||
exec_command_and_wait_for_pattern(self,
|
||||
'cat /sys/bus/pci/devices/*/uevent',
|
||||
'PCI_ID=1000:0012')
|
||||
|
||||
def test_multiprocess_x86_64(self):
|
||||
"""
|
||||
:avocado: tags=arch:x86_64
|
||||
"""
|
||||
kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
|
||||
'/linux/releases/31/Everything/x86_64/os/images'
|
||||
'/pxeboot/vmlinuz')
|
||||
kernel_hash = '5b6f6876e1b5bda314f93893271da0d5777b1f3c'
|
||||
initrd_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
|
||||
'/linux/releases/31/Everything/x86_64/os/images'
|
||||
'/pxeboot/initrd.img')
|
||||
initrd_hash = 'dd0340a1b39bd28f88532babd4581c67649ec5b1'
|
||||
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
|
||||
'console=ttyS0 rdinit=/bin/bash')
|
||||
machine_type = 'pc'
|
||||
self.do_test(kernel_url, kernel_hash, initrd_url, initrd_hash,
|
||||
kernel_command_line, machine_type)
|
||||
|
||||
def test_multiprocess_aarch64(self):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
"""
|
||||
kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
|
||||
'/linux/releases/31/Everything/aarch64/os/images'
|
||||
'/pxeboot/vmlinuz')
|
||||
kernel_hash = '3505f2751e2833c681de78cee8dda1e49cabd2e8'
|
||||
initrd_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
|
||||
'/linux/releases/31/Everything/aarch64/os/images'
|
||||
'/pxeboot/initrd.img')
|
||||
initrd_hash = '519a1962daf17d67fc3a9c89d45affcb399607db'
|
||||
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
|
||||
'rdinit=/bin/bash console=ttyAMA0')
|
||||
machine_type = 'virt,gic-version=3'
|
||||
self.do_test(kernel_url, kernel_hash, initrd_url, initrd_hash,
|
||||
kernel_command_line, machine_type)
|
||||
@ -39,6 +39,7 @@ tests_aarch64_system_thorough = [
|
||||
'aarch64_raspi4',
|
||||
'aarch64_sbsaref',
|
||||
'aarch64_virt',
|
||||
'multiprocess',
|
||||
]
|
||||
|
||||
tests_alpha_system_thorough = [
|
||||
@ -141,6 +142,7 @@ tests_x86_64_system_quick = [
|
||||
tests_x86_64_system_thorough = [
|
||||
'acpi_bits',
|
||||
'linux_initrd',
|
||||
'multiprocess',
|
||||
'netdev_ethtool',
|
||||
'virtio_gpu',
|
||||
]
|
||||
|
||||
100
tests/functional/test_multiprocess.py
Executable file
100
tests/functional/test_multiprocess.py
Executable file
@ -0,0 +1,100 @@
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# Test for multiprocess qemu
|
||||
#
|
||||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||
# later. See the COPYING file in the top-level directory.
|
||||
|
||||
|
||||
import os
|
||||
import socket
|
||||
|
||||
from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern
|
||||
from qemu_test import exec_command, exec_command_and_wait_for_pattern
|
||||
|
||||
class Multiprocess(QemuSystemTest):
|
||||
|
||||
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
||||
|
||||
ASSET_KERNEL_X86 = Asset(
|
||||
('https://archives.fedoraproject.org/pub/archive/fedora/linux'
|
||||
'/releases/31/Everything/x86_64/os/images/pxeboot/vmlinuz'),
|
||||
'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129')
|
||||
|
||||
ASSET_INITRD_X86 = Asset(
|
||||
('https://archives.fedoraproject.org/pub/archive/fedora/linux'
|
||||
'/releases/31/Everything/x86_64/os/images/pxeboot/initrd.img'),
|
||||
'3b6cb5c91a14c42e2f61520f1689264d865e772a1f0069e660a800d31dd61fb9')
|
||||
|
||||
ASSET_KERNEL_AARCH64 = Asset(
|
||||
('https://archives.fedoraproject.org/pub/archive/fedora/linux'
|
||||
'/releases/31/Everything/aarch64/os/images/pxeboot/vmlinuz'),
|
||||
'3ae07fcafbfc8e4abeb693035a74fe10698faae15e9ccd48882a9167800c1527')
|
||||
|
||||
ASSET_INITRD_AARCH64 = Asset(
|
||||
('https://archives.fedoraproject.org/pub/archive/fedora/linux'
|
||||
'/releases/31/Everything/aarch64/os/images/pxeboot/initrd.img'),
|
||||
'9fd230cab10b1dafea41cf00150e6669d37051fad133bd618d2130284e16d526')
|
||||
|
||||
def do_test(self, kernel_asset, initrd_asset,
|
||||
kernel_command_line, machine_type):
|
||||
"""Main test method"""
|
||||
self.require_accelerator('kvm')
|
||||
self.require_device('x-pci-proxy-dev')
|
||||
|
||||
# Create socketpair to connect proxy and remote processes
|
||||
proxy_sock, remote_sock = socket.socketpair(socket.AF_UNIX,
|
||||
socket.SOCK_STREAM)
|
||||
os.set_inheritable(proxy_sock.fileno(), True)
|
||||
os.set_inheritable(remote_sock.fileno(), True)
|
||||
|
||||
kernel_path = kernel_asset.fetch()
|
||||
initrd_path = initrd_asset.fetch()
|
||||
|
||||
# Create remote process
|
||||
remote_vm = self.get_vm()
|
||||
remote_vm.add_args('-machine', 'x-remote')
|
||||
remote_vm.add_args('-nodefaults')
|
||||
remote_vm.add_args('-device', 'lsi53c895a,id=lsi1')
|
||||
remote_vm.add_args('-object', 'x-remote-object,id=robj1,'
|
||||
'devid=lsi1,fd='+str(remote_sock.fileno()))
|
||||
remote_vm.launch()
|
||||
|
||||
# Create proxy process
|
||||
self.vm.set_console()
|
||||
self.vm.add_args('-machine', machine_type)
|
||||
self.vm.add_args('-accel', 'kvm')
|
||||
self.vm.add_args('-cpu', 'host')
|
||||
self.vm.add_args('-object',
|
||||
'memory-backend-memfd,id=sysmem-file,size=2G')
|
||||
self.vm.add_args('--numa', 'node,memdev=sysmem-file')
|
||||
self.vm.add_args('-m', '2048')
|
||||
self.vm.add_args('-kernel', kernel_path,
|
||||
'-initrd', initrd_path,
|
||||
'-append', kernel_command_line)
|
||||
self.vm.add_args('-device',
|
||||
'x-pci-proxy-dev,'
|
||||
'id=lsi1,fd='+str(proxy_sock.fileno()))
|
||||
self.vm.launch()
|
||||
wait_for_console_pattern(self, 'as init process',
|
||||
'Kernel panic - not syncing')
|
||||
exec_command(self, 'mount -t sysfs sysfs /sys')
|
||||
exec_command_and_wait_for_pattern(self,
|
||||
'cat /sys/bus/pci/devices/*/uevent',
|
||||
'PCI_ID=1000:0012')
|
||||
|
||||
def test_multiprocess(self):
|
||||
kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
|
||||
if self.arch == 'x86_64':
|
||||
kernel_command_line += 'console=ttyS0 rdinit=/bin/bash'
|
||||
self.do_test(self.ASSET_KERNEL_X86, self.ASSET_INITRD_X86,
|
||||
kernel_command_line, 'pc')
|
||||
elif self.arch == 'aarch64':
|
||||
kernel_command_line += 'rdinit=/bin/bash console=ttyAMA0'
|
||||
self.do_test(self.ASSET_KERNEL_AARCH64, self.ASSET_INITRD_AARCH64,
|
||||
kernel_command_line, 'virt,gic-version=3')
|
||||
else:
|
||||
assert False
|
||||
|
||||
if __name__ == '__main__':
|
||||
QemuSystemTest.main()
|
||||
Loading…
Reference in New Issue
Block a user