avocado-qemu: New SMMUv3 and intel IOMMU tests
v3 cover avocado-qemu: New SMMUv3 and intel IOMMU tests
This series adds ARM SMMU and Intel IOMMU functional tests using Fedora cloud-init images.
ARM SMMU tests feature guests with and without RIL (range invalidation support) using respectively fedora 33 and 31. For each, we test the protection of virtio-net-pci and virtio-block-pci devices. Also strict=no and passthrough modes are tested. So there is a total of 6 tests.
Compared to v2, Intel IOMMU tests were added. Different operating modes are tested such as strict, caching mode, pt.
The series applies on top of Cleber's series:
- [PATCH 0/3] Acceptance Tests: support choosing specific
Best Regards
Eric
The series and its dependencies can be found at:
https://github.com/eauger/qemu/tree/avocado-qemu-v3
Eric Auger (3):
Acceptance Tests: Add default kernel params and pxeboot url to the
KNOWN_DISTROS collection
avocado_qemu: Add SMMUv3 tests
avocado_qemu: Add Intel iommu tests
tests/acceptance/avocado_qemu/__init__.py | 52 ++++++++- tests/acceptance/intel_iommu.py | 115 +++++++++++++++++++ tests/acceptance/smmu.py | 133 ++++++++++++++++++++++ 3 files changed, 298 insertions(+), 2 deletions(-) create mode 100644 tests/acceptance/intel_iommu.py create mode 100644 tests/acceptance/smmu.py
Signature · 1 line
2.26.3
PATCH v3 1/3 Acceptance Tests: Add default kernel params and pxeboot url to the KNOWN_DISTROS collection
When running LinuxTests we may need to run the guest with custom params. It is practical to store the pxeboot URL and the default kernel params so that the
tests just need to fetch those and augment the kernel params.
---
v2 -> v3:
- add fed32 and fed33 checksums
--- tests/acceptance/avocado_qemu/__init__.py | 52 ++++++++++++++++++++++- 1 file changed, 50 insertions(+), 2 deletions(-)
tests/acceptance/avocado_qemu/__init__.py +50 -2
@@ -305,17 +305,59 @@ def ssh_command(self, command): 'fedora': { '31': { 'x86_64': - {'checksum': 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0'}, + {'checksum': 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0', + 'pxeboot_url': "https://archives.fedoraproject.org/pub/archive/fedora/" + "linux/releases/31/Everything/x86_64/os/images/pxeboot/", + 'kernel_params': "root=UUID=b1438b9b-2cab-4065-a99a-08a96687f73c ro " + "no_timer_check net.ifnames=0 " + "console=tty1 console=ttyS0,115200n8"}, 'aarch64': - {'checksum': '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49'}, + {'checksum': '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49', + 'pxeboot_url': "https://archives.fedoraproject.org/pub/archive/fedora/" + "linux/releases/31/Everything/aarch64/os/images/pxeboot/", + 'kernel_params': "root=UUID=b6950a44-9f3c-4076-a9c2-355e8475b0a7 ro " + "earlyprintk=pl011,0x9000000 ignore_loglevel " + "no_timer_check printk.time=1 rd_NO_PLYMOUTH " + "console=ttyAMA0 "}, 'ppc64': {'checksum': '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58'}, 's390x': {'checksum': '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d'}, } + , + '32': { + 'aarch64': + { 'kernel_params': "root=UUID=3df75b65-be8d-4db4-8655-14d95c0e90c5 ro " + "no_timer_check net.ifnames=0 console=tty1 " + "console=ttyS0,115200n8 ", + 'checksum': 'b367755c664a2d7a26955bbfff985855adfa2ca15e908baf15b4b176d68d3967', + 'pxeboot_url': "https://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/" + "32/Server/aarch64/os/images/pxeboot/"}, + } + , + '33': { + 'aarch64': + { 'kernel_params': "root=UUID=d20b3ffa-6397-4a63-a734-1126a0208f8a ro " + "no_timer_check net.ifnames=0 console=tty1 " + "console=ttyS0,115200n8 console=tty0 ", + 'checksum': 'e7f75cdfd523fe5ac2ca9eeece68edc1a81f386a17f969c1d1c7c87031008a6b', + 'pxeboot_url': "https://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/" + "33/Server/aarch64/os/images/pxeboot/"}, + } } } +def get_known_distro_kernel_params(distro, distro_version, arch): + try: + return KNOWN_DISTROS.get(distro).get(distro_version).get(arch).get('kernel_params') + except AttributeError: + return None + +def get_known_distro_pxeboot_url(distro, distro_version, arch): + try: + return KNOWN_DISTROS.get(distro).get(distro_version).get(arch).get('pxeboot_url') + except AttributeError: + return None def get_known_distro_checksum(distro, distro_version, arch): try:
@@ -449,6 +491,12 @@ def set_up_cloudinit(self, ssh_pubkey=None): cloudinit_iso = self.prepare_cloudinit(ssh_pubkey) self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso) + def get_default_kernel_params(self): + return get_known_distro_kernel_params(self.distro, self.distro_version, self.arch) + + def get_pxeboot_url(self): + return get_known_distro_pxeboot_url(self.distro, self.distro_version, self.arch) + def launch_and_wait(self, set_up_ssh_connection=True): self.vm.set_console() self.vm.launch()
Signature · 1 line
2.26.3
Re: [PATCH v3 1/3] Acceptance Tests: Add default kernel params and pxeboot url to the KNOWN_DISTROS collection
Hi Eric,
Quoted 40 lines · Eric Auger
When running LinuxTests we may need to run the guest with custom params. It is practical to store the pxeboot URL and the default kernel params so that the
tests just need to fetch those and augment the kernel params.Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- add fed32 and fed33 checksums--- tests/acceptance/avocado_qemu/__init__.py | 52 ++++++++++++++++++++++- 1 file changed, 50 insertions(+), 2 deletions(-)tests/acceptance/avocado_qemu/__init__.py +13
-2@@ -305,17 +305,59 @@ def ssh_command(self, command): 'fedora': { '31': { 'x86_64': - {'checksum': 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0'}, + {'checksum': 'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0', + 'pxeboot_url': "https://archives.fedoraproject.org/pub/archive/fedora/" + "linux/releases/31/Everything/x86_64/os/images/pxeboot/", + 'kernel_params': "root=UUID=b1438b9b-2cab-4065-a99a-08a96687f73c ro " + "no_timer_check net.ifnames=0 " + "console=tty1 console=ttyS0,115200n8"}, 'aarch64': - {'checksum': '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49'}, + {'checksum': '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49', + 'pxeboot_url': "https://archives.fedoraproject.org/pub/archive/fedora/" + "linux/releases/31/Everything/aarch64/os/images/pxeboot/", + 'kernel_params': "root=UUID=b6950a44-9f3c-4076-a9c2-355e8475b0a7 ro " + "earlyprintk=pl011,0x9000000 ignore_loglevel " + "no_timer_check printk.time=1 rd_NO_PLYMOUTH " + "console=ttyAMA0 "}, 'ppc64':
tests/acceptance/avocado_qemu/__init__.py def ssh_command(self, command): · line 332
Quoted 10 lines
tests/acceptance/avocado_qemu/__init__.py +6
-0{'checksum': '7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58'}, 's390x': {'checksum': '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d'}, } + , + '32': { + 'aarch64': + { 'kernel_params': "root=UUID=3df75b65-be8d-4db4-8655-14d95c0e90c5 ro " + "no_timer_check net.ifnames=0 console=tty1 " + "console=ttyS0,115200n8 ",
Nit: indentation ^
tests/acceptance/avocado_qemu/__init__.py def ssh_command(self, command): · line 334
Quoted 2 lines
tests/acceptance/avocado_qemu/__init__.py +2
-0+ 'checksum': 'b367755c664a2d7a26955bbfff985855adfa2ca15e908baf15b4b176d68d3967', + 'pxeboot_url': "https://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/"
Maybe use dl.fedoraproject.org instead of a mirror server?
tests/acceptance/avocado_qemu/__init__.py def ssh_command(self, command): · line 344
Quoted 10 lines
tests/acceptance/avocado_qemu/__init__.py +10
-0+ "32/Server/aarch64/os/images/pxeboot/"}, + } + , + '33': { + 'aarch64': + { 'kernel_params': "root=UUID=d20b3ffa-6397-4a63-a734-1126a0208f8a ro " + "no_timer_check net.ifnames=0 console=tty1 " + "console=ttyS0,115200n8 console=tty0 ", + 'checksum': 'e7f75cdfd523fe5ac2ca9eeece68edc1a81f386a17f969c1d1c7c87031008a6b', + 'pxeboot_url': "https://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/"
Likewise.
Quoted 20 lines
tests/acceptance/avocado_qemu/__init__.py +13
-0+ "33/Server/aarch64/os/images/pxeboot/"}, + } } } +def get_known_distro_kernel_params(distro, distro_version, arch): + try: + return KNOWN_DISTROS.get(distro).get(distro_version).get(arch).get('kernel_params') + except AttributeError: + return None + +def get_known_distro_pxeboot_url(distro, distro_version, arch): + try: + return KNOWN_DISTROS.get(distro).get(distro_version).get(arch).get('pxeboot_url') + except AttributeError: + return None def get_known_distro_checksum(distro, distro_version, arch): try:
tests/acceptance/avocado_qemu/__init__.py def set_up_cloudinit(self, ssh_pubkey=None): · line 499
Quoted 9 lines
tests/acceptance/avocado_qemu/__init__.py +6
-0@@ -449,6 +491,12 @@ def set_up_cloudinit(self, ssh_pubkey=None): cloudinit_iso = self.prepare_cloudinit(ssh_pubkey) self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso) + def get_default_kernel_params(self): + return get_known_distro_kernel_params(self.distro, self.distro_version, self.arch) + + def get_pxeboot_url(self): + return get_known_distro_pxeboot_url(self.distro, self.distro_version, self.arch) +
As the KNOWN_DISTROS grows, more loosely methods will be created in the avocado_qemu/__init__.py file.
I refactored the code so that KNOWN_DISTROS and related methods are packaged in a class. See in:
https://github.com/wainersm/qemu/tree/eauger_avocado-qemu-v3-refactor
Maybe you could incorporate that in your series? Otherwise I can send as a follow up series. Whatever you prefer.
Thanks!
- Wainer
Quoted 3 lines
tests/acceptance/avocado_qemu/__init__.py +0
-0def launch_and_wait(self, set_up_ssh_connection=True): self.vm.set_console() self.vm.launch()
Re: [PATCH v3 1/3] Acceptance Tests: Add default kernel params and pxeboot url to the KNOWN_DISTROS collection
Hi Wainer,
Quoted 63 lines · Wainer dos Santos Moschetta
Hi Eric,
Quoted 60 lines · Eric Auger
When running LinuxTests we may need to run the guest with custom params. It is practical to store the pxeboot URL and the default kernel params so that the
tests just need to fetch those and augment the kernel params.Signed-off-by Eric Auger <[email protected]>---
v2 -> v3:
- add fed32 and fed33 checksums
---
tests/acceptance/avocado_qemu/__init__.py| 52 ++++++++++++++++++++++-1 file changed, 50 insertions(+), 2 deletions(-)tests/acceptance/avocado_qemu/__init__.py +0
-0@@ -305,17 +305,59 @@ def ssh_command(self, command): 'fedora': { '31': {'
x86_64':
- {'checksum':
'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0'}, + {'checksum':
'e3c1b309d9203604922d6e255c2c5d098a309c2d46215d8fc026954f3c5c27a0', + 'pxeboot_url':
"https://archives.fedoraproject.org/pub/archive/fedora/"
+
"linux/releases/31/Everything/x86_64/os/images/pxeboot/",
+ 'kernel_params':
"root=UUID=b1438b9b-2cab-4065-a99a-08a96687f73c ro "
+ "no_timer_checknet.ifnames=0 " + "console=tty1 console=ttyS0,115200n8"}, 'aarch64':
- {'checksum':
'1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49'}, + {'checksum':
'1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49', + 'pxeboot_url':
"https://archives.fedoraproject.org/pub/archive/fedora/"
+ "linux/releases/31/Everything/aarch64/os/images/pxeboot/", + 'kernel_params':
"root=UUID=b6950a44-9f3c-4076-a9c2-355e8475b0a7 ro "
+ "earlyprintk=pl011,0x9000000ignore_loglevel"
+ "no_timer_checkprintk.time=1rd_NO_PLYMOUTH"
+ "console=ttyAMA0 "}, 'ppc64':
{'checksum':
'7c3528b85a3df4b2306e892199a9e1e43f991c506f2cc390dc4efa2026ad2f58'}, 's390x':
{'checksum':
'4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf5a122d'}, }
+ ,
Quoted 8 lines
Quoted 7 lines
+ '32': {
+ 'aarch64':
+ { 'kernel_params':
"root=UUID=3df75b65-be8d-4db4-8655-14d95c0e90c5 ro " + "no_timer_checknet.ifnames=0 console=tty1 "
+ "console=ttyS0,115200n8 ",Nit: indentation ^
sure
Quoted 5 lines
Quoted 4 lines
+ 'checksum':
'b367755c664a2d7a26955bbfff985855adfa2ca15e908baf15b4b176d68d3967', + 'pxeboot_url':
"https://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/"Maybe use dl.fedoraproject.org instead of a mirror server?
yep
Quoted 14 lines
Quoted 6 lines
+ "32/Server/aarch64/os/images/pxeboot/"}, + }
+ ,
+ '33': {
+ 'aarch64':
+ { 'kernel_params':Quoted 8 lines
"root=UUID=d20b3ffa-6397-4a63-a734-1126a0208f8a ro "
+ "no_timer_checknet.ifnames=0 console=tty1 "
+ "console=ttyS0,115200n8 console=tty0 ", + 'checksum':
'e7f75cdfd523fe5ac2ca9eeece68edc1a81f386a17f969c1d1c7c87031008a6b', + 'pxeboot_url':
"https://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/"
Quoted 1 line
Likewise.
ok
Quoted 35 lines
Quoted 23 lines
+ "33/Server/aarch64/os/images/pxeboot/"}, + }
}
}
+defget_known_distro_kernel_params(distro, distro_version, arch):
+ try:
+ return KNOWN_DISTROS.get(distro).get(distro_version).get(arch).get('kernel_params') + except AttributeError:
+ return Nonetests/acceptance/avocado_qemu/__init__.py +4
-0+ +def get_known_distro_pxeboot_url(distro, distro_version, arch): + try: + returnKNOWN_DISTROS.get(distro).get(distro_version).get(arch).get('pxeboot_url') + except AttributeError:
+ return None
defget_known_distro_checksum(distro, distro_version, arch):
try:tests/acceptance/avocado_qemu/__init__.py +0
-0@@ -449,6 +491,12 @@ def set_up_cloudinit(self, ssh_pubkey=None): cloudinit_iso = self.prepare_cloudinit(ssh_pubkey)
self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso)Quoted 8 lines
+ def
get_default_kernel_params(self):
+ returnget_known_distro_kernel_params(self.distro, self.distro_version, self.arch)
+
+ defget_pxeboot_url(self):
+ returnget_known_distro_pxeboot_url(self.distro, self.distro_version, self.arch)
+As the
KNOWN_DISTROSgrows, more loosely methods will be created in theavocado_qemu/__init__.pyfile.
Quoted 7 lines
I refactored the code so that
KNOWN_DISTROSand related methods are packaged in a class. See in:https://github.com/wainersm/qemu/tree/eauger_avocado-qemu-v3-refactor
Maybe you could incorporate that in your series? Otherwise I can send as a follow up series. Whatever you prefer.
OK I take your patch on top of my series then.
Quoted 9 lines
Thanks!
- Wainer
Quoted 3 lines
def
launch_and_wait(self, set_up_ssh_connection=True):
self.vm.set_console()
self.vm.launch()
PATCH v3 2/3 avocado_qemu: Add SMMUv3 tests
In reply to Eric AugerAdd 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.
---
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
tests/acceptance/smmu.py new file +133 -0
@@ -0,0 +1,133 @@ +# SMMUv3 Functional tests +# +# Copyright (c) 2021 Red Hat, Inc. +# +# Author: +# Eric Auger <[email protected]> +# +# 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): + self.require_accelerator("kvm") + self.vm.add_args("-machine", "virt") + self.vm.add_args("-accel", "kvm") + self.vm.add_args("-cpu", "host") + self.vm.add_args("-smp", "8") + self.vm.add_args("-m", "4096") + 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 + """ + 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()
Signature · 1 line
2.26.3
Re: [PATCH v3 2/3] avocado_qemu: Add SMMUv3 tests
Hi,
Quoted 57 lines · Eric Auger
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 <[email protected]>---
v1 -> v2:
- removed ssh import
- combinedadd_command_args()andcommon_vm_setup()
- moved tags in class' docstring and added tags=arch:aarch64
- useself.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.pytests/acceptance/smmu.py new file +29
-0@@ -0,0 +1,133 @@ +# SMMUv3 Functional tests +# +# Copyright (c) 2021 Red Hat, Inc. +# +# Author: +# Eric Auger <[email protected]> +# +# 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()
tests/acceptance/smmu.py line 39
Quoted 10 lines
tests/acceptance/smmu.py new file +10
-0+ 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.
tests/acceptance/smmu.py line 41
Quoted 2 lines
tests/acceptance/smmu.py new file +2
-0+ 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.
tests/acceptance/smmu.py line 45
Quoted 4 lines
tests/acceptance/smmu.py new file +4
-0+ 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
Quoted 32 lines
tests/acceptance/smmu.py new file +32
-0+ 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
tests/acceptance/smmu.py line 87
Quoted 10 lines
tests/acceptance/smmu.py new file +10
-0+ :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
Quoted 46 lines
tests/acceptance/smmu.py new file +46
-0+ """ + 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()
Re: [PATCH v3 2/3] avocado_qemu: Add SMMUv3 tests
Quoted 69 lines · Wainer dos Santos Moschetta
Hi,
Quoted 66 lines · Eric Auger
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 <[email protected]>---
v1 -> v2:
- removed ssh import
- combinedadd_command_args()andcommon_vm_setup()
- moved tags in class' docstring and added tags=arch:aarch64
- useself.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.pytests/acceptance/smmu.py new file +23
-0@@ -0,0 +1,133 @@ +# SMMUv3 Functional tests +# +# Copyright (c) 2021 Red Hat, Inc. +# +# Author: +# Eric Auger <[email protected]> +# +# 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
+
+ defset_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)
Quoted 8 lines
Quoted 6 lines
+
+ def setUp(self):
+super(SMMU, self).setUp(None, 'virtio-net-pci' + self.IOMMU_ADDON)
+
+ defcommon_vm_setup(self, custom_kernel=None):As some tests call
self.common_vm_setup(True), I thinkcustom_kernelshould beTrue|False.
OK changed to False
Quoted 5 lines
Quoted 2 lines
+
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_qemuwill set "-machine" automatically to any created VM.
OK
Quoted 11 lines
Quoted 4 lines
+
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.LinuxTestprovides 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
OK removed those params and rely on defaults
Quoted 40 lines
Quoted 40 lines
+
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')tests/acceptance/smmu.py new file +32
-0+ + 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): + """
Quoted 8 lines
Quoted 3 lines
+ :avocado: tags=smmu_noril_passthrough
+ :avocado: tags=smmu_noril_tests
+ :avocado: tags=distro_version:31Maybe you should "distro" tag the tests (or better, tag the class), so that a readers of this don't need to browse the
LinuxTestclass looking for the distro to be used (although it may be clear to some, based on thedistro_version)...
done
Quoted 2 lines
Thanks for contributing those tests!
you're welcome
Thanks
Eric
Quoted 54 lines
- Wainer
Quoted 50 lines
+ """
+self.common_vm_setup(True)
+ self.kernel_params =self.get_default_kernel_params()+ ' iommu.passthrough=on'
+self.run_and_check()
+
+ deftest_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()tests/acceptance/smmu.py new file +21
-0+ + # 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()
+
+ deftest_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()
PATCH v3 3/3 avocado_qemu: Add Intel iommu tests
In reply to Eric AugerAdd Intel IOMMU functional tests based on fedora 31. Different configs are checked:
- strict
- caching mode, strict
- passthrough.
--- tests/acceptance/intel_iommu.py | 115 ++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 tests/acceptance/intel_iommu.py
tests/acceptance/intel_iommu.py new file +115 -0
@@ -0,0 +1,115 @@ +# INTEL_IOMMU Functional tests +# +# Copyright (c) 2021 Red Hat, Inc. +# +# Author: +# Eric Auger <[email protected]> +# +# 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 +from avocado.utils import ssh + +class INTEL_IOMMU(LinuxTest): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=distro:fedora + :avocado: tags=distro_version:31 + :avocado: tags=machine:q35 + :avocado: tags=accel:kvm + :avocado: tags=intel_iommu + """ + + 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('-device', 'virtio-gpu-pci' + self.IOMMU_ADDON) + self.vm.add_args('-drive', + 'file=%s,if=none,cache=writethrough,id=drv0' % path) + + def setUp(self): + super(INTEL_IOMMU, self).setUp(None, 'virtio-net-pci' + self.IOMMU_ADDON) + + def add_common_args(self): + self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0') + self.vm.add_args('-object', + 'rng-random,id=rng0,filename=/dev/urandom') + + def common_vm_setup(self, custom_kernel=None): + self.require_accelerator("kvm") + self.add_common_args() + self.vm.add_args("-accel", "kvm") + + 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('dmesg | grep -e DMAR -e IOMMU') + self.ssh_command('find /sys/kernel/iommu_groups/ -type l') + self.ssh_command('dnf -y install numactl-devel') + + def test_intel_iommu(self): + """ + :avocado: tags=intel_iommu_intremap + """ + + self.common_vm_setup(True) + self.vm.add_args('-device', 'intel-iommu,intremap=on') + self.vm.add_args('-machine', 'kernel_irqchip=split') + + self.kernel_params = self.get_default_kernel_params() + ' quiet intel_iommu=on' + self.run_and_check() + + def test_intel_iommu_strict(self): + """ + :avocado: tags=intel_iommu_strict + """ + + self.common_vm_setup(True) + self.vm.add_args('-device', 'intel-iommu,intremap=on') + self.vm.add_args('-machine', 'kernel_irqchip=split') + self.kernel_params = self.get_default_kernel_params() + ' quiet intel_iommu=on,strict' + self.run_and_check() + + def test_intel_iommu_strict_cm(self): + """ + :avocado: tags=intel_iommu_strict_cm + """ + + self.common_vm_setup(True) + self.vm.add_args('-device', 'intel-iommu,intremap=on,caching-mode=on') + self.vm.add_args('-machine', 'kernel_irqchip=split') + self.kernel_params = self.get_default_kernel_params() + ' quiet intel_iommu=on,strict' + self.run_and_check() + + def test_intel_iommu_pt(self): + """ + :avocado: tags=intel_iommu_pt + """ + + self.common_vm_setup(True) + self.vm.add_args('-device', 'intel-iommu,intremap=on') + self.vm.add_args('-machine', 'kernel_irqchip=split') + self.kernel_params = self.get_default_kernel_params() + ' quiet intel_iommu=on iommu=pt' + self.run_and_check()
Signature · 1 line
2.26.3
Re: [PATCH v3 3/3] avocado_qemu: Add Intel iommu tests
Hi, Eric,
Quoted 7 lines · Eric Auger
Add Intel IOMMU functional tests based on fedora 31. Different configs are checked:
- strict
- caching mode, strict
- passthrough.Signed-off-by Eric Auger <[email protected]>
Thanks for adding this test!
Signature · 1 line
Peter Xu
Cc'ing Willian
Quoted 36 lines · Eric Auger
This series adds ARM SMMU and Intel IOMMU functional tests using Fedora cloud-init images.
ARM SMMU tests feature guests with and without RIL (range invalidation support) using respectively fedora 33 and 31. For each, we test the protection of virtio-net-pci and virtio-block-pci devices. Also strict=no and passthrough modes are tested. So there is a total of 6 tests.
Compared to v2, Intel IOMMU tests were added. Different operating modes are tested such as strict, caching mode, pt.
The series applies on top of Cleber's series:
- [PATCH 0/3] Acceptance Tests: support choosing specificBest Regards
Eric
The series and its dependencies can be found at:
https://github.com/eauger/qemu/tree/avocado-qemu-v3Eric Auger (3):
Acceptance Tests: Add default kernel params and pxeboot url to the
KNOWN_DISTROScollection
avocado_qemu: Add SMMUv3 tests
avocado_qemu: Add Intel iommu teststests/acceptance/avocado_qemu/__init__.py | 52 ++++++++- tests/acceptance/intel_iommu.py | 115 +++++++++++++++++++ tests/acceptance/smmu.py | 133 ++++++++++++++++++++++ 3 files changed, 298 insertions(+), 2 deletions(-) create mode 100644 tests/acceptance/intel_iommu.py create mode 100644 tests/acceptance/smmu.py