From patchwork Wed Feb 15 19:25:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 653742 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp524737wrr; Wed, 15 Feb 2023 11:27:11 -0800 (PST) X-Google-Smtp-Source: AK7set+wzhZp6fIkYelDeKDFF6vdJ/sV6DQivs8sm11XVaurj0W31kA7ehCe9tpP4At1FOfJGfNW X-Received: by 2002:ad4:5b86:0:b0:56e:b1c8:381b with SMTP id 6-20020ad45b86000000b0056eb1c8381bmr5672722qvp.31.1676489231063; Wed, 15 Feb 2023 11:27:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676489231; cv=none; d=google.com; s=arc-20160816; b=g6BU+6oE2qyy8OYEhSei2SV2HMjYLgVp8Fzj8uaGtkjBplYXQrcU0YYL6M7+Cwf4vz 0l10PK2CT0mQho2UwHyYjjZPcLs3NoaHTqCvUbezZ53M683GbDycZ5sDaqG4CvpW4t7J Qom2ZfGbDegW2Er2rJdkKjcJBtkFpDZ5r7Tld5eFmy1O1VFcqbMzTjCmrPm0wXsbrxA+ 2fZtLPJea0YR4/OS9tHPAtv6x5kSfOzUjdRpk0XBJ7Q9IviKHhnCBmuagLilD+ifEb4w vQz9G2zG3lnn3UPBH53IQ0R+aG4yuIGOUwgHQIYV2zY7JYTx/SWSH2n4a5ZfpiDBtg/Z plRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pOGRkGIImJUYHM7juc7wyyKAcjrkEX/ui1SLJCBbokI=; b=MBXoNwrxwICEiY3ZaWkjH98cY8XaDj5IlxCcke2vzDTqv66Dl75TSCztdeZI349Apk 5Gw/oVp3TAesm43dqTkgSC2ReKgs7OSndypYouGt3VVJ5VONrhPUmALWC/85QiqgIbMA +ODcKaGIBuPsUEXyZSDRixDbEu9dMoWeRt5jl2Baq66m9i1cqYlJhQ87iz1D1rGvZD9A rhIf38BvgiQH4SuudTPEtRy8+5683TvfmC9Mv+DlkaYAy2htkf5GVnT6J/VVjlimXsKb NyXLi66krYIwVq7vhihZbd7lcMO9ofFgKMHAPhN3XYG1BoRg49T+W75qAJEYtH6uLPF2 /EPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="oFXwg/2s"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a18-20020a0cca92000000b0056ea0fb9d6csi9748362qvk.404.2023.02.15.11.27.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Feb 2023 11:27:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="oFXwg/2s"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSNPR-0006k5-5K; Wed, 15 Feb 2023 14:25:41 -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 1pSNPM-0006hp-PW for qemu-devel@nongnu.org; Wed, 15 Feb 2023 14:25:36 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSNPJ-0001g5-P5 for qemu-devel@nongnu.org; Wed, 15 Feb 2023 14:25:36 -0500 Received: by mail-wr1-x429.google.com with SMTP id co8so16494375wrb.1 for ; Wed, 15 Feb 2023 11:25:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pOGRkGIImJUYHM7juc7wyyKAcjrkEX/ui1SLJCBbokI=; b=oFXwg/2sI++cuAp23+D+Dh/ns3LCMZ3J8fdAIyoR8ogYJJPLTgGgNIMGcitthKq9WE 4bt+VZ36yaZ+oTP2OKoPz2VM4B3n09xP8Nv3fUow78x0mpZN4EtoGsacx00Hzkulc3uC VZoT6FmF/XZUAo5qLColcMRqzJbJaD5gDmslIQZn0uM06toiJzxVjJOKJyxrPIYHsKfQ gVfkhOvzhZKwyAXb/Eh8yqaxmwBPs2C0kdzgj7RKlfzSctCwoTGEgaLku2WrhUBEGnem bo+oZZyLKMjTZW4VvJ2zH4pFV4hzol5AkSXU8T3gbS1EIL1zdHyFY4/XvZx2n87HAWy8 2qCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pOGRkGIImJUYHM7juc7wyyKAcjrkEX/ui1SLJCBbokI=; b=25t3ccdCEL0rklCS5TQcjzgOy0uCLhwrVL8vkMtXu/379igPYeI2L8SIwLKVZUZ8Ay GX1GLp7Slt0hI6SJSMNtaoe/X1h9Om9PD5hNQEcu3VK/KNGNUO+oyzm+aasveofNP7uJ woPshZOf2OUmz050L63K34ufy6r6suosaYmL4cVTy5WK5kF0lkfB/whRgAuB44FOzsEA HP+MpAm/erEIFqj1gUgeAQmJ0ufzSyst4KH/MHyvu/Bt6wlqQBtidWtR7fuBIm7tQSFE r0zhD1OF+fUtb82KXMX1Lm8KXnYnbTzsdip1Akwt5eNx1tIMsktY1dr+2uTa/xoWqqUO O9RQ== X-Gm-Message-State: AO0yUKUQBrOJ+7ILWBKWijISVwKtolGNaJUYId5OgT+ko/Z7/ze4c26X wgZuF+XAVSbGl0xYln88sh/WiXD6zB+FAYcf X-Received: by 2002:a5d:56c5:0:b0:2c3:ed18:2e96 with SMTP id m5-20020a5d56c5000000b002c3ed182e96mr2426322wrw.13.1676489132141; Wed, 15 Feb 2023 11:25:32 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y13-20020a5d614d000000b002c5526234d2sm10480314wrt.8.2023.02.15.11.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 11:25:31 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9C6891FFBA; Wed, 15 Feb 2023 19:25:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Michael Roth , Alexander Bulekov , Qiuhao Li , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , qemu-arm@nongnu.org, John Snow , Pavel Dovgalyuk , Darren Kenny , =?utf-8?q?Alex_Benn=C3=A9e?= , Stefan Hajnoczi , Bandan Das , Cleber Rosa , Peter Maydell , Bastian Koppelmann , Yonggang Luo , Li-Wen Hsu , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Beraldo Leal , Ed Maste , Wainer dos Santos Moschetta , Fabiano Rosas , Richard Henderson Subject: [PATCH 02/12] tests/avocado: retire the Aarch64 TCG tests from boot_linux.py Date: Wed, 15 Feb 2023 19:25:20 +0000 Message-Id: <20230215192530.299263-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230215192530.299263-1-alex.bennee@linaro.org> References: <20230215192530.299263-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The two TCG tests for GICv2 and GICv3 are very heavy weight distros that take a long time to boot up, especially for an --enable-debug build. The total code coverage they give is: Overall coverage rate: lines......: 11.2% (59584 of 530123 lines) functions..: 15.0% (7436 of 49443 functions) branches...: 6.3% (19273 of 303933 branches) We already get pretty close to that with the machine_aarch64_virt tests which only does one full boot (~120s vs ~600s) of alpine. We expand the kernel+initrd boot (~8s) to test both GICs and also add an RNG device and a block device to generate a few IRQs and exercise the storage layer. With that we get to a coverage of: Overall coverage rate: lines......: 11.0% (58121 of 530123 lines) functions..: 14.9% (7343 of 49443 functions) branches...: 6.0% (18269 of 303933 branches) which I feel is close enough given the massive time saving. If we want to target any more sub-systems we can use lighter weight more directed tests. Reviewed-by: Fabiano Rosas Acked-by: Richard Henderson Signed-off-by: Alex Bennée Cc: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- v2 - fix checkpatch warning --- tests/avocado/boot_linux.py | 48 ++++---------------- tests/avocado/machine_aarch64_virt.py | 64 ++++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 46 deletions(-) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index b3e58fa309..fe0bb180d9 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -58,52 +58,16 @@ def test_pc_q35_kvm(self): self.launch_and_wait(set_up_ssh_connection=False) -# For Aarch64 we only boot KVM tests in CI as the TCG tests are very -# heavyweight. There are lighter weight distros which we use in the -# machine_aarch64_virt.py tests. +# For Aarch64 we only boot KVM tests in CI as booting the current +# Fedora OS in TCG tests is very heavyweight. There are lighter weight +# distros which we use in the machine_aarch64_virt.py tests. class BootLinuxAarch64(LinuxTest): """ :avocado: tags=arch:aarch64 :avocado: tags=machine:virt - :avocado: tags=machine:gic-version=2 """ timeout = 720 - def add_common_args(self): - 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') - - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') - def test_fedora_cloud_tcg_gicv2(self): - """ - :avocado: tags=accel:tcg - :avocado: tags=cpu:max - :avocado: tags=device:gicv2 - """ - self.require_accelerator("tcg") - self.vm.add_args("-accel", "tcg") - self.vm.add_args("-cpu", "max,lpa2=off") - self.vm.add_args("-machine", "virt,gic-version=2") - self.add_common_args() - self.launch_and_wait(set_up_ssh_connection=False) - - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') - def test_fedora_cloud_tcg_gicv3(self): - """ - :avocado: tags=accel:tcg - :avocado: tags=cpu:max - :avocado: tags=device:gicv3 - """ - self.require_accelerator("tcg") - self.vm.add_args("-accel", "tcg") - self.vm.add_args("-cpu", "max,lpa2=off") - self.vm.add_args("-machine", "virt,gic-version=3") - self.add_common_args() - self.launch_and_wait(set_up_ssh_connection=False) - def test_virt_kvm(self): """ :avocado: tags=accel:kvm @@ -112,7 +76,11 @@ def test_virt_kvm(self): self.require_accelerator("kvm") self.vm.add_args("-accel", "kvm") self.vm.add_args("-machine", "virt,gic-version=host") - self.add_common_args() + 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') self.launch_and_wait(set_up_ssh_connection=False) diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py index c2b2ba2cf8..60921fed8b 100644 --- a/tests/avocado/machine_aarch64_virt.py +++ b/tests/avocado/machine_aarch64_virt.py @@ -10,11 +10,14 @@ import time import os +import logging from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command from avocado_qemu import BUILD_DIR +from avocado.utils import process +from avocado.utils.path import find_command class Aarch64VirtMachine(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' @@ -65,16 +68,15 @@ def test_alpine_virt_tcg_gic_max(self): self.wait_for_console_pattern('Welcome to Alpine Linux 3.16') - def test_aarch64_virt(self): + def common_aarch64_virt(self, machine): """ - :avocado: tags=arch:aarch64 - :avocado: tags=machine:virt - :avocado: tags=accel:tcg - :avocado: tags=cpu:max + Common code to launch basic virt machine with kernel+initrd + and a scratch disk. """ + logger = logging.getLogger('aarch64_virt') + kernel_url = ('https://fileserver.linaro.org/s/' 'z6B2ARM7DQT3HWN/download') - kernel_hash = 'ed11daab50c151dde0e1e9c9cb8b2d9bd3215347' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -83,13 +85,63 @@ def test_aarch64_virt(self): 'console=ttyAMA0') self.require_accelerator("tcg") self.vm.add_args('-cpu', 'max,pauth-impdef=on', + '-machine', machine, '-accel', 'tcg', '-kernel', kernel_path, '-append', kernel_command_line) + + # A RNG offers an easy way to generate a few IRQs + self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0') + self.vm.add_args('-object', + 'rng-random,id=rng0,filename=/dev/urandom') + + # Also add a scratch block device + logger.info('creating scratch qcow2 image') + image_path = os.path.join(self.workdir, 'scratch.qcow2') + qemu_img = os.path.join(BUILD_DIR, 'qemu-img') + if not os.path.exists(qemu_img): + qemu_img = find_command('qemu-img', False) + if qemu_img is False: + self.cancel('Could not find "qemu-img", which is required to ' + 'create the temporary qcow2 image') + cmd = '%s create -f qcow2 %s 8M' % (qemu_img, image_path) + process.run(cmd) + + # Add the device + self.vm.add_args('-blockdev', + f"driver=qcow2,file.driver=file," + f"file.filename={image_path},node-name=scratch") + self.vm.add_args('-device', + 'virtio-blk-device,drive=scratch') + self.vm.launch() self.wait_for_console_pattern('Welcome to Buildroot') time.sleep(0.1) exec_command(self, 'root') time.sleep(0.1) + exec_command(self, 'dd if=/dev/hwrng of=/dev/vda bs=512 count=4') + time.sleep(0.1) + exec_command(self, 'md5sum /dev/vda') + time.sleep(0.1) + exec_command(self, 'cat /proc/interrupts') + time.sleep(0.1) exec_command(self, 'cat /proc/self/maps') time.sleep(0.1) + + def test_aarch64_virt_gicv3(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:virt + :avocado: tags=accel:tcg + :avocado: tags=cpu:max + """ + self.common_aarch64_virt("virt,gic_version=3") + + def test_aarch64_virt_gicv2(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:virt + :avocado: tags=accel:tcg + :avocado: tags=cpu:max + """ + self.common_aarch64_virt("virt,gic-version=2")