riscv: Add kvmtool support
Subsystems (4)
cover riscv: Add kvmtool support
The first patch is for arm's scripts. It adds a check that I found useful on the riscv side. The second patch enables riscv to use kvmtool too.
Andrew Jones (2):
arm/arm64: Ensure proper host arch with kvmtool
riscv: Add kvmtool support
README.md | 7 ++-- arm/run | 5 +++ configure | 12 ++++-- riscv/efi/run | 6 +++ riscv/run | 110 +++++++++++++++++++++++++++++++++++--------------- 5 files changed, 101 insertions(+), 39 deletions(-)
Signature · 1 line
2.49.0
PATCH 1/2 arm/arm64: Ensure proper host arch with kvmtool
When running on non-arm (e.g. an x86 machine) if the framework is configured to use kvmtool then, unlike with QEMU, it can't work.
--- arm/run | 5 +++++ 1 file changed, 5 insertions(+)
arm/run +5 -0
@@ -97,6 +97,11 @@ function arch_run_kvmtool() { local command + if [ "$HOST" != "arm" ] && [ "$HOST" != "aarch64" ]; then + echo "kvmtool requires KVM but the host ('$HOST') is not arm" >&2 + exit 2 + fi + kvmtool=$(search_kvmtool_binary) || exit $?
Signature · 1 line
2.49.0
Re: [kvm-unit-tests PATCH 1/2] arm/arm64: Ensure proper host arch with kvmtool
Quoted 5 lines · Andrew Jones
When running on non-arm (e.g. an x86 machine) if the framework is configured to use kvmtool then, unlike with QEMU, it can't work.
Signed-off-by Andrew Jones <[email protected]>
Quoted 23 lines
--- arm/run | 5 +++++ 1 file changed, 5 insertions(+)arm/run +5
-1@@ -97,6 +97,11 @@ function arch_run_kvmtool() { local command + if [ "$HOST" != "arm" ] && [ "$HOST" != "aarch64" ]; then + echo "kvmtool requires KVM but the host ('$HOST') is not arm" >&2 + exit 2 + fi + kvmtool=$(search_kvmtool_binary) || exit $? --2.49.0
Re: [kvm-unit-tests PATCH 1/2] arm/arm64: Ensure proper host arch with kvmtool
In reply to Andrew JonesQuoted 4 lines · Andrew Jones
When running on non-arm (e.g. an x86 machine) if the framework is configured to use kvmtool then, unlike with QEMU, it can't work.
Signed-off-by Andrew Jones <[email protected]>
Thanks,
Nutty
Quoted 19 lines
--- arm/run | 5 +++++ 1 file changed, 5 insertions(+)arm/run +5
-0@@ -97,6 +97,11 @@ function arch_run_kvmtool() { local command + if [ "$HOST" != "arm" ] && [ "$HOST" != "aarch64" ]; then + echo "kvmtool requires KVM but the host ('$HOST') is not arm" >&2 + exit 2 + fi + kvmtool=$(search_kvmtool_binary) || exit $?
PATCH 2/2 riscv: Add kvmtool support
In reply to Andrew Jonesarm/arm64 supports running tests with kvmtool as a first class citizen. Most the code to do that is in the common scripts, so just add the riscv specific bits needed to allow riscv to use kvmtool as a first class citizen too.
--- README.md | 7 ++-- configure | 12 ++++-- riscv/efi/run | 6 +++ riscv/run | 110 +++++++++++++++++++++++++++++++++++--------------- 4 files changed, 96 insertions(+), 39 deletions(-)
README.md +3 -4
@@ -65,8 +65,8 @@ or: to run them all. -All tests can be run using QEMU. On arm and arm64, tests can also be run using -kvmtool. +All tests can be run using QEMU. On arm, arm64, riscv32, and riscv64 tests can +also be run using kvmtool. By default the runner script searches for a suitable QEMU binary in the system. To select a specific QEMU binary though, specify the QEMU=path/to/binary
@@ -97,8 +97,7 @@ variable. kvmtool supports only kvm as the accelerator. Check [x86/efi/README.md](./x86/efi/README.md). -On arm and arm64, this is only supported with QEMU; kvmtool cannot run the -tests under UEFI. +This is only supported with QEMU; kvmtool cannot run the tests under UEFI. # Tests configuration file
configure +9 -3
@@ -90,7 +90,7 @@ usage() { selects the best value based on the host system and the test configuration. --target=TARGET target platform that the tests will be running on (qemu or - kvmtool, default is qemu) (arm/arm64 only) + kvmtool, default is qemu) (arm/arm64 and riscv32/riscv64 only) --cross-prefix=PREFIX cross compiler prefix --cc=CC c compiler to use ($cc) --cflags=FLAGS extra options to be passed to the c compiler
@@ -284,7 +284,8 @@ fi if [ -z "$target" ]; then target="qemu" else - if [ "$arch" != "arm64" ] && [ "$arch" != "arm" ]; then + if [ "$arch" != "arm" ] && [ "$arch" != "arm64" ] && + [ "$arch" != "riscv32" ] && [ "$arch" != "riscv64" ]; then echo "--target is not supported for $arch" usage fi
@@ -393,6 +394,10 @@ elif [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then testdir=riscv arch_libdir=riscv : "${uart_early_addr:=0x10000000}" + if [ "$target" != "qemu" ] && [ "$target" != "kvmtool" ]; then + echo "--target must be one of 'qemu' or 'kvmtool'!" + usage + fi elif [ "$arch" = "s390x" ]; then testdir=s390x else
@@ -519,7 +524,8 @@ EFI_DIRECT=$efi_direct CONFIG_WERROR=$werror GEN_SE_HEADER=$gen_se_header EOF -if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then +if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ] || + [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then echo "TARGET=$target" >> config.mak fi
riscv/efi/run +6 -0
@@ -11,6 +11,12 @@ if [ ! -f config.mak ]; then fi source config.mak source scripts/arch-run.bash +source scripts/vmm.bash + +if [[ $(vmm_get_target) == "kvmtool" ]]; then + echo "kvmtool does not support EFI tests." + exit 2 +fi if [ -f RISCV_VIRT_CODE.fd ]; then DEFAULT_UEFI=RISCV_VIRT_CODE.fd
riscv/run +78 -32
113 lines not on this page · raw message
Signature · 1 line
2.49.0
Quoted 7 lines · Andrew Jones
arm/arm64 supports running tests with kvmtool as a first class citizen. Most the code to do that is in the common scripts, so just add the riscv specific bits needed to allow riscv to use kvmtool as a first class citizen too.
Signed-off-by Andrew Jones <[email protected]>
Quoted 46 lines
--- README.md | 7 ++-- configure | 12 ++++-- riscv/efi/run | 6 +++ riscv/run | 110 +++++++++++++++++++++++++++++++++++--------------- 4 files changed, 96 insertions(+), 39 deletions(-)README.md +3
-4@@ -65,8 +65,8 @@ or: to run them all. -All tests can be run using QEMU. On arm and arm64, tests can also be run using -kvmtool. +All tests can be run using QEMU. On arm, arm64, riscv32, and riscv64 tests can +also be run using kvmtool. By default the runner script searches for a suitable QEMU binary in the system. To select a specific QEMU binary though, specify the QEMU=path/to/binary@@ -97,8 +97,7 @@ variable. kvmtool supports only kvm as the accelerator. Check [x86/efi/README.md](./x86/efi/README.md). -On arm and arm64, this is only supported with QEMU; kvmtool cannot run the -tests under UEFI. +This is only supported with QEMU; kvmtool cannot run the tests under UEFI. # Tests configuration fileconfigure +1
-1@@ -90,7 +90,7 @@ usage() { selects the best value based on the host system and the test configuration. --target=TARGET target platform that the tests will be running on (qemu or - kvmtool, default is qemu) (arm/arm64 only) + kvmtool, default is qemu) (arm/arm64 and riscv32/riscv64 only) --cross-prefix=PREFIX cross compiler prefix --cc=CC c compiler to use ($cc) --cflags=FLAGS extra options to be passed to the c compiler
configure fi · line 288
Quoted 6 lines
configure +2
-1@@ -284,7 +284,8 @@ fi if [ -z "$target" ]; then target="qemu" else - if [ "$arch" != "arm64" ] && [ "$arch" != "arm" ]; then + if [ "$arch" != "arm" ] && [ "$arch" != "arm64" ] && + [ "$arch" != "riscv32" ] && [ "$arch" != "riscv64" ]; then
Are there plans to add i386 and x86_64 too?
Quoted 134 lines
configure +6
-1echo "--target is not supported for $arch" usage fi@@ -393,6 +394,10 @@ elif [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then testdir=riscv arch_libdir=riscv : "${uart_early_addr:=0x10000000}" + if [ "$target" != "qemu" ] && [ "$target" != "kvmtool" ]; then + echo "--target must be one of 'qemu' or 'kvmtool'!" + usage + fi elif [ "$arch" = "s390x" ]; then testdir=s390x else@@ -519,7 +524,8 @@ EFI_DIRECT=$efi_direct CONFIG_WERROR=$werror GEN_SE_HEADER=$gen_se_header EOF -if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then +if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ] || + [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then echo "TARGET=$target" >> config.mak firiscv/efi/run +6
-0@@ -11,6 +11,12 @@ if [ ! -f config.mak ]; then fi source config.mak source scripts/arch-run.bash +source scripts/vmm.bash + +if [[ $(vmm_get_target) == "kvmtool" ]]; then + echo "kvmtool does not support EFI tests." + exit 2 +fi if [ -f RISCV_VIRT_CODE.fd ]; then DEFAULT_UEFI=RISCV_VIRT_CODE.fdriscv/run +53
-32@@ -10,35 +10,81 @@ if [ -z "$KUT_STANDALONE" ]; then source scripts/vmm.bash fi -# Allow user overrides of some config.mak variables -mach=$MACHINE_OVERRIDE -qemu_cpu=$TARGET_CPU_OVERRIDE -firmware=$FIRMWARE_OVERRIDE - -: "${mach:=virt}" -: "${qemu_cpu:=$TARGET_CPU}" -: "${qemu_cpu:=$DEFAULT_QEMU_CPU}" -: "${firmware:=$FIRMWARE}" -[ "$firmware" ] && firmware="-bios $firmware" - -set_qemu_accelerator || exit $? -[ "$ACCEL" = "kvm" ] && QEMU_ARCH=$HOST -acc="-accel $ACCEL$ACCEL_PROPS" - -qemu=$(search_qemu_binary) || exit $? -if [ "$mach" = 'virt' ] && ! $qemu -machine '?' | grep -q 'RISC-V VirtIO board'; then - echo "$qemu doesn't support mach-virt ('-machine virt'). Exiting." - exit 2 -fi -mach="-machine $mach" - -command="$qemu -nodefaults -nographic -serial mon:stdio" -command+=" $mach $acc $firmware -cpu $qemu_cpu " -command="$(migration_cmd) $(timeout_cmd) $command" - -if [ "$UEFI_SHELL_RUN" = "y" ]; then - ENVIRON_DEFAULT=n run_test_status $command "$@" -else - # We return the exit code via stdout, not via the QEMU return code - run_test_status $command -kernel "$@" -fi +vmm_check_supported + +function arch_run_qemu() +{ + # Allow user overrides of some config.mak variables + mach=$MACHINE_OVERRIDE + qemu_cpu=$TARGET_CPU_OVERRIDE + firmware=$FIRMWARE_OVERRIDE + + : "${mach:=virt}" + : "${qemu_cpu:=$TARGET_CPU}" + : "${qemu_cpu:=$DEFAULT_QEMU_CPU}" + : "${firmware:=$FIRMWARE}" + [ "$firmware" ] && firmware="-bios $firmware" + + set_qemu_accelerator || exit $? + [ "$ACCEL" = "kvm" ] && QEMU_ARCH=$HOST + acc="-accel $ACCEL$ACCEL_PROPS" + + qemu=$(search_qemu_binary) || exit $? + if [ "$mach" = 'virt' ] && ! $qemu -machine '?' | grep -q 'RISC-V VirtIO board'; then + echo "$qemu doesn't support mach-virt ('-machine virt'). Exiting." + exit 2 + fi + mach="-machine $mach" + + command="$qemu -nodefaults -nographic -serial mon:stdio" + command+=" $mach $acc $firmware -cpu $qemu_cpu " + command="$(migration_cmd) $(timeout_cmd) $command" + + if [ "$UEFI_SHELL_RUN" = "y" ]; then + ENVIRON_DEFAULT=n run_test_status $command "$@" + else + # We return the exit code via stdout, not via the QEMU return code + run_test_status $command -kernel "$@" + fi +} + +function arch_run_kvmtool() +{ + local command + + if [ "$HOST" != "riscv32" ] && [ "$HOST" != "riscv64" ]; then + echo "kvmtool requires KVM but the host ('$HOST') is not riscv" >&2 + exit 2 + fi + + kvmtool=$(search_kvmtool_binary) || + exit $? + + if [ "$ACCEL" ] && [ "$ACCEL" != "kvm" ]; then + echo "kvmtool does not support $ACCEL" >&2 + exit 2
riscv/run if [ -z "$KUT_STANDALONE" ]; then · line 75
Quoted 10 lines
riscv/run +10
-0+ fi + + if ! kvm_available; then + echo "kvmtool requires KVM but not available on the host" >&2 + exit 2 + fi + + command="$(timeout_cmd) $kvmtool run" + if ( [ "$HOST" = "riscv64" ] && [ "$ARCH" = "riscv32" ] ) || + ( [ "$HOST" = "riscv32" ] && [ "$ARCH" = "riscv64" ] ); then
Shouldn't there be a check like this on arm for when [ "$HOST" = "arm" ] && [ "$ARCH" = "aarch64" ]?
Quoted 18 lines
riscv/run +15
-1+ echo "Cannot run guests with a different xlen than the host" >&2 + exit 2 + else + run_test_status $command --kernel "$@" + fi +} + +case $(vmm_get_target) in +qemu) + arch_run_qemu "$@" + ;; +kvmtool) + arch_run_kvmtool "$@" + ;; +esac --2.49.0
Quoted 10 lines · Jesse Taube
Quoted 7 lines · Andrew Jones
arm/arm64 supports running tests with kvmtool as a first class citizen. Most the code to do that is in the common scripts, so just add the riscv specific bits needed to allow riscv to use kvmtool as a first class citizen too.
Signed-off-by Andrew Jones <[email protected]>Reviewed-by Jesse Taube <[email protected]>
Thanks!
...
Quoted 6 lines
configure fi · line 288
Quoted 4 lines
else
configure +2
-1- if [ "$arch" != "arm64" ] && [ "$arch" != "arm" ]; then + if [ "$arch" != "arm" ] && [ "$arch" != "arm64" ] && + [ "$arch" != "riscv32" ] && [ "$arch" != "riscv64" ]; thenAre there plans to add i386 and
x86_64too?
I don't have plans myself, at least not right now, but I think it'd be good to do it, so it'd be great if somebody would write the patch and do the testing.
...
Quoted 6 lines
riscv/run if [ -z "$KUT_STANDALONE" ]; then · line 75
Quoted 3 lines
riscv/run +3
-0+ command="$(timeout_cmd) $kvmtool run" + if ( [ "$HOST" = "riscv64" ] && [ "$ARCH" = "riscv32" ] ) || + ( [ "$HOST" = "riscv32" ] && [ "$ARCH" = "riscv64" ] ); thenShouldn't there be a check like this on arm for when [ "$HOST" = "arm" ] && [ "$ARCH" = "aarch64" ]?
arm kvm has been long deprecated and removed from Linux so we should actually remove any references to HOST==arm throughout the framework too, since it can't happen (any more).
Thanks,
drew
Quoted 6 lines · Andrew Jones
arm/arm64 supports running tests with kvmtool as a first class citizen. Most the code to do that is in the common scripts, so just add the riscv specific bits needed to allow riscv to use kvmtool as a first class citizen too.
Signed-off-by Andrew Jones <[email protected]>
Thanks,
Nutty
Quoted 211 lines
--- README.md | 7 ++-- configure | 12 ++++-- riscv/efi/run | 6 +++ riscv/run | 110 +++++++++++++++++++++++++++++++++++--------------- 4 files changed, 96 insertions(+), 39 deletions(-)README.md +3
-4@@ -65,8 +65,8 @@ or: to run them all. -All tests can be run using QEMU. On arm and arm64, tests can also be run using -kvmtool. +All tests can be run using QEMU. On arm, arm64, riscv32, and riscv64 tests can +also be run using kvmtool. By default the runner script searches for a suitable QEMU binary in the system. To select a specific QEMU binary though, specify the QEMU=path/to/binary@@ -97,8 +97,7 @@ variable. kvmtool supports only kvm as the accelerator. Check [x86/efi/README.md](./x86/efi/README.md). -On arm and arm64, this is only supported with QEMU; kvmtool cannot run the -tests under UEFI. +This is only supported with QEMU; kvmtool cannot run the tests under UEFI. # Tests configuration fileconfigure +9
-3@@ -90,7 +90,7 @@ usage() { selects the best value based on the host system and the test configuration. --target=TARGET target platform that the tests will be running on (qemu or - kvmtool, default is qemu) (arm/arm64 only) + kvmtool, default is qemu) (arm/arm64 and riscv32/riscv64 only) --cross-prefix=PREFIX cross compiler prefix --cc=CC c compiler to use ($cc) --cflags=FLAGS extra options to be passed to the c compiler@@ -284,7 +284,8 @@ fi if [ -z "$target" ]; then target="qemu" else - if [ "$arch" != "arm64" ] && [ "$arch" != "arm" ]; then + if [ "$arch" != "arm" ] && [ "$arch" != "arm64" ] && + [ "$arch" != "riscv32" ] && [ "$arch" != "riscv64" ]; then echo "--target is not supported for $arch" usage fi@@ -393,6 +394,10 @@ elif [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then testdir=riscv arch_libdir=riscv : "${uart_early_addr:=0x10000000}" + if [ "$target" != "qemu" ] && [ "$target" != "kvmtool" ]; then + echo "--target must be one of 'qemu' or 'kvmtool'!" + usage + fi elif [ "$arch" = "s390x" ]; then testdir=s390x else@@ -519,7 +524,8 @@ EFI_DIRECT=$efi_direct CONFIG_WERROR=$werror GEN_SE_HEADER=$gen_se_header EOF -if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then +if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ] || + [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then echo "TARGET=$target" >> config.mak firiscv/efi/run +6
-0@@ -11,6 +11,12 @@ if [ ! -f config.mak ]; then fi source config.mak source scripts/arch-run.bash +source scripts/vmm.bash + +if [[ $(vmm_get_target) == "kvmtool" ]]; then + echo "kvmtool does not support EFI tests." + exit 2 +fi if [ -f RISCV_VIRT_CODE.fd ]; then DEFAULT_UEFI=RISCV_VIRT_CODE.fdriscv/run +78
-32@@ -10,35 +10,81 @@ if [ -z "$KUT_STANDALONE" ]; then source scripts/vmm.bash fi -# Allow user overrides of some config.mak variables -mach=$MACHINE_OVERRIDE -qemu_cpu=$TARGET_CPU_OVERRIDE -firmware=$FIRMWARE_OVERRIDE - -: "${mach:=virt}" -: "${qemu_cpu:=$TARGET_CPU}" -: "${qemu_cpu:=$DEFAULT_QEMU_CPU}" -: "${firmware:=$FIRMWARE}" -[ "$firmware" ] && firmware="-bios $firmware" - -set_qemu_accelerator || exit $? -[ "$ACCEL" = "kvm" ] && QEMU_ARCH=$HOST -acc="-accel $ACCEL$ACCEL_PROPS" - -qemu=$(search_qemu_binary) || exit $? -if [ "$mach" = 'virt' ] && ! $qemu -machine '?' | grep -q 'RISC-V VirtIO board'; then - echo "$qemu doesn't support mach-virt ('-machine virt'). Exiting." - exit 2 -fi -mach="-machine $mach" - -command="$qemu -nodefaults -nographic -serial mon:stdio" -command+=" $mach $acc $firmware -cpu $qemu_cpu " -command="$(migration_cmd) $(timeout_cmd) $command" - -if [ "$UEFI_SHELL_RUN" = "y" ]; then - ENVIRON_DEFAULT=n run_test_status $command "$@" -else - # We return the exit code via stdout, not via the QEMU return code - run_test_status $command -kernel "$@" -fi +vmm_check_supported + +function arch_run_qemu() +{ + # Allow user overrides of some config.mak variables + mach=$MACHINE_OVERRIDE + qemu_cpu=$TARGET_CPU_OVERRIDE + firmware=$FIRMWARE_OVERRIDE + + : "${mach:=virt}" + : "${qemu_cpu:=$TARGET_CPU}" + : "${qemu_cpu:=$DEFAULT_QEMU_CPU}" + : "${firmware:=$FIRMWARE}" + [ "$firmware" ] && firmware="-bios $firmware" + + set_qemu_accelerator || exit $? + [ "$ACCEL" = "kvm" ] && QEMU_ARCH=$HOST + acc="-accel $ACCEL$ACCEL_PROPS" + + qemu=$(search_qemu_binary) || exit $? + if [ "$mach" = 'virt' ] && ! $qemu -machine '?' | grep -q 'RISC-V VirtIO board'; then + echo "$qemu doesn't support mach-virt ('-machine virt'). Exiting." + exit 2 + fi + mach="-machine $mach" + + command="$qemu -nodefaults -nographic -serial mon:stdio" + command+=" $mach $acc $firmware -cpu $qemu_cpu " + command="$(migration_cmd) $(timeout_cmd) $command" + + if [ "$UEFI_SHELL_RUN" = "y" ]; then + ENVIRON_DEFAULT=n run_test_status $command "$@" + else + # We return the exit code via stdout, not via the QEMU return code + run_test_status $command -kernel "$@" + fi +} + +function arch_run_kvmtool() +{ + local command + + if [ "$HOST" != "riscv32" ] && [ "$HOST" != "riscv64" ]; then + echo "kvmtool requires KVM but the host ('$HOST') is not riscv" >&2 + exit 2 + fi + + kvmtool=$(search_kvmtool_binary) || + exit $? + + if [ "$ACCEL" ] && [ "$ACCEL" != "kvm" ]; then + echo "kvmtool does not support $ACCEL" >&2 + exit 2 + fi + + if ! kvm_available; then + echo "kvmtool requires KVM but not available on the host" >&2 + exit 2 + fi + + command="$(timeout_cmd) $kvmtool run" + if ( [ "$HOST" = "riscv64" ] && [ "$ARCH" = "riscv32" ] ) || + ( [ "$HOST" = "riscv32" ] && [ "$ARCH" = "riscv64" ] ); then + echo "Cannot run guests with a different xlen than the host" >&2 + exit 2 + else + run_test_status $command --kernel "$@" + fi +} + +case $(vmm_get_target) in +qemu) + arch_run_qemu "$@" + ;; +kvmtool) + arch_run_kvmtool "$@" + ;; +esac
Quoted 8 lines · Andrew Jones
The first patch is for arm's scripts. It adds a check that I found useful on the riscv side. The second patch enables riscv to use kvmtool too.
Andrew Jones (2):
arm/arm64: Ensure proper host arch with kvmtool
riscv: Add kvmtool support
Quoted 9 lines
README.md | 7 ++-- arm/run | 5 +++ configure | 12 ++++-- riscv/efi/run | 6 +++ riscv/run | 110 +++++++++++++++++++++++++++++++++++--------------- 5 files changed, 101 insertions(+), 39 deletions(-)Signature · 1 line
2.49.0
Merged.