PV can only handle one page of SCLP read info, hence it can only support a maximum of 247 CPUs. To make sure we respect these limitations under PV, add a confidential guest device to QEMU when launching a PV guest. This fixes the topology-2 test failing under PV. Also refactor the run script a bit to reduce code duplication by moving the check whether we're running a PV guest to a function. Suggested-by: Nina Schoetterl-Glausch <nsg@xxxxxxxxxxxxx> Reviewed-by: Nina Schoetterl-Glausch <nsg@xxxxxxxxxxxxx> Reviewed-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230925135259.1685540-1-nrb@xxxxxxxxxxxxx Signed-off-by: Nico Boehr <nrb@xxxxxxxxxxxxx> --- s390x/run | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/s390x/run b/s390x/run index dcbf3f0..e58fa4a 100755 --- a/s390x/run +++ b/s390x/run @@ -14,19 +14,34 @@ set_qemu_accelerator || exit $? qemu=$(search_qemu_binary) || exit $? -if [ "${1: -7}" = ".pv.bin" ] || [ "${TESTNAME: -3}" = "_PV" ] && [ "$ACCEL" = "tcg" ]; then +is_pv() { + if [ "${1: -7}" = ".pv.bin" ] || [ "${TESTNAME: -3}" = "_PV" ]; then + return 0 + fi + return 1 +} + +if is_pv && [ "$ACCEL" = "tcg" ]; then echo "Protected Virtualization isn't supported under TCG" exit 2 fi -if [ "${1: -7}" = ".pv.bin" ] || [ "${TESTNAME: -3}" = "_PV" ] && [ "$MIGRATION" = "yes" ]; then +if is_pv && [ "$MIGRATION" = "yes" ]; then echo "Migration isn't supported under Protected Virtualization" exit 2 fi M='-machine s390-ccw-virtio' M+=",accel=$ACCEL$ACCEL_PROPS" + +if is_pv; then + M+=",confidential-guest-support=pv0" +fi + command="$qemu -nodefaults -nographic $M" +if is_pv; then + command+=" -object s390-pv-guest,id=pv0" +fi command+=" -chardev stdio,id=con0 -device sclpconsole,chardev=con0" command+=" -kernel" command="$(panic_cmd) $(migration_cmd) $(timeout_cmd) $command" -- 2.41.0
