From patchwork Mon Mar 28 16:13:57 2022 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: 554818 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp8709549mag; Mon, 28 Mar 2022 09:14:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRbeIX02N49nFOX3C7N0Cf5b/1f0plsuPeWskdQxqzjcdXEMjE+OKm+CP0Pyd4uWqfldid X-Received: by 2002:a81:9104:0:b0:2e5:b044:2ac2 with SMTP id i4-20020a819104000000b002e5b0442ac2mr26529042ywg.498.1648484096543; Mon, 28 Mar 2022 09:14:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648484096; cv=none; d=google.com; s=arc-20160816; b=hZadz0ebZpAF/ycJ1fq9It8rhCNqQ5cPdCyMYAoa7rvgMTzHRcu44AKwriAMRKLM5L H+Ky1rRnZgwSwSA2UCLZYLyATmYFUj6TFb3yggxNoKebsRnESQfc5OHZSO51cF8jq/H7 ql3mZJbNyJIeRdhpIMYOSFTfwJox8Vi4sWiyhwknhPTX0SBA4A8+wldMD+WQjluzWWW9 bDDEL78LedVZtx5joG7B90x/uxeo8jeT+BovKZ7dER6g0t37Zw04+qWlUpiRH8dDQDlb ujI1sSlubKKq2U0BNwm9CIhY52rGyYvo9DNRAZcddCYMP068mNwFi7ifI7DO3pIwK/Z8 jtsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=aKpBv3U0hobzkCwe2ZAGwg6ApjZd5S9HLueRuddE1qg=; b=j3T2OeZItGIshfUg7gAOMJu+bCWCpcOcPJNGvWGLWtRQBQArL4hG/GSgSQ0NPq4nnZ ERFz2a1EuQH94pPygADUE4I99+au3DLvaz8h4wwiv2BNyse8IsU+RbnnR4K7m8jDFVBx zLQV+MwZOx4/MI5uQ0sCLVl2CqoVtDss5ZSyK3/nGgTooa67PaRxSyt3aTm++PFn5Nz7 RKpiHbGfC1S2uROpjK2//aqKIvTlVhh4A3bYLfYS3ZNx8OG9rnYsauJANOWfEsYP+Bj1 DQtcadrjcfVv82KX98+HTWVNqAq6BJpbzwAXagPQtVMCdZXotu8W78gbVDP6g5Emjxwl dOcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ok94tF4X; 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=fail (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 84-20020a251857000000b00633994045c9si13095909yby.563.2022.03.28.09.14.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Mar 2022 09:14:56 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b=Ok94tF4X; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYs1A-0003dM-29 for patch@linaro.org; Mon, 28 Mar 2022 12:14:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYs0N-0003cn-R4 for qemu-devel@nongnu.org; Mon, 28 Mar 2022 12:14:07 -0400 Received: from [2a00:1450:4864:20::530] (port=45809 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYs0L-0000et-Ry for qemu-devel@nongnu.org; Mon, 28 Mar 2022 12:14:07 -0400 Received: by mail-ed1-x530.google.com with SMTP id u26so17492980eda.12 for ; Mon, 28 Mar 2022 09:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aKpBv3U0hobzkCwe2ZAGwg6ApjZd5S9HLueRuddE1qg=; b=Ok94tF4X62f0h1lxr/08ALmUHVpp1FTSfBJWaiDGIfo/GDpZVWQ4xh+wPE1iuqh9EN t66xXyL1j4RRrpX6JstehIqcUDR31fT9AtaSybuxFXCmGbc7LajwUPaUfMVt7V+edfq1 0NvcRqKiPYD/CBHAxWamxikRt/+E7FS2fpmXMKxswCyo7PJ59i2SA52bft6E49OCbTCy mxQce4gWK0V3tQoUNW37H91UIQBchCU9K81cbW02kPbCa0+DXsKkVcKDNVdW19a01Qla Zj7TVxpo08ZBcpMG+rSUOdrCT7RG3W6xrbll7/WyAZwMwbVtzyiv3m2o4xlQWfZe+CLu RodQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aKpBv3U0hobzkCwe2ZAGwg6ApjZd5S9HLueRuddE1qg=; b=rF9DE9ddZExk5Fl0H4tg8CFKkLgxdc/MaAKx3KwatlKD8FfrOXiW3o1uUtOObyMnnS hesZX1G6sLtHZM/RC1SWf+I+7TpPP19e6ti9F+Dr1lr4OlNMWpoABOPeB7wHZc7Jhc11 qgmtP8B5GRQHJYNPDq59SgXp5hDlJrYocBQQQZFj4zaZdO7mif6KLW0fHAWlj4kPaYul 9IFjFYNTdzUd3CPazqChYqCp4EPtUkzvyJsyYXCZa+Q38HhrgmQDSSWCZR6DHIFvYhei 4YpWuSdZxA8rVzPfVfI3WF8L3si7rqon1p4VuNH93tMyUjnffS5bn3/Krs2q1KeDDIJW 8/kw== X-Gm-Message-State: AOAM533QPFnTv60s2tL264FXHjaC71+lpu4me4QxuUQj0yKjAf3NO+MS FmB4ZNC8EK+wbnuCNmtMCRzMfw== X-Received: by 2002:a05:6402:278d:b0:419:3794:de39 with SMTP id b13-20020a056402278d00b004193794de39mr17150898ede.137.1648484042873; Mon, 28 Mar 2022 09:14:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id rh26-20020a17090720fa00b006e0da7ef847sm3139597ejb.13.2022.03.28.09.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 09:14:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EE39A1FFB7; Mon, 28 Mar 2022 17:14:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3] tests/avocado: update aarch64_virt test to exercise -cpu max Date: Mon, 28 Mar 2022 17:13:57 +0100 Message-Id: <20220328161357.2464572-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Peter Maydell , Beraldo Leal , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , "open list:Virt" , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The Fedora 29 kernel is quite old and importantly fails when running in LPA2 scenarios. As it's not really exercising much of the CPU space replace it with a custom 5.16.12 kernel with all the architecture options turned on. There is a minimal buildroot initramfs included in the kernel which has a few tools for stress testing the memory subsystem. The userspace also targets the Neoverse N1 processor so would fail with a v8.0 cpu like cortex-a53. While we are at it move the test into its own file so it can have an assigned maintainer. Signed-off-by: Alex Bennée Acked-by: Richard Henderson Tested-by: Richard Henderson Message-Id: <20220315121251.2280317-3-alex.bennee@linaro.org> --- v2 - move test into own machine file v3 - minor reword of commit, added tags --- MAINTAINERS | 1 + tests/avocado/boot_linux_console.py | 25 ------------- tests/avocado/machine_aarch64_virt.py | 51 +++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 tests/avocado/machine_aarch64_virt.py diff --git a/MAINTAINERS b/MAINTAINERS index cc364afef7..4fd1c2c955 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -942,6 +942,7 @@ S: Maintained F: hw/arm/virt* F: include/hw/arm/virt.h F: docs/system/arm/virt.rst +F: tests/avocado/machine_aarch64_virt.py Xilinx Zynq M: Edgar E. Iglesias diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index b40a3abc81..45a2ceda22 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -325,31 +325,6 @@ def test_mips_malta32el_nanomips_64k_dbg(self): kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180' self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) - def test_aarch64_virt(self): - """ - :avocado: tags=arch:aarch64 - :avocado: tags=machine:virt - :avocado: tags=accel:tcg - :avocado: tags=cpu:cortex-a53 - """ - kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' - '/linux/releases/29/Everything/aarch64/os/images/pxeboot' - '/vmlinuz') - kernel_hash = '8c73e469fc6ea06a58dc83a628fc695b693b8493' - kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) - - self.vm.set_console() - kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + - 'console=ttyAMA0') - self.require_accelerator("tcg") - self.vm.add_args('-cpu', 'cortex-a53', - '-accel', 'tcg', - '-kernel', kernel_path, - '-append', kernel_command_line) - self.vm.launch() - console_pattern = 'Kernel command line: %s' % kernel_command_line - self.wait_for_console_pattern(console_pattern) - def test_aarch64_xlnx_versal_virt(self): """ :avocado: tags=arch:aarch64 diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py new file mode 100644 index 0000000000..21848cba70 --- /dev/null +++ b/tests/avocado/machine_aarch64_virt.py @@ -0,0 +1,51 @@ +# Functional test that boots a Linux kernel and checks the console +# +# Copyright (c) 2022 Linaro Ltd. +# +# Author: +# Alex Bennée +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import time + +from avocado_qemu import QemuSystemTest +from avocado_qemu import wait_for_console_pattern +from avocado_qemu import exec_command + +class Aarch64VirtMachine(QemuSystemTest): + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' + + def wait_for_console_pattern(self, success_message, vm=None): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + + def test_aarch64_virt(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:virt + :avocado: tags=accel:tcg + :avocado: tags=cpu:max + """ + kernel_url = ('https://fileserver.linaro.org/s/' + 'z6B2ARM7DQT3HWN/download') + + kernel_hash = 'ed11daab50c151dde0e1e9c9cb8b2d9bd3215347' + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'console=ttyAMA0') + self.require_accelerator("tcg") + self.vm.add_args('-cpu', 'max,pauth-impdef=on', + '-accel', 'tcg', + '-kernel', kernel_path, + '-append', kernel_command_line) + 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, 'cat /proc/self/maps') + time.sleep(0.1)