From: Cleber Rosa <crosa@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Willian Rampazzo" <wrampazz@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Kamil Rytarowski" <kamil@netbsd.org>,
"Reinoud Zandijk" <reinoud@netbsd.org>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Greg Kurz" <groug@kaod.org>,
"Eric Auger" <eric.auger@redhat.com>,
qemu-arm@nongnu.org, "Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
"Cleber Rosa" <crosa@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Beraldo Leal" <bleal@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Ryo ONODERA" <ryoon@netbsd.org>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 10/23] avocado_qemu: Add SMMUv3 tests
Date: Tue, 13 Jul 2021 17:19:10 -0400 [thread overview]
Message-ID: <20210713211923.3809241-11-crosa@redhat.com> (raw)
In-Reply-To: <20210713211923.3809241-1-crosa@redhat.com>
From: Eric Auger <eric.auger@redhat.com>
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>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Tested-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210706131729.30749-4-eric.auger@redhat.com>
[CR: split long lines]
[CR: added MAINTAINERS entry]
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
MAINTAINERS | 1 +
tests/acceptance/smmu.py | 137 +++++++++++++++++++++++++++++++++++++++
2 files changed, 138 insertions(+)
create mode 100644 tests/acceptance/smmu.py
diff --git a/MAINTAINERS b/MAINTAINERS
index c340bb02b0..148153d74f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -171,6 +171,7 @@ L: qemu-arm@nongnu.org
S: Maintained
F: hw/arm/smmu*
F: include/hw/arm/smmu*
+F: tests/acceptance/smmu.py
AVR TCG CPUs
M: Michael Rolnik <mrolnik@gmail.com>
diff --git a/tests/acceptance/smmu.py b/tests/acceptance/smmu.py
new file mode 100644
index 0000000000..b3c4de6bf4
--- /dev/null
+++ b/tests/acceptance/smmu.py
@@ -0,0 +1,137 @@
+# 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 import skipIf
+from avocado_qemu import LinuxTest, BUILD_DIR
+
+@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
+class SMMU(LinuxTest):
+ """
+ :avocado: tags=accel:kvm
+ :avocado: tags=cpu:host
+ :avocado: tags=arch:aarch64
+ :avocado: tags=machine:virt
+ :avocado: tags=distro:fedora
+ :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=False):
+ self.require_accelerator("kvm")
+ self.vm.add_args("-accel", "kvm")
+ self.vm.add_args("-cpu", "host")
+ 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 False:
+ return
+
+ kernel_url = self.distro.pxeboot_url + 'vmlinuz'
+ initrd_url = self.distro.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
+ """
+ self.common_vm_setup(True)
+ self.kernel_params = (self.distro.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.distro.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.distro.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.distro.default_kernel_params +
+ ' iommu.strict=0')
+ self.run_and_check()
--
2.31.1
next prev parent reply other threads:[~2021-07-13 21:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 21:19 [PULL 00/23] Python and Acceptance Tests Cleber Rosa
2021-07-13 21:19 ` [PULL 01/23] Acceptance Tests: use the job work directory for created VMs Cleber Rosa
2021-07-13 21:19 ` [PULL 02/23] Acceptance Tests: log information when creating QEMUMachine Cleber Rosa
2021-07-13 21:19 ` [PULL 03/23] Acceptance Tests: distinguish between temp and logs dir Cleber Rosa
2021-07-13 21:19 ` [PULL 04/23] Acceptance Tests: rename attribute holding the distro image checksum Cleber Rosa
2021-07-13 21:19 ` [PULL 05/23] Acceptance Tests: move definition of distro checksums to the framework Cleber Rosa
2021-07-13 21:19 ` [PULL 06/23] Acceptance Tests: support choosing specific distro and version Cleber Rosa
2021-07-13 21:19 ` [PULL 07/23] tests/acceptance: Ignore binary data sent on serial console Cleber Rosa
2021-07-13 21:19 ` [PULL 08/23] avocado_qemu: Fix KNOWN_DISTROS map into the LinuxDistro class Cleber Rosa
2021-07-13 21:19 ` [PULL 09/23] Acceptance Tests: Add default kernel params and pxeboot url to the KNOWN_DISTROS collection Cleber Rosa
2021-07-13 21:19 ` Cleber Rosa [this message]
2021-07-13 21:19 ` [PULL 11/23] avocado_qemu: Add Intel iommu tests Cleber Rosa
2021-07-13 21:19 ` [PULL 12/23] tests/acceptance: Tag NetBSD tests as 'os:netbsd' Cleber Rosa
2021-07-13 21:19 ` [PULL 13/23] tests/acceptance: Automatic set -cpu to the test vm Cleber Rosa
2021-07-13 21:19 ` [PULL 14/23] tests/acceptance: Fix mismatch on cpu tagged tests Cleber Rosa
2021-07-13 21:19 ` [PULL 15/23] tests/acceptance: Let the framework handle "cpu:VALUE" " Cleber Rosa
2021-07-13 21:19 ` [PULL 16/23] tests/acceptance: Tagging tests with "cpu:VALUE" Cleber Rosa
2021-07-13 21:19 ` [PULL 17/23] python/qemu: Add args property to the QEMUMachine class Cleber Rosa
2021-07-13 21:19 ` [PULL 18/23] tests/acceptance: Add set_vm_arg() to the Test class Cleber Rosa
2021-07-13 21:19 ` [PULL 19/23] tests/acceptance: Handle cpu tag on x86_cpu_model_versions tests Cleber Rosa
2021-07-13 21:19 ` [PULL 20/23] python: Configure tox to skip missing interpreters Cleber Rosa
2021-07-13 21:19 ` [PULL 21/23] Acceptance tests: do not try to reuse packages from the system Cleber Rosa
2021-07-13 21:19 ` [PULL 22/23] tests/acceptance/linux_ssh_mips_malta.py: drop identical setUp Cleber Rosa
2021-07-13 21:19 ` [PULL 23/23] tests/acceptance/cpu_queries.py: use the proper logging channels Cleber Rosa
2021-07-14 19:33 ` [PULL 00/23] Python and Acceptance Tests Peter Maydell
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=20210713211923.3809241-11-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=bleal@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=ehabkost@redhat.com \
--cc=eric.auger@redhat.com \
--cc=f4bug@amsat.org \
--cc=groug@kaod.org \
--cc=hpoussin@reactos.org \
--cc=jsnow@redhat.com \
--cc=kamil@netbsd.org \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=reinoud@netbsd.org \
--cc=ryoon@netbsd.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
--cc=wrampazz@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).