[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 2/3] avocado_qemu: Add SMMUv3 tests
|
From: |
Wainer dos Santos Moschetta |
|
Subject: |
Re: [PATCH v3 2/3] avocado_qemu: Add SMMUv3 tests |
|
Date: |
Mon, 28 Jun 2021 15:27:10 -0300 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 |
Hi,
On 6/21/21 5:08 AM, Eric Auger wrote:
Add new tests checking the good behavior of the SMMUv3 protecting
2 virtio pci devices (block and net). We check the guest boots and
we are able to install a package. Different guest configs are tested:
standard, passthrough an strict=0. This is tested with both fedora 31 and
33. The former uses a 5.3 kernel without range invalidation whereas the
latter uses a 5.8 kernel that features range invalidation.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v1 -> v2:
- removed ssh import
- combined add_command_args() and common_vm_setup()
- moved tags in class' docstring and added tags=arch:aarch64
- use self.get_default_kernel_params()
- added RIL tests with fed33 + introduce new tags
---
tests/acceptance/smmu.py | 133 +++++++++++++++++++++++++++++++++++++++
1 file changed, 133 insertions(+)
create mode 100644 tests/acceptance/smmu.py
diff --git a/tests/acceptance/smmu.py b/tests/acceptance/smmu.py
new file mode 100644
index 0000000000..bcb5416a56
--- /dev/null
+++ b/tests/acceptance/smmu.py
@@ -0,0 +1,133 @@
+# SMMUv3 Functional tests
+#
+# Copyright (c) 2021 Red Hat, Inc.
+#
+# Author:
+# Eric Auger <eric.auger@redhat.com>
+#
+# 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
+
+from avocado_qemu import LinuxTest, BUILD_DIR
+
+class SMMU(LinuxTest):
+ """
+ :avocado: tags=accel:kvm
+ :avocado: tags=cpu:host
+ :avocado: tags=arch:aarch64
+ :avocado: tags=smmu
+ """
+
+ IOMMU_ADDON = ',iommu_platform=on,disable-modern=off,disable-legacy=on'
+ kernel_path = None
+ initrd_path = None
+ kernel_params = None
+
+ def set_up_boot(self):
+ path = self.download_boot()
+ self.vm.add_args('-device', 'virtio-blk-pci,bus=pcie.0,scsi=off,' +
+ 'drive=drv0,id=virtio-disk0,bootindex=1,'
+ 'werror=stop,rerror=stop' + self.IOMMU_ADDON)
+ self.vm.add_args('-drive',
+ 'file=%s,if=none,cache=writethrough,id=drv0' % path)
+
+ def setUp(self):
+ super(SMMU, self).setUp(None, 'virtio-net-pci' + self.IOMMU_ADDON)
+
+ def common_vm_setup(self, custom_kernel=None):
As some tests call `self.common_vm_setup(True)`, I think `custom_kernel`
should be `True|False`.
+ self.require_accelerator("kvm")
+ self.vm.add_args("-machine", "virt")
FYI, if you have the "machine" tag (e.g. "tags=machine:virt") to your
tests then avocado_qemu will set "-machine" automatically to any created VM.
+ self.vm.add_args("-accel", "kvm")
+ self.vm.add_args("-cpu", "host")
+ self.vm.add_args("-smp", "8")
+ self.vm.add_args("-m", "4096")
The `avocado_qemu.LinuxTest` provides default values for smp and memory
which cannot be properly overwritten. The resulting command line will
have -smp and -m twice.
I created an issue to track that improvement:
https://gitlab.com/qemu-project/qemu/-/issues/453
+ self.vm.add_args("-machine", "iommu=smmuv3")
+ self.vm.add_args("-d", "guest_errors")
+ self.vm.add_args('-bios', os.path.join(BUILD_DIR, 'pc-bios',
+ 'edk2-aarch64-code.fd'))
+ self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
+ self.vm.add_args('-object',
+ 'rng-random,id=rng0,filename=/dev/urandom')
+
+ if custom_kernel is None:
+ return
+
+ kernel_url = self.get_pxeboot_url() + 'vmlinuz'
+ initrd_url = self.get_pxeboot_url() + 'initrd.img'
+ self.kernel_path = self.fetch_asset(kernel_url)
+ self.initrd_path = self.fetch_asset(initrd_url)
+
+ def run_and_check(self):
+ if self.kernel_path:
+ self.vm.add_args('-kernel', self.kernel_path,
+ '-append', self.kernel_params,
+ '-initrd', self.initrd_path)
+ self.launch_and_wait()
+ self.ssh_command('cat /proc/cmdline')
+ self.ssh_command('dnf -y install numactl-devel')
+
+
+ # 5.3 kernel without RIL #
+
+ def test_smmu_noril(self):
+ """
+ :avocado: tags=smmu_noril
+ :avocado: tags=smmu_noril_tests
+ :avocado: tags=distro_version:31
+ """
+ self.common_vm_setup()
+ self.run_and_check()
+
+ def test_smmu_noril_passthrough(self):
+ """
+ :avocado: tags=smmu_noril_passthrough
+ :avocado: tags=smmu_noril_tests
+ :avocado: tags=distro_version:31
Maybe you should "distro" tag the tests (or better, tag the class), so
that a readers of this don't need to browse the `LinuxTest` class
looking for the distro to be used (although it may be clear to some,
based on the distro_version)...
Thanks for contributing those tests!
- Wainer
+ """
+ self.common_vm_setup(True)
+ self.kernel_params = self.get_default_kernel_params() + '
iommu.passthrough=on'
+ self.run_and_check()
+
+ def test_smmu_noril_nostrict(self):
+ """
+ :avocado: tags=smmu_noril_nostrict
+ :avocado: tags=smmu_noril_tests
+ :avocado: tags=distro_version:31
+ """
+ self.common_vm_setup(True)
+ self.kernel_params = self.get_default_kernel_params() + '
iommu.strict=0'
+ self.run_and_check()
+
+ # 5.8 kernel featuring range invalidation
+ # >= v5.7 kernel
+
+ def test_smmu_ril(self):
+ """
+ :avocado: tags=smmu_ril
+ :avocado: tags=smmu_ril_tests
+ :avocado: tags=distro_version:33
+ """
+ self.common_vm_setup()
+ self.run_and_check()
+
+ def test_smmu_ril_passthrough(self):
+ """
+ :avocado: tags=smmu_ril_passthrough
+ :avocado: tags=smmu_ril_tests
+ :avocado: tags=distro_version:33
+ """
+ self.common_vm_setup(True)
+ self.kernel_params = self.get_default_kernel_params() + '
iommu.passthrough=on'
+ self.run_and_check()
+
+ def test_smmu_ril_nostrict(self):
+ """
+ :avocado: tags=smmu_ril_nostrict
+ :avocado: tags=smmu_ril_tests
+ :avocado: tags=distro_version:33
+ """
+ self.common_vm_setup(True)
+ self.kernel_params = self.get_default_kernel_params() + '
iommu.strict=0'
+ self.run_and_check()