From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8112822127A for ; Wed, 24 Dec 2025 00:29:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766536148; cv=none; b=az2i1Hx3q5vN8Ed/2uD7QHGCmjg2vf9rQnPp3T8v0bE7OFsx/Zi4Cjtz9xYR2ykFPWROjK3pR6e2Sbxx+iDVp+zSHmRl2TwtQWio5Oily11xGh/hZ0H+nA54olxlwhnVtzeZLqVbFGkLTZqTPXbpMJfVeoPHaNUhDYSl7h0+/Ho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766536148; c=relaxed/simple; bh=1Q26HXpW7TYNGutKg90p+BWQKQP/kUEHf57kmmFmrxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jWhSX7xCilYOWF9qm0eW/+VgpfRnfKvYC2GWejW2bIoj1uDtvyU8VHsjQRXWk67BVZgZ/Qx5cOQ+3ETyo4dQ39kb7yfBYydBl5qG3mTThBKQu+XApli7elB0YXqlwg34cf89x8MRzX4icdaZ1+qJeXH4mg6TYx6f95PTgD8BjsU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K0uI0Jvc; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K0uI0Jvc" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-34ccbf37205so4100364a91.2 for ; Tue, 23 Dec 2025 16:29:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766536143; x=1767140943; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=lG0BScxKvY/q9QPoykPF18FCgS+okYK88nxhg8/Kgqs=; b=K0uI0JvcOPidjwZ/GLk1696AdoTs5bkFaGqv2JXv02SJ5IdWF2/Q2szP0Ll+Mtj8HR U3uKogS2sxa+5IA0yoCf/08fEOubXX2/+BOYoRcjNVZ18Noz32eAXqT2vva4ythtXew9 pTMvPTU3Q7nlkw1vluSF+ZMO5RhQbYoWN/r3H5eEOGl2eocmBvTSUFCr/FLlnpqyeNRp ClTRwijoTa5Ezhn0omW6qyx3l9rRmvuy7tLLJTV/o9HQgcHbZ6dV+l2o4YfIs1FcQESa hKTvd9fn12PQpywuKKTURVhApJ+uq+JMfsfwGGPI4/otxMzcPpMSICsk1qt7eeWGML7R CL9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766536143; x=1767140943; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=lG0BScxKvY/q9QPoykPF18FCgS+okYK88nxhg8/Kgqs=; b=mJq5fDNCN4SK0Rm1HK2XahXUfqqZDzWQK8YcHmEtI31Xd+/J3KN+X7tAB1NHIzFIpe P4jcWsK3p7HKC1vkpriJsG9uPi3IUh7T58cFwIHlkX5Ho9rRIwbOK2Tf7CMZXRrQNgsO N7pPt/oPmwl4h0eClFHpRRb8F8BfENFD91++ZjTzcAxKkGOXLANm+qMAsLojpj7BKSjs J9+Pj9VdnheJ4QEuaYt7Z/2+X+2HCZ4qWfSM9QFAKTgmM8CRc/QS3+LjFDH8LYh6i63s WblILMd16SKe6BPQz5EGUYr2fDep0ii4T17TLAQhnW8R3CHdc56tSxICuMGZ7q2rq1Yu micg== X-Forwarded-Encrypted: i=1; AJvYcCVazxK/ez34mtXEw2rmZGAoGE6B2X1ouj7dOP8SIfEV9Tu8YLM2LfO2RjrQ2YwDjE05qRdv1EEvT7wmyusdJCw=@vger.kernel.org X-Gm-Message-State: AOJu0YzCF2ThO6qyKykPTeJ/POWs5iDBAgIjPYOaipClLUUrx9ECgo0N Niz3B9vaVaE4HTRXOrIWVI/5znrZJ73WRNE6055/C4amk60SbA85s6Xn X-Gm-Gg: AY/fxX4kqeAeWGCO8a5fmA+qtbCTyBjMSvM2KxgrVT8UDGnPo1y2/MS9UEUw8TQTggf 0tf3XouuVvogmPU0SwqlIkqtnw8RmXDUoj16XBp1y24kfujLpyHrFqTM0FBOMa7jsIExFjVgEF3 cksVtX9dA1JHCGWw+leVssPcHJ+3i1RhoCcI3P3JusfiOQeIqGyY54V1Sk7sPteWB6/7v1Sb6R+ TShCDMYkAoaUpn2DySDEPAwTSBx+6sYRiDBZmbkguWZaGd0j510JJ5Ke84H4O2ZycNk02g5TIns UlhHrVNTZ3kevIveR89ZtZdNEIR0Yq1tq/ynv+DMjDLzyYrz3xP8fo2PJMIw7OXLMqz6896NP54 nhIOKoYH1uHpYj9y2KocOZXC0blQHmGBvAhU6yvtxfXjsmmJSzpi4Ul95ITjCtNw+FxqFkQTQQu 0ISUFqQguCM2H4zmmVOKc= X-Google-Smtp-Source: AGHT+IGZf6TT1tJ9mgC9qURqLNgIYj5Me44ihebDLG/vQVGrabGjP55Ue0cesraskTAuO8K4lZL9tw== X-Received: by 2002:a17:90b:1dc6:b0:33b:b020:5968 with SMTP id 98e67ed59e1d1-34e921be2a1mr13235818a91.21.1766536143150; Tue, 23 Dec 2025 16:29:03 -0800 (PST) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34e76ce0b4csm6505392a91.1.2025.12.23.16.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 16:29:02 -0800 (PST) From: Bobby Eshleman Date: Tue, 23 Dec 2025 16:28:41 -0800 Subject: [PATCH RFC net-next v13 07/13] selftests/vsock: prepare vm management helpers for namespaces Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251223-vsock-vmtest-v13-7-9d6db8e7c80b@meta.com> References: <20251223-vsock-vmtest-v13-0-9d6db8e7c80b@meta.com> In-Reply-To: <20251223-vsock-vmtest-v13-0-9d6db8e7c80b@meta.com> To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , =?utf-8?q?Eugenio_P=C3=A9rez?= , Xuan Zhuo , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Bryan Tan , Vishnu Dasa , Broadcom internal kernel review list , Shuah Khan , Long Li Cc: linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kselftest@vger.kernel.org, berrange@redhat.com, Sargun Dhillon , Bobby Eshleman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman 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 Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 93 +++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh index c2bdc293b94c..1d03acb62347 100755 --- 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 <&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 @@ -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[@]}" -- 2.47.3