selftests/vsock: prepare vm management helpers for namespaces

Add namespace support to vm management, ssh helpers, and vsock_test
wrapper functions. This enables running VMs and test helpers in specific
namespaces, which is required for upcoming namespace isolation tests.

The functions still work correctly within the init ns, though the caller
must now pass "init_ns" explicitly.

No functional changes for existing tests. All have been updated to pass
"init_ns" explicitly.

Affected functions (such as vm_start() and vm_ssh()) now wrap their
commands with 'ip netns exec' when executing commands in non-init
namespaces.

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com>
Link: https://patch.msgid.link/20260121-vsock-vmtest-v16-6-2859a7512097@meta.com
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh
index c2bdc293b94c2989c75c400d1cbc6aa02aa7da38..c4d73dd0a4cf168ebf8c9598f016786c581cd5ac 100755 (executable)
--- a/tools/testing/selftests/vsock/vmtest.sh
+++ b/tools/testing/selftests/vsock/vmtest.sh
@@ -135,7 +135,18 @@ del_namespaces() {
 }
 
 vm_ssh() {
-       ssh -q -o UserKnownHostsFile=/dev/null -p ${SSH_HOST_PORT} localhost "$@"
+       local ns_exec
+
+       if [[ "${1}" == init_ns ]]; then
+               ns_exec=""
+       else
+               ns_exec="ip netns exec ${1}"
+       fi
+
+       shift
+
+       ${ns_exec} ssh -q -o UserKnownHostsFile=/dev/null -p "${SSH_HOST_PORT}" localhost "$@"
+
        return $?
 }
 
@@ -258,10 +269,12 @@ terminate_pidfiles() {
 
 vm_start() {
        local pidfile=$1
+       local ns=$2
        local logfile=/dev/null
        local verbose_opt=""
        local kernel_opt=""
        local qemu_opts=""
+       local ns_exec=""
        local qemu
 
        qemu=$(command -v "${QEMU}")
@@ -282,7 +295,11 @@ vm_start() {
                kernel_opt="${KERNEL_CHECKOUT}"
        fi
 
-       vng \
+       if [[ "${ns}" != "init_ns" ]]; then
+               ns_exec="ip netns exec ${ns}"
+       fi
+
+       ${ns_exec} vng \
                --run \
                ${kernel_opt} \
                ${verbose_opt} \
@@ -297,6 +314,7 @@ vm_start() {
 }
 
 vm_wait_for_ssh() {
+       local ns=$1
        local i
 
        i=0
@@ -304,7 +322,8 @@ vm_wait_for_ssh() {
                if [[ ${i} -gt ${WAIT_PERIOD_MAX} ]]; then
                        die "Timed out waiting for guest ssh"
                fi
-               if vm_ssh -- true; then
+
+               if vm_ssh "${ns}" -- true; then
                        break
                fi
                i=$(( i + 1 ))
@@ -338,30 +357,41 @@ wait_for_listener()
 }
 
 vm_wait_for_listener() {
-       local port=$1
+       local ns=$1
+       local port=$2
 
-       vm_ssh <<EOF
+       vm_ssh "${ns}" <<EOF
 $(declare -f wait_for_listener)
 wait_for_listener ${port} ${WAIT_PERIOD} ${WAIT_PERIOD_MAX}
 EOF
 }
 
 host_wait_for_listener() {
-       local port=$1
+       local ns=$1
+       local port=$2
 
-       wait_for_listener "${port}" "${WAIT_PERIOD}" "${WAIT_PERIOD_MAX}"
+       if [[ "${ns}" == "init_ns" ]]; then
+               wait_for_listener "${port}" "${WAIT_PERIOD}" "${WAIT_PERIOD_MAX}"
+       else
+               ip netns exec "${ns}" bash <<-EOF
+                       $(declare -f wait_for_listener)
+                       wait_for_listener ${port} ${WAIT_PERIOD} ${WAIT_PERIOD_MAX}
+               EOF
+       fi
 }
 
+
 vm_vsock_test() {
-       local host=$1
-       local cid=$2
-       local port=$3
+       local ns=$1
+       local host=$2
+       local cid=$3
+       local port=$4
        local rc
 
        # log output and use pipefail to respect vsock_test errors
        set -o pipefail
        if [[ "${host}" != server ]]; then
-               vm_ssh -- "${VSOCK_TEST}" \
+               vm_ssh "${ns}" -- "${VSOCK_TEST}" \
                        --mode=client \
                        --control-host="${host}" \
                        --peer-cid="${cid}" \
@@ -369,7 +399,7 @@ vm_vsock_test() {
                        2>&1 | log_guest
                rc=$?
        else
-               vm_ssh -- "${VSOCK_TEST}" \
+               vm_ssh "${ns}" -- "${VSOCK_TEST}" \
                        --mode=server \
                        --peer-cid="${cid}" \
                        --control-port="${port}" \
@@ -381,7 +411,7 @@ vm_vsock_test() {
                        return $rc
                fi
 
-               vm_wait_for_listener "${port}"
+               vm_wait_for_listener "${ns}" "${port}"
                rc=$?
        fi
        set +o pipefail
@@ -390,22 +420,28 @@ vm_vsock_test() {
 }
 
 host_vsock_test() {
-       local host=$1
-       local cid=$2
-       local port=$3
+       local ns=$1
+       local host=$2
+       local cid=$3
+       local port=$4
        local rc
 
+       local cmd="${VSOCK_TEST}"
+       if [[ "${ns}" != "init_ns" ]]; then
+               cmd="ip netns exec ${ns} ${cmd}"
+       fi
+
        # log output and use pipefail to respect vsock_test errors
        set -o pipefail
        if [[ "${host}" != server ]]; then
-               ${VSOCK_TEST} \
+               ${cmd} \
                        --mode=client \
                        --peer-cid="${cid}" \
                        --control-host="${host}" \
                        --control-port="${port}" 2>&1 | log_host
                rc=$?
        else
-               ${VSOCK_TEST} \
+               ${cmd} \
                        --mode=server \
                        --peer-cid="${cid}" \
                        --control-port="${port}" 2>&1 | log_host &
@@ -416,7 +452,7 @@ host_vsock_test() {
                        return $rc
                fi
 
-               host_wait_for_listener "${port}"
+               host_wait_for_listener "${ns}" "${port}"
                rc=$?
        fi
        set +o pipefail
@@ -460,11 +496,11 @@ log_guest() {
 }
 
 test_vm_server_host_client() {
-       if ! vm_vsock_test "server" 2 "${TEST_GUEST_PORT}"; then
+       if ! vm_vsock_test "init_ns" "server" 2 "${TEST_GUEST_PORT}"; then
                return "${KSFT_FAIL}"
        fi
 
-       if ! host_vsock_test "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}"; then
+       if ! host_vsock_test "init_ns" "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}"; then
                return "${KSFT_FAIL}"
        fi
 
@@ -472,11 +508,11 @@ test_vm_server_host_client() {
 }
 
 test_vm_client_host_server() {
-       if ! host_vsock_test "server" "${VSOCK_CID}" "${TEST_HOST_PORT_LISTENER}"; then
+       if ! host_vsock_test "init_ns" "server" "${VSOCK_CID}" "${TEST_HOST_PORT_LISTENER}"; then
                return "${KSFT_FAIL}"
        fi
 
-       if ! vm_vsock_test "10.0.2.2" 2 "${TEST_HOST_PORT_LISTENER}"; then
+       if ! vm_vsock_test "init_ns" "10.0.2.2" 2 "${TEST_HOST_PORT_LISTENER}"; then
                return "${KSFT_FAIL}"
        fi
 
@@ -486,13 +522,14 @@ test_vm_client_host_server() {
 test_vm_loopback() {
        local port=60000 # non-forwarded local port
 
-       vm_ssh -- modprobe vsock_loopback &> /dev/null || :
+       vm_ssh "init_ns" -- modprobe vsock_loopback &> /dev/null || :
 
-       if ! vm_vsock_test "server" 1 "${port}"; then
+       if ! vm_vsock_test "init_ns" "server" 1 "${port}"; then
                return "${KSFT_FAIL}"
        fi
 
-       if ! vm_vsock_test "127.0.0.1" 1 "${port}"; then
+
+       if ! vm_vsock_test "init_ns" "127.0.0.1" 1 "${port}"; then
                return "${KSFT_FAIL}"
        fi
 
@@ -550,8 +587,8 @@ run_shared_vm_test() {
 
        host_oops_cnt_before=$(dmesg | grep -c -i 'Oops')
        host_warn_cnt_before=$(dmesg --level=warn | grep -c -i 'vsock')
-       vm_oops_cnt_before=$(vm_ssh -- dmesg | grep -c -i 'Oops')
-       vm_warn_cnt_before=$(vm_ssh -- dmesg --level=warn | grep -c -i 'vsock')
+       vm_oops_cnt_before=$(vm_ssh "init_ns" -- dmesg | grep -c -i 'Oops')
+       vm_warn_cnt_before=$(vm_ssh "init_ns" -- dmesg --level=warn | grep -c -i 'vsock')
 
        name=$(echo "${1}" | awk '{ print $1 }')
        eval test_"${name}"
@@ -569,13 +606,13 @@ run_shared_vm_test() {
                rc=$KSFT_FAIL
        fi
 
-       vm_oops_cnt_after=$(vm_ssh -- dmesg | grep -i 'Oops' | wc -l)
+       vm_oops_cnt_after=$(vm_ssh "init_ns" -- dmesg | grep -i 'Oops' | wc -l)
        if [[ ${vm_oops_cnt_after} -gt ${vm_oops_cnt_before} ]]; then
                echo "FAIL: kernel oops detected on vm" | log_host
                rc=$KSFT_FAIL
        fi
 
-       vm_warn_cnt_after=$(vm_ssh -- dmesg --level=warn | grep -c -i 'vsock')
+       vm_warn_cnt_after=$(vm_ssh "init_ns" -- dmesg --level=warn | grep -c -i 'vsock')
        if [[ ${vm_warn_cnt_after} -gt ${vm_warn_cnt_before} ]]; then
                echo "FAIL: kernel warning detected on vm" | log_host
                rc=$KSFT_FAIL
@@ -621,8 +658,8 @@ cnt_total=0
 if shared_vm_tests_requested "${ARGS[@]}"; then
        log_host "Booting up VM"
        pidfile="$(create_pidfile)"
-       vm_start "${pidfile}"
-       vm_wait_for_ssh
+       vm_start "${pidfile}" "init_ns"
+       vm_wait_for_ssh "init_ns"
        log_host "VM booted up"
 
        run_shared_vm_tests "${ARGS[@]}"