| Message ID | 20210629143621.907831-4-eric.auger@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | avocado-qemu: New SMMUv3 and intel IOMMU tests | expand |
On Tue, Jun 29, 2021 at 11:36 AM Eric Auger <eric.auger@redhat.com> wrote: > > Add Intel IOMMU functional tests based on fedora 31. > Different configs are checked: > - strict > - caching mode, strict > - passthrough. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > Acked-by: Peter Xu <peterx@redhat.com> > --- > tests/acceptance/intel_iommu.py | 115 ++++++++++++++++++++++++++++++++ > 1 file changed, 115 insertions(+) > create mode 100644 tests/acceptance/intel_iommu.py > > diff --git a/tests/acceptance/intel_iommu.py b/tests/acceptance/intel_iommu.py > new file mode 100644 > index 0000000000..0b68d3c572 > --- /dev/null > +++ b/tests/acceptance/intel_iommu.py > @@ -0,0 +1,115 @@ > +# INTEL_IOMMU 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 "os" package is not used, you can remove it, unless you add the skipIf decorator, then you will need it. > + > +from avocado_qemu import LinuxTest, BUILD_DIR BUILD_DIR is not used in this file. > +from avocado.utils import ssh The ssh package is not used in this file. > + > +class INTEL_IOMMU(LinuxTest): I suggest you use IntelIOMMU as the class name, so it conforms to Python class naming. > + """ > + :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) If you change the class name, you need to change it here too. > + > + 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() > -- > 2.26.3 >
diff --git a/tests/acceptance/intel_iommu.py b/tests/acceptance/intel_iommu.py new file mode 100644 index 0000000000..0b68d3c572 --- /dev/null +++ b/tests/acceptance/intel_iommu.py @@ -0,0 +1,115 @@ +# INTEL_IOMMU 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 +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()