From nobody Wed May 7 21:47:41 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1733509122; cv=none;
d=zohomail.com; s=zohoarc;
b=HrrNB549UrYYuQL6WQYMf55CZTPK1T0ik+GzQAH0cRXep2JD2W9dJxvmx5j52BIo1SZu01nB+qfQkWJSPJSGK153LhfmhrT1BjohcqilhzopqR4rWqbDqzHlKmupvRgtmV0zPUpI7F2FGEufsMWks3C1+yc9/Z0SyoD0+CS2q5I=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1733509122;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=c4uFeZSoR59ahaJfkFIGos/Z3D4DZaECEsQT1YrRS3g=;
b=R8Vugo0q+VuWT87GPoaW5YpxMKYUoIDU3ZJboM+bmppswkXOFsHf0SVUMy9Y8suvMrHX8weIVLyFlTXsaEs3FqcQJF606Azumt9z0YKuRz+KpJzy8O9IKpJdrQ0xvyIwj6CpMk6IUWId6z/E+MmoX/yWhhu/wNKJFM2/HgufLic=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<thuth@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 173350912221727.773448156761674;
Fri, 6 Dec 2024 10:18:42 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tJctw-0006sM-Ul; Fri, 06 Dec 2024 13:18:05 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1tJcto-0006iJ-1A
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 13:17:57 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1tJctf-0005xV-GF
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 13:17:54 -0500
Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-124-1zGNmUFMPhGq8C6IAdeyhw-1; Fri,
06 Dec 2024 13:17:38 -0500
Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
SHA256)
(No client certificate requested)
by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id 60F6E1955DE3; Fri, 6 Dec 2024 18:17:36 +0000 (UTC)
Received: from thuth-p1g4.redhat.com (unknown [10.39.192.66])
by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id C9704300019E; Fri, 6 Dec 2024 18:17:30 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1733509061;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding;
bh=c4uFeZSoR59ahaJfkFIGos/Z3D4DZaECEsQT1YrRS3g=;
b=VwIOYqEKKOBRF0U9uIReWyGoBz2ZpIpW7NgzRMozCkqndyOb2eHqwB0i35zSBlosHvMhmT
bHsD3V8kIl4SKfTyVEsn8bmNlCf3RlJsPCJa3j0bQsDXOODZcYV8GApghaUW5CCoFk9mYI
tCNS3DnA2ie2AYf9C2gc2Ky+sVFOphY=
X-MC-Unique: 1zGNmUFMPhGq8C6IAdeyhw-1
X-Mimecast-MFC-AGG-ID: 1zGNmUFMPhGq8C6IAdeyhw
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org,
"Michael S. Tsirkin" <mst@redhat.com>
Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eric Auger <eric.auger@redhat.com>,
=?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= <clement.mathieu--drif@eviden.com>,
Yi Liu <yi.l.liu@intel.com>, Jason Wang <jasowang@redhat.com>
Subject: [PATCH for-10.0] tests/functional: Convert the intel_iommu avocado
test
Date: Fri, 6 Dec 2024 19:17:28 +0100
Message-ID: <20241206181728.1241169-1-thuth@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -50
X-Spam_score: -5.1
X-Spam_bar: -----
X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1733509123174116600
Content-Type: text/plain; charset="utf-8"
Convert the intel_iommu test to the new functional framework.
This test needs some changes since we neither support the old 'LinuxTest'
class in the functional framework yet, nor a way to use SSH for running
commands in the guest. So we now directly download a Fedora kernel and
initrd and set up the serial console for executing the commands and for
looking for the results.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cl=C3=A9ment Mathieu--Drif<clement.mathieu--drif@eviden.com>
Reviewed-by: C=C3=A9dric Le Goater <clg@redhat.com>
Tested-by: C=C3=A9dric Le Goater <clg@redhat.com>
---
MAINTAINERS | 1 +
tests/functional/meson.build | 1 +
.../test_intel_iommu.py} | 119 ++++++++----------
3 files changed, 51 insertions(+), 70 deletions(-)
rename tests/{avocado/intel_iommu.py =3D> functional/test_intel_iommu.py} =
(41%)
mode change 100644 =3D> 100755
diff --git a/MAINTAINERS b/MAINTAINERS
index a62659b330..2ca452dbf9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3679,6 +3679,7 @@ S: Supported
F: hw/i386/intel_iommu.c
F: hw/i386/intel_iommu_internal.h
F: include/hw/i386/intel_iommu.h
+F: tests/functional/test_intel_iommu.py
=20
AMD-Vi Emulation
S: Orphan
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 30c3eda7e4..dfc95fd904 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -238,6 +238,7 @@ tests_x86_64_system_quick =3D [
=20
tests_x86_64_system_thorough =3D [
'acpi_bits',
+ 'intel_iommu',
'x86_64_tuxrun',
'linux_initrd',
'multiprocess',
diff --git a/tests/avocado/intel_iommu.py b/tests/functional/test_intel_iom=
mu.py
old mode 100644
new mode 100755
similarity index 41%
rename from tests/avocado/intel_iommu.py
rename to tests/functional/test_intel_iommu.py
index 992583fa7d..6e47b1e9de
--- a/tests/avocado/intel_iommu.py
+++ b/tests/functional/test_intel_iommu.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+#
# INTEL_IOMMU Functional tests
#
# Copyright (c) 2021 Red Hat, Inc.
@@ -7,116 +9,93 @@
#
# 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
=20
-from avocado import skipUnless
-from avocado_qemu.linuxtest import LinuxTest
+from qemu_test import LinuxKernelTest, Asset, exec_command_and_wait_for_pa=
ttern
+
+class IntelIOMMU(LinuxKernelTest):
=20
-@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLa=
b')
-class IntelIOMMU(LinuxTest):
- """
- :avocado: tags=3Darch:x86_64
- :avocado: tags=3Ddistro:fedora
- :avocado: tags=3Ddistro_version:31
- :avocado: tags=3Dmachine:q35
- :avocado: tags=3Daccel:kvm
- :avocado: tags=3Dintel_iommu
- :avocado: tags=3Dflaky
- """
+ ASSET_KERNEL =3D Asset(
+ ('https://archives.fedoraproject.org/pub/archive/fedora/linux/'
+ 'releases/39/Server/x86_64/os/images/pxeboot/vmlinuz'),
+ '5f2ef0de47f8d79d5ee9bf8b0ee6d5ba4d987c2f9a16b8b511a7c69e53931fe3')
+
+ ASSET_INITRD =3D Asset(
+ ('https://archives.fedoraproject.org/pub/archive/fedora/linux/'
+ 'releases/39/Server/x86_64/os/images/pxeboot/initrd.img'),
+ '5bc29e2d872ceeb39a9698d42da3fb0afd7583dc7180de05a6b78bcc726674bb')
=20
IOMMU_ADDON =3D ',iommu_platform=3Don,disable-modern=3Doff,disable-leg=
acy=3Don'
+ default_kernel_params =3D 'console=3DttyS0 rd.rescue quiet '
kernel_path =3D None
initrd_path =3D None
kernel_params =3D None
=20
- def set_up_boot(self):
- path =3D self.download_boot()
- self.vm.add_args('-device', 'virtio-blk-pci,bus=3Dpcie.0,' +
- 'drive=3Ddrv0,id=3Dvirtio-disk0,bootindex=3D1,'
- 'werror=3Dstop,rerror=3Dstop' + self.IOMMU_ADDON)
- self.vm.add_args('-device', 'virtio-gpu-pci' + self.IOMMU_ADDON)
- self.vm.add_args('-drive',
- 'file=3D%s,if=3Dnone,cache=3Dwritethrough,id=3Ddr=
v0' % path)
-
- def setUp(self):
- super(IntelIOMMU, self).setUp(None, 'virtio-net-pci' + self.IOMMU_=
ADDON)
-
def add_common_args(self):
self.vm.add_args('-device', 'virtio-rng-pci,rng=3Drng0')
self.vm.add_args('-object',
'rng-random,id=3Drng0,filename=3D/dev/urandom')
+ self.vm.add_args('-device', 'virtio-net-pci' + self.IOMMU_ADDON)
+ self.vm.add_args('-device', 'virtio-gpu-pci' + self.IOMMU_ADDON)
+ self.vm.add_args("-m", "1G")
=20
- def common_vm_setup(self, custom_kernel=3DNone):
+ def common_vm_setup(self):
+ self.set_machine('q35')
self.require_accelerator("kvm")
self.add_common_args()
self.vm.add_args("-accel", "kvm")
=20
- if custom_kernel is None:
- return
-
- kernel_url =3D self.distro.pxeboot_url + 'vmlinuz'
- kernel_hash =3D '5b6f6876e1b5bda314f93893271da0d5777b1f3c'
- initrd_url =3D self.distro.pxeboot_url + 'initrd.img'
- initrd_hash =3D 'dd0340a1b39bd28f88532babd4581c67649ec5b1'
- self.kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dker=
nel_hash)
- self.initrd_path =3D self.fetch_asset(initrd_url, asset_hash=3Dini=
trd_hash)
+ self.kernel_path =3D self.ASSET_KERNEL.fetch()
+ self.initrd_path =3D self.ASSET_INITRD.fetch()
+ self.kernel_params =3D self.default_kernel_params
=20
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')
+ self.vm.set_console()
+ self.vm.launch()
+ self.wait_for_console_pattern('(or press Control-D to continue):')
+ prompt =3D ':/root#'
+ exec_command_and_wait_for_pattern(self, '', prompt)
+ exec_command_and_wait_for_pattern(self, 'cat /proc/cmdline',
+ 'intel_iommu=3Don')
+ self.wait_for_console_pattern(prompt)
+ exec_command_and_wait_for_pattern(self, 'dmesg | grep DMAR:',
+ 'IOMMU enabled')
+ self.wait_for_console_pattern(prompt)
+ exec_command_and_wait_for_pattern(self,
+ 'find /sys/kernel/iommu_groups/ -type =
l',
+ 'devices/0000:00:')
+ self.wait_for_console_pattern(prompt)
=20
def test_intel_iommu(self):
- """
- :avocado: tags=3Dintel_iommu_intremap
- """
-
- self.common_vm_setup(True)
+ self.common_vm_setup()
self.vm.add_args('-device', 'intel-iommu,intremap=3Don')
self.vm.add_args('-machine', 'kernel_irqchip=3Dsplit')
-
- self.kernel_params =3D (self.distro.default_kernel_params +
- ' quiet intel_iommu=3Don')
+ self.kernel_params +=3D 'intel_iommu=3Don'
self.run_and_check()
=20
def test_intel_iommu_strict(self):
- """
- :avocado: tags=3Dintel_iommu_strict
- """
-
- self.common_vm_setup(True)
+ self.common_vm_setup()
self.vm.add_args('-device', 'intel-iommu,intremap=3Don')
self.vm.add_args('-machine', 'kernel_irqchip=3Dsplit')
- self.kernel_params =3D (self.distro.default_kernel_params +
- ' quiet intel_iommu=3Don,strict')
+ self.kernel_params +=3D 'intel_iommu=3Don,strict'
self.run_and_check()
=20
def test_intel_iommu_strict_cm(self):
- """
- :avocado: tags=3Dintel_iommu_strict_cm
- """
-
- self.common_vm_setup(True)
+ self.common_vm_setup()
self.vm.add_args('-device', 'intel-iommu,intremap=3Don,caching-mod=
e=3Don')
self.vm.add_args('-machine', 'kernel_irqchip=3Dsplit')
- self.kernel_params =3D (self.distro.default_kernel_params +
- ' quiet intel_iommu=3Don,strict')
+ self.kernel_params +=3D 'intel_iommu=3Don,strict'
self.run_and_check()
=20
def test_intel_iommu_pt(self):
- """
- :avocado: tags=3Dintel_iommu_pt
- """
-
- self.common_vm_setup(True)
+ self.common_vm_setup()
self.vm.add_args('-device', 'intel-iommu,intremap=3Don')
self.vm.add_args('-machine', 'kernel_irqchip=3Dsplit')
- self.kernel_params =3D (self.distro.default_kernel_params +
- ' quiet intel_iommu=3Don iommu=3Dpt')
+ self.kernel_params +=3D 'intel_iommu=3Don iommu=3Dpt'
self.run_and_check()
+
+if __name__ =3D=3D '__main__':
+ LinuxKernelTest.main()
--=20
2.47.1