From nobody Tue May 7 23:53:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677847951571887.3520596236136; Fri, 3 Mar 2023 04:52:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pY4sz-0007yP-A3; Fri, 03 Mar 2023 07:51:45 -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 ) id 1pY4su-0007vw-RQ for qemu-devel@nongnu.org; Fri, 03 Mar 2023 07:51:40 -0500 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pY4sr-0000VG-ID for qemu-devel@nongnu.org; Fri, 03 Mar 2023 07:51:40 -0500 Received: from i7.infradead.org ([2001:8b0:10b:1:21e:67ff:fecb:7a92]) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pY4si-00388C-EN; Fri, 03 Mar 2023 12:51:28 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1pY4sh-005KMb-27; Fri, 03 Mar 2023 12:51:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=JdP2312WoOZhLmXW7+UuT4K6GVXGf/m2n3vir6Waq1Q=; b=jUHgF4QZN7/DVo2vlwRWg0t2Ct tLKH0gvSRLfW9wGTVO17q81IYzlyDzyLkjSkKSNttR/4HPu8ZJwAklrLitj7MAUX6cLLGJVWgZS2a zaKckYhGsYK25N7GdCoHf5XqgEsHpVBmVb0eH/gtVRLNf3IQ6GRM7o6xqSBY4NJGGm6QYskL5xmmv 6Zow1oaNNMzHqq+s1FyR/3xIDDX8xqn/bK2KAkE6diannTflqjxGt5QBu6tH7NGavrWcZ0ZzbM2ZU GWwaep4N0IGMf20pj2L8s0sVQ3F8kT4yNNBHxYV+HhyW9fQaVwv/lDGyJu3yxPBEfSVPhAPzBeNpe oTahUbyQ==; From: David Woodhouse To: qemu-devel@nongnu.org Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Paolo Bonzini , Paul Durrant Subject: [PATCH 1/2] tests/avocado: Add Fedora 34 distro, including kernel/initrd checksums Date: Fri, 3 Mar 2023 12:51:25 +0000 Message-Id: <20230303125126.1269861-2-dwmw2@infradead.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230303125126.1269861-1-dwmw2@infradead.org> References: <20230303125126.1269861-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html 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: none client-ip=2001:8b0:10b:1236::1; envelope-from=BATV+c2a260b7edcf36afa963+7131+infradead.org+dwmw2@casper.srs.infradead.org; helo=casper.infradead.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1677847952560100003 Content-Type: text/plain; charset="utf-8" From: David Woodhouse The kernel in Fedora 31 doesn't support 'xen_no_vector_callback' on its command line, so add a slightly newer version as a prelude to enabling avocado tests for Xen guests. Signed-off-by: David Woodhouse --- tests/avocado/avocado_qemu/__init__.py | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index a313e88c07..49e414e267 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -485,6 +485,23 @@ class LinuxDistro: ' console=3Dtty0'), }, }, + '34': { + 'x86_64': + {'checksum': ('b9b621b26725ba95442d9a56cbaa0547' + '84e0779a9522ec6eafff07c6e6f717ea'), + 'pxeboot_url': ('https://archives.fedoraproject.org/' + 'pub/archive/fedora/linux/releases/34/' + 'Everything/x86_64/os/images/pxeboot/'), + 'kernel_hash': ('085fc6e47f2e3a271b591f3e56739ca9' + '4c16718837a5f431ab95468e1e95f9eb'), + 'initrd_hash': ('d6cd2e03e8188eed6c896fd65ff05f81' + '2c4c1c8777d630b5909e9a1a4627e337'), + 'kernel_params': ('root=3DUUID=3D386769a3-cfa5-47c8-8797-' + 'd5ec58c9cb6c ro no_timer_check ' + 'net.ifnames=3D0 console=3Dtty1 ' + 'console=3DttyS0,115200n8'), + }, + }, } } =20 @@ -513,6 +530,16 @@ def pxeboot_url(self): """Gets the repository url where pxeboot files can be found""" return self._info.get('pxeboot_url', None) =20 + @property + def kernel_hash(self): + """Gets checksum of the pxeboot kernel image""" + return self._info.get('kernel_hash', None) + + @property + def initrd_hash(self): + """Gets checksum of the pxeboot initrd image""" + return self._info.get('initrd_hash', None) + @property def default_kernel_params(self): """Gets the default kernel parameters""" --=20 2.39.0 From nobody Tue May 7 23:53:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677847934576883.7256893593582; Fri, 3 Mar 2023 04:52:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pY4sw-0007wC-08; Fri, 03 Mar 2023 07:51:42 -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 ) id 1pY4st-0007vZ-MA for qemu-devel@nongnu.org; Fri, 03 Mar 2023 07:51:39 -0500 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pY4sr-0000VH-IG for qemu-devel@nongnu.org; Fri, 03 Mar 2023 07:51:39 -0500 Received: from i7.infradead.org ([2001:8b0:10b:1:21e:67ff:fecb:7a92]) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pY4si-00388E-EQ; Fri, 03 Mar 2023 12:51:29 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1pY4sh-005KMe-2I; Fri, 03 Mar 2023 12:51:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description; bh=yZoV4E9jMGtk4Hfp0MK1HhStYmqar/waJ9gJZtOoYCw=; b=CAdNXNOL+XKPnMMCQs5Iq57vhH KkXwLNGXlB4TfYp9QoCmaMdHgp6QoMbUSh3s+5vek9JRxeCWnbRExHI3dI17fAEVid36saKdH/yZX qrOGuHx1JLijE9oexVpHsoqB+4fyXKEA2oMPlshzi3JIP85/mhU7chzKkjbz1tHbcTm2tWfcmPtMm yCZJEbL2t6mV7pa0UkfDnrWSiu+aFl9IDt5otEy7lAFEt8MxxnLVhabWw53UbKl70EGA/zhcPJrk2 2tXApal9nH8EaKgr784CVQElwtq0QfdUOGZC1yuqomkgLi00Gp1vTjAwzMU72IpYcm1iMfp42Oxwg bALYH+nA==; From: David Woodhouse To: qemu-devel@nongnu.org Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Paolo Bonzini , Paul Durrant Subject: [PATCH 2/2] tests/avocado: Test Xen guest support under KVM Date: Fri, 3 Mar 2023 12:51:26 +0000 Message-Id: <20230303125126.1269861-3-dwmw2@infradead.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230303125126.1269861-1-dwmw2@infradead.org> References: <20230303125126.1269861-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html 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: none client-ip=2001:8b0:10b:1236::1; envelope-from=BATV+c2a260b7edcf36afa963+7131+infradead.org+dwmw2@casper.srs.infradead.org; helo=casper.infradead.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1677847936501100003 From: David Woodhouse Signed-off-by: David Woodhouse --- tests/avocado/xen_guest.py | 113 +++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 tests/avocado/xen_guest.py diff --git a/tests/avocado/xen_guest.py b/tests/avocado/xen_guest.py new file mode 100644 index 0000000000..111ef3ca08 --- /dev/null +++ b/tests/avocado/xen_guest.py @@ -0,0 +1,113 @@ +# Xen guest functional tests +# +# Copyright =C2=A9 2021 Red Hat, Inc. +# Copyright =C2=A9 2023 Amazon.com, Inc. or its affiliates. All Rights Res= erved. +# +# Author: +# David Woodhouse +# +# 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 + +@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') +class XenGuest(LinuxTest): + """ + :avocado: tags=3Darch:x86_64 + :avocado: tags=3Ddistro:fedora + :avocado: tags=3Ddistro_version:34 + :avocado: tags=3Dmachine:q35 + :avocado: tags=3Daccel:kvm + :avocado: tags=3Dxen_guest + """ + + kernel_path =3D None + initrd_path =3D None + kernel_params =3D None + + def set_up_boot(self): + path =3D self.download_boot() + self.vm.add_args('-drive', 'file=3D%s,if=3Dnone,id=3Ddrv0' % path) + if False: # Soon... + self.vm.add_args('-device', 'xen-disk,drive=3Ddrv0,vdev=3Dxvda= ') + else: + self.vm.add_args('-device', 'ahci,id=3Dahci') + self.vm.add_args('-device', 'ide-hd,drive=3Ddrv0,bus=3Dahci.0') + + def setUp(self): + super(XenGuest, self).setUp(None, 'virtio-net-pci') + + def common_vm_setup(self, custom_kernel=3DNone): + self.require_accelerator("kvm") + self.vm.add_args("-accel", "kvm,xen-version=3D0x4000a,kernel-irqch= ip=3Dsplit") + + if custom_kernel is None: + return + + kernel_url =3D self.distro.pxeboot_url + 'vmlinuz' + initrd_url =3D self.distro.pxeboot_url + 'initrd.img' + self.kernel_path =3D self.fetch_asset(kernel_url, algorithm=3D'sha= 256', + asset_hash=3Dself.distro.kerne= l_hash) + self.initrd_path =3D self.fetch_asset(initrd_url, algorithm=3D'sha= 256', + asset_hash=3Dself.distro.initr= d_hash) + + 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 "Grant table initialized"') + + def test_xen_guest(self): + """ + :avocado: tags=3Dxen_guest + """ + + self.common_vm_setup(True) + + self.kernel_params =3D (self.distro.default_kernel_params + + ' xen_emul_unplug=3Dide-disks') + self.run_and_check() + self.ssh_command('grep xen-pirq.*msi /proc/interrupts') + + def test_xen_guest_vapic(self): + """ + :avocado: tags=3Dxen_guest_vapic + """ + + self.common_vm_setup(True) + self.vm.add_args('-cpu', 'host,+xen-vapic') + self.kernel_params =3D (self.distro.default_kernel_params + + ' xen_emul_unplug=3Dide-disks') + self.run_and_check() + self.ssh_command('grep xen-pirq /proc/interrupts') + self.ssh_command('grep PCI-MSI /proc/interrupts') + + def test_xen_guest_novector(self): + """ + :avocado: tags=3Dxen_guest_novector + """ + + self.common_vm_setup(True) + self.kernel_params =3D (self.distro.default_kernel_params + + ' xen_emul_unplug=3Dide-disks' + + ' xen_no_vector_callback') + self.run_and_check() + self.ssh_command('grep xen-platform-pci /proc/interrupts') + + def test_xen_guest_novector_noapic(self): + """ + :avocado: tags=3Dxen_guest_novector_noapic + """ + + self.common_vm_setup(True) + self.kernel_params =3D (self.distro.default_kernel_params + + ' xen_emul_unplug=3Dide-disks' + + ' xen_no_vector_callback noapic') + self.run_and_check() + self.ssh_command('grep xen-platform-pci /proc/interrupts') --=20 2.39.0