From patchwork Sat Nov 14 02:12:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 11905365 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 67FD6921 for ; Sat, 14 Nov 2020 02:13:01 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3B7522225D for ; Sat, 14 Nov 2020 02:13:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="SU83EcLA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B7522225D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.27051.55741 (Exim 4.92) (envelope-from ) id 1kdl2t-0006I0-WE; Sat, 14 Nov 2020 02:12:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 27051.55741; Sat, 14 Nov 2020 02:12:07 +0000 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" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdl2t-0006Ht-SF; Sat, 14 Nov 2020 02:12:07 +0000 Received: by outflank-mailman (input) for mailman id 27051; Sat, 14 Nov 2020 02:12:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdl2s-0006HX-Nd for xen-devel@lists.xenproject.org; Sat, 14 Nov 2020 02:12:06 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f6f05e91-57df-4183-8251-99cd8b11ad7b; Sat, 14 Nov 2020 02:12:06 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-24-130-65-46.hsd1.ca.comcast.net [24.130.65.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3284B2225D; Sat, 14 Nov 2020 02:12:05 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdl2s-0006HX-Nd for xen-devel@lists.xenproject.org; Sat, 14 Nov 2020 02:12:06 +0000 X-Inumbo-ID: f6f05e91-57df-4183-8251-99cd8b11ad7b Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f6f05e91-57df-4183-8251-99cd8b11ad7b; Sat, 14 Nov 2020 02:12:06 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-24-130-65-46.hsd1.ca.comcast.net [24.130.65.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3284B2225D; Sat, 14 Nov 2020 02:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605319925; bh=FBqpCBRCXyQW7zW1Z4nTkrwi13yRf09HktL4SI8wk1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SU83EcLAvGA9em+JWb/7PacKdsP7KH7JIJVNQIhcOjfxMYXN1zB9KQqwGua4pf4lk TZ0SN/0QOxffxP8D+ksBjHRbmoJ/CS1mu6pISIMSJ3dsh9Km8TvziTVISHdHsU6DDE W2c0U/RMF2K3oaT5PYX5/ABafK2k8juEwpIh2bXk= From: Stefano Stabellini To: andrew.cooper3@citrix.com, cardoe@cardoe.com, wl@xen.org Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini Subject: [PATCH 1/2] automation: add a QEMU aarch64 smoke test Date: Fri, 13 Nov 2020 18:12:02 -0800 Message-Id: <20201114021203.24558-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Use QEMU to start Xen (just the hypervisor) up until it stops because there is no dom0 kernel to boot. It is based on the existing build job unstable-arm64v8. Also use make -j$(nproc) to build Xen. Signed-off-by: Stefano Stabellini --- automation/gitlab-ci/test.yaml | 22 ++++++++++++++++++ automation/scripts/build | 8 +++---- automation/scripts/qemu-smoke-arm64.sh | 32 ++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100755 automation/scripts/qemu-smoke-arm64.sh diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 793feafe8b..35346e3f6e 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -22,6 +22,28 @@ build-each-commit-gcc: - /^coverity-tested\/.*/ - /^stable-.*/ +qemu-smoke-arm64-gcc: + stage: test + image: registry.gitlab.com/xen-project/xen/${CONTAINER} + variables: + CONTAINER: debian:unstable-arm64v8 + script: + - ./automation/scripts/qemu-smoke-arm64.sh 2>&1 | tee qemu-smoke-arm64.log + dependencies: + - debian-unstable-gcc-arm64 + 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/build b/automation/scripts/build index 0cd0f3971d..95ad23eadb 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -10,9 +10,9 @@ cc-ver() # random config or default config if [[ "${RANDCONFIG}" == "y" ]]; then - make -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config randconfig + make -j$(nproc) -C xen KCONFIG_ALLCONFIG=tools/kconfig/allrandom.config randconfig else - make -C xen defconfig + make -j$(nproc) -C xen defconfig fi # build up our configure options @@ -45,9 +45,7 @@ make -j$(nproc) dist # Extract artifacts to avoid getting rewritten by customised builds cp xen/.config xen-config mkdir binaries -if [[ "${XEN_TARGET_ARCH}" == "x86_64" ]]; then - cp xen/xen binaries/xen -fi +cp xen/xen binaries/xen # Build all the configs we care about case ${XEN_TARGET_ARCH} in diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh new file mode 100755 index 0000000000..a7efbf8b6f --- /dev/null +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +set -ex + +# Install QEMU +export DEBIAN_FRONTENT=noninteractive +apt-get -qy update +apt-get -qy install --no-install-recommends qemu-system-aarch64 \ + u-boot-qemu + +# XXX Silly workaround to get the following QEMU command to work +cp /usr/share/qemu/pvh.bin /usr/share/qemu/efi-virtio.rom +qemu-system-aarch64 \ + -machine virtualization=true \ + -cpu cortex-a57 -machine type=virt \ + -m 512 -display none \ + -machine dumpdtb=binaries/virt-gicv3.dtb + +rm -f smoke.serial +set +e +echo " booti 0x49000000 - 0x44000000" | timeout -k 1 30 qemu-system-aarch64 \ + -machine virtualization=true \ + -cpu cortex-a57 -machine type=virt \ + -m 512 -monitor none -serial stdio \ + -no-reboot \ + -device loader,file=binaries/virt-gicv3.dtb,force-raw=on,addr=0x44000000 \ + -device loader,file=binaries/xen,force-raw=on,addr=0x49000000 \ + -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial + +set -e +grep -q 'LOADING DOMAIN 0' smoke.serial || exit 1 +exit 0 From patchwork Sat Nov 14 02:12:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 11905363 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 24F82139F for ; Sat, 14 Nov 2020 02:13:01 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EA97B2225D for ; Sat, 14 Nov 2020 02:13:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="DKs91J+W" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA97B2225D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.27052.55747 (Exim 4.92) (envelope-from ) id 1kdl2u-0006IW-Bi; Sat, 14 Nov 2020 02:12:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 27052.55747; Sat, 14 Nov 2020 02:12:08 +0000 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" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdl2u-0006II-4B; Sat, 14 Nov 2020 02:12:08 +0000 Received: by outflank-mailman (input) for mailman id 27052; Sat, 14 Nov 2020 02:12:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdl2t-0006HX-54 for xen-devel@lists.xenproject.org; Sat, 14 Nov 2020 02:12:07 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 35034942-9481-4946-a3c5-b9acff4eb3c7; Sat, 14 Nov 2020 02:12:06 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-24-130-65-46.hsd1.ca.comcast.net [24.130.65.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9F8F422261; Sat, 14 Nov 2020 02:12:05 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdl2t-0006HX-54 for xen-devel@lists.xenproject.org; Sat, 14 Nov 2020 02:12:07 +0000 X-Inumbo-ID: 35034942-9481-4946-a3c5-b9acff4eb3c7 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 35034942-9481-4946-a3c5-b9acff4eb3c7; Sat, 14 Nov 2020 02:12:06 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-24-130-65-46.hsd1.ca.comcast.net [24.130.65.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9F8F422261; Sat, 14 Nov 2020 02:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605319925; bh=91tedtBqSR/PprDuGd1wddKAk0sf1gu/9Y2miqIdwYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKs91J+WyJcDhkUMgag8WI4czY6yMYgw4ef5yTPe7+NOcRPTnj+EPEophNMkyP48b /Bhb4z2nFC2WMQrQHIYvx4lvhlbk/vYGd5HRDgTwc7nxp5Mu3lNt9D1ryl53EyhOAp cJLVAtktIUq8yyzSTeDiJsR2hLxfyvB+CuKC0y+w= From: Stefano Stabellini To: andrew.cooper3@citrix.com, cardoe@cardoe.com, wl@xen.org Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini Subject: [PATCH 2/2] automation: add dom0less to the QEMU aarch64 smoke test Date: Fri, 13 Nov 2020 18:12:03 -0800 Message-Id: <20201114021203.24558-2-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Add a trivial dom0less test: - build Linux defconfig arm64 to be used as dom0/U kernel - use busybox-static to create a trivial dom0/U ramdisk - use ImageBuilder to generate the uboot boot script automatically - install and use u-boot from the Debian package to start the test - binaries are loaded from uboot via tftp Disabling the pl061 device is required to get any version of Linux to boot on Xen on qemu-system-aarch64. Signed-off-by: Stefano Stabellini --- automation/gitlab-ci/test.yaml | 1 + automation/scripts/qemu-smoke-arm64.sh | 87 +++++++++++++++++++++++--- 2 files changed, 81 insertions(+), 7 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 35346e3f6e..76eff1004e 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -27,6 +27,7 @@ qemu-smoke-arm64-gcc: image: registry.gitlab.com/xen-project/xen/${CONTAINER} variables: CONTAINER: debian:unstable-arm64v8 + LINUX_VERSION: 5.9.8 script: - ./automation/scripts/qemu-smoke-arm64.sh 2>&1 | tee qemu-smoke-arm64.log dependencies: diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index a7efbf8b6f..e8dc5b19cb 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -6,27 +6,100 @@ set -ex export DEBIAN_FRONTENT=noninteractive apt-get -qy update apt-get -qy install --no-install-recommends qemu-system-aarch64 \ - u-boot-qemu + u-boot-qemu \ + u-boot-tools \ + device-tree-compiler \ + busybox-static \ + curl \ + cpio \ + bc # XXX Silly workaround to get the following QEMU command to work cp /usr/share/qemu/pvh.bin /usr/share/qemu/efi-virtio.rom qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ - -m 512 -display none \ + -m 1024 -display none \ -machine dumpdtb=binaries/virt-gicv3.dtb +# XXX disable pl061 to avoid Linux crash +dtc -I dtb -O dts binaries/virt-gicv3.dtb > binaries/virt-gicv3.dts +sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv3.dts > binaries/virt-gicv3-edited.dts +dtc -I dts -O dtb binaries/virt-gicv3-edited.dts > binaries/virt-gicv3.dtb + +# Busybox Dom0 +mkdir -p initrd +mkdir -p initrd/bin +mkdir -p initrd/sbin +mkdir -p initrd/etc +mkdir -p initrd/dev +mkdir -p initrd/proc +mkdir -p initrd/sys +mkdir -p initrd/lib +mkdir -p initrd/var +mkdir -p initrd/mnt +cp /bin/busybox initrd/bin/busybox +initrd/bin/busybox --install initrd/bin +echo "#!/bin/sh + +mount -t proc proc /proc +mount -t sysfs sysfs /sys +mount -t devtmpfs devtmpfs /dev +/bin/sh" > initrd/init +chmod +x initrd/init +cd initrd +find . | cpio --create --format='newc' | gzip > ../binaries/initrd +cd .. + + +# Linux Dom0 +curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX_VERSION".tar.xz +tar xvJf linux-"$LINUX_VERSION".tar.xz +cd linux-"$LINUX_VERSION" +make defconfig +make -j$(nproc) Image.gz +cp arch/arm64/boot/Image ../binaries +cd .. + + +# ImageBuilder +echo 'MEMORY_START="0x40000000" +MEMORY_END="0x80000000" + +DEVICE_TREE="virt-gicv3.dtb" +XEN="xen" +DOM0_KERNEL="Image" +DOM0_RAMDISK="initrd" +XEN_CMD="console=dtuart dom0_mem=512M" + +NUM_DOMUS=1 +DOMU_KERNEL[0]="Image" +DOMU_RAMDISK[0]="initrd" +DOMU_MEM[0]="256" + +LOAD_CMD="tftpb" +UBOOT_SOURCE="boot.source" +UBOOT_SCRIPT="boot.scr"' > binaries/config +rm -rf imagebuilder +git clone https://gitlab.com/ViryaOS/imagebuilder +bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c binaries/config + + +# Run the test rm -f smoke.serial set +e -echo " booti 0x49000000 - 0x44000000" | timeout -k 1 30 qemu-system-aarch64 \ +echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ +timeout -k 1 240 \ +qemu-system-aarch64 \ -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ - -m 512 -monitor none -serial stdio \ + -m 1024 -monitor none -serial stdio \ + -smp 2 \ -no-reboot \ - -device loader,file=binaries/virt-gicv3.dtb,force-raw=on,addr=0x44000000 \ - -device loader,file=binaries/xen,force-raw=on,addr=0x49000000 \ + -device virtio-net-pci,netdev=n0 \ + -netdev user,id=n0,tftp=binaries \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial set -e -grep -q 'LOADING DOMAIN 0' smoke.serial || exit 1 +(grep -q "^BusyBox" smoke.serial && grep -q "DOM1: BusyBox" smoke.serial) || exit 1 exit 0