From patchwork Tue Feb 14 15:38:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13140427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B617AC64EC7 for ; Tue, 14 Feb 2023 15:39:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.495214.765500 (Exim 4.92) (envelope-from ) id 1pRxOT-0001ap-UF; Tue, 14 Feb 2023 15:38:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 495214.765500; Tue, 14 Feb 2023 15:38:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOT-0001af-PW; Tue, 14 Feb 2023 15:38:57 +0000 Received: by outflank-mailman (input) for mailman id 495214; Tue, 14 Feb 2023 15:38:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOR-0001Wo-Va for xen-devel@lists.xenproject.org; Tue, 14 Feb 2023 15:38:55 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2061f.outbound.protection.outlook.com [2a01:111:f400:fe59::61f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ad369242-ac7d-11ed-93b5-47a8fe42b414; Tue, 14 Feb 2023 16:38:51 +0100 (CET) Received: from BN7PR02CA0033.namprd02.prod.outlook.com (2603:10b6:408:20::46) by DM4PR12MB7717.namprd12.prod.outlook.com (2603:10b6:8:103::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Tue, 14 Feb 2023 15:38:47 +0000 Received: from BN8NAM11FT086.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::ef) by BN7PR02CA0033.outlook.office365.com (2603:10b6:408:20::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24 via Frontend Transport; Tue, 14 Feb 2023 15:38:47 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT086.mail.protection.outlook.com (10.13.176.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6086.26 via Frontend Transport; Tue, 14 Feb 2023 15:38:47 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 14 Feb 2023 09:38:47 -0600 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Tue, 14 Feb 2023 09:38:46 -0600 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ad369242-ac7d-11ed-93b5-47a8fe42b414 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ta12bThNphkHAZydVdUXkmkG+JwwTOkoadommGHiD09IgXjBBW1by0fzbhKxRCeNEDtkCe/f7JNLvSFvGLDfH7T2oKFPtvuUNWeJkvxVZ2MFPwMBdb5hqHXvaLGl2gAfE3AAQIDNbwqzqjGAqfEKJvsuJ3H82rJc7rWW6YoT6LbxBItvXAvxU0piVqIUDF42q6EIywqDUP3R46zBF5RsW6XNd/4D+UzJ2Av9OfvHsYPYhmxlVV82x5leqaV9pnd9CpLFubFHUwxUGUyR6t4RL6uqTYCPkLJ8m6nAi8xRrKQ5Dlr9PEJ1Ey18klw4/yG/vY+Y0iS3HJwhkRMkO6Myjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YBMwFXs2iyyGl7+YYdai6PnoFQtpNzal7lo6WSR2gU0=; b=C0i1AqZgTIYFelYLmlb0yG/1xCQZiMtvuZilf4g8Zd0zSILEPRdhYXsF0ONkQr1vjUVi0KiewihkjGosS0ZvVLJfBiV3YSlsXbRFEpoJ+sY2FTioV0KoXund+QhKpWZUIcjKDJntQu6KaM6sm3jYv5UaotpVVE5df004+RmieZtZaBOlkWylnbZ08WbSA98V/tuCoTEDwe8m6NKcNr3z7/APqYsi9hpriWvGRPOT8TTe1HBM+s0iBgzTclyQODaKGGTjmawRYRwf6umjHhBtisDGtm6htN3BrWnm4KhopNIE37rSL+HAf9XGWcvATkrzPK9UvAHoxRQQI+p2HW5xJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YBMwFXs2iyyGl7+YYdai6PnoFQtpNzal7lo6WSR2gU0=; b=vUMomFGwdZLrE0Y/RmFqvyrnm72ATArsasPi4an4hZDN6K9KzgciqVF4T6Up9Tsl7LtRpdy63ycgLMn4OniIB3RaXPmqYAlGontOi2iye7FNsxqdjjmxDqc6UHPVCPrvHwPdD1q2XMtMsk/BHJZJ7Ll6tpBn9OdOBhZ2crbtf7A= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Doug Goldstein , Stefano Stabellini , Subject: [PATCH v2 1/5] automation: Switch arm32 cross builds to run on arm64 Date: Tue, 14 Feb 2023 16:38:38 +0100 Message-ID: <20230214153842.15637-2-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230214153842.15637-1-michal.orzel@amd.com> References: <20230214153842.15637-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT086:EE_|DM4PR12MB7717:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a065924-8f57-4207-fa46-08db0ea19043 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sYuq54mPUTnDagYjCATStV04epwf+GdG6DSKT3nWOfLnaIFhsVK+Hn++JIVwUyzU8Y4I1c/S4xGH4NHcPNO+7x5OsqPwWN6hH5l9G+mwBBXlRdiv3k9q/1VcR6/jwwUs/TuqpL706cobJILoDmL5FRTieacXzSMZEOVF00cYx+p7t7QSRV1qJqkmJ3TNbUjZ48DyE8FKwhy3v3UEokdSxjVnE0SX7ocehtCZWb91nQ91uQltJnlCzXuOcbtgB+YxW6dIaldVpbNvz/GqSL4mQaZ8jmYJi9gSCbHTgsHwJJWK8DSaBlpwJxCAYj4Pr2lPwW2l/JE6Zk71ncbXi9QHwnBCWCX0dSLufFw3e9LImuMhztff2FCAljvhZgSC8DdRHRQc/Tmr97l3nCglM+UKn7RVN/eW/JMpnjOWqu5v2PgU85OTp8LSP4zjHKPmVWQS/QFAAoqNAsH4Jo2GOl4GuTQNbG6hG9v+ItFPiz2vEV9vKCwD5S94Fkn3wXgjqDLcJ+eydkbxnY20v7Dn2f17Gkm11+94ymT/MGOt7XG8DhZANmmxy+AUAriSbF9WfalgtQ7FoC/GDcHn3Qxb7yPi2dKwoOknjA7E296EV3RTGkrU+tw7M8EH7U0fofBdFScgeA4eAPg2OGAT8iMqFHplLdtUx2glMf/UlQ0bHGhYcG9EjPOQiF09+c5N2e9P4b/8JZm4WikEL5gFo8wbdUWk7cF/ZuqPIfRQWg1/d7veuio= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(396003)(39860400002)(136003)(376002)(346002)(451199018)(46966006)(36840700001)(40470700004)(336012)(26005)(186003)(36756003)(82310400005)(2616005)(478600001)(86362001)(426003)(83380400001)(47076005)(1076003)(6666004)(54906003)(316002)(40480700001)(4326008)(41300700001)(36860700001)(8676002)(6916009)(8936002)(70586007)(5660300002)(70206006)(44832011)(2906002)(356005)(81166007)(40460700003)(82740400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 15:38:47.5486 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5a065924-8f57-4207-fa46-08db0ea19043 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT086.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7717 Due to the limited x86 CI resources slowing down the whole pipeline, switch the arm32 cross builds to be executed on arm64 which is much more capable. For that, rename the existing debian container dockerfile from unstable-arm32-gcc to unstable-arm64v8-arm32-gcc and use arm64v8/debian:unstable as an image. Note, that we cannot use the same container name as we have to keep the backwards compatibility. Take the opportunity to remove extra empty line at the end of a file. Modify the tag of .arm32-cross-build-tmpl to arm64 and update the build jobs accordingly. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - new patch For convenience and own testing, I built and pushed the new container to registry. --- ...ockerfile => unstable-arm64v8-arm32-gcc.dockerfile} | 3 +-- automation/gitlab-ci/build.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) rename automation/build/debian/{unstable-arm32-gcc.dockerfile => unstable-arm64v8-arm32-gcc.dockerfile} (94%) diff --git a/automation/build/debian/unstable-arm32-gcc.dockerfile b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile similarity index 94% rename from automation/build/debian/unstable-arm32-gcc.dockerfile rename to automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile index b41a57f19729..11860425a6a2 100644 --- a/automation/build/debian/unstable-arm32-gcc.dockerfile +++ b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile @@ -1,4 +1,4 @@ -FROM debian:unstable +FROM arm64v8/debian:unstable LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" @@ -21,4 +21,3 @@ RUN apt-get update && \ apt-get autoremove -y && \ apt-get clean && \ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index a053c5c7325d..f8e156e0a994 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -123,7 +123,7 @@ variables: XEN_TARGET_ARCH: arm32 tags: - - x86_64 + - arm64 .arm32-cross-build: extends: .arm32-cross-build-tmpl @@ -542,26 +542,26 @@ alpine-3.12-clang-debug: debian-unstable-gcc-arm32: extends: .gcc-arm32-cross-build variables: - CONTAINER: debian:unstable-arm32-gcc + CONTAINER: debian:unstable-arm64v8-arm32-gcc HYPERVISOR_ONLY: y debian-unstable-gcc-arm32-debug: extends: .gcc-arm32-cross-build-debug variables: - CONTAINER: debian:unstable-arm32-gcc + CONTAINER: debian:unstable-arm64v8-arm32-gcc HYPERVISOR_ONLY: y debian-unstable-gcc-arm32-randconfig: extends: .gcc-arm32-cross-build variables: - CONTAINER: debian:unstable-arm32-gcc + CONTAINER: debian:unstable-arm64v8-arm32-gcc HYPERVISOR_ONLY: y RANDCONFIG: y debian-unstable-gcc-arm32-debug-randconfig: extends: .gcc-arm32-cross-build-debug variables: - CONTAINER: debian:unstable-arm32-gcc + CONTAINER: debian:unstable-arm64v8-arm32-gcc HYPERVISOR_ONLY: y RANDCONFIG: y From patchwork Tue Feb 14 15:38:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13140429 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6277C64ED6 for ; Tue, 14 Feb 2023 15:39:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.495216.765513 (Exim 4.92) (envelope-from ) id 1pRxOU-0001un-Ns; Tue, 14 Feb 2023 15:38:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 495216.765513; Tue, 14 Feb 2023 15:38:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOU-0001s6-KS; Tue, 14 Feb 2023 15:38:58 +0000 Received: by outflank-mailman (input) for mailman id 495216; Tue, 14 Feb 2023 15:38:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOS-0001Wo-LF for xen-devel@lists.xenproject.org; Tue, 14 Feb 2023 15:38:56 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20604.outbound.protection.outlook.com [2a01:111:f400:fe59::604]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ada5c1cc-ac7d-11ed-93b5-47a8fe42b414; Tue, 14 Feb 2023 16:38:51 +0100 (CET) Received: from BN0PR04CA0060.namprd04.prod.outlook.com (2603:10b6:408:e8::35) by CH0PR12MB8530.namprd12.prod.outlook.com (2603:10b6:610:188::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Tue, 14 Feb 2023 15:38:49 +0000 Received: from BN8NAM11FT114.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e8:cafe::6c) by BN0PR04CA0060.outlook.office365.com (2603:10b6:408:e8::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26 via Frontend Transport; Tue, 14 Feb 2023 15:38:49 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT114.mail.protection.outlook.com (10.13.177.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6086.24 via Frontend Transport; Tue, 14 Feb 2023 15:38:48 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 14 Feb 2023 09:38:48 -0600 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Tue, 14 Feb 2023 09:38:47 -0600 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ada5c1cc-ac7d-11ed-93b5-47a8fe42b414 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BF5LUlnLZeDKb1dPvjs9bGBH1HIAYaIW031oJAxemT+tLUngvPI1V4uil/vn9ghsVnE4BjfqTrY4xLSG5lvILXgtxk+ztagkdDmP/607RM+V8Y4YU2gfz7WPBDFoKru1/GGAECnJ5ibwPFXIqtRPiJCQz7VVol765d9jSAtiAFZ2O9H6CscYDsw9JIo6x+uC4QR/Fpv88DdUt6ah+uZ1ZUocOsEV9fbEgPFE2BXeeUsrKHe8LAjnR0V3WTpDK1NKKgkPIXg/A/hQTLTB/oO42NzKO+AbAYaTc7xjiVPQh2VWQwxV7YzgJ7fyuTf1ntEH/X7vJBYgCbIIDjcXHhBVIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TzwAM6S/ZDvUz+GhVuoZK+2MU6N8kVAHfsdpOWO3UmA=; b=XYvu+QaWaznZ85rCfYJ5T9WTFrx7GCtk+h2ZHlh+M78H2L4jVHeqeGAfqanusmbI3nuF0IvZYUjre4jxZyaRN3UILeMuwP3NLLzWWiqVaI063DkgAwIMxsNEEujC0ErjquAux+sNG22uIfso8mJ/4X19iQKDa7WqHFQTNBVG0V2gl96w2uwkC0nj8s4drfe0yuootf2s5wJxW/Kybsn+Mfirp9oTpEFfJGYLuZL1BZnOWfuHU3JLnadCzpPp9mzvoxzU0T6vCzGgxRBvcOU7n8QFpp9EzipnXf1YW7ua1Pw508nPAAQDIvtx7iVR/eaDcbc3o9w/75XXNPSf63sFeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TzwAM6S/ZDvUz+GhVuoZK+2MU6N8kVAHfsdpOWO3UmA=; b=btNP785clnkVLCGWypCHINfsJHVFsuqw0/7MgNYaFCo3PZZu/OBrCXAc2ON/PSrKxtm0TgYQ6rEleddmob+RGJ5UWyGhoT3dEEB/85rIF/yMtbsxXcHsYOFOcibGLVd1TvNK1KHJy4fXVqPes3i5EI5oOP7bCj+2BFgIOJFnbes= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 2/5] automation: Add arm32 dom0less testing Date: Tue, 14 Feb 2023 16:38:39 +0100 Message-ID: <20230214153842.15637-3-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230214153842.15637-1-michal.orzel@amd.com> References: <20230214153842.15637-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT114:EE_|CH0PR12MB8530:EE_ X-MS-Office365-Filtering-Correlation-Id: 55d2efce-5a7a-4867-395a-08db0ea19100 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 36kciKjGiw4YZnxNNGTb6QFwXu88MwyAkFt5pd77bSi0hsynGQ/XhDilxS/s9O7fSZvPUtHooyeT9xN+n95I+0RfJM+YD5BYyP4XiY4SILLaXxw1G16MFPj9h453s85YD7tbnG/wUtIBscGi0pWIL1JI2DGPcjeMalO4ZKPiX9pdhrGw+Hzz1rq8EEkMoDVj8MiFJntNIMYfluF8BzIcOdJ3NnIsYETDD1Iw6E/Koq3wGMfr1EgJTJoIBewkX2so2MZ/77NZIhnMznDJkDoInc2PnAX+yVDzUztNr6GboItyp50kcxgVWocQbDfzRHG6Q5L5H9Zyc5/1lFpad8ZdK9Z74lzpqEujZQC9tJDYPESHdOD2LF43SMbUqdASdurXTjFvvFyUPuTnjtf5ued3DtKx684RcgWS2lnC4t+GVgXsnkWJkN4Dc2ZCecAY4n7MdcjFMMcou6FaN2BwZ11dQ/A2hGT2F7t4XYXxk92OBgh5Nlypvn0WOKQPexQRyQbdMoWzktvegZlKLttAdoufxFFjLBWN/xYMNOEOPZlM8ePoITu9uta9/b9/dpwNpVARgXjp7vvK9/mTsR9dxPpKyI1Tm4s1CSRpKSD3ilCw9sjkkU2nZEOdfX+hkwMwuSDfjrCHoSe7uCh/JEgfblfcemGrTbDoAx/Nm5eqUZc4MmB708NVGvYNBxZJn9BNzwCgpB0pJHJRiBfn7Ic2Sjrf6eXLFhhALst3IvLxu9cP/8JjB8mb4OOBCD1ToTAMIz5UE9gQOza+CPziTTCAW60GsehOAkShSN8qFxrRmBbscNGnpen8sRhO+Fu7Ikd/RmqbJaucFRqTlNE0qHjLByjjzA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(396003)(39860400002)(376002)(136003)(346002)(451199018)(40470700004)(36840700001)(46966006)(26005)(186003)(2616005)(6666004)(316002)(478600001)(336012)(966005)(70206006)(70586007)(8676002)(4326008)(54906003)(356005)(83380400001)(1076003)(5660300002)(36860700001)(8936002)(44832011)(41300700001)(82740400003)(2906002)(81166007)(6916009)(82310400005)(86362001)(36756003)(426003)(47076005)(40460700003)(40480700001)(32563001)(21314003)(36900700001)(139555002);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 15:38:48.7822 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55d2efce-5a7a-4867-395a-08db0ea19100 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT114.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8530 At the moment, we only perform a single arm32 test in our CI, checking whether dom0 boots successfully or not. This is mostly because we do not have any arm32 runners and we only execute a hypervisor only build. In order not to leave the arm32 testing in such a poor state, add a script qemu-smoke-dom0less-arm32.sh to start testing dom0less configuration, while keeping dom0 to make the test more interesting. The script is mostly based on the one used for dom0 arm32 testing as well as the one used for dom0less arm64 testing. We obtain Debian Bullseye kernel and Alpine Linux busybox-based rootfs. Depending on the test variant, we prepare a test case contained within domU_check variable, that will be executed as part of /init script from domU rootfs. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - keep dom0 around by default to make tests more interesting --- automation/gitlab-ci/test.yaml | 16 +++ .../scripts/qemu-smoke-dom0less-arm32.sh | 99 +++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100755 automation/scripts/qemu-smoke-dom0less-arm32.sh diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ce543ef5c0ef..84ab1fee50a4 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -210,6 +210,22 @@ qemu-smoke-dom0-arm32-gcc-debug: - *arm32-test-needs - debian-unstable-gcc-arm32-debug +qemu-smoke-dom0less-arm32-gcc: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32 + +qemu-smoke-dom0less-arm32-gcc-debug: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32-debug + qemu-alpine-x86_64-gcc: extends: .qemu-x86-64 script: diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh new file mode 100755 index 000000000000..e3f2b28f3f89 --- /dev/null +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -0,0 +1,99 @@ +#!/bin/bash + +set -ex + +test_variant=$1 + +# Prompt to grep for to check if dom0 booted successfully +dom0_prompt="^/ #" + +cd binaries +# Use the kernel from Debian +curl --fail --silent --show-error --location --output vmlinuz https://deb.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/netboot/vmlinuz +# Use a tiny initrd based on busybox from Alpine Linux +curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15.1-armhf.tar.gz + +if [ -z "${test_variant}" ]; then + passed="generic test passed" + domU_check=" +echo \"${passed}\" +" +fi + +# dom0/domU rootfs +# We are using the same rootfs for dom0 and domU. The only difference is +# that for the former, we set explictly rdinit to /bin/sh, whereas for the +# latter we rely on using custom /init script with test case inside. +mkdir rootfs +cd rootfs +tar xvzf ../initrd.tar.gz +echo "#!/bin/sh + +mount -t proc proc /proc +mount -t sysfs sysfs /sys +mount -t devtmpfs devtmpfs /dev +${domU_check} +/bin/sh" > init +chmod +x init +find . | cpio -H newc -o | gzip > ../initrd.gz +cd .. + +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded +curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom +./qemu-system-arm \ + -machine virt \ + -machine virtualization=true \ + -smp 4 \ + -m 2048 \ + -serial stdio \ + -monitor none \ + -display none \ + -machine dumpdtb=virt.dtb + +# ImageBuilder +echo 'MEMORY_START="0x40000000" +MEMORY_END="0xC0000000" + +DEVICE_TREE="virt.dtb" +XEN="xen" +XEN_CMD="console=dtuart dom0_mem=512M bootscrub=0" + +DOM0_KERNEL="vmlinuz" +DOM0_RAMDISK="initrd.gz" +DOM0_CMD="console=hvc0 earlyprintk clk_ignore_unused root=/dev/ram0 rdinit=/bin/sh" + +DOMU_KERNEL[0]="vmlinuz" +DOMU_RAMDISK[0]="initrd.gz" +DOMU_MEM[0]="512" +NUM_DOMUS=1 + +LOAD_CMD="tftpb" +BOOT_CMD="bootm" +UBOOT_SOURCE="boot.source" +UBOOT_SCRIPT="boot.scr"' > config + +rm -rf imagebuilder +git clone https://gitlab.com/ViryaOS/imagebuilder +bash imagebuilder/scripts/uboot-script-gen -t tftp -d . -c config + +# Run the test +rm -f smoke.serial +set +e +echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ +timeout -k 1 240 \ +./qemu-system-arm \ + -machine virt \ + -machine virtualization=true \ + -smp 4 \ + -m 2048 \ + -serial stdio \ + -monitor none \ + -display none \ + -no-reboot \ + -device virtio-net-pci,netdev=n0 \ + -netdev user,id=n0,tftp=./ \ + -bios /usr/lib/u-boot/qemu_arm/u-boot.bin |& tee smoke.serial + +set -e +(grep -q "${dom0_prompt}" smoke.serial && grep -q "${passed}" smoke.serial) || exit 1 +exit 0 From patchwork Tue Feb 14 15:38:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13140426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 34B4BC05027 for ; Tue, 14 Feb 2023 15:39:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.495213.765493 (Exim 4.92) (envelope-from ) id 1pRxOT-0001XL-JY; Tue, 14 Feb 2023 15:38:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 495213.765493; Tue, 14 Feb 2023 15:38:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOT-0001XE-Gg; Tue, 14 Feb 2023 15:38:57 +0000 Received: by outflank-mailman (input) for mailman id 495213; Tue, 14 Feb 2023 15:38:55 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOR-0001Wn-H1 for xen-devel@lists.xenproject.org; Tue, 14 Feb 2023 15:38:55 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on20600.outbound.protection.outlook.com [2a01:111:f400:7eae::600]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id af75abb3-ac7d-11ed-933c-83870f6b2ba8; Tue, 14 Feb 2023 16:38:54 +0100 (CET) Received: from BN8PR07CA0020.namprd07.prod.outlook.com (2603:10b6:408:ac::33) by PH7PR12MB7844.namprd12.prod.outlook.com (2603:10b6:510:27b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Tue, 14 Feb 2023 15:38:50 +0000 Received: from BN8NAM11FT016.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ac:cafe::3a) by BN8PR07CA0020.outlook.office365.com (2603:10b6:408:ac::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26 via Frontend Transport; Tue, 14 Feb 2023 15:38:50 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT016.mail.protection.outlook.com (10.13.176.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6086.26 via Frontend Transport; Tue, 14 Feb 2023 15:38:50 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 14 Feb 2023 09:38:49 -0600 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Tue, 14 Feb 2023 09:38:48 -0600 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: af75abb3-ac7d-11ed-933c-83870f6b2ba8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l76iyEkYIughuGzCdunfHXJJDhYmt9tTpraRDyFf5LbzYUY/SJZI1CHz4aeDBthRZNhv8dx4TMJwipE7OcSaeotw4sH+U3P9RFr7XF6QkvxOKH5sDkklbDILiLO12HI0IowsUMUh0I/E99x2RvBpl1CZBilVv/kSXLzXT0HjXNhIK9mdBcvuXfKq6lEQEKxiTNiuY856XIxV+8LAFNzMlMXncrUZbXFVW89iVKJIZE6YaqVymxpSPgKLZhgQpELDknx+aI0lTN8TcJqs7gDGjKEONGQpo7TbzmEGjWBT1rTmNk2rIPrcsnB+Iq5G0vJLliAwes2uh8bsW2kUDHU0ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b0EpUoqR8Ti6mMX8h1TX8yK7lQ2ly00UlOlPVf05D8M=; b=czo20orL9s8AmhbE3L5FxpS7UVgk0utDi8z3rbqWjdOMnfUj588cJrOC2LzqsmFe0pstcHGWsSilJFV7wPp7gEXflXZy2DWB9tzGhNx4QtL1UpCMg8gns6yzeZl1NAtoGlfPb4doK/76mEZdmpCy/U6zR2/HiyxkOSZ8bTQaQqBxrkhRoilz+jrqPwDJfUUcN1ZU6D3kzuIHbVmOvPTTN+PMU52H9UG8IrpeBAjXeBFkGF7UXfveBk6m2q649/fuzyD8V0uSL3cVEWFY0r0bvLBnYxDJIhR1MLzClk07dzpQCTMeQjIqcFCSEKGMniVukmf7V8r0cINDvFm8/XMB3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b0EpUoqR8Ti6mMX8h1TX8yK7lQ2ly00UlOlPVf05D8M=; b=AcxtLSPSg+WzlrhYkiwSTxzJPIjZReHAzDdciY8sl8skDH7fXdLQ9qno7xkrDrQCUeC8FTM6V1E8h8yHqSPGXHGHerZ6b4Tcj5bExgsiuzil0YjSzapWkdtUQ7F7polm2DDz/HIoUlLt/4mAp0GPdyCZw6NXbrm3clQiCKLn26E= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 3/5] automation: Add a static memory allocation test on arm32 Date: Tue, 14 Feb 2023 16:38:40 +0100 Message-ID: <20230214153842.15637-4-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230214153842.15637-1-michal.orzel@amd.com> References: <20230214153842.15637-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT016:EE_|PH7PR12MB7844:EE_ X-MS-Office365-Filtering-Correlation-Id: a850e441-3bab-4253-0c6d-08db0ea191c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tAI1zthRDMO5RkWh29zxkBPijJagfdHvAcwxWx5N0EyRJmEs9bN32OB2oMswlzp5qWpdx7rjO1SE4gUpYJLc5N1Boh3EUTxgaWYWVv9posXW/6aPPgLfzq8t7acl3WBrixe36ikxNx6nfdbJ60vufY1mkvTBIbKxN4ZwuniU/WqYkVuSBzasnJQOvoc8uf2lB+D9zXsKQ/K4yP5ADizja/aMtrB+EDlEuLemdaYSaE7iYvscdHgp3tRnxzHtyUQEqhc/F+jYqK4jrDLald1QHOBUJRf8V6mUOcyEY+sFRZflHEKiKF9jB9lBGeepSAs/s+gauMxtTogjT8eNP7FtWknqhzM5d24wjEia1zSpuk4tsZztc+gv9/P1qITsHFc213QWU2ZVbV+BRXJWtIhi3q8SRKUdj9VNcnVGAEdURg3lAnBkEJLBOhzAKayhWmyBJX6jyXsj5JxpVdWKEjvARWY8N3DyPJww6EywOuczEfJsDTiNZ0nKW1nZEZn/v+HxqijREIbu7rS4r464MZxvydZbHkQgfZJ6b74ZBOuNSS2tevYlQMg5VgPltg1dp93hzu3yglP6wtF2L7wVGyhkyuCG8UTWAvlT1/+rJsxPL0KRDNat3SmHY1RNgh6crQxovFAjyIBMrHI0xqlRlaNO8TQmkJN7/uCm1X9vUGSorVByGJAAnxdR9yH67v2olZWLBHW0P3aQbnW5H6MznBxsFxJpW+x+uDKLK+vCWX5Aui9JmKi4OtTH+3os/EtmZCID X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(396003)(346002)(376002)(136003)(39860400002)(451199018)(40470700004)(46966006)(36840700001)(82310400005)(40460700003)(478600001)(966005)(6666004)(26005)(2616005)(40480700001)(1076003)(41300700001)(186003)(6916009)(70206006)(356005)(8676002)(70586007)(4326008)(316002)(8936002)(82740400003)(86362001)(47076005)(81166007)(83380400001)(426003)(36756003)(36860700001)(54906003)(5660300002)(44832011)(2906002)(336012)(36900700001)(139555002);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 15:38:50.0616 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a850e441-3bab-4253-0c6d-08db0ea191c1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT016.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7844 Add a new test job qemu-smoke-dom0less-arm32-gcc-staticmem in debug and non-debug variant that will execute qemu-smoke-dom0less-arm32.sh script to test static memory allocation feature. The test case itself is directly taken from dom0less arm64 testing. Populate build jobs to compile Xen with config options necessary to enable static memory feature. Populate test jobs passing "static-mem" as a test variant. The test configures domU with a static memory region (direct-mapped) and adds a check using /proc/iomem to determine the memory region marked as "System RAM". Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - take into account new container for arm32 cross builds - drop Rb as a result of code changes --- automation/gitlab-ci/build.yaml | 20 +++++++++++++++++++ automation/gitlab-ci/test.yaml | 16 +++++++++++++++ .../scripts/qemu-smoke-dom0less-arm32.sh | 17 ++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index f8e156e0a994..079e9b73f659 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -565,6 +565,26 @@ debian-unstable-gcc-arm32-debug-randconfig: HYPERVISOR_ONLY: y RANDCONFIG: y +debian-unstable-gcc-arm32-staticmem: + extends: .gcc-arm32-cross-build + variables: + CONTAINER: debian:unstable-arm64v8-arm32-gcc + HYPERVISOR_ONLY: y + EXTRA_XEN_CONFIG: | + CONFIG_EXPERT=y + CONFIG_UNSUPPORTED=y + CONFIG_STATIC_MEMORY=y + +debian-unstable-gcc-arm32-debug-staticmem: + extends: .gcc-arm32-cross-build-debug + variables: + CONTAINER: debian:unstable-arm64v8-arm32-gcc + HYPERVISOR_ONLY: y + EXTRA_XEN_CONFIG: | + CONFIG_EXPERT=y + CONFIG_UNSUPPORTED=y + CONFIG_STATIC_MEMORY=y + # Arm builds debian-unstable-gcc-arm64: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 84ab1fee50a4..c2bcc5d4d3e5 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -226,6 +226,22 @@ qemu-smoke-dom0less-arm32-gcc-debug: - *arm32-test-needs - debian-unstable-gcc-arm32-debug +qemu-smoke-dom0less-arm32-gcc-staticmem: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32-staticmem + +qemu-smoke-dom0less-arm32-gcc-debug-staticmem: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32-debug-staticmem + qemu-alpine-x86_64-gcc: extends: .qemu-x86-64 script: diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index e3f2b28f3f89..bd89a3f8b45e 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -20,6 +20,19 @@ echo \"${passed}\" " fi +if [[ "${test_variant}" == "static-mem" ]]; then + # Memory range that is statically allocated to domU1 + domu_base="0x50000000" + domu_size="0x20000000" + passed="${test_variant} test passed" + domU_check=" +mem_range=$(printf \"%08x-%08x\" ${domu_base} $(( ${domu_base} + ${domu_size} - 1 ))) +if grep -q -x \"\${mem_range} : System RAM\" /proc/iomem; then + echo \"${passed}\" +fi +" +fi + # dom0/domU rootfs # We are using the same rootfs for dom0 and domU. The only difference is # that for the former, we set explictly rdinit to /bin/sh, whereas for the @@ -72,6 +85,10 @@ BOOT_CMD="bootm" UBOOT_SOURCE="boot.source" UBOOT_SCRIPT="boot.scr"' > config +if [[ "${test_variant}" == "static-mem" ]]; then + echo -e "\nDOMU_STATIC_MEM[0]=\"${domu_base} ${domu_size}\"" >> config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d . -c config From patchwork Tue Feb 14 15:38:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13140428 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77C88C64ED8 for ; Tue, 14 Feb 2023 15:39:27 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.495217.765523 (Exim 4.92) (envelope-from ) id 1pRxOV-00023n-BJ; Tue, 14 Feb 2023 15:38:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 495217.765523; Tue, 14 Feb 2023 15:38:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOV-00021f-1Y; Tue, 14 Feb 2023 15:38:59 +0000 Received: by outflank-mailman (input) for mailman id 495217; Tue, 14 Feb 2023 15:38:57 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOT-0001Wn-73 for xen-devel@lists.xenproject.org; Tue, 14 Feb 2023 15:38:57 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on20600.outbound.protection.outlook.com [2a01:111:f400:7eae::600]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b07c23f2-ac7d-11ed-933c-83870f6b2ba8; Tue, 14 Feb 2023 16:38:55 +0100 (CET) Received: from BN0PR04CA0001.namprd04.prod.outlook.com (2603:10b6:408:ee::6) by CH2PR12MB4938.namprd12.prod.outlook.com (2603:10b6:610:34::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Tue, 14 Feb 2023 15:38:51 +0000 Received: from BN8NAM11FT083.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ee:cafe::fe) by BN0PR04CA0001.outlook.office365.com (2603:10b6:408:ee::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26 via Frontend Transport; Tue, 14 Feb 2023 15:38:51 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT083.mail.protection.outlook.com (10.13.177.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6086.26 via Frontend Transport; Tue, 14 Feb 2023 15:38:51 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 14 Feb 2023 09:38:50 -0600 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Tue, 14 Feb 2023 09:38:49 -0600 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b07c23f2-ac7d-11ed-933c-83870f6b2ba8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bZcH4xujC2G2v82cxAudHWpjXsFoRHAqdcXZ/oIv/aF/KHzqFk4Dc73AIibMKPPQ6FVM1XRiLM2y5hY05zNCIAV8lUWtuD/w9+0b2CD22nGFhVNH3UiI3JQSFEJKINFIHQrFQR96tEJKm2EWosfxl6kF0Ets/tnnCdOjX4pvIEjsfxRv9n0ydVLHb7qbA2P9Px8c1uxAbCpFt4Nrw6oR+B3LOnA/+aBmWFqB9JTJ0ZRylBpzKrn37CQ1jCy/hDXB3NbU5tn03q4PbcF8IOeu2Zi5EmcbX3DCYKGmur7ok79mM+oMpvv/5zFAOKh8FS0Ss8xSkKsOYcZOAjjpJuLtGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VrWoeY005CFD5W1azhm+V3ALraRSyeUKG95MNZECaF8=; b=RiCQypaykDEH8zyEUyUnCglaMHqZ/Au4gy6thrngoWiVzNld56Y9+NFDfc/IpIM6m0fAy8OsUv4Pc6WXJPIHCaco2/Z7QpNTde5r19KWGVp0m5nY9JrYlCakvbHDK2pfVB+s9MPKV30Vbee+uLDQCw+uCEbjvSE/ngdorz8cglu2Ez5mGrMrYjXNnXmQxZtf05zd0g+cPQfzJIK5j/6CHsCyHvlLCe2mVBp3b3Pb5kutn2UouwGo/7ISBIAmZYB577veNqXr71CeQ7VYJlstt+J/MdzQNUJvxKNWbxUkDcDJYz5NczZn9dzPpmLUhP8x7JEY2NjaVE3In9TnGa1r6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VrWoeY005CFD5W1azhm+V3ALraRSyeUKG95MNZECaF8=; b=ZtRAuO9swxrvYVM3aXHxqCAMhaaXvjROM6vt6tN6Q/4YAIhx6mXuzMGB1wggcOsE1BnZYpduLAlCyXK6PJLUiTCh6uervCpoWOg3ZhVAYYQL7LcfEYZYh3vpv4+n6vnkE3MojAJh/EktrRgLK//2AJWgyvtf/7hmx5vJFvHuYKU= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 4/5] automation: Add a gzip compressed kernel image test on arm32 Date: Tue, 14 Feb 2023 16:38:41 +0100 Message-ID: <20230214153842.15637-5-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230214153842.15637-1-michal.orzel@amd.com> References: <20230214153842.15637-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT083:EE_|CH2PR12MB4938:EE_ X-MS-Office365-Filtering-Correlation-Id: ca799b3c-8d72-4548-8cc3-08db0ea1927d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: stVE1UCSS1wdeJf9uMFsK6dHh4qQNpqq4EWDgy1025opqGjI6rbH4aYnZ/UY57jI/nGzzXCNsUIp7TCteN2OXfyfEMHiDHY8YF/uQIFBAjva7q4fNHh7lbSpLEv/N1n3gc6aEazrhxw1tSoFsI0058zskyFlDovgoxRhICN18/4ss3fWz840QGAghWa4l0BKP+tvs4X2u04RrSbykLKUxS9aDQZBT/9nB+aYaEIHkrmVHuFw038jTHno0dZ8Yw+t//XUiJs9jfsGLjII37TAmbgN7z1otX269ESB2ui7QN2NIi0XoW2fHMHxdNJZFNI6l+2bdN0JNX3FVFo+NaNFxU1XpQcF7Br2oqUC3jD0goZRng644DmzaRvJAV3K/XLSXBQADDS+7bqAbMO0gP/tN+MTLN5fS1L275DSvMnpESU19F/VPgZxdNNN1///vLAntg87KpMUVjOImYCnBRYAQ/DERJaacUNaPchfkbdutsAfrt9r/qny8zVyEh6QDk3yXvbt+2P6twCDLKSCPyzAmeZetlo5c088vIbQK/Y7rjX0si7bfB4JMZW6n232VNNpo370+wGPVKlREpZ6ktikCnm1u05wKQNa2GkhCi7fpgByUZ3IMY017rHrP1pjOO7AeKLXnq6QdpMWD9FH02h15EydUeNt1pwHRq1ul6EY58lgIorEh+4mobvyb1ywqqJ4WHJLGqbJ4qazxg3Wsv127uOLeoBPUGAM4I+vjkBC1xE= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(346002)(136003)(376002)(451199018)(36840700001)(46966006)(40470700004)(82740400003)(40460700003)(2906002)(478600001)(83380400001)(356005)(26005)(1076003)(186003)(6666004)(36756003)(966005)(5660300002)(41300700001)(44832011)(36860700001)(70586007)(70206006)(8936002)(6916009)(8676002)(4326008)(82310400005)(81166007)(86362001)(426003)(54906003)(40480700001)(336012)(47076005)(2616005)(316002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 15:38:51.2969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca799b3c-8d72-4548-8cc3-08db0ea1927d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT083.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4938 Xen supports booting gzip compressed kernels, therefore add a new test job qemu-smoke-dom0less-arm32-gcc-gzip in debug and non-debug variant that will execute qemu-smoke-dom0less-arm32.sh script to test booting a domU with a gzip compressed kernel image (in our case zImage). By passing "gzip" as a test variant, the test will call gzip command to compress kernel image and use it in ImageBuilder configuration for domU1. No need for a specific check to be executed from domU. Being able to see a test message from a boot log is sufficient to mark a test as passed. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - take into account dom0 presence - drop Rb as a result of code changes --- automation/gitlab-ci/test.yaml | 16 ++++++++++++++++ automation/scripts/qemu-smoke-dom0less-arm32.sh | 13 +++++++++++++ 2 files changed, 29 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index c2bcc5d4d3e5..be7a55d89708 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -242,6 +242,22 @@ qemu-smoke-dom0less-arm32-gcc-debug-staticmem: - *arm32-test-needs - debian-unstable-gcc-arm32-debug-staticmem +qemu-smoke-dom0less-arm32-gcc-gzip: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32 + +qemu-smoke-dom0less-arm32-gcc-debug-gzip: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32-debug + qemu-alpine-x86_64-gcc: extends: .qemu-x86-64 script: diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index bd89a3f8b45e..c2e331451d99 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -33,6 +33,15 @@ fi " fi +if [[ "${test_variant}" == "gzip" ]]; then + # Compress kernel image with gzip (keep unmodified one for dom0) + gzip -k vmlinuz + passed="${test_variant} test passed" + domU_check=" +echo \"${passed}\" +" +fi + # dom0/domU rootfs # We are using the same rootfs for dom0 and domU. The only difference is # that for the former, we set explictly rdinit to /bin/sh, whereas for the @@ -89,6 +98,10 @@ if [[ "${test_variant}" == "static-mem" ]]; then echo -e "\nDOMU_STATIC_MEM[0]=\"${domu_base} ${domu_size}\"" >> config fi +if [[ "${test_variant}" == "gzip" ]]; then + sed -i 's/DOMU_KERNEL\[0\]=.*/DOMU_KERNEL\[0\]="vmlinuz.gz"/' config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d . -c config From patchwork Tue Feb 14 15:38:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13140430 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A252CC64ED9 for ; Tue, 14 Feb 2023 15:39:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.495218.765548 (Exim 4.92) (envelope-from ) id 1pRxOX-0002pq-OS; Tue, 14 Feb 2023 15:39:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 495218.765548; Tue, 14 Feb 2023 15:39:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOX-0002ph-Kw; Tue, 14 Feb 2023 15:39:01 +0000 Received: by outflank-mailman (input) for mailman id 495218; Tue, 14 Feb 2023 15:39:00 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pRxOV-0001Wo-On for xen-devel@lists.xenproject.org; Tue, 14 Feb 2023 15:38:59 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2061d.outbound.protection.outlook.com [2a01:111:f400:7eaa::61d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b14520fa-ac7d-11ed-93b5-47a8fe42b414; Tue, 14 Feb 2023 16:38:57 +0100 (CET) Received: from MW3PR05CA0005.namprd05.prod.outlook.com (2603:10b6:303:2b::10) by CY8PR12MB8215.namprd12.prod.outlook.com (2603:10b6:930:77::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Tue, 14 Feb 2023 15:38:53 +0000 Received: from CO1NAM11FT079.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2b:cafe::2b) by MW3PR05CA0005.outlook.office365.com (2603:10b6:303:2b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.10 via Frontend Transport; Tue, 14 Feb 2023 15:38:53 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT079.mail.protection.outlook.com (10.13.175.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6086.24 via Frontend Transport; Tue, 14 Feb 2023 15:38:52 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 14 Feb 2023 09:38:52 -0600 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Tue, 14 Feb 2023 09:38:51 -0600 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b14520fa-ac7d-11ed-93b5-47a8fe42b414 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=StwK5pcufpLBofMygVg2MDnCQhDo+4pdgbkKKzFRFnbOHaOBxSBekcB/eo+qsGtvyRKpUMJ/ckBJNE0eizJg4MqPVGJptsvh1wsT5zA9nnJF5lKCDJF3RyBrX0UlXT1fyPxRn6DDYls609jdhXICH9BdBWFh3L3BJK71waXQtTsfdR1jf+xv0kIsEim9l0kdKNeDjvfqyEjnCTrEqYQP+n2+leTTzFXRRqurBwV8t0JOFq/LEzcwGS1GiFMjtqwbghJhTfWEUKE9qCtu8UvMLEe7vbWxicgQ2bNCyuW0wRaamlTMHYAoEKhV1k3f/rBmmbgtfbplvytJoEJwXGBfHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7oqGuHYhJRqwJMQYh2Owy78U87YkEB1pjFAaF5dtpc0=; b=GaQu2ioDGHFUv1YFe7i8gyUxbni0eJHjcC8MiiJvV+qixELpcDXIrb2K8KC7Vgjv8OHNFKqa/R11EtYonpDY7hOfBau/Gf2hWyqkvQAxb3S45zQ4r2JqpNs6es+osXrb20JKGHhiV/DeqmC3qMjYWRmZ8N2Wyjj/RgiDNZzlGgMKeTo40yXGEvQNoeOmLy9EIafu0bJkujnM3vxFJVGWHi4l0ONyiHHtvaMI6ZiRyTNBvg9LRW+jv7DaMZa7fy9m0O8jUUfKJ9wC8vRWL2Ztknh+QK1TZTM/OOjBF1ZMtWx7Q+e8DKrAHGlZDyOFPeg3YJVpVB5SaxGimiW4KQC8wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7oqGuHYhJRqwJMQYh2Owy78U87YkEB1pjFAaF5dtpc0=; b=PQa+i5iNcP2kPUrWumGqA11OxH0dt1VKgneHUKePgRvUhDypjVK/w7/LhS6WwRmkUOAFk096eP9zRuIp4WK1Pu9n14vfKbOTVTTo+c5d4LljmLpT2cvtwkhRMBn83RQCQThPMdcPO1c0EpHqJX0BVxz5c5E5r6YC7gmnoAilXWQ= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 5/5] automation: Add a true dom0less test on arm32 Date: Tue, 14 Feb 2023 16:38:42 +0100 Message-ID: <20230214153842.15637-6-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230214153842.15637-1-michal.orzel@amd.com> References: <20230214153842.15637-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT079:EE_|CY8PR12MB8215:EE_ X-MS-Office365-Filtering-Correlation-Id: 676466e1-36a2-40a7-3a56-08db0ea19393 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jcxqjx9YDuwFBjGp/Xvv/nWISnZFFpVp+1Imnl7QcW6a19tSm/OSz9rXyq0nbcyPu1AoZM023tHAm8Al7TEGWqtPbSooDxr72RuNU0J1YbWBC/8PrXrEZPXBgpduMxQEOldq653Vx9Ip/2ZRe1UHKYe8zFRAkaynLY6BjblPFjItvQ3vvcLH0mW8q+XwaiFiud/CTnZc9BaxkwpmypY9v+MpyjfcNaojfB1nxM0V8gIiiJSVc23Nxm+PgIydKPcKeuKxLReUM9A4rLL68KSIdZax+zofeHZyfwl8btMzuexqfhaCLjud3UgXXEkQWkZx4875KfPpX2uqa3yls5yLczH1APzV8EDq7aNWln+kox/c398aYVRUJjmLvLT6kD+zvsG1mg7/Gq26S6iMBUlSbWjKIOFJnxfuEeM4ZkVnY27Y7r9RSAS4ZktwDgtVRt+vE0M+k8Umjbd8UTWoL8VXwR/kItDifUa3zIceFaWmeENHwqaGMLkVZ/209APtzO0EXUXwntTQL8KK2OVbthKHBON7MgVfcEUR9L39F/gLA/xfuCzK2EmhW7jUbw3M8+AfPSwQ2jeRGejsNH0YrOBdNum88NF0vbNFke4x/ygpRJUw9ArNqstCXpKrVHNTZEMBM5/AS16Dxzm8/AK9TJR/i/21eMGcm/+56RItwdLKNPJf8x8DV4RkWKCycO026r5rSeR5G+MFR3EDeswtMWC/EhBAqilyZrZ39fSd/ReRxfyn94bhzLy5eV1EtpnLXZsZ X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(346002)(376002)(136003)(451199018)(46966006)(40470700004)(36840700001)(44832011)(6666004)(478600001)(2616005)(316002)(86362001)(82310400005)(54906003)(40460700003)(70206006)(2906002)(966005)(4326008)(8676002)(36860700001)(5660300002)(6916009)(41300700001)(36756003)(426003)(1076003)(26005)(186003)(336012)(47076005)(40480700001)(82740400003)(70586007)(8936002)(81166007)(356005)(32563001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 15:38:52.9917 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 676466e1-36a2-40a7-3a56-08db0ea19393 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT079.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8215 Add a new test job qemu-smoke-dom0less-arm32-gcc-without-dom0 in debug and non-debug variant that will execute qemu-smoke-dom0less-arm32.sh script to test dom0less domU boot without dom0 (i.e. true dom0less configuration). By passing "without-dom0" as a test variant, the test will clear the dom0 prompt that we grep for as a last step and remove all the DOM0 related options in ImageBuilder configuration. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - new patch created as a result of deciding to keep dom0 by default. We still need to test true dom0less configuration, hence added a new test. --- automation/gitlab-ci/test.yaml | 16 ++++++++++++++++ automation/scripts/qemu-smoke-dom0less-arm32.sh | 13 +++++++++++++ 2 files changed, 29 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index be7a55d89708..c0b4a90e0d29 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -258,6 +258,22 @@ qemu-smoke-dom0less-arm32-gcc-debug-gzip: - *arm32-test-needs - debian-unstable-gcc-arm32-debug +qemu-smoke-dom0less-arm32-gcc-without-dom0: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32 + +qemu-smoke-dom0less-arm32-gcc-debug-without-dom0: + extends: .qemu-arm32 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE} + needs: + - *arm32-test-needs + - debian-unstable-gcc-arm32-debug + qemu-alpine-x86_64-gcc: extends: .qemu-x86-64 script: diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index c2e331451d99..cc91238f4222 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -42,6 +42,15 @@ echo \"${passed}\" " fi +if [[ "${test_variant}" == "without-dom0" ]]; then + # Clear dom0 prompt + dom0_prompt="" + passed="${test_variant} test passed" + domU_check=" +echo \"${passed}\" +" +fi + # dom0/domU rootfs # We are using the same rootfs for dom0 and domU. The only difference is # that for the former, we set explictly rdinit to /bin/sh, whereas for the @@ -102,6 +111,10 @@ if [[ "${test_variant}" == "gzip" ]]; then sed -i 's/DOMU_KERNEL\[0\]=.*/DOMU_KERNEL\[0\]="vmlinuz.gz"/' config fi +if [[ "${test_variant}" == "without-dom0" ]]; then + sed -i '/^DOM0/d' config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d . -c config