Commit ae858484 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'pull-request-2020-09-28' of https://gitlab.com/huth/kvm-unit-tests

- s390x protected VM support
- Some other small s390x improvements
- Generic improvements in the scripts (better TAP13 names, nc -> ncat, ...)
parents 11cec501 b508e114
dist: bionic
dist: focal
language: c
cache: ccache
git:
......@@ -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
......
......@@ -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
......
#!/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
......@@ -19,6 +24,7 @@ wa_divide=
vmm="qemu"
errata_force=0
erratatxt="$srcdir/errata.txt"
host_key_document=
usage() {
cat <<-EOF
......@@ -41,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
}
......@@ -93,6 +102,9 @@ while [[ "$1" = -* ]]; do
erratatxt=
[ "$arg" ] && erratatxt=$(eval realpath "$arg")
;;
--host-key-document)
host_key_document="$arg"
;;
--help)
usage
;;
......@@ -224,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
......
......@@ -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
......
......@@ -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
......
......@@ -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);
}
......
test 123
\ No newline at end of file
......@@ -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]
......
......@@ -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
......
source config.mak
function for_each_unittest()
{
......@@ -17,7 +18,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
$(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
fi
testname=${BASH_REMATCH[1]}
smp=1
kernel=""
......@@ -45,6 +48,20 @@ function for_each_unittest()
timeout=${BASH_REMATCH[1]}
fi
done
"$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
if [ -n "${testname}" ]; then
$(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
if [ -f "${ARCH_FUNC}" ]; then
source "${ARCH_FUNC}"
fi
......@@ -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
......
# 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"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment