From patchwork Thu Sep 8 09:22:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 12969836 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 3F9B5C54EE9 for ; Thu, 8 Sep 2022 09:22:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.402994.644946 (Exim 4.92) (envelope-from ) id 1oWDkB-00066R-3z; Thu, 08 Sep 2022 09:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402994.644946; Thu, 08 Sep 2022 09:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWDkA-00065X-Tp; Thu, 08 Sep 2022 09:22:42 +0000 Received: by outflank-mailman (input) for mailman id 402994; Thu, 08 Sep 2022 09:22:41 +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 1oWDk9-00062t-PT for xen-devel@lists.xenproject.org; Thu, 08 Sep 2022 09:22:41 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2059.outbound.protection.outlook.com [40.107.243.59]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c8bb93aa-2f57-11ed-a31c-8f8a9ae3403f; Thu, 08 Sep 2022 11:22:40 +0200 (CEST) Received: from MW4PR02CA0004.namprd02.prod.outlook.com (2603:10b6:303:16d::19) by MW4PR12MB6949.namprd12.prod.outlook.com (2603:10b6:303:208::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12; Thu, 8 Sep 2022 09:22:37 +0000 Received: from CO1NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:303:16d:cafe::84) by MW4PR02CA0004.outlook.office365.com (2603:10b6:303:16d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.15 via Frontend Transport; Thu, 8 Sep 2022 09:22:37 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT056.mail.protection.outlook.com (10.13.175.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Thu, 8 Sep 2022 09:22:36 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.28; Thu, 8 Sep 2022 04:22:35 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.28 via Frontend Transport; Thu, 8 Sep 2022 04:22:34 -0500 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: c8bb93aa-2f57-11ed-a31c-8f8a9ae3403f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aAmnqea1r1TWORAioI2l0a5veDLrZo7PSHHsPU1eC0UE/Y//wMOSzDZRSvJVPYwkStXwiMcSkvmgPFDxcFoFK2mUJlJmT1Qql5ji7XfAEn+5ozx8k703imXdbB2+++ECFbQr/KJG+dz81guh5161TrLkUltEcKTrHoOoyi0L4BGH8br0DMILezil+vzLLNrcQEA1jzoQ0g6X8nM/nXXruL5fmmo//ZQ6oeFpDwI7LQxxt+iSArwJufHloqub4AYOip4FX7rF2GG7sXBiZY/JN+j3ri8ibhj3GTGnc3oTeOZQ0GhTHXaqOOd/r2h0JRzWBjitCap8iCyjKo4UpUMJaA== 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=tyfchKA7NgWWrIrLugjPaY2e//gdOL9mWhpHot2OCqg=; b=ICkS6HZq2fe3AOjC/blGL7qfRHcYQhBDAPiHPHeTkqB4iL7EIbo5/J64I2Zx1pJPZLJw4EcoMZguyJIfpVQKlncbR05bc0ZkwSHCsX6clTqHMWU0eKk9cPilys0japDGxJOdEe1kiflcv+61zfM05TWHss4vfPSw09icc0kZRUtelz+NMnKD0ymkGEZzpLF0vIh9nPjHkQthuJN4gsvIXypdyX0EgUV7blSQt7QYyKehP0cKAeNhV+lxaLkJ3176esR+2o14haf2RBnouHOUDwJKEdZY+Ny2QJhTxjOYN2OrDASsS6KXhQI3RwL7F6ArYq3SsMah5qGDauoGy7++NQ== 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=tyfchKA7NgWWrIrLugjPaY2e//gdOL9mWhpHot2OCqg=; b=dOAyNW3Ak/S6wqPwAiqXp38at/fXYNPoX5lQx5MhBty+3pdw46lsXpXl6IC77py4gnLeNkjyu/QX7NLZk1ywOTrQiy0quioFvkhXYEpW++d4/WvQDTfDaHJzFzbacxHXLGYAe5WrQho00fyLJjA30MCsn4qP/uzqyBF5FQNjRyE= 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 , Luca Fancellu , Ayan Kumar Halder Subject: [for-4.17 v2 1/3] automation: qemu-alpine-arm64-gcc: Use kernel 5.19 Date: Thu, 8 Sep 2022 11:22:28 +0200 Message-ID: <20220908092230.21421-2-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220908092230.21421-1-michal.orzel@amd.com> References: <20220908092230.21421-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT056:EE_|MW4PR12MB6949:EE_ X-MS-Office365-Filtering-Correlation-Id: d54294cb-a9f9-4f26-5d7e-08da917bab92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SjIiWqALMBxzrnh8u0JllRhyAJnUvrutBn2hSL2dk5NeHmrm+M+oS01Jvwh2+6XXozmNGBzInNnDdWLY1emjZi8pfqKK8f59m56P/WrHbYp7m9KpOA6RzBX3Pfwe/3eLM7HgGHlYfRBe0ooVVZLiCyin7vjw39Zppk9ThxikMFeco0AFPn+eXtaN0vj8vj3JLuyqutX6eK/sRlJg9Ib8PITrglzwtIBWe6BJvUMJsg7yqXJaI5OIR8w6nQGcqvQEYJT0SScUGz+Ty7mY80FMsBbg0ZPRzUoF2fBAzJXfIOeKBnYVqa/Qq8n7cM7i7RBnSVYHMpBbeAPcZ6RK388yKaUzCsBjcjlBV3ZK6HtSu/HakOpuz/+vPa7kz3u42twmkgDcFrw4ygO80VArMmEKZAQ481+CPHuaQEzMd0QFvsmiMKY4RVLE97Y3j+soKTpn6wd8n8R14M1f4chcuRUytV7SIyil0uK3+YREyaeLF8SkaN4+56ewACmiM6nfjdSM4/yBB9ID6zgimAbOYgq5F7vy3Xy3tsKu/FRXLFUAsnJ1RA1VnJrttu0c3lYulCr8gKZoi4ce3Y9ljA4TbgYVsARG1en0bVM7KdvnqJPH7Ngc/cdFywRoJTze/SGUAqJcM8n9pbit/qphmvNhJT/pO6iLFvUtLfemWxxvn1kNhFaHYMohxawVZ7sRx81R9LJnKLiDOL7s2uPXODOzVpqjWJzdEJJXzY7+YxKX4ocLQTy0DBUhA2OFuZa0nI2/fRocu8hYPX86AoYtA0w/6/5GvP5AATmciGf1ikB3LO3whIQ8bW5qtgPT479l0Wmk7r2aP6YuhPRuv1xP/qO/v885Pw== 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:(13230016)(4636009)(346002)(39860400002)(376002)(136003)(396003)(46966006)(36840700001)(40470700004)(40480700001)(316002)(36756003)(41300700001)(82310400005)(81166007)(356005)(82740400003)(6916009)(54906003)(36860700001)(4326008)(966005)(44832011)(478600001)(70206006)(47076005)(5660300002)(70586007)(8676002)(84970400001)(83380400001)(336012)(8936002)(426003)(86362001)(186003)(2616005)(2906002)(6666004)(26005)(40460700003)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 09:22:36.9816 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d54294cb-a9f9-4f26-5d7e-08da917bab92 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: CO1NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6949 After qemu-smoke-arm64 was changed to use kernel 5.19 we end up having two kernel configurations. This is something not needed and maintaining a single kernel version is always easier. Modify qemu-alpine-arm64-gcc to use kernel 5.19 and remove kernel 5.9 from tests-artifacts. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Ayan Kumar Halder Acked-by: Stefano Stabellini --- Changes in v2: - none --- automation/gitlab-ci/build.yaml | 11 ------ automation/gitlab-ci/test.yaml | 2 +- .../kernel/5.9.9-arm64v8.dockerfile | 34 ------------------- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d2f75a090c0f..720ce6e07ba0 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -586,17 +586,6 @@ alpine-3.12-arm64-rootfs-export: tags: - arm64 -kernel-5.9.9-arm64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.9.9-arm64v8 - script: - - mkdir binaries && cp /Image binaries/Image - artifacts: - paths: - - binaries/Image - tags: - - arm64 - kernel-5.19-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.19-arm64v8 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 2eb6c3866e2c..07209820b474 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -34,7 +34,7 @@ qemu-alpine-arm64-gcc: needs: - alpine-3.12-gcc-arm64 - alpine-3.12-arm64-rootfs-export - - kernel-5.9.9-arm64-export + - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export artifacts: paths: diff --git a/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile deleted file mode 100644 index 053d65a3454e..000000000000 --- a/automation/tests-artifacts/kernel/5.9.9-arm64v8.dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM arm64v8/debian:unstable -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=5.9.9 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - libssl-dev \ - bc \ - curl \ - flex \ - bison \ - && \ - \ - # Build the kernel - curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - make -j$(nproc) Image.gz && \ - cp arch/arm64/boot/Image / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* From patchwork Thu Sep 8 09:22:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 12969837 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 1D313C6FA82 for ; Thu, 8 Sep 2022 09:22:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.402995.644962 (Exim 4.92) (envelope-from ) id 1oWDkC-0006Z8-CH; Thu, 08 Sep 2022 09:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402995.644962; Thu, 08 Sep 2022 09:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWDkC-0006Yv-7p; Thu, 08 Sep 2022 09:22:44 +0000 Received: by outflank-mailman (input) for mailman id 402995; Thu, 08 Sep 2022 09:22:43 +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 1oWDkB-00062s-Hl for xen-devel@lists.xenproject.org; Thu, 08 Sep 2022 09:22:43 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2064.outbound.protection.outlook.com [40.107.223.64]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ca847a7b-2f57-11ed-9760-273f2230c3a0; Thu, 08 Sep 2022 11:22:42 +0200 (CEST) Received: from MW4PR03CA0346.namprd03.prod.outlook.com (2603:10b6:303:dc::21) by DM4PR12MB5184.namprd12.prod.outlook.com (2603:10b6:5:397::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.12; Thu, 8 Sep 2022 09:22:39 +0000 Received: from CO1NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dc:cafe::b4) by MW4PR03CA0346.outlook.office365.com (2603:10b6:303:dc::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14 via Frontend Transport; Thu, 8 Sep 2022 09:22:39 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT064.mail.protection.outlook.com (10.13.175.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Thu, 8 Sep 2022 09:22:39 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.28; Thu, 8 Sep 2022 04:22:37 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.28 via Frontend Transport; Thu, 8 Sep 2022 04:22:36 -0500 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: ca847a7b-2f57-11ed-9760-273f2230c3a0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JxN2pbZRREUTXnEVTnw+wReYdUTCGtUKqkFh3lS2t9pAYa6HIlTNXlofngLiIwSoq9do5Glzu06XxxJRqXwnM9d4Qzprg0yWnZr0oM2Wjqm3ojwrAQfgLfGpBIG7z8zFyDUVcrnxfnBB7rUuWwvCJrAM9oeTvwPQbQnmFgFqRiiZxtqGeANU3bXcPGtMoTY+53/saAz5BMhQNkmLpRhtMz0aeDHhADzmVNUrvzWK/hFDrflgJJbWhsaE3p7BUeUlgG0HWifrlme1U74l1dymtqyUx9XdbFx5lnOIfAJbtPKYjtXhDb4R+eJGxwGy7IVxGx4DvL5sfEnYtNb2DpJtkQ== 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=jvUwy5NfFiVoeWjuPBA52OtQW6Tn5x/aILqdyOhSfG8=; b=djBgLSL1x9hA58gRko08qu811zYuagxl+4fuQWUA2OlQRsr1tSscg35JpFKxATVNMloEX97OExlkaHP5fKAkE7PZcDS93RMyIFcQLZQSie/PAl63a13Wt7wKPPiqIVBf1oxdKbCLK+iFqSHxR1KMSl1K2rZ+2fH6aHJ3JbHuZfttCu2AlA2EP0vDtYCPirTVCf7WzUGdM5U35pTwav9AUFue7w6rIr98XYYaUatoErzBJOtv24DehV7WksGsk/tN8+uI7WuGssX1F6ScmMjttecNSREWbj9VOMOXUReL2lHRyaNmLC0aS//M2dEgwpuvl4P2Z0OW+1jsAH/mSuksXw== 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=jvUwy5NfFiVoeWjuPBA52OtQW6Tn5x/aILqdyOhSfG8=; b=rf0FY1gxBXhgoCo1QUc01zHERgeZ1G34lIjxARi4UtfqWnA68h8R1FeAdIVjM0FtNAuHLTFYb6B0y0BDpeUq5kkLhr+o/SmJEvmBLTElWi4H8/+DzeZ5rWxbrCiZuzq2V96vtZpsAyoKsWC5yx8M733sNoQ3SA0Lwi7aI5ZcsSc= 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 , Luca Fancellu , Ayan Kumar Halder Subject: [for-4.17 v2 2/3] automation: qemu-smoke-arm64: Silence ifconfig error messages Date: Thu, 8 Sep 2022 11:22:29 +0200 Message-ID: <20220908092230.21421-3-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220908092230.21421-1-michal.orzel@amd.com> References: <20220908092230.21421-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT064:EE_|DM4PR12MB5184:EE_ X-MS-Office365-Filtering-Correlation-Id: 25cdd7fe-2187-4e0d-e258-08da917bacdd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZGbRchYuTW71s6rPUZJj/3OkLRT5VOFprifrKEliSAW1ZAWtkFKL2KbvhiEORu5fu85sAonA0z6cITyPLGc4C/CDuMU5YEeMWJvMnykVjjx5610Af815IqUpGJse20f9hyGu0m3+vpcTQaBZ8WLQ+wmhvxf7vg4KcGP3NGnK+FC7vF+kcaLqk/bmipY+zW6cLj5p496KN/y2Op9ZIrwMt0WmAd/xKzHQNvsOIGtP7rSP0LGnHmsgZvk9Eb2+ggjrAOcBpI5HG6Uj0xNDFhPtkhYXHNpKBavuVdjaca6fzAvycK43mNUpZYwurbiY1jctPx+JAC7eqjk96LfR7YYPPvMnxFlR99ieadcP6Iwy56s43dluVW3KN5AH+0erSgzE3kZn4lGY1P+H6zyFJHhBW25e2aPML84u1Dr6yG1n64nMH4EaRlyW7nRhqf8FZ6X6QzGDg9Z46HeXAdF3WbMfK1glz17lfNHc7SBPMcSod3ZGryxtEMTXwbbnNR7gxcHdRYDQVZge2X7M4N4GUfvL/9sUCUw6RmhfDOt9lee+g0zyWnkjcMFtn7gvNX9dIB6BfkbJEP1gO1wCwWp4zckkSI+xyPvR1UYFm5tDVwI8LCDLguruSuCoSK3OOGO5/fYok/a7NW9Tl+4e4Q+E02rzfjg8p2Q9eApRNi0eXxv7wZ4Zy30iAtnqkUCWSrpiyLLA6KDjmxOzjHQLEc6KsHudcQxg3yhpl09rvPVlfAfnwie4Rb3MoNMWm/28RpCthYFjWfJ/S+lzCuVXDtsNnjQvt5d6GajpC5uMkW+VhmADClh8nXMgY3VnRJMaIlZyVAMC 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:(13230016)(4636009)(39860400002)(376002)(136003)(396003)(346002)(40470700004)(46966006)(36840700001)(5660300002)(6916009)(54906003)(316002)(36860700001)(36756003)(70586007)(44832011)(8676002)(2906002)(8936002)(4326008)(15650500001)(70206006)(82310400005)(478600001)(86362001)(2616005)(41300700001)(426003)(40480700001)(1076003)(82740400003)(186003)(47076005)(81166007)(83380400001)(26005)(336012)(40460700003)(356005)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 09:22:39.0761 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25cdd7fe-2187-4e0d-e258-08da917bacdd 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: CO1NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5184 During the ping test, dom1 tries to assign an ip to eth0 in a loop. Before setting up the network interface by dom0, this results in printing the following error message several times: (XEN) DOM1: ifconfig: SIOCSIFADDR: No such device Silence this by redirecting stderr/stdout to /dev/null as we do not care about the output and we should not pollute the log file. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Ayan Kumar Halder Acked-by: Stefano Stabellini --- Changes in v2: - none --- automation/scripts/qemu-smoke-arm64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index c80d9b2aee00..7ac96027760d 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -6,7 +6,7 @@ test_variant=$1 passed="passed" check=" -until ifconfig eth0 192.168.0.2 && ping -c 10 192.168.0.1; do +until ifconfig eth0 192.168.0.2 &> /dev/null && ping -c 10 192.168.0.1; do sleep 30 done echo \"${passed}\" From patchwork Thu Sep 8 09:22:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 12969839 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 4AD90C6FA8A for ; Thu, 8 Sep 2022 09:22:54 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.402996.644973 (Exim 4.92) (envelope-from ) id 1oWDkD-0006qN-LY; Thu, 08 Sep 2022 09:22:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 402996.644973; Thu, 08 Sep 2022 09:22:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWDkD-0006qG-I7; Thu, 08 Sep 2022 09:22:45 +0000 Received: by outflank-mailman (input) for mailman id 402996; Thu, 08 Sep 2022 09:22:44 +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 1oWDkC-00062t-MS for xen-devel@lists.xenproject.org; Thu, 08 Sep 2022 09:22:44 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cac4280c-2f57-11ed-a31c-8f8a9ae3403f; Thu, 08 Sep 2022 11:22:43 +0200 (CEST) Received: from MW4PR03CA0343.namprd03.prod.outlook.com (2603:10b6:303:dc::18) by DS0PR12MB7679.namprd12.prod.outlook.com (2603:10b6:8:134::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.18; Thu, 8 Sep 2022 09:22:40 +0000 Received: from CO1NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dc:cafe::eb) by MW4PR03CA0343.outlook.office365.com (2603:10b6:303:dc::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.17 via Frontend Transport; Thu, 8 Sep 2022 09:22:40 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT064.mail.protection.outlook.com (10.13.175.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Thu, 8 Sep 2022 09:22:40 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.28; Thu, 8 Sep 2022 04:22:39 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.28 via Frontend Transport; Thu, 8 Sep 2022 04:22:38 -0500 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: cac4280c-2f57-11ed-a31c-8f8a9ae3403f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VlxrDuuxlsysefRUm10G1uLEigfCDRc7H0kWIm3gC5c790A5mhnUCpET7UwSqdhdmenscxPeZSSTuj7bELnxTS552YQSsLEn2CNizm7Fn0HfEzncPrxBNXKM4OcmFqklHM1xTIS0XVQUDnEALr++o3TPJ0vHdrEN6BVy7TVd7rOUDr+JuIGuJC65uTvO6gkzwkGwcQivut8faVTGwqwttNwaas+hcCDu6IqS+2X23BX5oceR3Ugt3Brt/CqG0cvC7Fa/yiw3JC6SCQIaAz5k3fzsTuwC/9bJnoN7zRMS+Or7/7IM6GRCjxwnFcTPJW2hyvO+2HaAbN4qPKiwpwcTZA== 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=s/RWuT6WWjwt9nx2ahhlPfQEA0lD6Hh30SG14hqOTvI=; b=UNjxZe2DoC6G2ImPYoFSJF8QfkODX6+3vVNbc2rCaqZT23PKzTadRhQ88T1iaE41q7S6S+yOzFBdOD359MTQl0/OwOTwyXTTW9E6CuJ63dAcyXYCyBjgTiOu9j78sLWwyQNxHA4HNch8yAcSa7z4LpHuIMMc9VTrjpwh61LGNF/G5I6T1jsl5cVfWoANttbDXr1vfFdZ876x2d//DBICai6qIFchRhZHffR9wwwN7aaLPpmAYm5SYTxbt/dG/oJimiztYYTMNv/mVQsQT0mA5952V04z87KtKnOM7vo1059ZYALv+NZmc0woFX3sDChTbNqUJE41bIVYQKA8y+QM4w== 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=s/RWuT6WWjwt9nx2ahhlPfQEA0lD6Hh30SG14hqOTvI=; b=s2+Nm3rpAWGRAvGLa1msdTPDOSjGQJp4EququafMLpONtePkArdsdPg1W7D4bpplTO5llMNJ925QEw0HizCwNiNNr7fUpBabgPCjGCVyEBrHO6XMSVgCTTbS20GXxdZyXaYuXP4vwewOCeHXsNxdbHq3w+CoVD3CXYs+rK63wEU= 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: [for-4.17 v2 3/3] automation: Add a new job for testing boot time cpupools on arm64 Date: Thu, 8 Sep 2022 11:22:30 +0200 Message-ID: <20220908092230.21421-4-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220908092230.21421-1-michal.orzel@amd.com> References: <20220908092230.21421-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT064:EE_|DS0PR12MB7679:EE_ X-MS-Office365-Filtering-Correlation-Id: 35cb52e7-1e79-48fe-7450-08da917bad95 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xbJBGhi4WGsBxoxWU1sGB77/b7fURX5gCEqpN58THn8zSjcV4dIgBwyPnNVzzMBdEjZCBD9IVQw4elUXsramhbioyaqKQNH+4uHOhULDx2LiaAtILU7GkqsjKW/GTLEv9xs7GSxL1MPafHQZbqqTjmvjClfxDX69MMULY4eLdCU3wBJEpajNRdwHGdPj+8dIftl0NiXlZNm3m2yU4tmSAtxQJp3Kw2/FgoNyKkkem0MDsebSNejil3jfp3J++Y9kUg20cxDdSBHBJ+/Bcg0EuRm6Xzd8/zACokOafkA2Sx2snzHXAcsn6ObFZynZYwLymNdpgw7JREjBLQ88Ir8bphrmo+xw9BA6Y2xbx/3AXncRrraf1U4rLsll6dNMON3iOl+omM2VT/twdAX1sewGiUvajJAMeZC1Mhr4LQHZItOqNLnx+Ztmw4p2YT4ccfiuNj4OKICzKEx9cHLW4QaY5XYohc9xHYI7ugBBGLc4Ew7gn2d3EnRWf5wFsPMJIEWK4F5YHynQfTf286WTow6JSLp7BGXfleSQw/l66LnAfLbOVEeosNXvsX8bMOc/i1xqYSCkhksCHXHiCEQBpZok0KhZ+G+J+lmAjm9YeiRQrMTmPFb5blqKSanEKbt2HuOsIGTc8s1ykDPetOf+WyLKoeppMqw3/7tOi9venutwYmiHOu1Ja9BRhVrvjqqdlKj3ZgZuj/zayVpd8XrfH057YJbnGxrw94HslOU7J+cEsZm37/A285NHsYYjFLj/5aGuPfJVyKrFd1xeF9ISlSagjPJ+gZjjyb1jKhQ+C/ISjpjb2FzC+rAwx7DPg3hYL9uyUY0gdGEuu+oauEGjjkE5jnALRcLkJuezSTdidVVurKABpgXj9o4RW0ERmMKLrg7HsEZgFJYPsuKkHR5fvXT7GUjULqrazHb+vn8clOFSpck= 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:(13230016)(4636009)(39860400002)(396003)(376002)(346002)(136003)(46966006)(40470700004)(36840700001)(316002)(83380400001)(8676002)(70206006)(4326008)(41300700001)(6666004)(6916009)(54906003)(82310400005)(2616005)(86362001)(36756003)(1076003)(336012)(426003)(186003)(26005)(70586007)(47076005)(8936002)(81166007)(44832011)(5660300002)(356005)(2906002)(36860700001)(40480700001)(478600001)(966005)(82740400003)(40460700003)(157313001)(21314003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 09:22:40.3104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35cb52e7-1e79-48fe-7450-08da917bad95 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: CO1NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7679 Add a new test job qemu-smoke-arm64-gcc-boot-cpupools that will execute script qemu-smoke-arm64.sh to test boot time cpupools feature. Enable CONFIG_BOOT_TIME_CPUPOOLS for the arm64 build and add a new test case in qemu-smoke-arm64.sh that if selected will make use of the ImageBuilder feature to create cpupool with cpu@1, null scheduler and assign it to domU. Add a check in dom0 xen.start to see if domU is assigned a Pool-1 with null scheduler. Take the opportunity to refactor the qemu-smoke-arm64.sh script as follows: - use domU_check to store the test's commands to be run from domU - use dom0_check to store the test's commands to be run from dom0 - use fdtput instead of sed to perform dtb modifications - use more meaningful messages for "passed" variable. This way we can grep for messages reported either by domU or dom0 and get rid of assumption that tests can only be run from domU Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - use ImageBuilder feature to create boot-time cpupools - also check if the scheduler is set up properly --- automation/gitlab-ci/test.yaml | 19 ++++++++++++++ automation/scripts/build | 3 ++- automation/scripts/qemu-smoke-arm64.sh | 36 +++++++++++++++++++------- 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 07209820b474..d899b3bdbf7a 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -100,6 +100,25 @@ qemu-smoke-arm64-gcc-staticmem: tags: - arm64 +qemu-smoke-arm64-gcc-boot-cpupools: + extends: .test-jobs-common + variables: + CONTAINER: debian:unstable-arm64v8 + script: + - ./automation/scripts/qemu-smoke-arm64.sh boot-cpupools 2>&1 | tee qemu-smoke-arm64.log + needs: + - alpine-3.12-gcc-arm64 + - alpine-3.12-arm64-rootfs-export + - kernel-5.19-arm64-export + - qemu-system-aarch64-6.0.0-arm64-export + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - arm64 + qemu-smoke-arm32-gcc: extends: .test-jobs-common variables: diff --git a/automation/scripts/build b/automation/scripts/build index 2b9f2d2b541a..2f15ab3198e6 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -19,7 +19,8 @@ else echo " CONFIG_EXPERT=y CONFIG_UNSUPPORTED=y -CONFIG_STATIC_MEMORY=y" > xen/.config +CONFIG_STATIC_MEMORY=y +CONFIG_BOOT_TIME_CPUPOOLS=y" > xen/.config make -j$(nproc) -C xen olddefconfig else make -j$(nproc) -C xen defconfig diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index 7ac96027760d..f803835779f4 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -4,20 +4,22 @@ set -ex test_variant=$1 -passed="passed" -check=" +if [ -z "${test_variant}" ]; then + passed="ping test passed" + domU_check=" until ifconfig eth0 192.168.0.2 &> /dev/null && ping -c 10 192.168.0.1; do sleep 30 done echo \"${passed}\" " +fi if [[ "${test_variant}" == "static-mem" ]]; then # Memory range that is statically allocated to DOM1 domu_base="50000000" domu_size="10000000" passed="${test_variant} test passed" - check=" + domU_check=" current=\$(hexdump -e '16/1 \"%02x\"' /proc/device-tree/memory@${domu_base}/reg 2>/dev/null) expected=$(printf \"%016x%016x\" 0x${domu_base} 0x${domu_size}) if [[ \"\${expected}\" == \"\${current}\" ]]; then @@ -26,6 +28,16 @@ fi " fi +if [[ "${test_variant}" == "boot-cpupools" ]]; then + # Check if domU0 (id=1) is assigned to Pool-1 with null scheduler + passed="${test_variant} test passed" + dom0_check=" +if xl list -c 1 | grep -q Pool-1 && xl cpupool-list Pool-1 | grep -q Pool-1; then + echo ${passed} +fi +" +fi + export DEBIAN_FRONTENT=noninteractive apt-get -qy update apt-get -qy install --no-install-recommends u-boot-qemu \ @@ -42,11 +54,9 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom -cpu cortex-a57 -machine type=virt \ -m 1024 -smp 2 -display none \ -machine dumpdtb=binaries/virt-gicv2.dtb -# XXX disable pl061 to avoid Linux crash -dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts -sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv2.dts > binaries/virt-gicv2-edited.dts -dtc -I dts -O dtb binaries/virt-gicv2-edited.dts > binaries/virt-gicv2.dtb +# XXX disable pl061 to avoid Linux crash +fdtput binaries/virt-gicv2.dtb -p -t s /pl061@9030000 status disabled # Busybox mkdir -p initrd @@ -66,7 +76,7 @@ echo "#!/bin/sh mount -t proc proc /proc mount -t sysfs sysfs /sys mount -t devtmpfs devtmpfs /dev -${check} +${domU_check} /bin/sh" > initrd/init chmod +x initrd/init cd initrd @@ -98,6 +108,7 @@ ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 xl network-attach 1 type=vif +${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf @@ -127,6 +138,13 @@ if [[ "${test_variant}" == "static-mem" ]]; then echo -e "\nDOMU_STATIC_MEM[0]=\"0x${domu_base} 0x${domu_size}\"" >> binaries/config fi +if [[ "${test_variant}" == "boot-cpupools" ]]; then + echo ' +CPUPOOL[0]="cpu@1 null" +DOMU_CPUPOOL[0]=0 +NUM_CPUPOOLS=1' >> binaries/config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c binaries/config @@ -148,5 +166,5 @@ timeout -k 1 240 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial set -e -(grep -q "^Welcome to Alpine Linux" smoke.serial && grep -q "DOM1: ${passed}" smoke.serial) || exit 1 +(grep -q "^Welcome to Alpine Linux" smoke.serial && grep -q "${passed}" smoke.serial) || exit 1 exit 0