[kvm-unit-tests PULL 00/11] s390x and generic script updates

[kvm-unit-tests PULL 00/11] s390x and generic script updates

[Thomas Huth]

 Hi Paolo,

the following changes since commit 58c94d57a51a6927a68e3f09627b2d85e3404c0f:

  travis.yml: Use TRAVIS_BUILD_DIR to refer to the top directory (2020-09-25 10:00:36 +0200)

are available in the Git repository at:

  https://gitlab.com/huth/kvm-unit-tests.git tags/pull-request-2020-09-28

for you to fetch changes up to b508e1147055255ecce93a95916363bda8c8f299:

  scripts/arch-run: use ncat rather than nc. (2020-09-28 15:03:50 +0200)

----------------------------------------------------------------
- s390x protected VM support
- Some other small s390x improvements
- Generic improvements in the scripts (better TAP13 names, nc -> ncat, ...)
----------------------------------------------------------------

Jamie Iles (1):
      scripts/arch-run: use ncat rather than nc.

Marc Hartmayer (6):
      runtime.bash: remove outdated comment
      Use same test names in the default and the TAP13 output format
      common.bash: run `cmd` only if a test case was found
      scripts: add support for architecture dependent functions
      run_tests/mkstandalone: add arch_cmd hook
      s390x: add Protected VM support

Thomas Huth (4):
      configure: Add a check for the bash version
      travis.yml: Update from Bionic to Focal
      travis.yml: Update the list of s390x tests
      s390x/selftest: Fix constraint of inline assembly

 .travis.yml             |  7 ++++---
 README.md               |  3 ++-
 configure               | 14 ++++++++++++++
 run_tests.sh            | 18 +++++++++---------
 s390x/Makefile          | 15 ++++++++++++++-
 s390x/selftest.c        |  2 +-
 s390x/selftest.parmfile |  1 +
 s390x/unittests.cfg     |  1 +
 scripts/arch-run.bash   |  6 +++---
 scripts/common.bash     | 21 +++++++++++++++++++--
 scripts/mkstandalone.sh |  4 ----
 scripts/runtime.bash    |  9 +++------
 scripts/s390x/func.bash | 35 +++++++++++++++++++++++++++++++++++
 13 files changed, 106 insertions(+), 30 deletions(-)
 create mode 100644 s390x/selftest.parmfile
 create mode 100644 scripts/s390x/func.bash

[kvm-unit-tests PULL 01/11] runtime.bash: remove outdated comment

[Thomas Huth]

From: Marc Hartmayer <mhartmay@linux.ibm.com>

Since commit 6e1d3752d7ca ("tap13: list testcases individually") the
comment is no longer valid. Therefore let's remove it.

Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20200825102036.17232-2-mhartmay@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 scripts/runtime.bash | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index c88e246..caa4c5b 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -53,9 +53,6 @@ skip_nodefault()
 
 function print_result()
 {
-    # output test results in a TAP format
-    # https://testanything.org/tap-version-13-specification.html
-
     local status="$1"
     local testname="$2"
     local summary="$3"
-- 
2.18.2

[kvm-unit-tests PULL 02/11] Use same test names in the default and the TAP13 output format

[Thomas Huth]

From: Marc Hartmayer <mhartmay@linux.ibm.com>

Use the same test names in the TAP13 output as in the default output
format. This makes the output more consistent. To achieve this, we
need to pass the test name as an argument to the function
`process_test_output`.

Before this change:
$ ./run_tests.sh
PASS selftest-setup (14 tests)
...

vs.

$ ./run_tests.sh -t
TAP version 13
ok 1 - selftest: true
ok 2 - selftest: argc == 3
...

After this change:
$ ./run_tests.sh
PASS selftest-setup (14 tests)
...

vs.

$ ./run_tests.sh -t
TAP version 13
ok 1 - selftest-setup: selftest: true
ok 2 - selftest-setup: selftest: argc == 3
...

While at it, introduce a local variable `kernel` in
`RUNTIME_log_stdout` since this makes the function easier to read.

Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20200825102036.17232-3-mhartmay@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 run_tests.sh         | 15 +++++++++------
 scripts/runtime.bash |  6 +++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index fc4b3c2..d7cad9b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -88,18 +88,19 @@ if [[ $tap_output == "no" ]]; then
     postprocess_suite_output() { cat; }
 else
     process_test_output() {
+        local testname="$1"
         CR=$'\r'
         while read -r line; do
             line="${line%$CR}"
             case "${line:0:4}" in
                 PASS)
-                    echo "ok TEST_NUMBER - ${line#??????}" >&3
+                    echo "ok TEST_NUMBER - ${testname}: ${line#??????}" >&3
                     ;;
                 FAIL)
-                    echo "not ok TEST_NUMBER - ${line#??????}" >&3
+                    echo "not ok TEST_NUMBER - ${testname}: ${line#??????}" >&3
                     ;;
                 SKIP)
-                    echo "ok TEST_NUMBER - ${line#??????} # skip" >&3
+                    echo "ok TEST_NUMBER - ${testname}: ${line#??????} # skip" >&3
                     ;;
                 *)
                     ;;
@@ -121,12 +122,14 @@ else
     }
 fi
 
-RUNTIME_log_stderr () { process_test_output; }
+RUNTIME_log_stderr () { process_test_output "$1"; }
 RUNTIME_log_stdout () {
+    local testname="$1"
     if [ "$PRETTY_PRINT_STACKS" = "yes" ]; then
-        ./scripts/pretty_print_stacks.py $1 | process_test_output
+        local kernel="$2"
+        ./scripts/pretty_print_stacks.py "$kernel" | process_test_output "$testname"
     else
-        process_test_output
+        process_test_output "$testname"
     fi
 }
 
diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index caa4c5b..294e6b1 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -140,10 +140,10 @@ function run()
     # extra_params in the config file may contain backticks that need to be
     # expanded, so use eval to start qemu.  Use "> >(foo)" instead of a pipe to
     # preserve the exit status.
-    summary=$(eval $cmdline 2> >(RUNTIME_log_stderr) \
-                             > >(tee >(RUNTIME_log_stdout $kernel) | extract_summary))
+    summary=$(eval $cmdline 2> >(RUNTIME_log_stderr $testname) \
+                             > >(tee >(RUNTIME_log_stdout $testname $kernel) | extract_summary))
     ret=$?
-    [ "$STANDALONE" != "yes" ] && echo > >(RUNTIME_log_stdout $kernel)
+    [ "$STANDALONE" != "yes" ] && echo > >(RUNTIME_log_stdout $testname $kernel)
 
     if [ $ret -eq 0 ]; then
         print_result "PASS" $testname "$summary"
-- 
2.18.2

[kvm-unit-tests PULL 03/11] configure: Add a check for the bash version

[Thomas Huth]

Our scripts do not work with older versions of the bash, like the
default Bash 3 from macOS (e.g. we use the "|&" operator which has
been introduced in Bash 4.0). Add a check to make sure that we use
at least version 4 to avoid that the users run into problems later.

Message-Id: <20200925143852.227908-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 configure | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure b/configure
index f930543..39b63ae 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if [ -z "${BASH_VERSINFO[0]}" ] || [ "${BASH_VERSINFO[0]}" -lt 4 ] ; then
+    echo "Error: Bash version 4 or newer is required for the kvm-unit-tests"
+    exit 1
+fi
+
 srcdir=$(cd "$(dirname "$0")"; pwd)
 prefix=/usr/local
 cc=gcc
-- 
2.18.2

[kvm-unit-tests PULL 04/11] travis.yml: Update from Bionic to Focal

[Thomas Huth]

The newer version of QEMU in Focal should help to run more tests
with TCG (which will be enabled in later patches).

Message-Id: <20200924161612.144549-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b497264..4b7947c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: bionic
+dist: focal
 language: c
 cache: ccache
 git:
-- 
2.18.2

[kvm-unit-tests PULL 05/11] travis.yml: Update the list of s390x tests

[Thomas Huth]

With the new QEMU from Ubuntu Focal, we can now run more tests with TCG.

Message-Id: <20200924161612.144549-10-thuth@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4b7947c..ef3cc40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,7 +106,8 @@ jobs:
       env:
       - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
       - BUILD_DIR="."
-      - TESTS="diag10 diag308"
+      - TESTS="cpumodel css diag10 diag288 diag308 emulator intercept sclp-1g
+          sclp-3g selftest-setup"
       - ACCEL="tcg,firmware=s390x/run"
 
     - addons:
@@ -114,7 +115,7 @@ jobs:
       env:
       - CONFIG="--arch=s390x --cross-prefix=s390x-linux-gnu-"
       - BUILD_DIR="s390x-builddir"
-      - TESTS="sieve"
+      - TESTS="sieve skey stsi vector"
       - ACCEL="tcg,firmware=s390x/run"
 
     - os: osx
-- 
2.18.2

[kvm-unit-tests PULL 06/11] common.bash: run `cmd` only if a test case was found

[Thomas Huth]

From: Marc Hartmayer <mhartmay@linux.ibm.com>

It's only useful to run `cmd` in `for_each_unittest` if a test case
was found. This change allows us to remove the guards from the
functions `run_task` and `mkstandalone`.

Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20200923134758.19354-2-mhartmay@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 run_tests.sh            | 3 ---
 scripts/common.bash     | 8 ++++++--
 scripts/mkstandalone.sh | 4 ----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index d7cad9b..65108e7 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -136,9 +136,6 @@ RUNTIME_log_stdout () {
 function run_task()
 {
 	local testname="$1"
-	if [ -z "$testname" ]; then
-		return
-	fi
 
 	while (( $(jobs | wc -l) == $unittest_run_queues )); do
 		# wait for any background test to finish
diff --git a/scripts/common.bash b/scripts/common.bash
index 9a6ebbd..96655c9 100644
--- a/scripts/common.bash
+++ b/scripts/common.bash
@@ -17,7 +17,9 @@ function for_each_unittest()
 
 	while read -r -u $fd line; do
 		if [[ "$line" =~ ^\[(.*)\]$ ]]; then
-			"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+			if [ -n "${testname}" ]; then
+				"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+			fi
 			testname=${BASH_REMATCH[1]}
 			smp=1
 			kernel=""
@@ -45,6 +47,8 @@ function for_each_unittest()
 			timeout=${BASH_REMATCH[1]}
 		fi
 	done
-	"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+	if [ -n "${testname}" ]; then
+		"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+	fi
 	exec {fd}<&-
 }
diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
index 9d506cc..cefdec3 100755
--- a/scripts/mkstandalone.sh
+++ b/scripts/mkstandalone.sh
@@ -83,10 +83,6 @@ function mkstandalone()
 {
 	local testname="$1"
 
-	if [ -z "$testname" ]; then
-		return
-	fi
-
 	if [ -n "$one_testname" ] && [ "$testname" != "$one_testname" ]; then
 		return
 	fi
-- 
2.18.2

[kvm-unit-tests PULL 07/11] scripts: add support for architecture dependent functions

[Thomas Huth]

From: Marc Hartmayer <mhartmay@linux.ibm.com>

This is necessary to keep architecture dependent code separate from
common code.

Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20200923134758.19354-3-mhartmay@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 README.md           | 3 ++-
 scripts/common.bash | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 48be206..24d4bda 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,8 @@ all unit tests.
 ## Directory structure
 
     .:                  configure script, top-level Makefile, and run_tests.sh
-    ./scripts:          helper scripts for building and running tests
+    ./scripts:          general architecture neutral helper scripts for building and running tests
+    ./scripts/<ARCH>:   architecture dependent helper scripts for building and running tests
     ./lib:              general architecture neutral services for the tests
     ./lib/<ARCH>:       architecture dependent services for the tests
     ./<ARCH>:           the sources of the tests and the created objects/images
diff --git a/scripts/common.bash b/scripts/common.bash
index 96655c9..c7acdf1 100644
--- a/scripts/common.bash
+++ b/scripts/common.bash
@@ -1,3 +1,4 @@
+source config.mak
 
 function for_each_unittest()
 {
@@ -52,3 +53,10 @@ function for_each_unittest()
 	fi
 	exec {fd}<&-
 }
+
+# The current file has to be the only file sourcing the arch helper
+# file
+ARCH_FUNC=scripts/${ARCH}/func.bash
+if [ -f "${ARCH_FUNC}" ]; then
+	source "${ARCH_FUNC}"
+fi
-- 
2.18.2

[kvm-unit-tests PULL 08/11] run_tests/mkstandalone: add arch_cmd hook

[Thomas Huth]

From: Marc Hartmayer <mhartmay@linux.ibm.com>

This allows us, for example, to auto generate a new test case based on
an existing test case.

Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20200923134758.19354-4-mhartmay@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 scripts/common.bash | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/common.bash b/scripts/common.bash
index c7acdf1..a6044b7 100644
--- a/scripts/common.bash
+++ b/scripts/common.bash
@@ -19,7 +19,7 @@ function for_each_unittest()
 	while read -r -u $fd line; do
 		if [[ "$line" =~ ^\[(.*)\]$ ]]; then
 			if [ -n "${testname}" ]; then
-				"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+				$(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
 			fi
 			testname=${BASH_REMATCH[1]}
 			smp=1
@@ -49,11 +49,16 @@ function for_each_unittest()
 		fi
 	done
 	if [ -n "${testname}" ]; then
-		"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
+		$(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
 	fi
 	exec {fd}<&-
 }
 
+function arch_cmd()
+{
+	[ "${ARCH_CMD}" ] && echo "${ARCH_CMD}"
+}
+
 # The current file has to be the only file sourcing the arch helper
 # file
 ARCH_FUNC=scripts/${ARCH}/func.bash
-- 
2.18.2

[kvm-unit-tests PULL 09/11] s390x: add Protected VM support

[Thomas Huth]

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

[kvm-unit-tests PULL 10/11] s390x/selftest: Fix constraint of inline assembly

[Thomas Huth]

Clang on s390x compains:

/home/thuth/devel/kvm-unit-tests/s390x/selftest.c:39:15: error:
 %r0 used in an address
        asm volatile("  stg %0,0(%0)\n" : : "r"(-1L));
                     ^
<inline asm>:1:13: note: instantiated into assembly here
                stg %r0,0(%r0)
                          ^

Right it is. We should not use address register 0 for STG.
Thus let's use the "a" constraint to avoid register 0 here.

Message-Id: <20200924111746.131633-1-thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 s390x/selftest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s390x/selftest.c b/s390x/selftest.c
index 4c16646..eaf5b18 100644
--- a/s390x/selftest.c
+++ b/s390x/selftest.c
@@ -36,7 +36,7 @@ static void test_pgm_int(void)
 	check_pgm_int_code(PGM_INT_CODE_OPERATION);
 
 	expect_pgm_int();
-	asm volatile("	stg %0,0(%0)\n" : : "r"(-1L));
+	asm volatile("	stg %0,0(%0)\n" : : "a"(-1L));
 	check_pgm_int_code(PGM_INT_CODE_ADDRESSING);
 }
 
-- 
2.18.2

[kvm-unit-tests PULL 11/11] scripts/arch-run: use ncat rather than nc.

[Thomas Huth]

From: Jamie Iles <jamie@nuviainc.com>

On Red Hat 7+ and derived distributions, 'nc' is nmap-ncat, but on
Debian based distributions this is often netcat-openbsd.  Both are
mostly compatible with the important distinction that netcat-openbsd
does not shutdown the socket on stdin EOF without also passing '-N' as
an argument which is not supported on nmap-ncat.  This has the
unfortunate consequence of hanging qmp calls so tests like aarch64
its-migration never complete.

We're depending on ncat behaviour and nmap-ncat is available in all
major distributions.

Signed-off-by: Jamie Iles <jamie@nuviainc.com>
Message-Id: <20200921103644.1718058-1-jamie@nuviainc.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 scripts/arch-run.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
index 660f1b7..5997e38 100644
--- a/scripts/arch-run.bash
+++ b/scripts/arch-run.bash
@@ -101,13 +101,13 @@ timeout_cmd ()
 
 qmp ()
 {
-	echo '{ "execute": "qmp_capabilities" }{ "execute":' "$2" '}' | nc -U $1
+	echo '{ "execute": "qmp_capabilities" }{ "execute":' "$2" '}' | ncat -U $1
 }
 
 run_migration ()
 {
-	if ! command -v nc >/dev/null 2>&1; then
-		echo "${FUNCNAME[0]} needs nc (netcat)" >&2
+	if ! command -v ncat >/dev/null 2>&1; then
+		echo "${FUNCNAME[0]} needs ncat (netcat)" >&2
 		return 2
 	fi
 
-- 
2.18.2

Re: [kvm-unit-tests PULL 00/11] s390x and generic script updates

[Paolo Bonzini]

On 28/09/20 19:49, Thomas Huth wrote:
>  Hi Paolo,
> 
> the following changes since commit 58c94d57a51a6927a68e3f09627b2d85e3404c0f:
> 
>   travis.yml: Use TRAVIS_BUILD_DIR to refer to the top directory (2020-09-25 10:00:36 +0200)
> 
> are available in the Git repository at:
> 
>   https://gitlab.com/huth/kvm-unit-tests.git tags/pull-request-2020-09-28
> 
> for you to fetch changes up to b508e1147055255ecce93a95916363bda8c8f299:
> 
>   scripts/arch-run: use ncat rather than nc. (2020-09-28 15:03:50 +0200)
> 
> ----------------------------------------------------------------
> - s390x protected VM support
> - Some other small s390x improvements
> - Generic improvements in the scripts (better TAP13 names, nc -> ncat, ...)
> ----------------------------------------------------------------
> 
> Jamie Iles (1):
>       scripts/arch-run: use ncat rather than nc.
> 
> Marc Hartmayer (6):
>       runtime.bash: remove outdated comment
>       Use same test names in the default and the TAP13 output format
>       common.bash: run `cmd` only if a test case was found
>       scripts: add support for architecture dependent functions
>       run_tests/mkstandalone: add arch_cmd hook
>       s390x: add Protected VM support
> 
> Thomas Huth (4):
>       configure: Add a check for the bash version
>       travis.yml: Update from Bionic to Focal
>       travis.yml: Update the list of s390x tests
>       s390x/selftest: Fix constraint of inline assembly
> 
>  .travis.yml             |  7 ++++---
>  README.md               |  3 ++-
>  configure               | 14 ++++++++++++++
>  run_tests.sh            | 18 +++++++++---------
>  s390x/Makefile          | 15 ++++++++++++++-
>  s390x/selftest.c        |  2 +-
>  s390x/selftest.parmfile |  1 +
>  s390x/unittests.cfg     |  1 +
>  scripts/arch-run.bash   |  6 +++---
>  scripts/common.bash     | 21 +++++++++++++++++++--
>  scripts/mkstandalone.sh |  4 ----
>  scripts/runtime.bash    |  9 +++------
>  scripts/s390x/func.bash | 35 +++++++++++++++++++++++++++++++++++
>  13 files changed, 106 insertions(+), 30 deletions(-)
>  create mode 100644 s390x/selftest.parmfile
>  create mode 100644 scripts/s390x/func.bash
> 

Pulled, thanks (for now to my clone; waiting for CI to complete).
Should we switch to Gitlab merge requests for pull requests only (i.e.
patches still go on the mailing list)?

Paolo

Re: [kvm-unit-tests PULL 00/11] s390x and generic script updates

[Thomas Huth]

On 29/09/2020 10.38, Paolo Bonzini wrote:
> On 28/09/20 19:49, Thomas Huth wrote:
>>  Hi Paolo,
>>
>> the following changes since commit 58c94d57a51a6927a68e3f09627b2d85e3404c0f:
>>
>>   travis.yml: Use TRAVIS_BUILD_DIR to refer to the top directory (2020-09-25 10:00:36 +0200)
>>
>> are available in the Git repository at:
>>
>>   https://gitlab.com/huth/kvm-unit-tests.git tags/pull-request-2020-09-28
>>
>> for you to fetch changes up to b508e1147055255ecce93a95916363bda8c8f299:
>>
>>   scripts/arch-run: use ncat rather than nc. (2020-09-28 15:03:50 +0200)
[...]
> Pulled, thanks (for now to my clone; waiting for CI to complete).
> Should we switch to Gitlab merge requests for pull requests only (i.e.
> patches still go on the mailing list)?

Fine for me, though I'm not sure whether the other maintainers are
already using gitlab or not... And do we need e-mail notifications for
such merge requests sent to the mailing list, in case anybody else still
wants to object?

 Thomas

Re: [kvm-unit-tests PULL 00/11] s390x and generic script updates

[Janosch Frank]

[-- Attachment #1.1: Type: text/plain, Size: 2846 bytes --]

On 9/29/20 10:38 AM, Paolo Bonzini wrote:
> On 28/09/20 19:49, Thomas Huth wrote:
>>  Hi Paolo,
>>
>> the following changes since commit 58c94d57a51a6927a68e3f09627b2d85e3404c0f:
>>
>>   travis.yml: Use TRAVIS_BUILD_DIR to refer to the top directory (2020-09-25 10:00:36 +0200)
>>
>> are available in the Git repository at:
>>
>>   https://gitlab.com/huth/kvm-unit-tests.git tags/pull-request-2020-09-28
>>
>> for you to fetch changes up to b508e1147055255ecce93a95916363bda8c8f299:
>>
>>   scripts/arch-run: use ncat rather than nc. (2020-09-28 15:03:50 +0200)
>>
>> ----------------------------------------------------------------
>> - s390x protected VM support
>> - Some other small s390x improvements
>> - Generic improvements in the scripts (better TAP13 names, nc -> ncat, ...)
>> ----------------------------------------------------------------
>>
>> Jamie Iles (1):
>>       scripts/arch-run: use ncat rather than nc.
>>
>> Marc Hartmayer (6):
>>       runtime.bash: remove outdated comment
>>       Use same test names in the default and the TAP13 output format
>>       common.bash: run `cmd` only if a test case was found
>>       scripts: add support for architecture dependent functions
>>       run_tests/mkstandalone: add arch_cmd hook
>>       s390x: add Protected VM support
>>
>> Thomas Huth (4):
>>       configure: Add a check for the bash version
>>       travis.yml: Update from Bionic to Focal
>>       travis.yml: Update the list of s390x tests
>>       s390x/selftest: Fix constraint of inline assembly
>>
>>  .travis.yml             |  7 ++++---
>>  README.md               |  3 ++-
>>  configure               | 14 ++++++++++++++
>>  run_tests.sh            | 18 +++++++++---------
>>  s390x/Makefile          | 15 ++++++++++++++-
>>  s390x/selftest.c        |  2 +-
>>  s390x/selftest.parmfile |  1 +
>>  s390x/unittests.cfg     |  1 +
>>  scripts/arch-run.bash   |  6 +++---
>>  scripts/common.bash     | 21 +++++++++++++++++++--
>>  scripts/mkstandalone.sh |  4 ----
>>  scripts/runtime.bash    |  9 +++------
>>  scripts/s390x/func.bash | 35 +++++++++++++++++++++++++++++++++++
>>  13 files changed, 106 insertions(+), 30 deletions(-)
>>  create mode 100644 s390x/selftest.parmfile
>>  create mode 100644 scripts/s390x/func.bash
>>
> 
> Pulled, thanks (for now to my clone; waiting for CI to complete).
> Should we switch to Gitlab merge requests for pull requests only (i.e.
> patches still go on the mailing list)?
> 
> Paolo
> 

Hrm, that would force everyone to use Gitlab and I see some value in
having pull request mails on the lists. You just opened the Pandora's
box of discussions :-)

If it's easier for you I'd be open to open a marge request and send out
pull mails at the same time so people can comment without login to Gitlab.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [kvm-unit-tests PULL 00/11] s390x and generic script updates

[Thomas Huth]

On 29/09/2020 10.49, Janosch Frank wrote:
> On 9/29/20 10:38 AM, Paolo Bonzini wrote:
>> On 28/09/20 19:49, Thomas Huth wrote:
>>>  Hi Paolo,
>>>
>>> the following changes since commit 58c94d57a51a6927a68e3f09627b2d85e3404c0f:
>>>
>>>   travis.yml: Use TRAVIS_BUILD_DIR to refer to the top directory (2020-09-25 10:00:36 +0200)
>>>
>>> are available in the Git repository at:
>>>
>>>   https://gitlab.com/huth/kvm-unit-tests.git tags/pull-request-2020-09-28
>>>
>>> for you to fetch changes up to b508e1147055255ecce93a95916363bda8c8f299:
>>>
>>>   scripts/arch-run: use ncat rather than nc. (2020-09-28 15:03:50 +0200)
>>>
>>> ----------------------------------------------------------------
>>> - s390x protected VM support
>>> - Some other small s390x improvements
>>> - Generic improvements in the scripts (better TAP13 names, nc -> ncat, ...)
>>> ----------------------------------------------------------------
>>>
>>> Jamie Iles (1):
>>>       scripts/arch-run: use ncat rather than nc.
>>>
>>> Marc Hartmayer (6):
>>>       runtime.bash: remove outdated comment
>>>       Use same test names in the default and the TAP13 output format
>>>       common.bash: run `cmd` only if a test case was found
>>>       scripts: add support for architecture dependent functions
>>>       run_tests/mkstandalone: add arch_cmd hook
>>>       s390x: add Protected VM support
>>>
>>> Thomas Huth (4):
>>>       configure: Add a check for the bash version
>>>       travis.yml: Update from Bionic to Focal
>>>       travis.yml: Update the list of s390x tests
>>>       s390x/selftest: Fix constraint of inline assembly
>>>
>>>  .travis.yml             |  7 ++++---
>>>  README.md               |  3 ++-
>>>  configure               | 14 ++++++++++++++
>>>  run_tests.sh            | 18 +++++++++---------
>>>  s390x/Makefile          | 15 ++++++++++++++-
>>>  s390x/selftest.c        |  2 +-
>>>  s390x/selftest.parmfile |  1 +
>>>  s390x/unittests.cfg     |  1 +
>>>  scripts/arch-run.bash   |  6 +++---
>>>  scripts/common.bash     | 21 +++++++++++++++++++--
>>>  scripts/mkstandalone.sh |  4 ----
>>>  scripts/runtime.bash    |  9 +++------
>>>  scripts/s390x/func.bash | 35 +++++++++++++++++++++++++++++++++++
>>>  13 files changed, 106 insertions(+), 30 deletions(-)
>>>  create mode 100644 s390x/selftest.parmfile
>>>  create mode 100644 scripts/s390x/func.bash
>>>
>>
>> Pulled, thanks (for now to my clone; waiting for CI to complete).
>> Should we switch to Gitlab merge requests for pull requests only (i.e.
>> patches still go on the mailing list)?
>>
>> Paolo
>>
> 
> Hrm, that would force everyone to use Gitlab and I see some value in
> having pull request mails on the lists. You just opened the Pandora's
> box of discussions :-)
> 
> If it's easier for you I'd be open to open a marge request and send out
> pull mails at the same time so people can comment without login to Gitlab.

... or maybe the people who already have a gitlab account could simply
include the URL to their CI run in their pull request cover letter...?

 Thomas

Re: [kvm-unit-tests PULL 00/11] s390x and generic script updates

[Paolo Bonzini]

On 29/09/20 10:58, Thomas Huth wrote:
>> Hrm, that would force everyone to use Gitlab and I see some value in
>> having pull request mails on the lists. You just opened the Pandora's
>> box of discussions :-)

That was the point. :)  It was more to see opinions and alternative
ideas than to seriously propose it.

>> If it's easier for you I'd be open to open a marge request and send out
>> pull mails at the same time so people can comment without login to Gitlab.
>
> ... or maybe the people who already have a gitlab account could simply
> include the URL to their CI run in their pull request cover letter...?

That's a good idea!

Paolo

Re: [kvm-unit-tests PULL 00/11] s390x and generic script updates

[Paolo Bonzini]

On 28/09/20 19:49, Thomas Huth wrote:
>  Hi Paolo,
> 
> the following changes since commit 58c94d57a51a6927a68e3f09627b2d85e3404c0f:
> 
>   travis.yml: Use TRAVIS_BUILD_DIR to refer to the top directory (2020-09-25 10:00:36 +0200)
> 
> are available in the Git repository at:
> 
>   https://gitlab.com/huth/kvm-unit-tests.git tags/pull-request-2020-09-28
> 
> for you to fetch changes up to b508e1147055255ecce93a95916363bda8c8f299:
> 
>   scripts/arch-run: use ncat rather than nc. (2020-09-28 15:03:50 +0200)
> 
> ----------------------------------------------------------------
> - s390x protected VM support
> - Some other small s390x improvements
> - Generic improvements in the scripts (better TAP13 names, nc -> ncat, ...)
> ----------------------------------------------------------------
> 
> Jamie Iles (1):
>       scripts/arch-run: use ncat rather than nc.
> 
> Marc Hartmayer (6):
>       runtime.bash: remove outdated comment
>       Use same test names in the default and the TAP13 output format
>       common.bash: run `cmd` only if a test case was found
>       scripts: add support for architecture dependent functions
>       run_tests/mkstandalone: add arch_cmd hook
>       s390x: add Protected VM support
> 
> Thomas Huth (4):
>       configure: Add a check for the bash version
>       travis.yml: Update from Bionic to Focal
>       travis.yml: Update the list of s390x tests
>       s390x/selftest: Fix constraint of inline assembly
> 
>  .travis.yml             |  7 ++++---
>  README.md               |  3 ++-
>  configure               | 14 ++++++++++++++
>  run_tests.sh            | 18 +++++++++---------
>  s390x/Makefile          | 15 ++++++++++++++-
>  s390x/selftest.c        |  2 +-
>  s390x/selftest.parmfile |  1 +
>  s390x/unittests.cfg     |  1 +
>  scripts/arch-run.bash   |  6 +++---
>  scripts/common.bash     | 21 +++++++++++++++++++--
>  scripts/mkstandalone.sh |  4 ----
>  scripts/runtime.bash    |  9 +++------
>  scripts/s390x/func.bash | 35 +++++++++++++++++++++++++++++++++++
>  13 files changed, 106 insertions(+), 30 deletions(-)
>  create mode 100644 s390x/selftest.parmfile
>  create mode 100644 scripts/s390x/func.bash
> 

Pulled, thanks.

Paolo