From: Thomas Huth <thuth@redhat.com>
To: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Janosch Frank <frankja@linux.ibm.com>
Subject: [kvm-unit-tests PULL 09/11] s390x: add Protected VM support
Date: Mon, 28 Sep 2020 19:49:56 +0200 [thread overview]
Message-ID: <20200928174958.26690-10-thuth@redhat.com> (raw)
In-Reply-To: <20200928174958.26690-1-thuth@redhat.com>
From: Marc Hartmayer <mhartmay@linux.ibm.com>
Add support for Protected Virtual Machine (PVM) tests. For starting a
PVM guest we must be able to generate a PVM image by using the
`genprotimg` tool from the s390-tools collection. This requires the
ability to pass a machine-specific host-key document, so the option
`--host-key-document` is added to the configure script.
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20200923134758.19354-5-mhartmay@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
[thuth: Drop the verbose "SKIP ... (no host-key document specified)" output]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
configure | 9 +++++++++
s390x/Makefile | 15 ++++++++++++++-
s390x/selftest.parmfile | 1 +
s390x/unittests.cfg | 1 +
scripts/s390x/func.bash | 35 +++++++++++++++++++++++++++++++++++
5 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 s390x/selftest.parmfile
create mode 100644 scripts/s390x/func.bash
diff --git a/configure b/configure
index 39b63ae..706aab5 100755
--- a/configure
+++ b/configure
@@ -24,6 +24,7 @@ wa_divide=
vmm="qemu"
errata_force=0
erratatxt="$srcdir/errata.txt"
+host_key_document=
usage() {
cat <<-EOF
@@ -46,6 +47,9 @@ usage() {
no environ is provided by the user (enabled by default)
--erratatxt=FILE specify a file to use instead of errata.txt. Use
'--erratatxt=' to ensure no file is used.
+ --host-key-document=HOST_KEY_DOCUMENT
+ Specify the machine-specific host-key document for creating
+ a PVM image with 'genprotimg' (s390x only)
EOF
exit 1
}
@@ -98,6 +102,9 @@ while [[ "$1" = -* ]]; do
erratatxt=
[ "$arg" ] && erratatxt=$(eval realpath "$arg")
;;
+ --host-key-document)
+ host_key_document="$arg"
+ ;;
--help)
usage
;;
@@ -229,6 +236,8 @@ ENVIRON_DEFAULT=$environ_default
ERRATATXT=$erratatxt
U32_LONG_FMT=$u32_long
WA_DIVIDE=$wa_divide
+GENPROTIMG=${GENPROTIMG-genprotimg}
+HOST_KEY_DOCUMENT=$host_key_document
EOF
cat <<EOF > lib/config.h
diff --git a/s390x/Makefile b/s390x/Makefile
index c2213ad..b079a26 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -19,12 +19,19 @@ tests += $(TEST_DIR)/smp.elf
tests += $(TEST_DIR)/sclp.elf
tests += $(TEST_DIR)/css.elf
tests += $(TEST_DIR)/uv-guest.elf
+
tests_binary = $(patsubst %.elf,%.bin,$(tests))
+ifneq ($(HOST_KEY_DOCUMENT),)
+tests_pv_binary = $(patsubst %.bin,%.pv.bin,$(tests_binary))
+else
+tests_pv_binary =
+endif
-all: directories test_cases test_cases_binary
+all: directories test_cases test_cases_binary test_cases_pv
test_cases: $(tests)
test_cases_binary: $(tests_binary)
+test_cases_pv: $(tests_pv_binary)
CFLAGS += -std=gnu99
CFLAGS += -ffreestanding
@@ -73,6 +80,12 @@ FLATLIBS = $(libcflat)
%.bin: %.elf
$(OBJCOPY) -O binary $< $@
+%selftest.pv.bin: %selftest.bin $(HOST_KEY_DOCUMENT) $(patsubst %.pv.bin,%.parmfile,$@)
+ $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --parmfile $(patsubst %.pv.bin,%.parmfile,$@) --no-verify --image $< -o $@
+
+%.pv.bin: %.bin $(HOST_KEY_DOCUMENT)
+ $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --no-verify --image $< -o $@
+
arch_clean: asm_offsets_clean
$(RM) $(TEST_DIR)/*.{o,elf,bin} $(TEST_DIR)/.*.d lib/s390x/.*.d
diff --git a/s390x/selftest.parmfile b/s390x/selftest.parmfile
new file mode 100644
index 0000000..5613931
--- /dev/null
+++ b/s390x/selftest.parmfile
@@ -0,0 +1 @@
+test 123
\ No newline at end of file
diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg
index 6d50c63..3feb8bc 100644
--- a/s390x/unittests.cfg
+++ b/s390x/unittests.cfg
@@ -21,6 +21,7 @@
[selftest-setup]
file = selftest.elf
groups = selftest
+# please keep the kernel cmdline in sync with $(TEST_DIR)/selftest.parmfile
extra_params = -append 'test 123'
[intercept]
diff --git a/scripts/s390x/func.bash b/scripts/s390x/func.bash
new file mode 100644
index 0000000..b391208
--- /dev/null
+++ b/scripts/s390x/func.bash
@@ -0,0 +1,35 @@
+# The file scripts/common.bash has to be the only file sourcing this
+# arch helper file
+source config.mak
+
+ARCH_CMD=arch_cmd_s390x
+
+function arch_cmd_s390x()
+{
+ local cmd=$1
+ local testname=$2
+ local groups=$3
+ local smp=$4
+ local kernel=$5
+ local opts=$6
+ local arch=$7
+ local check=$8
+ local accel=$9
+ local timeout=${10}
+
+ # run the normal test case
+ "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+
+ # run PV test case
+ kernel=${kernel%.elf}.pv.bin
+ testname=${testname}_PV
+ if [ ! -f "${kernel}" ]; then
+ if [ -z "${HOST_KEY_DOCUMENT}" ]; then
+ return 2
+ fi
+
+ print_result 'SKIP' $testname '' 'PVM image was not created'
+ return 2
+ fi
+ "$cmd" "$testname" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+}
--
2.18.2
next prev parent reply other threads:[~2020-09-28 17:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 17:49 [kvm-unit-tests PULL 00/11] s390x and generic script updates Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 01/11] runtime.bash: remove outdated comment Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 02/11] Use same test names in the default and the TAP13 output format Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 03/11] configure: Add a check for the bash version Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 04/11] travis.yml: Update from Bionic to Focal Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 05/11] travis.yml: Update the list of s390x tests Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 06/11] common.bash: run `cmd` only if a test case was found Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 07/11] scripts: add support for architecture dependent functions Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 08/11] run_tests/mkstandalone: add arch_cmd hook Thomas Huth
2020-09-28 17:49 ` Thomas Huth [this message]
2020-09-28 17:49 ` [kvm-unit-tests PULL 10/11] s390x/selftest: Fix constraint of inline assembly Thomas Huth
2020-09-28 17:49 ` [kvm-unit-tests PULL 11/11] scripts/arch-run: use ncat rather than nc Thomas Huth
2020-09-29 8:38 ` [kvm-unit-tests PULL 00/11] s390x and generic script updates Paolo Bonzini
2020-09-29 8:47 ` Thomas Huth
2020-09-29 8:49 ` Janosch Frank
2020-09-29 8:58 ` Thomas Huth
2020-09-29 9:06 ` Paolo Bonzini
2020-10-01 9:21 ` Paolo Bonzini
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=20200928174958.26690-10-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.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 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.