From patchwork Tue Jul 26 19:07:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xenia Ragiadakou X-Patchwork-Id: 12929705 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 028A2C00140 for ; Tue, 26 Jul 2022 19:07:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.375680.608150 (Exim 4.92) (envelope-from ) id 1oGPtv-00021r-95; Tue, 26 Jul 2022 19:07:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 375680.608150; Tue, 26 Jul 2022 19:07:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGPtv-00021k-61; Tue, 26 Jul 2022 19:07:27 +0000 Received: by outflank-mailman (input) for mailman id 375680; Tue, 26 Jul 2022 19:07:26 +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 1oGPtu-0001mA-Le for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 19:07:26 +0000 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [2a00:1450:4864:20::632]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2f9589ca-0d16-11ed-924f-1f966e50362f; Tue, 26 Jul 2022 21:07:25 +0200 (CEST) Received: by mail-ej1-x632.google.com with SMTP id j22so27863547ejs.2 for ; Tue, 26 Jul 2022 12:07:25 -0700 (PDT) Received: from uni.router.wind (adsl-45.176.58.224.tellas.gr. [176.58.224.45]) by smtp.googlemail.com with ESMTPSA id eg47-20020a05640228af00b0043bbcd94ee4sm8952306edb.51.2022.07.26.12.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 12:07:24 -0700 (PDT) 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: 2f9589ca-0d16-11ed-924f-1f966e50362f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KuhC1kxwd9csR35zZXVNzYXhV5vaAkNKgTfykKJEjLA=; b=U3henfgLSkyzH5mr8ZBE40xVwJ8yWiGKYEXKCAmdE5nS3ywp7is/6BRL4DADq3Vvxr /4ZGd2XU7u5+RL3cFTCmbONYnadPDemw5LnrmkwClym3qS60YC87EE7Y41mkpFZAQOF+ Psdzb0nn1UuxfEmfvdVCW7wiCdlQwDronuO+Wn0GnZLZ73HFmy05NRoEPJJGuBOv7Ote ygVuMlIRLrAisR7bJG80t3E9iLeXPKa0qTrfds6ao7JGlj84IAB//F8nG4Jh3t3aqa+6 gKYA9zoJSJ7flz0kkDGdRgszea9gf0OlGb3g47bSFSLM2sb/aHlBsVa9ki+VqizKKZsa hSoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KuhC1kxwd9csR35zZXVNzYXhV5vaAkNKgTfykKJEjLA=; b=gU92YnLt6GoSQzddSnwKn+bmF7gLabScTo+wkzukHrKFTjrAs3PypQDaPs00xgQpny JejmyTXhUC6wLXu/D/MecoWp4/hhf1apRUP2kqm4uZ6AZTq8ssopvNpcKqSkrBTJLyaA yeCgqqDgkYcdrOolrQTbuCObXaCK9uO6BjSaXTF+6TEfY8D3WyRpt5ca97xSQOEAUbDQ J/jKikaeAW9gi0Io0x9lCbXyYtDdPbGyy3RAhfwzmyh6g6DjwnsPQoT9dNN/HnTlb5Eg 60AOeQ6MzgsRsIaT74mmWyhHjMsicV3RegmdXpQBIVadgcJWL4nYVlM2x4LkGWXbdqPU UFBQ== X-Gm-Message-State: AJIora/xF32To8iwoyEUXYjSS+pMkmBpkN424M3OfW0U2Je/N7vpeZl6 nuBqYOzCBn3uVtXwJMTPwanPEek8VXQ= X-Google-Smtp-Source: AGRyM1uXQsxs32z/UGYWbc6C54OE0fAhSrD/HZ5ulNk4vTDQTPhDUYUNbUKjeIjcMrDaIqynd13AMA== X-Received: by 2002:a17:906:5a51:b0:72b:5cdf:ed77 with SMTP id my17-20020a1709065a5100b0072b5cdfed77mr14908863ejc.505.1658862445179; Tue, 26 Jul 2022 12:07:25 -0700 (PDT) From: Xenia Ragiadakou To: xen-devel@lists.xenproject.org Cc: Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 1/2] automation: Remove XEN_CONFIG_EXPERT leftovers Date: Tue, 26 Jul 2022 22:07:00 +0300 Message-Id: <20220726190701.1048824-2-burzalodowa@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220726190701.1048824-1-burzalodowa@gmail.com> References: <20220726190701.1048824-1-burzalodowa@gmail.com> MIME-Version: 1.0 The EXPERT config option cannot anymore be selected via the environmental variable XEN_CONFIG_EXPERT. Remove stale references to XEN_CONFIG_EXPERT from the automation code. Signed-off-by: Xenia Ragiadakou Reviewed-by: Stefano Stabellini --- Changes in v2: - add Stefano's R-b tag automation/build/README.md | 3 --- automation/scripts/build | 4 ++-- automation/scripts/containerize | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/automation/build/README.md b/automation/build/README.md index 2137957408..00305eed03 100644 --- a/automation/build/README.md +++ b/automation/build/README.md @@ -65,9 +65,6 @@ understands. - CONTAINER_NO_PULL: If set to 1, the script will not pull from docker hub. This is useful when testing container locally. -- XEN_CONFIG_EXPERT: If this is defined in your shell it will be - automatically passed through to the container. - If your docker host has Linux kernel > 4.11, and you want to use containers that run old glibc (for example, CentOS 6 or SLES11SP4), you may need to add diff --git a/automation/scripts/build b/automation/scripts/build index 281f8b1fcc..21b3bc57c8 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -91,6 +91,6 @@ for cfg in `ls ${cfg_dir}`; do echo "Building $cfg" make -j$(nproc) -C xen clean rm -f xen/.config - make -C xen KBUILD_DEFCONFIG=../../../../${cfg_dir}/${cfg} XEN_CONFIG_EXPERT=y defconfig - make -j$(nproc) -C xen XEN_CONFIG_EXPERT=y + make -C xen KBUILD_DEFCONFIG=../../../../${cfg_dir}/${cfg} defconfig + make -j$(nproc) -C xen done diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 8992c67278..9d4beca4fa 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -101,7 +101,6 @@ exec ${docker_cmd} run \ -v "${CONTAINER_PATH}":/build:rw${selinux} \ -v "${HOME}/.ssh":/root/.ssh:ro \ ${SSH_AUTH_DIR:+-v "${SSH_AUTH_DIR}":/tmp/ssh-agent${selinux}} \ - ${XEN_CONFIG_EXPERT:+-e XEN_CONFIG_EXPERT=${XEN_CONFIG_EXPERT}} \ ${CONTAINER_ARGS} \ -${termint}i --rm -- \ ${CONTAINER} \ From patchwork Tue Jul 26 19:07:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xenia Ragiadakou X-Patchwork-Id: 12929706 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 601A6C00140 for ; Tue, 26 Jul 2022 19:07:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.375681.608160 (Exim 4.92) (envelope-from ) id 1oGPty-0002KN-JV; Tue, 26 Jul 2022 19:07:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 375681.608160; Tue, 26 Jul 2022 19:07:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oGPty-0002KG-Gu; Tue, 26 Jul 2022 19:07:30 +0000 Received: by outflank-mailman (input) for mailman id 375681; Tue, 26 Jul 2022 19:07:29 +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 1oGPtx-0001mA-94 for xen-devel@lists.xenproject.org; Tue, 26 Jul 2022 19:07:29 +0000 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [2a00:1450:4864:20::632]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 313f4ee2-0d16-11ed-924f-1f966e50362f; Tue, 26 Jul 2022 21:07:28 +0200 (CEST) Received: by mail-ej1-x632.google.com with SMTP id j22so27863737ejs.2 for ; Tue, 26 Jul 2022 12:07:28 -0700 (PDT) Received: from uni.router.wind (adsl-45.176.58.224.tellas.gr. [176.58.224.45]) by smtp.googlemail.com with ESMTPSA id eg47-20020a05640228af00b0043bbcd94ee4sm8952306edb.51.2022.07.26.12.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 12:07:27 -0700 (PDT) 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: 313f4ee2-0d16-11ed-924f-1f966e50362f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Ux4cJFi9/ACsXCBrKM47orXeCmFYl/0tvZHbq+8ADQ=; b=IedBqstLflJ+RQBTnGH7SS0+bEthSnRN8uPfkib0G8d0HJVrB9zMg1teW6YSd51fol S9AJBxJ8DytETO93EjR2zrtnNzPw47vwXRz1HK6/St/PRg1ilJ9lcLgU1gU5CLzbsg1I 00qQUT6NsnhXO2rEtbzqQ77FIBdcBL3kR+o+bIIaAjsofGbZmy5FYkx+BdftUOx/t6dH MHjtds6cmu1UJPG1pVQA1A1x4OJoDO6l7moiLdbEx+4KNvwmw3jHj2xes2Mfsas5V+lI 1xKdnNHHgbt5oKPqsVrxo+3exPy4vU/jROq4dxzNCqVf7Kf9unrMrVhYu8n+uUBfnZw/ Aisg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Ux4cJFi9/ACsXCBrKM47orXeCmFYl/0tvZHbq+8ADQ=; b=cCm3SPxnRbo1wIWscF0Ysq7YdXgODBnB43WDNFab9ogoEbBkMXYtw0IVzrrXQ/13qY BTHK864/xEofttn2IPdzCZsr3EYmq9OmoRinASNMsD8mDQX2Re0X0lsHRppih8Q/iX5x CKhsK+rhdthLpg/uBh/f5E8vGEZYn1dcWg9ItXcSEjAmbiHvfl31WyfPVLIMOzx7WON2 2FjDPeoONl5s+U/zNrVUjckOegfKlBuXcg/MtaGcUYALKaWL/HnNqnzVjbuT22y4m+mE CYr11jY0V3UwnKjllqD8SQAj6coATYvIypXuH4Bj5Uu2U61SLJJufgU9ibSnOfus9Q6+ CVag== X-Gm-Message-State: AJIora9MFjZW0ycGqYJHsLo6xPjM9DLVsrHFLZEERhE7lou45cazYGxi W0myrNyYplAnLsabFwtc2Fel4xeEkVA= X-Google-Smtp-Source: AGRyM1t+ZAeZOtA8CtOkuowGI2el9zO/c1e4I/zzw2Zkg9z/Y/aBLp0VmCs06DxE1ilwnwGznEhSag== X-Received: by 2002:a17:906:5a68:b0:72b:3e88:fec1 with SMTP id my40-20020a1709065a6800b0072b3e88fec1mr15092081ejc.741.1658862447975; Tue, 26 Jul 2022 12:07:27 -0700 (PDT) From: Xenia Ragiadakou To: xen-devel@lists.xenproject.org Cc: Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 2/2] automation: arm64: Create a test job for testing static allocation on qemu Date: Tue, 26 Jul 2022 22:07:01 +0300 Message-Id: <20220726190701.1048824-3-burzalodowa@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220726190701.1048824-1-burzalodowa@gmail.com> References: <20220726190701.1048824-1-burzalodowa@gmail.com> MIME-Version: 1.0 Enable CONFIG_STATIC_MEMORY in the existing arm64 build. Create a new test job, called qemu-smoke-arm64-gcc-staticmem. Adjust qemu-smoke-arm64.sh script to accomodate the static memory test as a new test variant. The test variant is determined based on the first argument passed to the script. For testing static memory, the argument is 'static-mem'. The test configures DOM1 with a static memory region and adds a check in the init script. The check consists in comparing the contents of the /proc/device-tree memory entry with the static memory range with which DOM1 was configured. If the memory layout is correct, a message gets printed by DOM1. At the end of the qemu run, the script searches for the specific message in the logs and fails if not found. Signed-off-by: Xenia Ragiadakou Reviewed-by: Penny Zheng --- Changes in v2: - enable CONFIG_STATIC_MEMORY for all arm64 builds - use the existing qemu-smoke-arm64.sh with an argument passed for distinguishing between tests, instead of creating a new script - test does not rely on kernel logs but prints a message itself on success - remove the part that enables custom configs for arm64 builds - add comments - adapt commit message automation/gitlab-ci/test.yaml | 18 +++++++++++ automation/scripts/build | 8 +++++ automation/scripts/qemu-smoke-arm64.sh | 42 ++++++++++++++++++++++++-- 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 26bdbcc3ea..6f9f64a8da 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -80,6 +80,24 @@ qemu-smoke-arm64-gcc: tags: - arm64 +qemu-smoke-arm64-gcc-staticmem: + extends: .test-jobs-common + variables: + CONTAINER: debian:unstable-arm64v8 + script: + - ./automation/scripts/qemu-smoke-arm64.sh static-mem 2>&1 | tee qemu-smoke-arm64.log + needs: + - debian-unstable-gcc-arm64 + - kernel-5.9.9-arm64-export + - qemu-system-aarch64-6.0.0-arm64-export + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - arm64 + qemu-smoke-arm32-gcc: extends: .test-jobs-common variables: diff --git a/automation/scripts/build b/automation/scripts/build index 21b3bc57c8..1941763315 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -18,6 +18,14 @@ else make -j$(nproc) -C xen defconfig fi +if [[ "${XEN_TARGET_ARCH}" = "arm64" ]]; then + echo " +CONFIG_EXPERT=y +CONFIG_UNSUPPORTED=y +CONFIG_STATIC_MEMORY=y" > xen/.config + make -j$(nproc) -C xen olddefconfig +fi + # Save the config file before building because build failure causes the script # to exit early -- bash is invoked with -e. cp xen/.config xen-config diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index 53086a5ac7..48513a7832 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -2,6 +2,15 @@ set -ex +test_variant=$1 + +if [[ "${test_variant}" == "static-mem" ]]; then + # Memory range that is statically allocated to DOM1 + domu_base="50000000" + domu_size="10000000" + passed="static-mem test passed" +fi + # Install QEMU export DEBIAN_FRONTENT=noninteractive apt-get -qy update @@ -42,8 +51,22 @@ echo "#!/bin/sh mount -t proc proc /proc mount -t sysfs sysfs /sys -mount -t devtmpfs devtmpfs /dev -/bin/sh" > initrd/init +mount -t devtmpfs devtmpfs /dev" > initrd/init + +if [[ "${test_variant}" == "static-mem" ]]; then + # Verify that DOM1 booted with the expected memory layout by checking the + # contents of the memory entry in /proc/device-tree. + echo " +current=\$(hexdump -e '16/1 \"%02x\"' /proc/device-tree/memory@${domu_base}/reg 2>/dev/null) +expected=\"$(printf \"%016x%016x\" 0x${domu_base} 0x${domu_size})\" +if [[ ${expected} == \"\${current}\" ]]; then + echo \"${passed}\" +fi" >> initrd/init +fi + +echo " +/bin/sh" >> initrd/init + chmod +x initrd/init cd initrd find . | cpio --create --format='newc' | gzip > ../binaries/initrd @@ -68,6 +91,12 @@ DOMU_MEM[0]="256" LOAD_CMD="tftpb" UBOOT_SOURCE="boot.source" UBOOT_SCRIPT="boot.scr"' > binaries/config + +if [[ "${test_variant}" == "static-mem" ]]; then + echo " +DOMU_STATIC_MEM[0]=\"0x${domu_base} 0x${domu_size}\"" >> binaries/config +fi + rm -rf imagebuilder git clone https://gitlab.com/ViryaOS/imagebuilder bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c binaries/config @@ -89,5 +118,12 @@ timeout -k 1 240 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial set -e -(grep -q "^BusyBox" smoke.serial && grep -q "DOM1: BusyBox" smoke.serial) || exit 1 +grep -q "^BusyBox" smoke.serial || exit 1 + +if [[ "${test_variant}" == "static-mem" ]]; then + grep -q "DOM1: ${passed}" smoke.serial || exit 1 +else + grep -q "DOM1: BusyBox" smoke.serial || exit 1 +fi + exit 0