Kernel KVM virtualization development
 help / color / mirror / Atom feed
From: Nikos Nikoleris <nikos.nikoleris@arm.com>
To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, andrew.jones@linux.dev
Cc: pbonzini@redhat.com, alexandru.elisei@arm.com, ricarkol@google.com
Subject: [kvm-unit-tests PATCH v5 29/29] arm64: Add an efi/run script
Date: Fri, 28 Apr 2023 13:04:05 +0100	[thread overview]
Message-ID: <20230428120405.3770496-30-nikos.nikoleris@arm.com> (raw)
In-Reply-To: <20230428120405.3770496-1-nikos.nikoleris@arm.com>

This change adds a efi/run script inspired by the one in x86. This
script will setup a folder with the test compiled as an EFI app and a
startup.nsh script. The script launches QEMU providing an image with
EDKII and the path to the folder with the test which is executed
automatically.

For example:

$> ./arm/efi/run ./arm/selftest.efi -append "setup smp=2 mem=256" -smp 2 -m 256

Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-by: Ricardo Koller <ricarkol@google.com>
---
 scripts/runtime.bash | 13 +++++++---
 arm/efi/run          | 61 ++++++++++++++++++++++++++++++++++++++++++++
 arm/run              | 14 +++++++---
 arm/Makefile.common  |  1 +
 arm/dummy.c          | 12 +++++++++
 5 files changed, 94 insertions(+), 7 deletions(-)
 create mode 100755 arm/efi/run
 create mode 100644 arm/dummy.c

diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index 07b62b0e..785a7b62 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -130,11 +130,18 @@ function run()
         done
     fi
 
-    last_line=$(premature_failure > >(tail -1)) && {
+    log=$(premature_failure) && {
         skip=true
-        if [ "${CONFIG_EFI}" == "y" ] && [[ "${last_line}" =~ "Dummy Hello World!" ]]; then
-            skip=false
+        if [ "${CONFIG_EFI}" == "y" ]; then
+            if [ "$ARCH" == "x86_64" ] &&
+               [[ "$(tail -1 <<<"$log")" =~ "Dummy Hello World!" ]]; then
+                   skip=false
+            elif [ "$ARCH" == "arm64" ] &&
+               [[ "$(tail -2 <<<"$log" | head -1)" =~ "Dummy Hello World!" ]]; then
+                   skip=false
+            fi
         fi
+
         if [ ${skip} == true ]; then
             print_result "SKIP" $testname "" "$last_line"
             return 77
diff --git a/arm/efi/run b/arm/efi/run
new file mode 100755
index 00000000..dfff717a
--- /dev/null
+++ b/arm/efi/run
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e
+
+if [ $# -eq 0 ]; then
+	echo "Usage $0 TEST_CASE [QEMU_ARGS]"
+	exit 2
+fi
+
+if [ ! -f config.mak ]; then
+	echo "run './configure --enable-efi && make' first. See ./configure -h"
+	exit 2
+fi
+source config.mak
+source scripts/arch-run.bash
+source scripts/common.bash
+
+: "${EFI_SRC:=$(realpath "$(dirname "$0")/../")}"
+: "${EFI_UEFI:=/usr/share/qemu-efi-aarch64/QEMU_EFI.fd}"
+: "${EFI_TEST:=efi-tests}"
+: "${EFI_CASE:=$(basename $1 .efi)}"
+
+if [ ! -f "$EFI_UEFI" ]; then
+	echo "UEFI firmware not found: $EFI_UEFI"
+	echo "Please install the UEFI firmware to this path"
+	echo "Or specify the correct path with the env variable EFI_UEFI"
+	exit 2
+fi
+
+# Remove the TEST_CASE from $@
+shift 1
+
+# Fish out the arguments for the test, they should be the next string
+# after the "-append" option
+qemu_args=()
+cmd_args=()
+while (( "$#" )); do
+	if [ "$1" = "-append" ]; then
+		cmd_args=$2
+		shift 2
+	else
+		qemu_args+=("$1")
+		shift 1
+	fi
+done
+
+if [ "$EFI_CASE" = "_NO_FILE_4Uhere_" ]; then
+	EFI_CASE=dummy
+fi
+
+: "${EFI_CASE_DIR:="$EFI_TEST/$EFI_CASE"}"
+mkdir -p "$EFI_CASE_DIR"
+
+cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_TEST/$EFI_CASE/"
+echo "@echo -off" > "$EFI_TEST/$EFI_CASE/startup.nsh"
+echo "$EFI_CASE.efi" "${cmd_args[@]}" >> "$EFI_TEST/$EFI_CASE/startup.nsh"
+
+EFI_RUN=y $TEST_DIR/run \
+       -bios "$EFI_UEFI" \
+       -drive file.dir="$EFI_TEST/$EFI_CASE/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \
+       "${qemu_args[@]}"
diff --git a/arm/run b/arm/run
index c6f25b8c..de520c11 100755
--- a/arm/run
+++ b/arm/run
@@ -64,8 +64,10 @@ if ! $qemu $M -chardev '?' | grep -q testdev; then
 	exit 2
 fi
 
-chr_testdev='-device virtio-serial-device'
-chr_testdev+=' -device virtconsole,chardev=ctd -chardev testdev,id=ctd'
+if [ "$EFI_RUN" != "y" ]; then
+	chr_testdev='-device virtio-serial-device'
+	chr_testdev+=' -device virtconsole,chardev=ctd -chardev testdev,id=ctd'
+fi
 
 pci_testdev=
 if $qemu $M -device '?' | grep -q pci-testdev; then
@@ -74,7 +76,11 @@ fi
 
 A="-accel $ACCEL"
 command="$qemu -nodefaults $M $A -cpu $processor $chr_testdev $pci_testdev"
-command+=" -display none -serial stdio -kernel"
+command+=" -display none -serial stdio"
 command="$(migration_cmd) $(timeout_cmd) $command"
 
-run_qemu $command "$@"
+if [ "$EFI_RUN" = "y" ]; then
+	ENVIRON_DEFAULT=n run_qemu_status $command "$@"
+else
+	run_qemu $command -kernel "$@"
+fi
diff --git a/arm/Makefile.common b/arm/Makefile.common
index a133309d..d60cf8cd 100644
--- a/arm/Makefile.common
+++ b/arm/Makefile.common
@@ -12,6 +12,7 @@ tests-common += $(TEST_DIR)/gic.$(exe)
 tests-common += $(TEST_DIR)/psci.$(exe)
 tests-common += $(TEST_DIR)/sieve.$(exe)
 tests-common += $(TEST_DIR)/pl031.$(exe)
+tests-common += $(TEST_DIR)/dummy.$(exe)
 
 tests-all = $(tests-common) $(tests)
 all: directories $(tests-all)
diff --git a/arm/dummy.c b/arm/dummy.c
new file mode 100644
index 00000000..7033bb7c
--- /dev/null
+++ b/arm/dummy.c
@@ -0,0 +1,12 @@
+#include "libcflat.h"
+
+int main(int argc, char **argv)
+{
+	/*
+	 * scripts/runtime.bash uses this test as a canary to determine if the
+	 * basic setup is functional.  Print a magic string to let runtime.bash
+	 * know that all is well.
+	 */
+	printf("Dummy Hello World!");
+	return 0;
+}
-- 
2.25.1


  parent reply	other threads:[~2023-04-28 12:05 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-28 12:03 [kvm-unit-tests PATCH v5 00/29] EFI and ACPI support for arm64 Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 01/29] lib: Move acpi header and implementation to lib Nikos Nikoleris
2023-05-01 12:41   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 02/29] x86: Move x86_64-specific EFI CFLAGS to x86_64 Makefile Nikos Nikoleris
2023-05-01 12:41   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 03/29] lib: Apply Lindent to acpi.{c,h} Nikos Nikoleris
2023-05-01 12:44   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 04/29] lib: Fix style for acpi.{c,h} Nikos Nikoleris
2023-05-01 12:50   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 05/29] lib/acpi: Convert table names to Linux style Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 06/29] x86: Avoid references to fields of ACPI tables Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 07/29] lib/acpi: Ensure all struct definition for ACPI tables are packed Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 08/29] lib/acpi: Add support for the XSDT table Nikos Nikoleris
2023-05-01 12:50   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 09/29] lib/acpi: Extend the definition of the FADT table Nikos Nikoleris
2023-05-01 12:51   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 10/29] devicetree: Check that fdt is not NULL in dt_available() Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 11/29] arm64: Add support for setting up the PSCI conduit through ACPI Nikos Nikoleris
2023-05-01 12:54   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 12/29] arm64: Add support for discovering the UART " Nikos Nikoleris
2023-05-01 12:55   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 13/29] arm64: Add support for timer initialization " Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 14/29] arm64: Add support for cpu " Nikos Nikoleris
2023-05-01 12:56   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 15/29] arm64: Add support for gic " Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 16/29] lib/printf: Support for precision modifier in printf Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 17/29] lib/printf: Add support for printing wide strings Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 18/29] lib/efi: Add support for getting the cmdline Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 19/29] arm/arm64: Rename etext to _etext Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 20/29] lib: Avoid ms_abi for calls related to EFI on arm64 Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 21/29] arm64: Add a new type of memory type flag MR_F_RESERVED Nikos Nikoleris
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 22/29] arm64: Add a setup sequence for systems that boot through EFI Nikos Nikoleris
2023-05-01 12:59   ` Shaoqin Huang
2023-04-28 12:03 ` [kvm-unit-tests PATCH v5 23/29] arm64: Copy code from GNU-EFI Nikos Nikoleris
2023-04-28 12:04 ` [kvm-unit-tests PATCH v5 24/29] arm64: Change GNU-EFI imported code to use defined types Nikos Nikoleris
2023-04-28 12:04 ` [kvm-unit-tests PATCH v5 25/29] arm64: Use code from the gnu-efi when booting with EFI Nikos Nikoleris
2023-04-28 12:04 ` [kvm-unit-tests PATCH v5 26/29] lib: Avoid external dependency in libelf Nikos Nikoleris
2023-04-28 12:04 ` [kvm-unit-tests PATCH v5 27/29] arm64: Add support for efi in Makefile Nikos Nikoleris
2023-05-01 13:00   ` Shaoqin Huang
2023-04-28 12:04 ` [kvm-unit-tests PATCH v5 28/29] lib: arm: Print test exit status Nikos Nikoleris
2023-05-01 13:00   ` Shaoqin Huang
2023-04-28 12:04 ` Nikos Nikoleris [this message]
2023-05-01 12:48   ` [kvm-unit-tests PATCH v5 29/29] arm64: Add an efi/run script Shaoqin Huang
2023-04-29 16:18 ` [kvm-unit-tests PATCH v5 00/29] EFI and ACPI support for arm64 Andrew Jones
2023-04-29 16:21   ` Andrew Jones
2023-04-30  0:02     ` Nikos Nikoleris
2023-05-01 11:21       ` Andrew Jones
2023-05-01 22:27         ` Nikos Nikoleris
2023-05-02  7:32           ` Andrew Jones
2023-05-05 14:55             ` Nikos Nikoleris
2023-05-01 12:09 ` Shaoqin Huang
2023-05-03 21:18   ` Nikos Nikoleris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230428120405.3770496-30-nikos.nikoleris@arm.com \
    --to=nikos.nikoleris@arm.com \
    --cc=alexandru.elisei@arm.com \
    --cc=andrew.jones@linux.dev \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.linux.dev \
    --cc=pbonzini@redhat.com \
    --cc=ricarkol@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox