From patchwork Thu May 16 13:58:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666233 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 8539FC25B74 for ; Thu, 16 May 2024 13:59:54 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723357.1128133 (Exim 4.92) (envelope-from ) id 1s7be2-0005xM-Hh; Thu, 16 May 2024 13:59:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723357.1128133; Thu, 16 May 2024 13:59:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7be2-0005wF-CY; Thu, 16 May 2024 13:59:42 +0000 Received: by outflank-mailman (input) for mailman id 723357; Thu, 16 May 2024 13:59:41 +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 1s7be1-0005tl-2U for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:41 +0000 Received: from fhigh5-smtp.messagingengine.com (fhigh5-smtp.messagingengine.com [103.168.172.156]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8871f64b-138c-11ef-b4bb-af5377834399; Thu, 16 May 2024 15:59:38 +0200 (CEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 8B0711140163; Thu, 16 May 2024 09:59:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 16 May 2024 09:59:37 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:36 -0400 (EDT) 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: 8871f64b-138c-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867977; x=1715954377; bh=Vx5DcvP0Oc GsO9ZlwIl0/mxQ0w+8bvA0AKy34SdFnpQ=; b=LB0jqGR4r+UX55IsXmrypEm75t u7ftVY+Sn5U7djolifbMlCoBWpDWzJiiNDuiJ4vUewSEzca6Y+Ammx7/Co0zy6B1 Y5X/iqEsm/cDldOm3S9qBrLpg9UhJiRkXWcwklqUZH60hP9m+ah2jn3RNyT+w8Ld hqPk20yZbiV2LfZpKeVrbviljQp8Okieuj7s8Ah9b9iXUN+luGEsV7kKZTzsamCI Hv+0Mg6PnJaiY8vbXXZI3NaY1ipY6zSmX+efBqHyzSpqh3wA/xkwF/W5Mn0oOFHz KHace7spXuSPZ8HGSwtaRFLFraErWP7D91qj3QkwxijelkSDhp5jkl+/2Paw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867977; x= 1715954377; bh=Vx5DcvP0OcGsO9ZlwIl0/mxQ0w+8bvA0AKy34SdFnpQ=; b=R F3oAknZY5YdcRc1OmGxE/qxEOabYFci2Ei958Aca9ZAiYNZhloGQJ0ioOzsxN8WC NeLqOQw+NU/BALyPqLkLk+x8MWLjs33PAhFrR0+gdLx2LV+YdFyMof07ndJzAC+e 2womreuZ4YMlXVLC2jVhZJJ/qKeVDlXGmLfxpXIPD5EtUS5ZEGRy9soFa6LOr/Ks LgxWrA1Q3LSGhie3ebtmOFomnY+rQcjebofIhkv7Flcis0gdUr1z2k1rn7TyImOK U0td/cpuRo31GtV1xBvIyMVxmfU8wu5MuVX3bxYVLKak0EzIFBFi30AxCeRWBCqD roH3lSuVl4EdPMdLjTPnw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 01/12] automation: include domU kernel messages in the console output log Date: Thu, 16 May 2024 15:58:22 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index d81ed7b931cf..4beeff17d31b 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -131,6 +131,8 @@ mkdir sys rm var/run echo "#!/bin/sh +echo 8 > /proc/sys/kernel/printk + ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start From patchwork Thu May 16 13:58:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666235 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 3FE43C25B7C for ; Thu, 16 May 2024 13:59:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723358.1128138 (Exim 4.92) (envelope-from ) id 1s7be2-000672-S5; Thu, 16 May 2024 13:59:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723358.1128138; Thu, 16 May 2024 13:59:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7be2-00065g-Os; Thu, 16 May 2024 13:59:42 +0000 Received: by outflank-mailman (input) for mailman id 723358; Thu, 16 May 2024 13:59:42 +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 1s7be2-0005tl-2V for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:42 +0000 Received: from fhigh5-smtp.messagingengine.com (fhigh5-smtp.messagingengine.com [103.168.172.156]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 892b6787-138c-11ef-b4bb-af5377834399; Thu, 16 May 2024 15:59:39 +0200 (CEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.nyi.internal (Postfix) with ESMTP id C09711140166; Thu, 16 May 2024 09:59:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 16 May 2024 09:59:38 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:37 -0400 (EDT) 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: 892b6787-138c-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867978; x=1715954378; bh=+2WEMyTqWK NhMj6QhIZf6GFM0RxapZhBZiw+isG8OcI=; b=Z8D8X4OxCVYdraaM0Va/bcbPBt YytTvaPlLVjGpxok0H798l4gAb74IL80W2jZV7H74Ibxjh+F8pX+lBNVzKYbR2xM xUKVeGieIHyDsxwqZd9kfUDsDX7EE1w2cKCEIWmmxR1AHH9tV7flFiOqp8ACSjs+ ILOMDtkl7XHvZvlVDioYGRyw9N+5qqQBkFALgxemwmOPAwIaqFWiBVqTJprdcmPo JHUW5eAJp2Ceq3If3Yi1u0pIFKhzvnj0JXmH3wh6Tu0phZWbb5ZR6nJJbYaw4IXl rTrGTr2zhMKVD28pyV12fN/V1eKE4CImqFbhAMOWIwCja2Ja+pIncN6EwgOg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867978; x= 1715954378; bh=+2WEMyTqWKNhMj6QhIZf6GFM0RxapZhBZiw+isG8OcI=; b=g 7Zi8nXMH8cRi7RR9rb80J20MasOsBpjvr4hXfKiYm+Hg0zMprWZAMHMTXxHVXVy0 h4J3IcLZwXv3y521N6Nxei7xuDEGg42iEMq7k8YZYsF6y4XdQDSoUu/zuJ42akrz pSdFou5uMsQ3+CEOXfoYb2UK8Q2KdzQVo3QhDZ9izDFB0+5A9JDNSq47oCO52zO5 zknoHIBDpHmchRi0IKY0IkyX1cK+Ku3jKGEEGTmbBTpyihvdYHBs25rPPWUjzDdv qkf0B799KA4bt/7SUx+Z+Tvpe1fDuJXbKEmAdBZX0HWLkuNg5Q65epqzLa5y1V8K HuwT86oAWKfZLD4aemptA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgjedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 02/12] automation: update fedora build to F39 Date: Thu, 16 May 2024 15:58:23 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Fedora 29 is long EOL Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/build/fedora/29.dockerfile | 46 +---------------------------- automation/build/fedora/39.dockerfile | 46 ++++++++++++++++++++++++++++- automation/gitlab-ci/build.yaml | 4 +- 3 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 automation/build/fedora/29.dockerfile create mode 100644 automation/build/fedora/39.dockerfile diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile deleted file mode 100644 index f473ae13e7c1..000000000000 --- a/automation/build/fedora/29.dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM --platform=linux/amd64 fedora:29 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -# install Xen depends -RUN dnf -y install \ - clang \ - gcc \ - gcc-c++ \ - ncurses-devel \ - zlib-devel \ - openssl-devel \ - python-devel \ - python3-devel \ - libuuid-devel \ - pkgconfig \ - flex \ - bison \ - libaio-devel \ - glib2-devel \ - yajl-devel \ - pixman-devel \ - glibc-devel \ - make \ - binutils \ - git \ - wget \ - acpica-tools \ - python-markdown \ - patch \ - checkpolicy \ - dev86 \ - xz-devel \ - bzip2 \ - nasm \ - ocaml \ - ocaml-findlib \ - golang \ - # QEMU - ninja-build \ - && dnf clean all && \ - rm -rf /var/cache/dnf - -RUN useradd --create-home user -USER user -WORKDIR /build diff --git a/automation/build/fedora/39.dockerfile b/automation/build/fedora/39.dockerfile new file mode 100644 index 000000000000..054f73444060 --- /dev/null +++ b/automation/build/fedora/39.dockerfile @@ -0,0 +1,46 @@ +FROM --platform=linux/amd64 fedora:39 +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +# install Xen depends +RUN dnf -y install \ + clang \ + gcc \ + gcc-c++ \ + ncurses-devel \ + zlib-devel \ + openssl-devel \ + python-devel \ + python3-devel \ + libuuid-devel \ + pkgconfig \ + flex \ + bison \ + libaio-devel \ + glib2-devel \ + yajl-devel \ + pixman-devel \ + glibc-devel \ + make \ + binutils \ + git \ + wget \ + acpica-tools \ + python-markdown \ + patch \ + checkpolicy \ + dev86 \ + xz-devel \ + bzip2 \ + nasm \ + ocaml \ + ocaml-findlib \ + golang \ + # QEMU + ninja-build \ + && dnf clean all && \ + rm -rf /var/cache/dnf + +RUN useradd --create-home user +USER user +WORKDIR /build diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 49d6265ad5b4..69665ec5b11f 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -691,12 +691,12 @@ debian-bookworm-32-gcc-debug: fedora-gcc: extends: .gcc-x86-64-build variables: - CONTAINER: fedora:29 + CONTAINER: fedora:39 fedora-gcc-debug: extends: .gcc-x86-64-build-debug variables: - CONTAINER: fedora:29 + CONTAINER: fedora:39 # Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5 From patchwork Thu May 16 13:58:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666236 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 0B57EC25B78 for ; Thu, 16 May 2024 13:59:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723360.1128167 (Exim 4.92) (envelope-from ) id 1s7be6-0006vC-F8; Thu, 16 May 2024 13:59:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723360.1128167; Thu, 16 May 2024 13:59:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7be6-0006us-A9; Thu, 16 May 2024 13:59:46 +0000 Received: by outflank-mailman (input) for mailman id 723360; Thu, 16 May 2024 13:59: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 1s7be4-0006bS-Hh for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:44 +0000 Received: from fhigh5-smtp.messagingengine.com (fhigh5-smtp.messagingengine.com [103.168.172.156]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 89f4f4df-138c-11ef-909d-e314d9c70b13; Thu, 16 May 2024 15:59:41 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 20B841140102; Thu, 16 May 2024 09:59:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 May 2024 09:59:40 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:38 -0400 (EDT) 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: 89f4f4df-138c-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867980; x=1715954380; bh=v8UvuOInE1 5TzCQTzCfX1F4m6ztY1tE/KixumMSvRV0=; b=4S2FrE7dCFylYj9l8v4/KoW/kk 50P+ca1qmgc0bDalyGezoapVGmT9vZzM6DV74E3ZSqbh6pxILDVX9PqCIDFsj+de F6AKT0QcrpaOyFHVGoAwzo3T9Qk7Va9p9f2OTmFS6Ah+FGlviP4o6EQZSzZ1XcTv W2j1I1O+5coU9ELiZsv+NgV8waOkWmI9rJacgclW9uYgvKo0GFT6WYQZvz0LRIP8 aN4JQfKV689rIrvm7V7Y5c/zkDpjCTSAOgG0D1XiHGoKoSMV9N94BQIERY9ruGq6 nwGB4E1OMqgu1GxLLW1KOpsN70b/h25sGUDiKy6WKwnFs6xYuc+x0afO9zlQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867980; x= 1715954380; bh=v8UvuOInE15TzCQTzCfX1F4m6ztY1tE/KixumMSvRV0=; b=C 4BvatJCXI7ML75S7WioE4RI79cKW0HLmwuCK2tWmSOwRo2rIV4T/E9Lm+gx2rFO/ 72sLRdnUG5dDKzaNWygJzmdi1h65nPUcoC/93maeIUP1DgG5tbrESixMk/x73Fyh RzKs5kq+8k3qqSABqshvCwLONZAH7/jHl/KMf2uVHHI347nxjLrk5AWg1U8f0U7x 5tgmYJdnrDAd+1v3YFOqCK2/nhg5ut1+KWkh7u4nMXgn53tFoWaCcQOL5vJ4OrLL YspxLw88Z44YCS8ret+IGAf/yP/sHNR8UjJ8W7/5+Ehpa7BfXNUFHBY9nn5eL6KJ unSsCZjXXfr0nlX1ll+2g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpeel fedtfefgfffghfevhfehvdeileehheffueekieetfeffhfetgefggfejudfggeenucffoh hmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhngh hslhgrsgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 03/12] automation: switch to alpine:3.19 Date: Thu, 16 May 2024 15:58:24 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Alpine 3.19 is needed for upcoming stubdomain tests, as linux stubdomain build requires dracut-core package (dracut-install tool specifically) which isn't available in 3.18. While technically it will be needed only in the x86_64 builds, switch Alpine version everywhere for uniformity. Note this bumps kernel version requirement on docker runners - dracut-install uses faccessat2() syscall which was introduced in Linux 5.8. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini --- automation/build/alpine/3.18-arm64v8.dockerfile | 49 +------ automation/build/alpine/3.18.dockerfile | 51 +------ automation/build/alpine/3.19-arm64v8.dockerfile | 49 ++++++- automation/build/alpine/3.19.dockerfile | 51 ++++++- automation/gitlab-ci/build.yaml | 56 +++---- automation/gitlab-ci/test.yaml | 52 +++--- automation/scripts/containerize | 4 +- automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile | 65 +-------- automation/tests-artifacts/alpine/3.18.dockerfile | 66 +-------- automation/tests-artifacts/alpine/3.19-arm64v8.dockerfile | 65 ++++++++- automation/tests-artifacts/alpine/3.19.dockerfile | 67 ++++++++- 11 files changed, 288 insertions(+), 287 deletions(-) delete mode 100644 automation/build/alpine/3.18-arm64v8.dockerfile delete mode 100644 automation/build/alpine/3.18.dockerfile create mode 100644 automation/build/alpine/3.19-arm64v8.dockerfile create mode 100644 automation/build/alpine/3.19.dockerfile delete mode 100644 automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile delete mode 100644 automation/tests-artifacts/alpine/3.18.dockerfile create mode 100644 automation/tests-artifacts/alpine/3.19-arm64v8.dockerfile create mode 100644 automation/tests-artifacts/alpine/3.19.dockerfile diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile deleted file mode 100644 index 91e90220240f..000000000000 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM --platform=linux/arm64/v8 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apk --no-cache add \ - \ - # xen build deps - argp-standalone \ - autoconf \ - bash \ - bison \ - curl \ - dev86 \ - dtc-dev \ - flex \ - gcc \ - git \ - iasl \ - libaio-dev \ - libfdt \ - linux-headers \ - make \ - musl-dev \ - ncurses-dev \ - ocaml \ - ocaml-findlib \ - patch \ - python3-dev \ - py3-setuptools \ - texinfo \ - util-linux-dev \ - xz-dev \ - yajl-dev \ - zlib-dev \ - \ - # qemu build deps - glib-dev \ - libattr \ - libcap-ng-dev \ - pixman-dev \ - # qubes test deps - openssh-client \ - fakeroot \ diff --git a/automation/build/alpine/3.18.dockerfile b/automation/build/alpine/3.18.dockerfile deleted file mode 100644 index 8d5dac05b01f..000000000000 --- a/automation/build/alpine/3.18.dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -FROM --platform=linux/amd64 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apk --no-cache add \ - \ - # xen build deps - argp-standalone \ - autoconf \ - bash \ - bison \ - clang \ - curl \ - dev86 \ - flex \ - g++ \ - gcc \ - git \ - grep \ - iasl \ - libaio-dev \ - libc6-compat \ - linux-headers \ - make \ - musl-dev \ - ncurses-dev \ - ocaml \ - ocaml-findlib \ - patch \ - python3-dev \ - py3-setuptools \ - texinfo \ - util-linux-dev \ - xz-dev \ - yajl-dev \ - zlib-dev \ - \ - # qemu build deps - glib-dev \ - libattr \ - libcap-ng-dev \ - ninja \ - pixman-dev \ - # livepatch-tools deps - elfutils-dev \ diff --git a/automation/build/alpine/3.19-arm64v8.dockerfile b/automation/build/alpine/3.19-arm64v8.dockerfile new file mode 100644 index 000000000000..158cf465a9ff --- /dev/null +++ b/automation/build/alpine/3.19-arm64v8.dockerfile @@ -0,0 +1,49 @@ +FROM --platform=linux/arm64/v8 alpine:3.19 +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apk --no-cache add \ + \ + # xen build deps + argp-standalone \ + autoconf \ + bash \ + bison \ + curl \ + dev86 \ + dtc-dev \ + flex \ + gcc \ + git \ + iasl \ + libaio-dev \ + libfdt \ + linux-headers \ + make \ + musl-dev \ + ncurses-dev \ + ocaml \ + ocaml-findlib \ + patch \ + python3-dev \ + py3-setuptools \ + texinfo \ + util-linux-dev \ + xz-dev \ + yajl-dev \ + zlib-dev \ + \ + # qemu build deps + glib-dev \ + libattr \ + libcap-ng-dev \ + pixman-dev \ + # qubes test deps + openssh-client \ + fakeroot \ diff --git a/automation/build/alpine/3.19.dockerfile b/automation/build/alpine/3.19.dockerfile new file mode 100644 index 000000000000..0be6d7c85fe7 --- /dev/null +++ b/automation/build/alpine/3.19.dockerfile @@ -0,0 +1,51 @@ +FROM --platform=linux/amd64 alpine:3.19 +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apk --no-cache add \ + \ + # xen build deps + argp-standalone \ + autoconf \ + bash \ + bison \ + clang \ + curl \ + dev86 \ + flex \ + g++ \ + gcc \ + git \ + grep \ + iasl \ + libaio-dev \ + libc6-compat \ + linux-headers \ + make \ + musl-dev \ + ncurses-dev \ + ocaml \ + ocaml-findlib \ + patch \ + python3-dev \ + py3-setuptools \ + texinfo \ + util-linux-dev \ + xz-dev \ + yajl-dev \ + zlib-dev \ + \ + # qemu build deps + glib-dev \ + libattr \ + libcap-ng-dev \ + ninja \ + pixman-dev \ + # livepatch-tools deps + elfutils-dev \ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 69665ec5b11f..b186289bbd82 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -258,9 +258,9 @@ # Arm test artifacts -alpine-3.18-arm64-rootfs-export: +alpine-3.19-arm64-rootfs-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-arm64v8 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.19-arm64v8 script: - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz artifacts: @@ -318,9 +318,9 @@ qemu-system-ppc64-8.1.0-ppc64-export: # x86_64 test artifacts -alpine-3.18-rootfs-export: +alpine-3.19-rootfs-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.19 script: - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz artifacts: @@ -344,15 +344,15 @@ kernel-6.1.19-export: # Build jobs needed for tests -alpine-3.18-gcc: +alpine-3.19-gcc: extends: .gcc-x86-64-build variables: - CONTAINER: alpine:3.18 + CONTAINER: alpine:3.19 -alpine-3.18-gcc-debug: +alpine-3.19-gcc-debug: extends: .gcc-x86-64-build-debug variables: - CONTAINER: alpine:3.18 + CONTAINER: alpine:3.19 debian-stretch-gcc-debug: extends: .gcc-x86-64-build-debug @@ -435,57 +435,57 @@ debian-bookworm-gcc-debug-arm64-randconfig: CONTAINER: debian:bookworm-arm64v8 RANDCONFIG: y -alpine-3.18-gcc-arm64: +alpine-3.19-gcc-arm64: extends: .gcc-arm64-build variables: - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 -alpine-3.18-gcc-debug-arm64: +alpine-3.19-gcc-debug-arm64: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 -alpine-3.18-gcc-arm64-randconfig: +alpine-3.19-gcc-arm64-randconfig: extends: .gcc-arm64-build variables: - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 RANDCONFIG: y -alpine-3.18-gcc-debug-arm64-randconfig: +alpine-3.19-gcc-debug-arm64-randconfig: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 RANDCONFIG: y -alpine-3.18-gcc-debug-arm64-staticmem: +alpine-3.19-gcc-debug-arm64-staticmem: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_EXPERT=y CONFIG_UNSUPPORTED=y CONFIG_STATIC_MEMORY=y -alpine-3.18-gcc-debug-arm64-static-shared-mem: +alpine-3.19-gcc-debug-arm64-static-shared-mem: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_UNSUPPORTED=y CONFIG_STATIC_MEMORY=y CONFIG_STATIC_SHM=y -alpine-3.18-gcc-debug-arm64-boot-cpupools: +alpine-3.19-gcc-debug-arm64-boot-cpupools: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_BOOT_TIME_CPUPOOLS=y -alpine-3.18-gcc-debug-arm64-earlyprintk: +alpine-3.19-gcc-debug-arm64-earlyprintk: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_EARLY_UART_CHOICE_PL011=y CONFIG_EARLY_UART_BASE_ADDRESS=0x9000000 @@ -588,15 +588,15 @@ debian-bookworm-gcc-arm64-cppcheck: # Build jobs not needed for tests -alpine-3.18-clang: +alpine-3.19-clang: extends: .clang-x86-64-build variables: - CONTAINER: alpine:3.18 + CONTAINER: alpine:3.19 -alpine-3.18-clang-debug: +alpine-3.19-clang-debug: extends: .clang-x86-64-build-debug variables: - CONTAINER: alpine:3.18 + CONTAINER: alpine:3.19 archlinux-gcc: extends: .gcc-x86-64-build diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ad249fa0a5d9..f62d426a8d34 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -3,7 +3,7 @@ image: registry.gitlab.com/xen-project/xen/${CONTAINER} .arm64-test-needs: &arm64-test-needs - - alpine-3.18-arm64-rootfs-export + - alpine-3.19-arm64-rootfs-export - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export @@ -11,7 +11,7 @@ - qemu-system-aarch64-6.0.0-arm32-export .x86-64-test-needs: &x86-64-test-needs - - alpine-3.18-rootfs-export + - alpine-3.19-rootfs-export - kernel-6.1.19-export .qemu-arm64: @@ -100,7 +100,7 @@ extends: .test-jobs-common variables: # the test controller runs on RPi4 - CONTAINER: alpine:3.18-arm64v8 + CONTAINER: alpine:3.19-arm64v8 LOGFILE: smoke-test.log PCIDEV: "03:00.0" PCIDEV_INTR: "MSI-X" @@ -149,7 +149,7 @@ xilinx-smoke-dom0less-arm64-gcc: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.19-gcc-arm64 xilinx-smoke-dom0less-arm64-gcc-gem-passthrough: extends: .xilinx-arm64 @@ -157,7 +157,7 @@ xilinx-smoke-dom0less-arm64-gcc-gem-passthrough: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh gem-passthrough 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.19-gcc-arm64 adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 @@ -165,7 +165,7 @@ adl-smoke-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.19-gcc-debug adl-smoke-x86-64-dom0pvh-gcc-debug: extends: .adl-x86-64 @@ -173,7 +173,7 @@ adl-smoke-x86-64-dom0pvh-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.19-gcc-debug adl-suspend-x86-64-gcc-debug: extends: .adl-x86-64 @@ -181,7 +181,7 @@ adl-suspend-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.19-gcc-debug adl-pci-pv-x86-64-gcc-debug: extends: .adl-x86-64 @@ -189,7 +189,7 @@ adl-pci-pv-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.19-gcc-debug adl-pci-hvm-x86-64-gcc-debug: extends: .adl-x86-64 @@ -197,7 +197,7 @@ adl-pci-hvm-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.19-gcc-debug zen3p-smoke-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -205,7 +205,7 @@ zen3p-smoke-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.19-gcc-debug zen3p-smoke-x86-64-dom0pvh-gcc-debug: extends: .zen3p-x86-64 @@ -213,7 +213,7 @@ zen3p-smoke-x86-64-dom0pvh-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.19-gcc-debug zen3p-pci-hvm-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -221,7 +221,7 @@ zen3p-pci-hvm-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.19-gcc-debug qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 @@ -229,7 +229,7 @@ qemu-smoke-dom0-arm64-gcc: - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.19-gcc-arm64 qemu-smoke-dom0-arm64-gcc-debug: extends: .qemu-arm64 @@ -237,7 +237,7 @@ qemu-smoke-dom0-arm64-gcc-debug: - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.19-gcc-debug-arm64 qemu-smoke-dom0less-arm64-gcc: extends: .qemu-arm64 @@ -245,7 +245,7 @@ qemu-smoke-dom0less-arm64-gcc: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.19-gcc-arm64 qemu-smoke-dom0less-arm64-gcc-debug: extends: .qemu-arm64 @@ -253,7 +253,7 @@ qemu-smoke-dom0less-arm64-gcc-debug: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.19-gcc-debug-arm64 qemu-smoke-dom0less-arm64-gcc-debug-gicv3: extends: .qemu-arm64 @@ -261,7 +261,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-gicv3: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh gicv3 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.19-gcc-debug-arm64 qemu-smoke-dom0less-arm64-gcc-debug-staticmem: extends: .qemu-arm64 @@ -269,7 +269,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-staticmem: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64-staticmem + - alpine-3.19-gcc-debug-arm64-staticmem qemu-smoke-dom0less-arm64-gcc-debug-staticheap: extends: .qemu-arm64 @@ -277,7 +277,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-staticheap: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.19-gcc-debug-arm64 qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem: extends: .qemu-arm64 @@ -285,7 +285,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64-static-shared-mem + - alpine-3.19-gcc-debug-arm64-static-shared-mem qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools: extends: .qemu-arm64 @@ -293,7 +293,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64-boot-cpupools + - alpine-3.19-gcc-debug-arm64-boot-cpupools qemu-smoke-dom0less-arm64-gcc-debug-earlyprintk: extends: .qemu-arm64 @@ -301,14 +301,14 @@ qemu-smoke-dom0less-arm64-gcc-debug-earlyprintk: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh earlyprintk 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64-earlyprintk + - alpine-3.19-gcc-debug-arm64-earlyprintk qemu-xtf-dom0less-arm64-gcc-hyp-xen-version: extends: .qemu-arm64 script: - ./automation/scripts/qemu-xtf-dom0less-arm64.sh hyp-xen-version 2>&1 | tee ${LOGFILE} needs: - - alpine-3.18-gcc-arm64 + - alpine-3.19-gcc-arm64 - qemu-system-aarch64-6.0.0-arm64-export qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version: @@ -316,7 +316,7 @@ qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version: script: - ./automation/scripts/qemu-xtf-dom0less-arm64.sh hyp-xen-version 2>&1 | tee ${LOGFILE} needs: - - alpine-3.18-gcc-debug-arm64 + - alpine-3.19-gcc-debug-arm64 - qemu-system-aarch64-6.0.0-arm64-export qemu-smoke-dom0-arm32-gcc: @@ -389,7 +389,7 @@ qemu-alpine-x86_64-gcc: - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc + - alpine-3.19-gcc qemu-smoke-x86-64-gcc: extends: .qemu-x86-64 diff --git a/automation/scripts/containerize b/automation/scripts/containerize index acdef1b54813..ae82e727b0b6 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -24,8 +24,8 @@ die() { # BASE="registry.gitlab.com/xen-project/xen" case "_${CONTAINER}" in - _alpine) CONTAINER="${BASE}/alpine:3.18" ;; - _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.18-arm64v8" ;; + _alpine) CONTAINER="${BASE}/alpine:3.19" ;; + _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.19-arm64v8" ;; _archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;; _riscv64) CONTAINER="${BASE}/archlinux:current-riscv64" ;; _centos7) CONTAINER="${BASE}/centos:7" ;; diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile deleted file mode 100644 index 0e5ae7f2b4d8..000000000000 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -FROM --platform=linux/arm64/v8 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add networking sysinit && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add killprocs shutdown && \ - rc-update add modloop sysinit && \ - rc-update add modules boot && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add sysctl boot && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile deleted file mode 100644 index 9cde6c9ad4da..000000000000 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -FROM --platform=linux/amd64 alpine:3.18 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add libgcc && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - apk add pciutils && \ - apk add libelf && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add modules boot && \ - rc-update add killprocs shutdown && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ - echo > /etc/modules && \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var diff --git a/automation/tests-artifacts/alpine/3.19-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.19-arm64v8.dockerfile new file mode 100644 index 000000000000..68a5831bca72 --- /dev/null +++ b/automation/tests-artifacts/alpine/3.19-arm64v8.dockerfile @@ -0,0 +1,65 @@ +FROM --platform=linux/arm64/v8 alpine:3.19 +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV USER root + +RUN mkdir /build +WORKDIR /build + +RUN \ + # apk + apk update && \ + \ + # xen runtime deps + apk add musl && \ + apk add openrc && \ + apk add busybox && \ + apk add sudo && \ + apk add dbus && \ + apk add bash && \ + apk add python3 && \ + apk add zlib && \ + apk add ncurses && \ + apk add yajl && \ + apk add libaio && \ + apk add xz && \ + apk add util-linux && \ + apk add argp-standalone && \ + apk add libfdt && \ + apk add glib && \ + apk add pixman && \ + apk add curl && \ + apk add udev && \ + \ + # Xen + cd / && \ + # Minimal ramdisk environment in case of cpio output + rc-update add udev && \ + rc-update add udev-trigger && \ + rc-update add udev-settle && \ + rc-update add networking sysinit && \ + rc-update add loopback sysinit && \ + rc-update add bootmisc boot && \ + rc-update add devfs sysinit && \ + rc-update add dmesg sysinit && \ + rc-update add hostname boot && \ + rc-update add hwclock boot && \ + rc-update add hwdrivers sysinit && \ + rc-update add killprocs shutdown && \ + rc-update add modloop sysinit && \ + rc-update add modules boot && \ + rc-update add mount-ro shutdown && \ + rc-update add savecache shutdown && \ + rc-update add sysctl boot && \ + rc-update add local default && \ + cp -a /sbin/init /init && \ + echo "ttyS0" >> /etc/securetty && \ + echo "hvc0" >> /etc/securetty && \ + echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ + echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ + passwd -d "root" root && \ + \ + # Create rootfs + cd / && \ + tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var diff --git a/automation/tests-artifacts/alpine/3.19.dockerfile b/automation/tests-artifacts/alpine/3.19.dockerfile new file mode 100644 index 000000000000..6d665daedfa4 --- /dev/null +++ b/automation/tests-artifacts/alpine/3.19.dockerfile @@ -0,0 +1,67 @@ +FROM --platform=linux/amd64 alpine:3.19 +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV USER root + +RUN mkdir /build +WORKDIR /build + +RUN \ + # apk + apk update && \ + \ + # xen runtime deps + apk add musl && \ + apk add libgcc && \ + apk add openrc && \ + apk add busybox && \ + apk add sudo && \ + apk add dbus && \ + apk add bash && \ + apk add python3 && \ + apk add zlib && \ + apk add ncurses && \ + apk add yajl && \ + apk add libaio && \ + apk add xz && \ + apk add util-linux && \ + apk add argp-standalone && \ + apk add libfdt && \ + apk add glib && \ + apk add pixman && \ + apk add curl && \ + apk add udev && \ + apk add pciutils && \ + apk add libelf && \ + apk add libdw && \ + \ + # Xen + cd / && \ + # Minimal ramdisk environment in case of cpio output + rc-update add udev && \ + rc-update add udev-trigger && \ + rc-update add udev-settle && \ + rc-update add loopback sysinit && \ + rc-update add bootmisc boot && \ + rc-update add devfs sysinit && \ + rc-update add dmesg sysinit && \ + rc-update add hostname boot && \ + rc-update add hwclock boot && \ + rc-update add hwdrivers sysinit && \ + rc-update add modules boot && \ + rc-update add killprocs shutdown && \ + rc-update add mount-ro shutdown && \ + rc-update add savecache shutdown && \ + rc-update add local default && \ + cp -a /sbin/init /init && \ + echo "ttyS0" >> /etc/securetty && \ + echo "hvc0" >> /etc/securetty && \ + echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ + echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ + echo > /etc/modules && \ + passwd -d "root" root && \ + \ + # Create rootfs + cd / && \ + tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var From patchwork Thu May 16 13:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666237 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 76390C25B7D for ; Thu, 16 May 2024 13:59:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723359.1128156 (Exim 4.92) (envelope-from ) id 1s7be5-0006cp-5B; Thu, 16 May 2024 13:59:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723359.1128156; Thu, 16 May 2024 13:59: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 1s7be5-0006cg-2L; Thu, 16 May 2024 13:59:45 +0000 Received: by outflank-mailman (input) for mailman id 723359; Thu, 16 May 2024 13:59: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 1s7be3-0005tl-L6 for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:43 +0000 Received: from fout8-smtp.messagingengine.com (fout8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8ab89abf-138c-11ef-b4bb-af5377834399; Thu, 16 May 2024 15:59:42 +0200 (CEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id 5F64313803A4; Thu, 16 May 2024 09:59:41 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 16 May 2024 09:59:41 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:40 -0400 (EDT) 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: 8ab89abf-138c-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867981; x=1715954381; bh=Y5qffu5/Vu +XKaybYq8e5lXVQKHQBbeNSAMA/00cIO8=; b=vm4+SF2jJWHszzivlgxwOtKZcj 1mVOHWWFAdq0r8scQu2OImIwabRzlhxn77GJ9KgVEIwABGWx04zMncfpo99UElSB A6TFB9Gxf3VBttMHRePH7qQhYBG3mv2KGG4SJDpoq0ndI/vygRc+VT8nz6I6OAjg SUa3sREWuLL2UgBJpu0yOur4UgXxB0M9o8k11n10mJXpmfbQhAZr9o4uBgW7jWAK HIQB0OJZweTsujJbrLLHRm/mVs++i3PHXUgsPWuKOqqXV/kAONZhjItCFajTxvj4 ezj3rvk0bywETFfnmNxy1pJcBS+UgPsmKsC1zbdtd5uUTRQjrUG6DeDm9LGA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867981; x= 1715954381; bh=Y5qffu5/Vu+XKaybYq8e5lXVQKHQBbeNSAMA/00cIO8=; b=Y CVeDLVNaIoCLUCRAmQdHFHrr9kD3hZh3Eyq7mL3zaMUFRc/mVUQWyxihsO7mJOlk /ZPP/OvmjPbnDXo3mJRadYly/GIsWSOjAQD3S5dTD3rnuVf8niXWLycjltEyJ4Y9 BNB3x83K7mH/SPI6yQa1U5JTFoM23puj+TSIvkXeGvUHDSZkSZRYtrG84FH8Na6Q SKx4SFN0XjOiRnXAyToQehiOIO4I7Q+0f4yPP1JGNqvF4uFl45aZ+5a1tYmk90kV vZ0rAJsEAqY+yDuQHuYeqgkJJx6CdcsPpLSp5LYIbyl/SYnGhJGZhR1dek5icQtt /ApqeFH4rAdFNvirLhSBw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 04/12] automation: increase verbosity of starting a domain Date: Thu, 16 May 2024 15:58:25 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 And start collecting qemu log earlier, so it isn't lost in case of a timeout during domain startup. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 8e398dcea34b..a188d60ea6f3 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -56,7 +56,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index d91648905669..3d208cd55bfa 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -21,7 +21,7 @@ echo "#!/bin/bash xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > ./root/xen.start echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index e0bb37af3610..afc24074eef8 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -52,7 +52,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 4beeff17d31b..bd620b0d9273 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -112,7 +112,6 @@ echo \"${passed}\" " dom0_check=" -tail -F /var/log/xen/qemu-dm-domU.log & until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do sleep 1 done @@ -167,7 +166,8 @@ ifconfig xenbr0 192.168.0.1 # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & +xl -vvv create /etc/xen/domU.cfg ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start From patchwork Thu May 16 13:58:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666238 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 18CA9C25B77 for ; Thu, 16 May 2024 13:59:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723361.1128171 (Exim 4.92) (envelope-from ) id 1s7be6-0006zI-Q9; Thu, 16 May 2024 13:59:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723361.1128171; Thu, 16 May 2024 13:59:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7be6-0006y2-Ky; Thu, 16 May 2024 13:59:46 +0000 Received: by outflank-mailman (input) for mailman id 723361; Thu, 16 May 2024 13:59:45 +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 1s7be5-0006bS-6e for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:45 +0000 Received: from fout8-smtp.messagingengine.com (fout8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8b79953b-138c-11ef-909d-e314d9c70b13; Thu, 16 May 2024 15:59:43 +0200 (CEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id A72EC13814A2; Thu, 16 May 2024 09:59:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 16 May 2024 09:59:42 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:41 -0400 (EDT) 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: 8b79953b-138c-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867982; x=1715954382; bh=cBlSjeC6zd zYMoWYLWhLp1CCK8q23xDxzAsx9E+dnrY=; b=mo6UKpsRNc7gr9AnBbyV8Cs/wV MnFgDUgiGTtBCZ5f0n04z5oFFW4xQQN1bahC8/TeFnmZXbWFCdB2FrECcyqQWKox RNgXHQcM85IdpAuNgzMzpkSXdEaOQmOd2+Kvo5uXkgGzpH+IASF4LLGVcjwXDA/v xoE/q98GDarHuyLYOVwzcVVZ20MqohdwHI1G1BwotOWx5S9LjI43SxOiPVNK9xaU wRUXxli5/5n/J/+X+aujx08Mtn075TtkXyfRNrxatpDmhuuO+YYLLSZjblfTeIu+ XgeklA6dwlwQbyr8YJ4qby6BzgxTAxJzWiEKiXANl/65b1+zRAeFY82fqpTw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867982; x= 1715954382; bh=cBlSjeC6zdzYMoWYLWhLp1CCK8q23xDxzAsx9E+dnrY=; b=c gNdw/XMpKM3xQC6wzV+yp3TnZlF7DG4A/9JrdGJPKx55dh7nyZYYYRddKsiAwjAN 2D7mk5J+6ywb2iBxF5pfW5cbqQ9o3FJjeLDh5p3u4uDpnirT2ao4CaRYiuJfRKGF 2tJSFwEPfeQ9btJ7EX6Hbp+CleXu0AVFdY5C5ew1lk6vsZ4JGJaALx4mVx74qmap vIOYOYb4VQbQokmnr8RhcSLiQO70P/ZUVQ3I3ClpbXXgarzrL3vgAZUH2tAvZkCw LcC4o0hHdRbUwcJ4BAOjG5uYeYxU7pW4H0sjVJ191NqLrh1WEITiIPmEkwAun6Lo ANlJKAGIgJrl/zA7+FQVQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 05/12] automation: prevent grub unpacking initramfs Date: Thu, 16 May 2024 15:58:26 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 It fails on larger initramfs (~250MB one), let Linux do it. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index bd620b0d9273..77cb0d45815d 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -189,7 +189,7 @@ CONTROLLER=control@thor.testnet echo " multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen -module2 (http)/gitlab-ci/initrd-dom0 +module2 --nounzip (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg cp -f binaries/xen $TFTP/xen From patchwork Thu May 16 13:58:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666239 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 763B9C41513 for ; Thu, 16 May 2024 13:59:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723362.1128179 (Exim 4.92) (envelope-from ) id 1s7be7-00077m-DO; Thu, 16 May 2024 13:59:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723362.1128179; Thu, 16 May 2024 13:59:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7be7-00076P-42; Thu, 16 May 2024 13:59:47 +0000 Received: by outflank-mailman (input) for mailman id 723362; Thu, 16 May 2024 13:59:46 +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 1s7be6-0006bS-6e for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:46 +0000 Received: from fhigh5-smtp.messagingengine.com (fhigh5-smtp.messagingengine.com [103.168.172.156]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8c3a470a-138c-11ef-909d-e314d9c70b13; Thu, 16 May 2024 15:59:44 +0200 (CEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.nyi.internal (Postfix) with ESMTP id E763D11400E9; Thu, 16 May 2024 09:59:43 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 16 May 2024 09:59:43 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:42 -0400 (EDT) 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: 8c3a470a-138c-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867983; x=1715954383; bh=mzdnDiyd0w yM7KrExNqycAdweGbpvBzSfJbl9cbzN/g=; b=g2vPIMHedE9HToZItkYtCegsib mayoJQ6/W4vR7HFVyvwit7sz6blxVUTSO3ySuu4/6gWC5Jn4mEPi0ODPYgXQ5/0y CBa6Kdg3Jk/t2eEXTH1vkJe1cMz71tW/qDH4gessgBlwYbUZt2GxaXSUZdCT2MrI upsGqV8grDZ9mpDHm1AyqsnaaVBLcN5lJSyFXMq+y7RRp1e28v3UYvHgPdboSKLi RN/rIDHtFGuCvc3Qs3AFCxDUV/GLylwySrUon0gLLY4iFdj2PBrOvXc+vUhYVMSH 1UXTc21HrilCrVeZfR5nSE9gRh5aMk16kBb7r7nR7RsJn8LEG0j567ySce+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867983; x= 1715954383; bh=mzdnDiyd0wyM7KrExNqycAdweGbpvBzSfJbl9cbzN/g=; b=T nTJZpOKfR6EvpzmUZJuwcyXkW7tb5p7Kifu9ZqlEAGfvfxt2ifm1cjub4mi0WBEY nznjCo4/pOwKaLT4q5eqOv2ZKgnfhd+xWPs/f8e2gXU8x0049uZdqo8nDAbHpMnt zNWF0DE9akff30mLjzWo5Z0Lf2PSrQuzVfgmYud1Xjb0uDAXDY7l2egZdc6T/7aH sDuHOOgfZjq5pDaR4xTEGkvgxfHXj8GMD5P1aH6w91EICexJ/ooVDypNX7mjY4Bf PvxOwd3Bdqb8E10h8OtV9ZYIINsxwurAS0l7l9Yg77FU4OY5gmmEtMNVqKa6wegM eVsoBxhGhAfgLkJoZolKw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpeff ffeiueffueejleevteduffehvddvgfetkeehlefgvefggfehhefhfeffuefhtdenucffoh hmrghinhepghhithhlrggsrdgtohhmpdhgihhthhhusgdrtghomhenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgvkhesihhnvh hishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 06/12] RFC: automation: Add linux stubdom build and smoke test Date: Thu, 16 May 2024 15:58:27 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Add minimal linux-stubdom smoke test. It starts a simple HVM with linux-stubdom. The actual stubdom implementation is taken from Qubes OS and then stripped off Qubes-specific code. In particular, the remaining code does _not_ support: - direct kernel boot (implemented by relaying on specific guest disk laying in Qubes OS) - graphical console (used Qubes GUI agent injected into stubdomain's qemu) - audio input/output (used Qubes audio agent inside stubdomain) - USB passthrough (used qrexec <-> usbip proxy inside stubdomain) - setting up DHCP server (assumes guest addressing used in Qubes OS) For this smoke test, the relevant part is missing direct kernel boot, as that's used in other smoke tests. Solve this by preparing disk image with proper bootloader (grub) installed. Since the test script is running on arm64 to control x86_64 box, it cannot (easily) install grub directly. For this reason, prepare bootsector as part of the Xen build (which runs on x86_64) and then prepend do the disk image during the test (and adjust partitions table afterwards). Signed-off-by: Marek Marczykowski-Górecki --- The test is implemented using hardware runner, because some of the further tests will require it (for example PCI passthrough with stubdomain). But if there is strong desire to have stubdomain tested inside qemu tests (to be included in patchew runs), it is probably an option for this basic smoke test. For now I'm keeping stubdomain code (build and glue scripts) in separate repository on my github account. This is far from ideal. What would be preferred option? New repository on xenbits? Or add directly into xen.git (stubdom directory)? Honestly, I'd rather avoid the latter, as from packager point of view those are mostly separate beings (similar to qemu, where many use distribution-provide one instead of the one bundled with Xen) and it's convenient to not need to rebuild stubdomain on every hypervisor change (like a security patch). Another topic is QEMU version inside stubdomain. It needs to be a separate build due to vastly different configure options, so I cannot reuse the qemu binary built for dom0 (or distribution-provided one if Xen is configured to use it). But also, at this moment qemu for stubdomain needs few extra patches that are not upstream yet. What should be the proper solution here (after upstreaming all the patches)? Generally, I try to add tests early, even though there is still some work to do for proper stubdomain integration into upstream Xen, so any cleanups and future changes (like the CDROM libxl patches by Jason Andryuk) can be made with more confidence and reduce risk of regressions. The patch is RFC only because of the stubdom repository location. --- automation/build/alpine/3.19-arm64v8.dockerfile | 2 +- automation/build/alpine/3.19.dockerfile | 9 ++- automation/gitlab-ci/build.yaml | 3 +- automation/gitlab-ci/test.yaml | 8 +- automation/scripts/build | 12 ++- automation/scripts/qubes-x86-64.sh | 87 +++++++++++++++- automation/tests-artifacts/alpine/3.19.dockerfile | 6 +- 7 files changed, 123 insertions(+), 4 deletions(-) diff --git a/automation/build/alpine/3.19-arm64v8.dockerfile b/automation/build/alpine/3.19-arm64v8.dockerfile index 158cf465a9ff..12810f87ecc6 100644 --- a/automation/build/alpine/3.19-arm64v8.dockerfile +++ b/automation/build/alpine/3.19-arm64v8.dockerfile @@ -47,3 +47,5 @@ RUN apk --no-cache add \ # qubes test deps openssh-client \ fakeroot \ + sfdisk \ + e2fsprogs \ diff --git a/automation/build/alpine/3.19.dockerfile b/automation/build/alpine/3.19.dockerfile index 0be6d7c85fe7..108284613987 100644 --- a/automation/build/alpine/3.19.dockerfile +++ b/automation/build/alpine/3.19.dockerfile @@ -49,3 +49,12 @@ RUN apk --no-cache add \ pixman-dev \ # livepatch-tools deps elfutils-dev \ + # stubdom deps + dracut-core \ + quilt \ + gnupg \ + libseccomp-dev \ + glib-static \ + gmp-dev \ + mpc1-dev \ + mpfr-dev \ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index b186289bbd82..783a0687ba34 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -323,9 +323,11 @@ alpine-3.19-rootfs-export: image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.19 script: - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz + - cp /grub-core.img binaries/grub-core.img artifacts: paths: - binaries/initrd.tar.gz + - binaries/grub-core.img tags: - x86_64 @@ -353,6 +355,7 @@ alpine-3.19-gcc-debug: extends: .gcc-x86-64-build-debug variables: CONTAINER: alpine:3.19 + STUBDOM_LINUX: y debian-stretch-gcc-debug: extends: .gcc-x86-64-build-debug diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index f62d426a8d34..80d10eb7f476 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -199,6 +199,14 @@ adl-pci-hvm-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.19-gcc-debug +adl-stubdom-hvm-x86-64-gcc-debug: + extends: .adl-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh stubdom-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.19-gcc-debug + zen3p-smoke-x86-64-gcc-debug: extends: .zen3p-x86-64 script: diff --git a/automation/scripts/build b/automation/scripts/build index b3c71fb6fb60..f7c85b07a8d0 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -102,4 +102,16 @@ else # build Xen cp -r dist binaries/ if [[ -f xen/xen ]] ; then cp xen/xen binaries/xen; fi + + if [[ "${STUBDOM_LINUX}" == "y" ]]; then + git clone https://github.com/marmarek/qubes-vmm-xen-stubdom-linux -b for-upstream2 + make -j$(nproc) -C qubes-vmm-xen-stubdom-linux get-sources + CFLAGS="-I${PWD}/dist/install/usr/local/include" \ + LDFLAGS="-L${PWD}/dist/install/usr/local/lib" \ + LD_LIBRARY_PATH="${PWD}/dist/install/usr/local/lib" \ + PATH="${PWD}/dist/install/usr/local/bin:$PATH" \ + make -j$(nproc) -C qubes-vmm-xen-stubdom-linux -f Makefile.stubdom all + cp qubes-vmm-xen-stubdom-linux/build/linux/arch/x86/boot/bzImage binaries/dist/install/usr/local/lib/xen/boot/qemu-stubdom-linux-kernel + cp qubes-vmm-xen-stubdom-linux/build/rootfs/stubdom-linux-rootfs binaries/dist/install/usr/local/lib/xen/boot/qemu-stubdom-linux-rootfs + fi fi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 77cb0d45815d..fc73403dbadf 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -18,6 +18,37 @@ memory = 512 vif = [ "bridge=xenbr0", ] disk = [ ] ' +domU_disk_path= + +### helper functions + +build_domU_disk() { + local kernel="$1" + local initrd="$2" + local rootfs="$3" + local output="$4" + local grubcfg="$rootfs/boot/grub2/grub.cfg" + local kernel_cmdline="root=/dev/xvda1 console=hvc0 earlyprintk=xen" + + mkdir -p "$rootfs/boot/grub2" + cp "$kernel" "$rootfs/boot/vmlinuz" + echo "linux /boot/vmlinuz $kernel_cmdline" >> "$grubcfg" + if [ -n "$initrd" ]; then + cp "$initrd" "$rootfs/boot/initrd.img" + echo "initrd /boot/initrd.img" >> "$grubcfg" + fi + echo "boot" >> "$grubcfg" + size=$(du -sm "$rootfs") + size=${size%% *} + # add 5M margin + size=$(( size + 5 )) + mke2fs -d "$rootfs" "$output.part1" ${size}m + cat "$rootfs/usr/lib/grub/i386-pc/boot_hybrid.img" binaries/grub-core.img > "$output" + # align for the partition 1 start (2048 sectors) + truncate -s $((2048 * 512)) "$output" + cat "$output.part1" >> "$output" + echo ",,linux,*" | sfdisk "$output" +} ### test: smoke test & smoke test PVH if [ -z "${test_variant}" ] || [ "${test_variant}" = "dom0pvh" ]; then @@ -116,6 +147,41 @@ until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU. sleep 1 done " + +### test: stubdom-hvm +elif [ "${test_variant}" = "stubdom-hvm" ]; then + passed="ping test passed" + + domU_config=' +type = "hvm" +name = "domU" +memory = 512 +vif = [ "bridge=xenbr0", ] +disk = [ "/srv/disk.img,format=raw,vdev=xvda" ] +device_model_version = "qemu-xen" +device_model_stubdomain_override = 1 +on_reboot = "destroy" +# libxl configures vkb backend to be dom0 instead of the stubdomain, defer +# changing that until there is consensus what to do about VGA output (VNC) +vkb_device = 0 +' + domU_check=" +ifconfig eth0 192.168.0.2 +until ping -c 10 192.168.0.1; do + sleep 1 +done +echo \"${passed}\" +" + dom0_check=" +set +x +until grep -q \"${passed}\" /var/log/xen/console/guest-domU.log; do + sleep 1 +done +set -x +echo \"${passed}\" +" + + domU_disk_path=/srv/disk.img fi # DomU @@ -137,8 +203,17 @@ ${domU_check} chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf sed -i -e 's/^Welcome/domU \0/' etc/issue -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. +if [ -n "$domU_disk_path" ]; then + build_domU_disk \ + "binaries/bzImage" \ + "" \ + "rootfs" \ + "binaries/disk.img" +else + (cd rootfs; find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz) +fi + rm -rf rootfs # DOM0 rootfs @@ -152,6 +227,9 @@ mkdir srv mkdir sys rm var/run cp -ar ../binaries/dist/install/* . +if [ -n "$domU_disk_path" ]; then + cp ../binaries/disk.img "./$domU_disk_path" +fi echo "#!/bin/bash @@ -164,8 +242,9 @@ ifconfig eth0 up ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 -# get domU console content into test log +# get domU (and possibly its stubdom) console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & +tail -F /var/log/xen/console/guest-domU-dm.log 2>/dev/null | sed -e \"s/^/(domU-dm) /\" & tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & xl -vvv create /etc/xen/domU.cfg ${dom0_check} @@ -178,7 +257,9 @@ echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +if [ -r ../binaries/domU-rootfs.cpio.gz ]; then + cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +fi find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/tests-artifacts/alpine/3.19.dockerfile b/automation/tests-artifacts/alpine/3.19.dockerfile index 6d665daedfa4..cfb2cb30fb30 100644 --- a/automation/tests-artifacts/alpine/3.19.dockerfile +++ b/automation/tests-artifacts/alpine/3.19.dockerfile @@ -35,6 +35,8 @@ RUN \ apk add pciutils && \ apk add libelf && \ apk add libdw && \ + apk add grub-bios && \ + apk add libseccomp && \ \ # Xen cd / && \ @@ -64,4 +66,6 @@ RUN \ \ # Create rootfs cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var + tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var && \ + # Prepare boot sector for HVM disk + grub-mkimage -o /grub-core.img -O i386-pc -p '(hd0,msdos1)/boot/grub2' boot part_msdos ext2 linux biosdisk configfile normal From patchwork Thu May 16 13:58:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666240 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 9C661C25B74 for ; Thu, 16 May 2024 14:00:01 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723363.1128197 (Exim 4.92) (envelope-from ) id 1s7be9-0007kl-P9; Thu, 16 May 2024 13:59:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723363.1128197; Thu, 16 May 2024 13:59:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7be9-0007kG-Ka; Thu, 16 May 2024 13:59:49 +0000 Received: by outflank-mailman (input) for mailman id 723363; Thu, 16 May 2024 13:59:47 +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 1s7be7-0005tl-Gu for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:47 +0000 Received: from fhigh5-smtp.messagingengine.com (fhigh5-smtp.messagingengine.com [103.168.172.156]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8d0b9a40-138c-11ef-b4bb-af5377834399; Thu, 16 May 2024 15:59:46 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 46BA51140163; Thu, 16 May 2024 09:59:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 May 2024 09:59:45 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:44 -0400 (EDT) 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: 8d0b9a40-138c-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867985; x=1715954385; bh=i0tm0hLqA8 ZLzyhanisejpktcCRo0bXMjTCqyw0gS+4=; b=c+7KzSezfvynmGBLoAmYd+WTzm 6Eo7ZAqWKL10udGCmQnv0LPk46g+EJiDfycE5Y1eSsJ04LaABvlGo20C2K4K106E csJDxEnM2QQZvviBMBbh1V8dRAnNgxY/1ZqwNkPB9ktA6I+bs8Xt0ZJfAmx/JftK QW+vQlbaye3hJ0sDB2nDnJNOmRjjVLAJ/ZwktGZcXLnHUcUTqBE7LxoFoD63N6r2 +KxTsI6hneuNhEgbWx9R+fvZZR42j6bg2IDy3xpS0jKpL7gtiv4YJoiQzvlxO/V4 B/GS85GqAg3JnKefGi3gs1Du+c7T06SSBAVG31pHF5yadUKhSX7RnGIY/nrw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867985; x= 1715954385; bh=i0tm0hLqA8ZLzyhanisejpktcCRo0bXMjTCqyw0gS+4=; b=K 08V5F5EbgXuDdcOHoGgBxEk0szGPAhh9I5EUblwRDQy+eoo+LzPnD3UTckbiZu09 QDrZi/774q0lBut6vTjZE4lz48pyZdyq07nK1WvVNn9okEoMh9/nNDps++M+M+Ic myiLzxLLyklVB39B2CogGJ9AeqPXL5fz6zU3B2kFE2Iv3nRUdfc14t2k78oN3gjD 86Xzz/hSH1rLW8fDbx7Ajdh1de/CCmTmP2yV4zhtahVtgi6jepRO1UyG76Jd3KLS bWrbIsKChgP3j7hhGsZWmNYgKzlYM+jke9s/qe01U85/JolXr3W/I+l9YZYrAoV2 2Xy8gGKG6gZ0SGtPEYjBw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Anthony PERARD , Juergen Gross Subject: [PATCH 07/12] libxl: Allow stubdomain to control interupts of PCI device Date: Thu, 16 May 2024 15:58:28 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Especially allow it to control MSI/MSI-X enabling bits. This part only writes a flag to a sysfs, the actual implementation is on the kernel side. This requires Linux >= 5.10 in dom0 (or relevant patch backported). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 96cb4da0794e..6f357b70b815 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -1513,6 +1513,14 @@ static void pci_add_dm_done(libxl__egc *egc, rc = ERROR_FAIL; goto out; } + } else if (libxl_is_stubdom(ctx, domid, NULL)) { + /* Allow acces to MSI enable flag in PCI config space for the stubdom */ + if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/allow_interrupt_control", + pci) < 0 ) { + LOGD(ERROR, domainid, "Setting allow_interrupt_control for device"); + rc = ERROR_FAIL; + goto out; + } } out_no_irq: From patchwork Thu May 16 13:58:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666243 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 19851C25B7B for ; Thu, 16 May 2024 14:00:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723364.1128202 (Exim 4.92) (envelope-from ) id 1s7beA-0007ov-5e; Thu, 16 May 2024 13:59:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723364.1128202; Thu, 16 May 2024 13:59:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7be9-0007no-UG; Thu, 16 May 2024 13:59:49 +0000 Received: by outflank-mailman (input) for mailman id 723364; Thu, 16 May 2024 13:59:48 +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 1s7be8-0006bS-2I for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:48 +0000 Received: from fout8-smtp.messagingengine.com (fout8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8dc5c438-138c-11ef-909d-e314d9c70b13; Thu, 16 May 2024 15:59:47 +0200 (CEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id 7B8C413814B2; Thu, 16 May 2024 09:59:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 16 May 2024 09:59:46 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:45 -0400 (EDT) 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: 8dc5c438-138c-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867986; x=1715954386; bh=u6dbejfCbQ Ta4IPIW9KKt75kBi6AoNdi5qidbD/kO3Q=; b=H+gYi5L/MQNUlVI+sOc+kOKGaa eTr8K5spBGn6SfiU6ug0XIg68Q3AeXNYFfQtabr0CkYt+DzrRmDj/q221D1E6Fmb 39KFsskZD83+QoYzPbpBET/rda8MB+9H6iUDronNtulyctZTkxbkKiBvwug388fS RBYubncENuDLhVQV18yncZCUQ8FeLL1snR+9V3YnZ4U04Z4glPeODai5emRA4m6T co6PkhE6K/CrA1R7dwEk3tjxKPPdZxa0epyzPCY4tDNj+6Q2QanopMq9jSUgE0oQ 7neNjmTOvr1wBgDS48kGY8sl7WAIqhe138tvTCjOGGMaZWire7ttU16+HIlQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867986; x= 1715954386; bh=u6dbejfCbQTa4IPIW9KKt75kBi6AoNdi5qidbD/kO3Q=; b=a xOQXQBOmO9Cew+s8XEfxNFpCMqXk7oJnXsr2yZR0jDE47PccfcStqXCuCQrOD/FZ jOYK3nx9qvxnUEdHOTA42GudDsj5u+E6f30JtJyzuG7o5jMh4Sln8a0dbTVvkpI+ BuqYypnCR5hcJZdrZSOOdjfY/XnxOCeZz4T6Fx1qhWqbzBGvRdys/5hODWXC/T3Z EGVDV1VntIQLAg6ApLobPyftnAceX6SOluZiUTUtPd6V//6zWG7k7UhXfaJ/Df3L szDsxodzwiU9D/pkjGcq7z/Oy4ah46i652ydAWrghD5ycThxHcbuyCFqW7Qn+z6k cUm6cFvv+GSi/C794wHjA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg lefggfeuffegjeduheeigeetueegfeekjeetgffhvdeiffeiieejgfduieekgeenucffoh hmrghinhepghhithhlrggsrdgtohhmpdhkvghrnhgvlhdrohhrghenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgvkhesihhnvh hishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 08/12] automation: update kernel for x86 tests Date: Thu, 16 May 2024 15:58:29 +0200 Message-ID: <2e6dc425056db1267768fd1bd0a20c444b1f1610.1715867907.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Update 6.1.x kernel to the latest version in this branch. This is especially needed to include MSI-X related fixes for stubdomain ("xen-pciback: Consider INTx disabled when MSI/MSI-X is enabled"). Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 4 +- automation/gitlab-ci/test.yaml | 2 +- automation/tests-artifacts/kernel/6.1.19.dockerfile | 40 +-------------- automation/tests-artifacts/kernel/6.1.90.dockerfile | 40 ++++++++++++++- 4 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 automation/tests-artifacts/kernel/6.1.19.dockerfile create mode 100644 automation/tests-artifacts/kernel/6.1.90.dockerfile diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 783a0687ba34..9b9e5464f179 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -331,9 +331,9 @@ alpine-3.19-rootfs-export: tags: - x86_64 -kernel-6.1.19-export: +kernel-6.1.90-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.19 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.90 script: - mkdir binaries && cp /bzImage binaries/bzImage artifacts: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 80d10eb7f476..e3910f4c1a9f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -12,7 +12,7 @@ .x86-64-test-needs: &x86-64-test-needs - alpine-3.19-rootfs-export - - kernel-6.1.19-export + - kernel-6.1.90-export .qemu-arm64: extends: .test-jobs-common diff --git a/automation/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile deleted file mode 100644 index 3a4096780d20..000000000000 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM --platform=linux/amd64 debian:bookworm -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV LINUX_VERSION=6.1.19 -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 \ - libelf-dev \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - -# Build the kernel -RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ - tar xvJf linux-"$LINUX_VERSION".tar.xz && \ - cd linux-"$LINUX_VERSION" && \ - make defconfig && \ - make xen.config && \ - scripts/config --enable BRIDGE && \ - scripts/config --enable IGC && \ - cp .config .config.orig && \ - cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ - make -j$(nproc) bzImage && \ - cp arch/x86/boot/bzImage / && \ - cd /build && \ - rm -rf linux-"$LINUX_VERSION"* diff --git a/automation/tests-artifacts/kernel/6.1.90.dockerfile b/automation/tests-artifacts/kernel/6.1.90.dockerfile new file mode 100644 index 000000000000..46cadf02ca78 --- /dev/null +++ b/automation/tests-artifacts/kernel/6.1.90.dockerfile @@ -0,0 +1,40 @@ +FROM --platform=linux/amd64 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV LINUX_VERSION=6.1.90 +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 \ + libelf-dev \ + && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* + +# Build the kernel +RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSION".tar.xz && \ + tar xvJf linux-"$LINUX_VERSION".tar.xz && \ + cd linux-"$LINUX_VERSION" && \ + make defconfig && \ + make xen.config && \ + scripts/config --enable BRIDGE && \ + scripts/config --enable IGC && \ + cp .config .config.orig && \ + cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ + make -j$(nproc) bzImage && \ + cp arch/x86/boot/bzImage / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* From patchwork Thu May 16 13:58:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666242 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 1988BC41513 for ; Thu, 16 May 2024 14:00:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723365.1128214 (Exim 4.92) (envelope-from ) id 1s7beB-0008EX-J8; Thu, 16 May 2024 13:59:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723365.1128214; Thu, 16 May 2024 13:59:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7beB-0008D1-DI; Thu, 16 May 2024 13:59:51 +0000 Received: by outflank-mailman (input) for mailman id 723365; Thu, 16 May 2024 13:59:50 +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 1s7beA-0005tl-4C for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:50 +0000 Received: from fout8-smtp.messagingengine.com (fout8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8e8c1d35-138c-11ef-b4bb-af5377834399; Thu, 16 May 2024 15:59:48 +0200 (CEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id BE49813803AD; Thu, 16 May 2024 09:59:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 16 May 2024 09:59:47 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:46 -0400 (EDT) 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: 8e8c1d35-138c-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867987; x=1715954387; bh=PRF53+BCaf 9Aziy/eN2Em2AqRlh6rGUA7cP+LaPIH+E=; b=OGnAGl2U4SmMOB08+dj3TM59DA 3o063TgAuCrFfnkmkOmQMfTfCEm5WB/Evf32CpJ3UByl3vp3STuKN2SVc92ux2+f zatHfYBYM7oIWtMBrGo40Kad+umSEyZAGjyWawBCDakpcs2UJ2YLOXkSYMv6oQp9 j6/AM4gxGuVdE5pI3+39vL023vG4WhKQlXMhTIVLa9HCMfTaJteXzMbRVsQ5ntLu kWzepZVZlK3d5Xf9x7Liunwyx9AtnXf0tAHDYVkYNyMjGZqTs84/LXiltJyubg8L bsUuECRGVeNu7ChnB0vrdWhixE2wyHloq4BwGBVV3OlENIxVErg0y9jvJArg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867987; x= 1715954387; bh=PRF53+BCaf9Aziy/eN2Em2AqRlh6rGUA7cP+LaPIH+E=; b=N RekwLBVqJaWLsmYT9L5zafMGv1FbQhx5EBQWlVhMuMJF2JlSvf2qjM3n9zXYbrzK jMOU1pkjHZaN8nriurCyOrp62afmbi2uE7WZBX1H2Lex4XCPsqBBsZNk2G9FP6Zc hHB2fpRXVOmDC/Mi6eAjBEmdhhgwATEu0hye5JwmqNL0iYBwXOGEDg3bsMurWE5Z zNoTZsqos3yLS++8kbjBUS2p0UD0wtN+rNi0P6l7h/9E2nHlM1IloMRFPP88ZF2+ a+FOfuwFLa5O3YQ25B2FFGT66ZUF6VjjpubKz2+TMAWIS74g31U+Mcx6/sb7xaCs AOLuhgT2WJ5fRdQg50+FA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 09/12] WIP: automation: temporarily add 'testlab' tag to stubdomain build Date: Thu, 16 May 2024 15:58:30 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Make it run on newer runners that have new enough kernel for dracut-install. Signed-off-by: Marek Marczykowski-Górecki --- automation/gitlab-ci/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 9b9e5464f179..134a01d03efa 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -356,6 +356,9 @@ alpine-3.19-gcc-debug: variables: CONTAINER: alpine:3.19 STUBDOM_LINUX: y + tags: + - x86_64 + - testlab debian-stretch-gcc-debug: extends: .gcc-x86-64-build-debug From patchwork Thu May 16 13:58:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666241 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 611DDC25B77 for ; Thu, 16 May 2024 14:00:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723366.1128226 (Exim 4.92) (envelope-from ) id 1s7beD-0000A1-20; Thu, 16 May 2024 13:59:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723366.1128226; Thu, 16 May 2024 13:59:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7beC-000096-Ok; Thu, 16 May 2024 13:59:52 +0000 Received: by outflank-mailman (input) for mailman id 723366; Thu, 16 May 2024 13:59:50 +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 1s7beA-0006bS-EW for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:50 +0000 Received: from fout8-smtp.messagingengine.com (fout8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8f468cfc-138c-11ef-909d-e314d9c70b13; Thu, 16 May 2024 15:59:49 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id 0F07D13803A4; Thu, 16 May 2024 09:59:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 May 2024 09:59:49 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:47 -0400 (EDT) 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: 8f468cfc-138c-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867989; x=1715954389; bh=neWLSYtrwE 5oJ6YyyAYbJGxLAujbQDz+IR1NVL0iM3w=; b=R25Te2hxyjQXXz6SNJaBblO2sZ PJb7NAWjSbryuR3D/6jNbC/Q4OHo02DtHIUpW3eU60r8b8fl0XRB4/X6kB3CpV5n 8yST4bI0zfYAsexvbuW/MqaJdkQGdyOvE3hr0OYNGZSCQdsMR0jLvJqkj4SHt6ck /0Tuo6eDsvPN5e7t8HVdIexEXcq/GVPu1OERzFrEXLX02miR9ZbgSsEqIvLVkk4T ZLj3LlBjUhZXiJXVKkxucVTSuyhTXB/+OmuNBp2n9lj1EDCbjGTPryL04RXB2N7q aaa3HpI0+k3R/t6tSertGzb2j6sOPY3w58MD3RKta/AQSlW/Vwm5yqA5rnWA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867989; x= 1715954389; bh=neWLSYtrwE5oJ6YyyAYbJGxLAujbQDz+IR1NVL0iM3w=; b=T qrNwIAbphsbDC2cHlgh1nEhVghfdWyDHWyRe8jp9gnHiMjfMy+THePOxfVqg0jGh JXpy3HUcM7UVkZe4+63IjwCek2SVRE8junLognkckSFaFuKfzcQ9Cd1fkhDLq8Ej 3It5xlXSg5c5R6f97JwbsawvxAEpsQb5twJE9F0SwAMLfSrhBuYmR/mtNW+pqDw/ hRsiHZwk6Bw1uTntwM288ciyoWyXIPKm+B8o4B+jqplqa5vZDUNd/8WCWInWRa4X +vddsbJLhtHcHZD7Ha60slxCYfi2HfXUe3KrL6rALtvKbY4f3tiUraizWE03/aPj xgkxhbL9DvgIPq7ECMXag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 10/12] automation: stubdom test with PCI passthrough Date: Thu, 16 May 2024 15:58:31 +0200 Message-ID: <16c7001cfec1cb7a601414b745655656ea63fe29.1715867907.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Based on the initial stubdomain test and existing PCI passthrough tests, add one that combines both. Schedule it on the AMD runner, as it has less tests right now. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/gitlab-ci/test.yaml | 8 ++++++++ automation/scripts/qubes-x86-64.sh | 30 +++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index e3910f4c1a9f..76cc430ae00f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -231,6 +231,14 @@ zen3p-pci-hvm-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.19-gcc-debug +zen3p-pci-stubdom-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-stubdom 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.19-gcc-debug + qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 script: diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index fc73403dbadf..816c16fbab3e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -98,8 +98,8 @@ ping -c 10 192.168.0.2 || exit 1 echo \"${passed}\" " -### test: pci-pv, pci-hvm -elif [ "${test_variant}" = "pci-pv" ] || [ "${test_variant}" = "pci-hvm" ]; then +### test: pci-pv, pci-hvm, pci-stubdom +elif [ "${test_variant}" = "pci-pv" ] || [ "${test_variant}" = "pci-hvm" ] || [ "${test_variant}" = "pci-stubdom" ]; then if [ -z "$PCIDEV" ]; then echo "Please set 'PCIDEV' variable with BDF of test network adapter" >&2 @@ -109,15 +109,35 @@ elif [ "${test_variant}" = "pci-pv" ] || [ "${test_variant}" = "pci-hvm" ]; then passed="pci test passed" - domU_config=' + domain_type="${test_variant#pci-}" + if [ "$test_variant" = "pci-stubdom" ]; then + domain_type="hvm" + domU_config=' +type = "hvm" +disk = [ "/srv/disk.img,format=raw,vdev=xvda" ] +device_model_version = "qemu-xen" +device_model_stubdomain_override = 1 +on_reboot = "destroy" +# libxl configures vkb backend to be dom0 instead of the stubdomain, defer +# changing that until there is consensus what to do about VGA output (VNC) +vkb_device = 0 +' + domU_disk_path=/srv/disk.img + else + domU_config=' type = "'${test_variant#pci-}'" -name = "domU" kernel = "/boot/vmlinuz" ramdisk = "/boot/initrd-domU" extra = "root=/dev/ram0 console=hvc0 earlyprintk=xen" +disk = [ ] +' + fi + + # common part + domU_config="$domU_config"' +name = "domU" memory = 512 vif = [ ] -disk = [ ] pci = [ "'$PCIDEV',seize=1" ] on_reboot = "destroy" ' From patchwork Thu May 16 13:58:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666244 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 60E90C25B74 for ; Thu, 16 May 2024 14:00:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723367.1128236 (Exim 4.92) (envelope-from ) id 1s7beE-0000Vh-FP; Thu, 16 May 2024 13:59:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723367.1128236; Thu, 16 May 2024 13:59:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7beE-0000V0-5n; Thu, 16 May 2024 13:59:54 +0000 Received: by outflank-mailman (input) for mailman id 723367; Thu, 16 May 2024 13:59:52 +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 1s7beC-0006bS-N1 for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:52 +0000 Received: from fhigh5-smtp.messagingengine.com (fhigh5-smtp.messagingengine.com [103.168.172.156]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9094c71b-138c-11ef-909d-e314d9c70b13; Thu, 16 May 2024 15:59:52 +0200 (CEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 3D62D11400E9; Thu, 16 May 2024 09:59:51 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 16 May 2024 09:59:51 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:49 -0400 (EDT) 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: 9094c71b-138c-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867991; x=1715954391; bh=+fHnK5t5dh ObVIi07JV7R8fbSKdAnIHiqOJTfPBBf/o=; b=xih3xk6iUC4oRz+Ikirrjztdz7 N8eXJSIh5k+/jg3O3zYpAjbiXc4CR3EmmJ/FQuioLz1+GjxfeqNYcrln3Vmpom5g /4mLHwvyxuYch0IWuoyxCgiVYbM+WDWESzDY7BSiwXFl2kYqhFoBKZTgGeW7l0Xf nNWyKa5JrLhdfLPSISdXT1znSyUr+On/KKrAsP62LMs0oK6ypwNDvfoJq/HDBdXV OMIwmv45bQxyLHxpdyu/ehyK236xsKZF7pTa8khMPwf1Az/zzvNeYnGI+YN0yHph rIls2xqlOPL3Otr+4/ygltYHCVTSBAGjDXwLK6Ofp+l4DRiaokBMLAsUB8Og== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867991; x= 1715954391; bh=+fHnK5t5dhObVIi07JV7R8fbSKdAnIHiqOJTfPBBf/o=; b=g dqtQML5KABpcZ5M6iT+EzKk5qgZeGkMKV5d5rNvX/p6owhz6F3w7v1GPqQW9ysRt xqSz3Fc1VpPKkHixdv8HUOScrBxrr2SVH+D3CgYwHvTC1uSTr5PJ1AYmgO2IGA57 8gc0ov1U96rnmvpKYFflCTHJaERDlTMEgjAuy2exNGX5qS/f5SCwGKsvrer8UtVv JdKT/oj/AFXZh8/ded4Od83+i8RePrHSoP9TyJ2re9VYxA/hoZIeDwr+fppMRp/7 z/YdnsibCMp1thSKVQWBFA3CWcMPr7XgYBvYE4iYNsI1Lc8Ngj6zqEfMesC1BAmX 0sBR1oQQPXpYBi3YQ4KYQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 11/12] automation: stubdom test with boot from CDROM Date: Thu, 16 May 2024 15:58:32 +0200 Message-ID: <4c08412876def58402f639b5cef2b9c7d5fffa96.1715867907.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Based on the initial stubdomain test add booting from CDOM. It's significantly different in terms of emulated devices (contrary to PV disk, the cdrom is backed by qemu), so test that path too. Schedule it on the AMD runner, as it has less tests right now. Signed-off-by: Marek Marczykowski-Górecki --- automation/build/alpine/3.19-arm64v8.dockerfile | 1 +- automation/gitlab-ci/build.yaml | 2 +- automation/gitlab-ci/test.yaml | 8 ++- automation/scripts/qubes-x86-64.sh | 58 +++++++++++----- automation/tests-artifacts/alpine/3.19.dockerfile | 3 +- 5 files changed, 56 insertions(+), 16 deletions(-) diff --git a/automation/build/alpine/3.19-arm64v8.dockerfile b/automation/build/alpine/3.19-arm64v8.dockerfile index 12810f87ecc6..03a3f28ff686 100644 --- a/automation/build/alpine/3.19-arm64v8.dockerfile +++ b/automation/build/alpine/3.19-arm64v8.dockerfile @@ -49,3 +49,4 @@ RUN apk --no-cache add \ fakeroot \ sfdisk \ e2fsprogs \ + xorriso \ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 134a01d03efa..f1e6a6144c90 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -324,10 +324,12 @@ alpine-3.19-rootfs-export: script: - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - cp /grub-core.img binaries/grub-core.img + - cp /grub-core-eltorito.img binaries/grub-core-eltorito.img artifacts: paths: - binaries/initrd.tar.gz - binaries/grub-core.img + - binaries/grub-core-eltorito.img tags: - x86_64 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 76cc430ae00f..4e4dca91c26e 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -239,6 +239,14 @@ zen3p-pci-stubdom-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.19-gcc-debug +zen3p-stubdom-hvm-cdboot-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh stubdom-hvm-cdboot 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.19-gcc-debug + qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 script: diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 816c16fbab3e..b4f5c846ffe3 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -19,6 +19,7 @@ vif = [ "bridge=xenbr0", ] disk = [ ] ' domU_disk_path= +domU_disk_type=disk ### helper functions @@ -27,27 +28,47 @@ build_domU_disk() { local initrd="$2" local rootfs="$3" local output="$4" + local img_type="$5" local grubcfg="$rootfs/boot/grub2/grub.cfg" - local kernel_cmdline="root=/dev/xvda1 console=hvc0 earlyprintk=xen" + local kernel_cmdline mkdir -p "$rootfs/boot/grub2" cp "$kernel" "$rootfs/boot/vmlinuz" + if [ "$img_type" = "disk" ]; then + kernel_cmdline="root=/dev/xvda1 console=hvc0 earlyprintk=xen" + elif [ "$img_type" = "cdrom" ]; then + kernel_cmdline="root=/dev/sr0 console=hvc0 earlyprintk=xen" + fi echo "linux /boot/vmlinuz $kernel_cmdline" >> "$grubcfg" if [ -n "$initrd" ]; then cp "$initrd" "$rootfs/boot/initrd.img" echo "initrd /boot/initrd.img" >> "$grubcfg" fi echo "boot" >> "$grubcfg" - size=$(du -sm "$rootfs") - size=${size%% *} - # add 5M margin - size=$(( size + 5 )) - mke2fs -d "$rootfs" "$output.part1" ${size}m - cat "$rootfs/usr/lib/grub/i386-pc/boot_hybrid.img" binaries/grub-core.img > "$output" - # align for the partition 1 start (2048 sectors) - truncate -s $((2048 * 512)) "$output" - cat "$output.part1" >> "$output" - echo ",,linux,*" | sfdisk "$output" + if [ "$img_type" = "disk" ]; then + size=$(du -sm "$rootfs") + size=${size%% *} + # add 5M margin + size=$(( size + 5 )) + mke2fs -d "$rootfs" "$output.part1" ${size}m + cat "$rootfs/usr/lib/grub/i386-pc/boot_hybrid.img" binaries/grub-core.img > "$output" + # align for the partition 1 start (2048 sectors) + truncate -s $((2048 * 512)) "$output" + cat "$output.part1" >> "$output" + echo ",,linux,*" | sfdisk "$output" + elif [ "$img_type" = "cdrom" ]; then + cp binaries/grub-core-eltorito.img "$rootfs/boot/" + xorriso -as mkisofs \ + -o "$output" \ + -b boot/grub-core-eltorito.img \ + -no-emul-boot \ + -boot-load-size 4 \ + -boot-info-table \ + "$rootfs" + else + echo "Invalid img_type: $img_type" >&2 + return 1 + fi } ### test: smoke test & smoke test PVH @@ -168,16 +189,22 @@ until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU. done " -### test: stubdom-hvm -elif [ "${test_variant}" = "stubdom-hvm" ]; then +### test: stubdom-hvm, stubdom-hvm-cdboot +elif [ "${test_variant}" = "stubdom-hvm" ] || [ "${test_variant}" = "stubdom-hvm-cdboot" ] ; then passed="ping test passed" + disk_opts= + if [ "${test_variant}" = "stubdom-hvm-cdboot" ]; then + disk_opts=",devtype=cdrom" + domU_disk_type="cdrom" + fi + domU_config=' type = "hvm" name = "domU" memory = 512 vif = [ "bridge=xenbr0", ] -disk = [ "/srv/disk.img,format=raw,vdev=xvda" ] +disk = [ "/srv/disk.img,format=raw,vdev=xvda'"$disk_opts"'" ] device_model_version = "qemu-xen" device_model_stubdomain_override = 1 on_reboot = "destroy" @@ -229,7 +256,8 @@ if [ -n "$domU_disk_path" ]; then "binaries/bzImage" \ "" \ "rootfs" \ - "binaries/disk.img" + "binaries/disk.img" \ + "$domU_disk_type" else (cd rootfs; find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz) fi diff --git a/automation/tests-artifacts/alpine/3.19.dockerfile b/automation/tests-artifacts/alpine/3.19.dockerfile index cfb2cb30fb30..7632b694c3da 100644 --- a/automation/tests-artifacts/alpine/3.19.dockerfile +++ b/automation/tests-artifacts/alpine/3.19.dockerfile @@ -68,4 +68,5 @@ RUN \ cd / && \ tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var && \ # Prepare boot sector for HVM disk - grub-mkimage -o /grub-core.img -O i386-pc -p '(hd0,msdos1)/boot/grub2' boot part_msdos ext2 linux biosdisk configfile normal + grub-mkimage -o /grub-core.img -O i386-pc -p '(hd0,msdos1)/boot/grub2' boot part_msdos ext2 linux biosdisk configfile normal && \ + grub-mkimage -o /grub-core-eltorito.img -O i386-pc-eltorito -p '(cd)/boot/grub2' boot part_msdos ext2 linux biosdisk configfile normal iso9660 From patchwork Thu May 16 13:58:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13666245 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 EBFD2C25B74 for ; Thu, 16 May 2024 14:00:07 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.723368.1128247 (Exim 4.92) (envelope-from ) id 1s7beG-0000yJ-Rb; Thu, 16 May 2024 13:59:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 723368.1128247; Thu, 16 May 2024 13:59:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7beG-0000y4-MD; Thu, 16 May 2024 13:59:56 +0000 Received: by outflank-mailman (input) for mailman id 723368; Thu, 16 May 2024 13:59:54 +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 1s7beE-0005tl-PR for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:54 +0000 Received: from fhigh5-smtp.messagingengine.com (fhigh5-smtp.messagingengine.com [103.168.172.156]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 91559875-138c-11ef-b4bb-af5377834399; Thu, 16 May 2024 15:59:53 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 76D441140191; Thu, 16 May 2024 09:59:52 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 May 2024 09:59:52 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:51 -0400 (EDT) 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: 91559875-138c-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to; s=fm3; t=1715867992; x=1715954392; bh=8Lwmc35RtboctQggSkgi0 X2iYEdiNrOG6NFi8XBFJfU=; b=Y07+ofj+C6yaj8CQ62l94Sw9BFdAcITaXDbUd oWyna9YEHPrJLiYuedx+YCE15d80c+bmJ8Kc/dci9UUZ0wQb/bARIHmOfXHEfAYx q5HCiHRXNnwv1yI7lpi8sfFKBdPffc2+bwx7zV1EKvpgNRX7rE3mwc+5sKkZAipS jtRRzbEQqk6HpfRnuorguonI58g2hgNy3QU7+nt8ADaW47vRMPi91WKR+6nygN2W /535QV7Z22QbtoM1JBd5XrgrPU1aOD7n/hEyIszi5pg5M6U4/QigTzosy1Ux/mfb lL+IKh3FFwiE/dXJKrRoXo9VjDmq13CmBIFMZhG8Wp1/nA01g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867992; x= 1715954392; bh=8Lwmc35RtboctQggSkgi0X2iYEdiNrOG6NFi8XBFJfU=; b=G XaxK/XmnS8GPzNtSwQ9lYdOpRtfzAX4k1UF7pBTDxBF/LCvqAuL7tRCWxhdDy/w4 frsSh0+VusIHys6Tp1RhQXWsjXX4jv0Gzh43qqCfd9mXzMqbIO2jnXi0SOPNQFtP 0zxA1l9BI+Du3NzxOSdfWlCdjkyVGr908MucYli7crb+2D5X258x5Xi0OEa6UaeX Mo0qp9ND9OzidDt923q1wtuzJYWWEA3+KlFyYb4XVu9ruVg57eNbajVeTRtoytVJ H1snnNogValp3Nvh9k5A9icgTM53xwcWT8lp9XGnL2pVJQasG0qvg2KW0eLxK4V2 tKXsdQPbAAzr0JfHgcbxw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredtjeenucfhrhhomhepofgrrhgv khcuofgrrhgtiiihkhhofihskhhiqdfikphrvggtkhhiuceomhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomheqnecuggftrfgrthhtvghrnhepueet hefgieehheeftdeuleduhffgieelueejhffggfeiieevtefhfeffffeftdehnecuffhomh grihhnpehgihhtlhgrsgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgsh hlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 12/12] [DO NOT MERGE] switch to my containers fork Date: Thu, 16 May 2024 15:58:33 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 --- automation/gitlab-ci/build.yaml | 19 ++++++++++++++++--- automation/gitlab-ci/test.yaml | 9 ++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index f1e6a6144c90..88a59692a881 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -260,7 +260,7 @@ alpine-3.19-arm64-rootfs-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.19-arm64v8 + image: registry.gitlab.com/xen-project/people/marmarek/xen/tests-artifacts/alpine:3.19-arm64v8 script: - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz artifacts: @@ -320,7 +320,7 @@ qemu-system-ppc64-8.1.0-ppc64-export: alpine-3.19-rootfs-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.19 + image: registry.gitlab.com/xen-project/people/marmarek/xen/tests-artifacts/alpine:3.19 script: - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - cp /grub-core.img binaries/grub-core.img @@ -335,7 +335,7 @@ alpine-3.19-rootfs-export: kernel-6.1.90-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:6.1.90 + image: registry.gitlab.com/xen-project/people/marmarek/xen/tests-artifacts/kernel:6.1.90 script: - mkdir binaries && cp /bzImage binaries/bzImage artifacts: @@ -350,11 +350,13 @@ kernel-6.1.90-export: alpine-3.19-gcc: extends: .gcc-x86-64-build + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19 alpine-3.19-gcc-debug: extends: .gcc-x86-64-build-debug + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19 STUBDOM_LINUX: y @@ -445,28 +447,33 @@ debian-bookworm-gcc-debug-arm64-randconfig: alpine-3.19-gcc-arm64: extends: .gcc-arm64-build + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19-arm64v8 alpine-3.19-gcc-debug-arm64: extends: .gcc-arm64-build-debug + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19-arm64v8 alpine-3.19-gcc-arm64-randconfig: extends: .gcc-arm64-build + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19-arm64v8 RANDCONFIG: y alpine-3.19-gcc-debug-arm64-randconfig: extends: .gcc-arm64-build-debug + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19-arm64v8 RANDCONFIG: y alpine-3.19-gcc-debug-arm64-staticmem: extends: .gcc-arm64-build-debug + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19-arm64v8 EXTRA_XEN_CONFIG: | @@ -476,6 +483,7 @@ alpine-3.19-gcc-debug-arm64-staticmem: alpine-3.19-gcc-debug-arm64-static-shared-mem: extends: .gcc-arm64-build-debug + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19-arm64v8 EXTRA_XEN_CONFIG: | @@ -485,6 +493,7 @@ alpine-3.19-gcc-debug-arm64-static-shared-mem: alpine-3.19-gcc-debug-arm64-boot-cpupools: extends: .gcc-arm64-build-debug + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19-arm64v8 EXTRA_XEN_CONFIG: | @@ -598,11 +607,13 @@ debian-bookworm-gcc-arm64-cppcheck: alpine-3.19-clang: extends: .clang-x86-64-build + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19 alpine-3.19-clang-debug: extends: .clang-x86-64-build-debug + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: alpine:3.19 @@ -698,11 +709,13 @@ debian-bookworm-32-gcc-debug: fedora-gcc: extends: .gcc-x86-64-build + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: fedora:39 fedora-gcc-debug: extends: .gcc-x86-64-build-debug + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} variables: CONTAINER: fedora:39 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 4e4dca91c26e..0f36036d8275 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -1,6 +1,6 @@ .test-jobs-common: stage: test - image: registry.gitlab.com/xen-project/xen/${CONTAINER} + image: registry.gitlab.com/xen-project/people/marmarek/xen/${CONTAINER} .arm64-test-needs: &arm64-test-needs - alpine-3.19-arm64-rootfs-export @@ -16,6 +16,7 @@ .qemu-arm64: extends: .test-jobs-common + image: registry.gitlab.com/xen-project/xen/${CONTAINER} variables: CONTAINER: debian:bookworm-arm64v8 LOGFILE: qemu-smoke-arm64.log @@ -29,6 +30,7 @@ .qemu-arm32: extends: .test-jobs-common + image: registry.gitlab.com/xen-project/xen/${CONTAINER} variables: CONTAINER: debian:bookworm-arm64v8 LOGFILE: qemu-smoke-arm32.log @@ -42,6 +44,7 @@ .qemu-x86-64: extends: .test-jobs-common + image: registry.gitlab.com/xen-project/xen/${CONTAINER} variables: CONTAINER: debian:bookworm LOGFILE: qemu-smoke-x86-64.log @@ -55,6 +58,7 @@ .qemu-riscv64: extends: .test-jobs-common + image: registry.gitlab.com/xen-project/xen/${CONTAINER} variables: CONTAINER: archlinux:current-riscv64 LOGFILE: qemu-smoke-riscv64.log @@ -68,6 +72,7 @@ .qemu-ppc64le: extends: .test-jobs-common + image: registry.gitlab.com/xen-project/xen/${CONTAINER} variables: CONTAINER: debian:bullseye-ppc64le LOGFILE: qemu-smoke-ppc64le.log @@ -81,6 +86,7 @@ .xilinx-arm64: extends: .test-jobs-common + image: registry.gitlab.com/xen-project/xen/${CONTAINER} variables: CONTAINER: ubuntu:xenial-xilinx LOGFILE: qemu-smoke-xilinx.log @@ -129,6 +135,7 @@ # Test jobs build-each-commit-gcc: extends: .test-jobs-common + image: registry.gitlab.com/xen-project/xen/${CONTAINER} variables: CONTAINER: debian:bookworm XEN_TARGET_ARCH: x86_64