* [PATCH v4 0/2] automation: qemu32 smoke test
@ 2022-03-22 20:38 Stefano Stabellini
2022-03-22 20:38 ` [PATCH v4 1/2] gitlab-ci: add qemu-system-arm to the existing tests-artifacts container Stefano Stabellini
2022-03-22 20:38 ` [PATCH v4 2/2] gitlab-ci: add an ARM32 qemu-based smoke test Stefano Stabellini
0 siblings, 2 replies; 5+ messages in thread
From: Stefano Stabellini @ 2022-03-22 20:38 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, cardoe, wl, andrew.cooper3, anthony.perard,
bertrand.marquis
Hi all,
This small series adds a simple Xen + Dom0 boot arm32 test to gitlab-ci
using QEMU, similar to the existing tests for arm64 and x86.
Cheers,
Stefano
Stefano Stabellini (2):
gitlab-ci: add qemu-system-arm to the existing tests-artifacts container
gitlab-ci: add an ARM32 qemu-based smoke test
automation/gitlab-ci/build.yaml | 14 +++-
automation/gitlab-ci/test.yaml | 27 +++++++-
automation/scripts/qemu-smoke-arm32.sh | 81 ++++++++++++++++++++++
...arm64v8.dockerfile => 6.0.0-arm64v8.dockerfile} | 5 +-
4 files changed, 121 insertions(+), 6 deletions(-)
create mode 100755 automation/scripts/qemu-smoke-arm32.sh
rename automation/tests-artifacts/qemu-system-aarch64/{5.2.0-arm64v8.dockerfile => 6.0.0-arm64v8.dockerfile} (95%)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v4 1/2] gitlab-ci: add qemu-system-arm to the existing tests-artifacts container
2022-03-22 20:38 [PATCH v4 0/2] automation: qemu32 smoke test Stefano Stabellini
@ 2022-03-22 20:38 ` Stefano Stabellini
2022-03-22 20:38 ` [PATCH v4 2/2] gitlab-ci: add an ARM32 qemu-based smoke test Stefano Stabellini
1 sibling, 0 replies; 5+ messages in thread
From: Stefano Stabellini @ 2022-03-22 20:38 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, cardoe, wl, andrew.cooper3, anthony.perard,
bertrand.marquis, Stefano Stabellini
From: Stefano Stabellini <stefano.stabellini@xilinx.com>
Add qemu-system-arm to the existing test-artifacts qemu container (which
doesn't get build for every iteration but only updated once in a while.)
With qemu-system-arm available, we'll be able to run ARM32 tests.
This patch also bumps the QEMU version to v6.0.0 for both arm32 and
arm64 (the test-artifacts container is one, shared for both).
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
---
automation/gitlab-ci/build.yaml | 14 ++++++++++++--
automation/gitlab-ci/test.yaml | 4 ++--
...arm64v8.dockerfile => 6.0.0-arm64v8.dockerfile} | 5 +++--
3 files changed, 17 insertions(+), 6 deletions(-)
rename automation/tests-artifacts/qemu-system-aarch64/{5.2.0-arm64v8.dockerfile => 6.0.0-arm64v8.dockerfile} (95%)
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index cc36428cf5..72f2a317ac 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -591,9 +591,9 @@ kernel-5.9.9-arm64-export:
tags:
- arm64
-qemu-system-aarch64-5.2.0-arm64-export:
+qemu-system-aarch64-6.0.0-arm64-export:
stage: build
- image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:5.2.0-arm64v8
+ image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8
script:
- mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch64
artifacts:
@@ -602,6 +602,16 @@ qemu-system-aarch64-5.2.0-arm64-export:
tags:
- arm64
+qemu-system-aarch64-6.0.0-arm32-export:
+ stage: build
+ image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-aarch64:6.0.0-arm64v8
+ script:
+ - mkdir binaries && cp /qemu-system-arm binaries/qemu-system-arm
+ artifacts:
+ paths:
+ - binaries/qemu-system-arm
+ tags:
+ - arm64
# x86_64 test artifacts
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 47e8704df3..ec2a2e1607 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -33,7 +33,7 @@ qemu-alpine-arm64-gcc:
- alpine-3.12-gcc-arm64
- alpine-3.12-arm64-rootfs-export
- kernel-5.9.9-arm64-export
- - qemu-system-aarch64-5.2.0-arm64-export
+ - qemu-system-aarch64-6.0.0-arm64-export
artifacts:
paths:
- smoke.serial
@@ -81,7 +81,7 @@ qemu-smoke-arm64-gcc:
dependencies:
- debian-unstable-gcc-arm64
- kernel-5.9.9-arm64-export
- - qemu-system-aarch64-5.2.0-arm64-export
+ - qemu-system-aarch64-6.0.0-arm64-export
artifacts:
paths:
- smoke.serial
diff --git a/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile
similarity index 95%
rename from automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile
rename to automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile
index e105a1c636..793432d40b 100644
--- a/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfile
+++ b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
ENV DEBIAN_FRONTEND=noninteractive
-ENV QEMU_VERSION=5.2.0
+ENV QEMU_VERSION=6.0.0
ENV USER root
RUN mkdir /build
@@ -25,7 +25,7 @@ RUN apt-get update && \
tar xvJf qemu-"$QEMU_VERSION".tar.xz && \
cd qemu-"$QEMU_VERSION" && \
./configure \
- --target-list=aarch64-softmmu \
+ --target-list=arm-softmmu,aarch64-softmmu \
--enable-system \
--disable-blobs \
--disable-bsd-user \
@@ -68,6 +68,7 @@ RUN apt-get update && \
&& \
make -j$(nproc) && \
cp ./build/qemu-system-aarch64 / && \
+ cp ./build/qemu-system-arm / && \
cd /build && \
rm -rf qemu-"$QEMU_VERSION"* && \
apt-get autoremove -y && \
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v4 2/2] gitlab-ci: add an ARM32 qemu-based smoke test
2022-03-22 20:38 [PATCH v4 0/2] automation: qemu32 smoke test Stefano Stabellini
2022-03-22 20:38 ` [PATCH v4 1/2] gitlab-ci: add qemu-system-arm to the existing tests-artifacts container Stefano Stabellini
@ 2022-03-22 20:38 ` Stefano Stabellini
2022-03-23 8:35 ` Michal Orzel
1 sibling, 1 reply; 5+ messages in thread
From: Stefano Stabellini @ 2022-03-22 20:38 UTC (permalink / raw)
To: xen-devel
Cc: sstabellini, cardoe, wl, andrew.cooper3, anthony.perard,
bertrand.marquis, Stefano Stabellini
Add a minimal ARM32 smoke test based on qemu-system-arm, as provided by
the test-artifacts qemu container. The minimal test simply boots Xen
(built from previous build stages) and Dom0.
The test needs a working kernel and minimal initrd for dom0. Instead of
building our own kernel and initrd, which would mean maintaining one or
two more builting scripts under automation/, we borrow a kernel and
initrd from distros.
For the kernel we pick the Debian Bullseye kernel, which has everything
we need already built-in. However, we cannot use the Debian Bullseye
initrd because it is 22MB and the large size causes QEMU to core dump.
Instead, use the tiny busybox-based rootfs provided by Alpine Linux,
which is really minimal: just 2.5MB. Note that we cannot use the Alpine
Linux kernel because that doesn't boot on Xen.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
---
Changes in v4:
- improve commit message
- use Debian Bullseye kernel
- use Alpine Linux initrd
---
automation/gitlab-ci/test.yaml | 23 ++++++++
automation/scripts/qemu-smoke-arm32.sh | 81 ++++++++++++++++++++++++++
2 files changed, 104 insertions(+)
create mode 100755 automation/scripts/qemu-smoke-arm32.sh
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index ec2a2e1607..42cd725a12 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -95,6 +95,29 @@ qemu-smoke-arm64-gcc:
- /^coverity-tested\/.*/
- /^stable-.*/
+qemu-smoke-arm32-gcc:
+ stage: test
+ image: registry.gitlab.com/xen-project/xen/${CONTAINER}
+ variables:
+ CONTAINER: debian:unstable-arm64v8
+ script:
+ - ./automation/scripts/qemu-smoke-arm32.sh 2>&1 | tee qemu-smoke-arm32.log
+ dependencies:
+ - debian-unstable-gcc-arm32
+ - qemu-system-aarch64-6.0.0-arm32-export
+ artifacts:
+ paths:
+ - smoke.serial
+ - '*.log'
+ when: always
+ tags:
+ - arm64
+ except:
+ - master
+ - smoke
+ - /^coverity-tested\/.*/
+ - /^stable-.*/
+
qemu-smoke-x86-64-gcc:
stage: test
image: registry.gitlab.com/xen-project/xen/${CONTAINER}
diff --git a/automation/scripts/qemu-smoke-arm32.sh b/automation/scripts/qemu-smoke-arm32.sh
new file mode 100755
index 0000000000..d554de7939
--- /dev/null
+++ b/automation/scripts/qemu-smoke-arm32.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+set -ex
+
+export DEBIAN_FRONTENT=noninteractive
+apt-get -qy update
+apt-get -qy install --no-install-recommends device-tree-compiler \
+ curl \
+ cpio
+
+cd binaries
+# Use the kernel from Debian
+curl --fail --silent --show-error --location --output vmlinuz http://http.us.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/netboot/vmlinuz
+# Use a tiny initrd based on busybox from Alpine Linux
+curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15.1-armhf.tar.gz
+
+mkdir rootfs
+cd rootfs
+tar xvzf ../initrd.tar.gz
+find . | cpio -H newc -o | gzip > ../initrd.gz
+cd ..
+
+kernel=`stat -L --printf="%s" vmlinuz`
+initrd=`stat -L --printf="%s" initrd.gz`
+
+# For Xen, we need a couple of more node. Dump the DT from QEMU and add them
+# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded
+curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom
+./qemu-system-arm \
+ -machine virt-6.0 \
+ -machine virtualization=true \
+ -smp 4 \
+ -m 1024 \
+ -serial stdio \
+ -monitor none \
+ -display none \
+ -machine dumpdtb=virt.dtb
+
+dtc -I dtb -O dts virt.dtb > virt.dts
+
+cat >> virt.dts << EOF
+/ {
+ chosen {
+ #address-cells = <0x2>;
+ #size-cells = <0x2>;
+ stdout-path = "/pl011@9000000";
+ xen,xen-bootargs = "console=dtuart dtuart=/pl011@9000000 dom0_mem=512M bootscrub=0";
+ xen,dom0-bootargs = "console=tty0 console=hvc0 earlyprintk clk_ignore_unused root=/dev/ram0 rdinit=/bin/sh init=/bin/sh";
+ dom0 {
+ compatible = "xen,linux-zimage", "xen,multiboot-module";
+ reg = <0x0 0x1000000 0x0 $kernel>;
+ };
+ dom0-ramdisk {
+ compatible = "xen,linux-initrd", "xen,multiboot-module";
+ reg = <0x0 0x3200000 0x0 $initrd>;
+ };
+ };
+};
+EOF
+dtc -I dts -O dtb virt.dts > virt.dtb
+
+rm -f smoke.serial
+set +e
+timeout -k 1 240 \
+./qemu-system-arm \
+ -machine virt-6.0 \
+ -machine virtualization=true \
+ -smp 4 \
+ -m 1024 \
+ -serial stdio \
+ -monitor none \
+ -display none \
+ -dtb virt.dtb \
+ -no-reboot \
+ -kernel ./xen \
+ -device loader,file=./vmlinuz,addr=0x1000000 \
+ -device loader,file=./initrd.gz,addr=0x3200000 |& tee smoke.serial
+
+set -e
+(grep -q "^/ #" smoke.serial) || exit 1
+exit 0
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] gitlab-ci: add an ARM32 qemu-based smoke test
2022-03-22 20:38 ` [PATCH v4 2/2] gitlab-ci: add an ARM32 qemu-based smoke test Stefano Stabellini
@ 2022-03-23 8:35 ` Michal Orzel
2022-04-16 0:15 ` Stefano Stabellini
0 siblings, 1 reply; 5+ messages in thread
From: Michal Orzel @ 2022-03-23 8:35 UTC (permalink / raw)
To: Stefano Stabellini, xen-devel
Cc: cardoe, wl, andrew.cooper3, anthony.perard, bertrand.marquis,
Stefano Stabellini
Hi Stefano,
On 22.03.2022 21:38, Stefano Stabellini wrote:
> Add a minimal ARM32 smoke test based on qemu-system-arm, as provided by
> the test-artifacts qemu container. The minimal test simply boots Xen
> (built from previous build stages) and Dom0.
>
> The test needs a working kernel and minimal initrd for dom0. Instead of
> building our own kernel and initrd, which would mean maintaining one or
> two more builting scripts under automation/, we borrow a kernel and
> initrd from distros.
>
> For the kernel we pick the Debian Bullseye kernel, which has everything
> we need already built-in. However, we cannot use the Debian Bullseye
> initrd because it is 22MB and the large size causes QEMU to core dump.
>
> Instead, use the tiny busybox-based rootfs provided by Alpine Linux,
> which is really minimal: just 2.5MB. Note that we cannot use the Alpine
> Linux kernel because that doesn't boot on Xen.
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
> ---
> Changes in v4:
> - improve commit message
> - use Debian Bullseye kernel
> - use Alpine Linux initrd
> ---
> automation/gitlab-ci/test.yaml | 23 ++++++++
> automation/scripts/qemu-smoke-arm32.sh | 81 ++++++++++++++++++++++++++
> 2 files changed, 104 insertions(+)
> create mode 100755 automation/scripts/qemu-smoke-arm32.sh
>
> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> index ec2a2e1607..42cd725a12 100644
> --- a/automation/gitlab-ci/test.yaml
> +++ b/automation/gitlab-ci/test.yaml
> @@ -95,6 +95,29 @@ qemu-smoke-arm64-gcc:
> - /^coverity-tested\/.*/
> - /^stable-.*/
>
> +qemu-smoke-arm32-gcc:
> + stage: test
> + image: registry.gitlab.com/xen-project/xen/${CONTAINER}
> + variables:
> + CONTAINER: debian:unstable-arm64v8
> + script:
> + - ./automation/scripts/qemu-smoke-arm32.sh 2>&1 | tee qemu-smoke-arm32.log
> + dependencies:
> + - debian-unstable-gcc-arm32
> + - qemu-system-aarch64-6.0.0-arm32-export
> + artifacts:
> + paths:
> + - smoke.serial
> + - '*.log'
> + when: always
> + tags:
> + - arm64
> + except:
> + - master
> + - smoke
> + - /^coverity-tested\/.*/
> + - /^stable-.*/
> +
> qemu-smoke-x86-64-gcc:
> stage: test
> image: registry.gitlab.com/xen-project/xen/${CONTAINER}
> diff --git a/automation/scripts/qemu-smoke-arm32.sh b/automation/scripts/qemu-smoke-arm32.sh
> new file mode 100755
> index 0000000000..d554de7939
> --- /dev/null
> +++ b/automation/scripts/qemu-smoke-arm32.sh
> @@ -0,0 +1,81 @@
> +#!/bin/bash
> +
> +set -ex
> +
> +export DEBIAN_FRONTENT=noninteractive
> +apt-get -qy update
> +apt-get -qy install --no-install-recommends device-tree-compiler \
> + curl \
> + cpio
> +
> +cd binaries
> +# Use the kernel from Debian
> +curl --fail --silent --show-error --location --output vmlinuz http://http.us.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/netboot/vmlinuz
> +# Use a tiny initrd based on busybox from Alpine Linux
> +curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15.1-armhf.tar.gz
> +
> +mkdir rootfs
> +cd rootfs
> +tar xvzf ../initrd.tar.gz
> +find . | cpio -H newc -o | gzip > ../initrd.gz
> +cd ..
> +
> +kernel=`stat -L --printf="%s" vmlinuz`
> +initrd=`stat -L --printf="%s" initrd.gz`
> +
> +# For Xen, we need a couple of more node. Dump the DT from QEMU and add them
> +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded
> +curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom
> +./qemu-system-arm \
> + -machine virt-6.0 \
Can't we just use "virt" as an alias to the latest virt machine available?
> + -machine virtualization=true \
> + -smp 4 \
> + -m 1024 \
> + -serial stdio \
> + -monitor none \
> + -display none \
> + -machine dumpdtb=virt.dtb
> +
> +dtc -I dtb -O dts virt.dtb > virt.dts
> +
> +cat >> virt.dts << EOF
> +/ {
> + chosen {
> + #address-cells = <0x2>;
> + #size-cells = <0x2>;
> + stdout-path = "/pl011@9000000";
> + xen,xen-bootargs = "console=dtuart dtuart=/pl011@9000000 dom0_mem=512M bootscrub=0";
> + xen,dom0-bootargs = "console=tty0 console=hvc0 earlyprintk clk_ignore_unused root=/dev/ram0 rdinit=/bin/sh init=/bin/sh";
As you are using initrd, rdinit is the correct option.
Specyfing both rdinit and init does not make a lot of sense as the kernel won't reach init= parsing.
> + dom0 {
> + compatible = "xen,linux-zimage", "xen,multiboot-module";
> + reg = <0x0 0x1000000 0x0 $kernel>;
> + };
> + dom0-ramdisk {
> + compatible = "xen,linux-initrd", "xen,multiboot-module";
> + reg = <0x0 0x3200000 0x0 $initrd>;
> + };
> + };
> +};
> +EOF
> +dtc -I dts -O dtb virt.dts > virt.dtb
> +
> +rm -f smoke.serial
> +set +e
> +timeout -k 1 240 \
> +./qemu-system-arm \
> + -machine virt-6.0 \
> + -machine virtualization=true \
> + -smp 4 \
> + -m 1024 \
> + -serial stdio \
> + -monitor none \
> + -display none \
> + -dtb virt.dtb \
> + -no-reboot \
> + -kernel ./xen \
> + -device loader,file=./vmlinuz,addr=0x1000000 \
> + -device loader,file=./initrd.gz,addr=0x3200000 |& tee smoke.serial
> +
> +set -e
> +(grep -q "^/ #" smoke.serial) || exit 1
> +exit 0
Cheers,
Michal
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] gitlab-ci: add an ARM32 qemu-based smoke test
2022-03-23 8:35 ` Michal Orzel
@ 2022-04-16 0:15 ` Stefano Stabellini
0 siblings, 0 replies; 5+ messages in thread
From: Stefano Stabellini @ 2022-04-16 0:15 UTC (permalink / raw)
To: Michal Orzel
Cc: Stefano Stabellini, xen-devel, cardoe, wl, andrew.cooper3,
anthony.perard, bertrand.marquis, Stefano Stabellini
On Wed, 23 Mar 2022, Michal Orzel wrote:
> Hi Stefano,
Hi Michal,
I addressed both points below. Sorry for taking so long but the CI-loop
was blocked on ARM. Now it is running again.
> On 22.03.2022 21:38, Stefano Stabellini wrote:
> > Add a minimal ARM32 smoke test based on qemu-system-arm, as provided by
> > the test-artifacts qemu container. The minimal test simply boots Xen
> > (built from previous build stages) and Dom0.
> >
> > The test needs a working kernel and minimal initrd for dom0. Instead of
> > building our own kernel and initrd, which would mean maintaining one or
> > two more builting scripts under automation/, we borrow a kernel and
> > initrd from distros.
> >
> > For the kernel we pick the Debian Bullseye kernel, which has everything
> > we need already built-in. However, we cannot use the Debian Bullseye
> > initrd because it is 22MB and the large size causes QEMU to core dump.
> >
> > Instead, use the tiny busybox-based rootfs provided by Alpine Linux,
> > which is really minimal: just 2.5MB. Note that we cannot use the Alpine
> > Linux kernel because that doesn't boot on Xen.
> >
> > Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
> > ---
> > Changes in v4:
> > - improve commit message
> > - use Debian Bullseye kernel
> > - use Alpine Linux initrd
> > ---
> > automation/gitlab-ci/test.yaml | 23 ++++++++
> > automation/scripts/qemu-smoke-arm32.sh | 81 ++++++++++++++++++++++++++
> > 2 files changed, 104 insertions(+)
> > create mode 100755 automation/scripts/qemu-smoke-arm32.sh
> >
> > diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> > index ec2a2e1607..42cd725a12 100644
> > --- a/automation/gitlab-ci/test.yaml
> > +++ b/automation/gitlab-ci/test.yaml
> > @@ -95,6 +95,29 @@ qemu-smoke-arm64-gcc:
> > - /^coverity-tested\/.*/
> > - /^stable-.*/
> >
> > +qemu-smoke-arm32-gcc:
> > + stage: test
> > + image: registry.gitlab.com/xen-project/xen/${CONTAINER}
> > + variables:
> > + CONTAINER: debian:unstable-arm64v8
> > + script:
> > + - ./automation/scripts/qemu-smoke-arm32.sh 2>&1 | tee qemu-smoke-arm32.log
> > + dependencies:
> > + - debian-unstable-gcc-arm32
> > + - qemu-system-aarch64-6.0.0-arm32-export
> > + artifacts:
> > + paths:
> > + - smoke.serial
> > + - '*.log'
> > + when: always
> > + tags:
> > + - arm64
> > + except:
> > + - master
> > + - smoke
> > + - /^coverity-tested\/.*/
> > + - /^stable-.*/
> > +
> > qemu-smoke-x86-64-gcc:
> > stage: test
> > image: registry.gitlab.com/xen-project/xen/${CONTAINER}
> > diff --git a/automation/scripts/qemu-smoke-arm32.sh b/automation/scripts/qemu-smoke-arm32.sh
> > new file mode 100755
> > index 0000000000..d554de7939
> > --- /dev/null
> > +++ b/automation/scripts/qemu-smoke-arm32.sh
> > @@ -0,0 +1,81 @@
> > +#!/bin/bash
> > +
> > +set -ex
> > +
> > +export DEBIAN_FRONTENT=noninteractive
> > +apt-get -qy update
> > +apt-get -qy install --no-install-recommends device-tree-compiler \
> > + curl \
> > + cpio
> > +
> > +cd binaries
> > +# Use the kernel from Debian
> > +curl --fail --silent --show-error --location --output vmlinuz http://http.us.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/netboot/vmlinuz
> > +# Use a tiny initrd based on busybox from Alpine Linux
> > +curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15.1-armhf.tar.gz
> > +
> > +mkdir rootfs
> > +cd rootfs
> > +tar xvzf ../initrd.tar.gz
> > +find . | cpio -H newc -o | gzip > ../initrd.gz
> > +cd ..
> > +
> > +kernel=`stat -L --printf="%s" vmlinuz`
> > +initrd=`stat -L --printf="%s" initrd.gz`
> > +
> > +# For Xen, we need a couple of more node. Dump the DT from QEMU and add them
> > +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded
> > +curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom
> > +./qemu-system-arm \
> > + -machine virt-6.0 \
> Can't we just use "virt" as an alias to the latest virt machine available?
>
> > + -machine virtualization=true \
> > + -smp 4 \
> > + -m 1024 \
> > + -serial stdio \
> > + -monitor none \
> > + -display none \
> > + -machine dumpdtb=virt.dtb
> > +
> > +dtc -I dtb -O dts virt.dtb > virt.dts
> > +
> > +cat >> virt.dts << EOF
> > +/ {
> > + chosen {
> > + #address-cells = <0x2>;
> > + #size-cells = <0x2>;
> > + stdout-path = "/pl011@9000000";
> > + xen,xen-bootargs = "console=dtuart dtuart=/pl011@9000000 dom0_mem=512M bootscrub=0";
> > + xen,dom0-bootargs = "console=tty0 console=hvc0 earlyprintk clk_ignore_unused root=/dev/ram0 rdinit=/bin/sh init=/bin/sh";
> As you are using initrd, rdinit is the correct option.
> Specyfing both rdinit and init does not make a lot of sense as the kernel won't reach init= parsing.
>
> > + dom0 {
> > + compatible = "xen,linux-zimage", "xen,multiboot-module";
> > + reg = <0x0 0x1000000 0x0 $kernel>;
> > + };
> > + dom0-ramdisk {
> > + compatible = "xen,linux-initrd", "xen,multiboot-module";
> > + reg = <0x0 0x3200000 0x0 $initrd>;
> > + };
> > + };
> > +};
> > +EOF
> > +dtc -I dts -O dtb virt.dts > virt.dtb
> > +
> > +rm -f smoke.serial
> > +set +e
> > +timeout -k 1 240 \
> > +./qemu-system-arm \
> > + -machine virt-6.0 \
> > + -machine virtualization=true \
> > + -smp 4 \
> > + -m 1024 \
> > + -serial stdio \
> > + -monitor none \
> > + -display none \
> > + -dtb virt.dtb \
> > + -no-reboot \
> > + -kernel ./xen \
> > + -device loader,file=./vmlinuz,addr=0x1000000 \
> > + -device loader,file=./initrd.gz,addr=0x3200000 |& tee smoke.serial
> > +
> > +set -e
> > +(grep -q "^/ #" smoke.serial) || exit 1
> > +exit 0
>
> Cheers,
> Michal
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-16 0:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-22 20:38 [PATCH v4 0/2] automation: qemu32 smoke test Stefano Stabellini
2022-03-22 20:38 ` [PATCH v4 1/2] gitlab-ci: add qemu-system-arm to the existing tests-artifacts container Stefano Stabellini
2022-03-22 20:38 ` [PATCH v4 2/2] gitlab-ci: add an ARM32 qemu-based smoke test Stefano Stabellini
2022-03-23 8:35 ` Michal Orzel
2022-04-16 0:15 ` Stefano Stabellini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.