From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (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 813B82F7468 for ; Tue, 16 Sep 2025 23:44:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758066246; cv=none; b=cN31VSwH8PthuuukYypn+1eHZTGIJAdWv4ssFkYEKLsM3LSWH1BEEUAxUyU9Q2hLFzDWp7YxcNlEIALFiT3FyhETrL54guqacdG6Fp7UKKBNT75mNVwDWlNCzx/6CEH0GPFSaHwzsgtF1RhxEpDtEdbEFV5hjSAElU2VknYzzmE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758066246; c=relaxed/simple; bh=BquwX6HjvEBxZ0NOdjFPMl3JAQrw/BuuZkbNRV5kNDE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tqMfbot6EyR8m5gjO5Sk9GnQTSNhruVsWJi1lb3mjKRERgNqYnT0HjTNZUkZ9Ckyj/IcNTh7ISGjCrsRKUqVfKHn8gFGu26gUofa0QswMb6OXoi4I3FPmE0U9D5j9s68jnjw4p6L+1EODFIUaOAWA0tDwZ+zkOZsKE7bX7lYKsc= 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=j6hfYL5z; arc=none smtp.client-ip=209.85.215.173 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="j6hfYL5z" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b54b301d621so4039326a12.0 for ; Tue, 16 Sep 2025 16:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758066244; x=1758671044; darn=lists.linux.dev; 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=1YyzkIGkPcN4s/5n8XbmWu5wXR7Mhh7fBZ/cTvP3v7E=; b=j6hfYL5zOKhcooE9HY6aWZ97JcAdVKDafGrF7+0HciNmGKI6SLBxFqTp2B+Kr/Tb2o BIWv3x7MESuD0Pq6lyFcy4HKjzroUhHJQpsEFj8GOJW42cd07z5LXmZHUhSRxYEM1ohS /5yAzQoTn5qjacLxKg0DTJRaisVRVzm1nzOdLToVNGLn4fuaiI+AiY8GCW8x9o2R7sUn gj/Y4AscNCiGL4mH4rD5Jyw6uOscHvVowP2SA1Vcx2xtS0D78gfubqQyoDe+2NQrp7Yi vsowQnZfWBFxGBJmWNGxfxFoVcZfnDfpLDYGOuBWU9hoZ8y9rcQQcoEzC5fiZQkvwzmI laSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758066244; x=1758671044; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1YyzkIGkPcN4s/5n8XbmWu5wXR7Mhh7fBZ/cTvP3v7E=; b=xCrNaaus2BZ82Esd+n+W3zmmX4MFwL5lJNew+l9Gr523tnQTDbaV38mJKqRvUKQBG6 MSM/PsAZ0CjckWIvl8nl0SKi61w/KF49uxzbZBStuG59uJ1RXWQq+D2pr2OdQL/sda9/ pIh4UpDqIiXMUVOSFq8MARnsivzkMbLRtNc30rIapwJCMLduGcfSKAgSujrYhNkdO0ev wi+dmBhKP/Iz2ajqPusg4poRdRLgaBm/1vjj8yj7Cbhi0jr/hbHn+CenP9jSqP0pCbUe oYI6en4VU6lQPRYf3YIT7Saqe4C9XHb4CQepRIG7AWvmhR5jhqEd6h2z7M8wBwnpTwAF VarA== X-Gm-Message-State: AOJu0YxmiEqfYG00HQg+xAAzkVNyHCG4N7ve0PdEuZQSzbOSDWJ2vPLe YNgYCWWPoyeCq8Y03GiBecotHurM+Grqn76USkkEmpxqWZGi7QOQu1WI X-Gm-Gg: ASbGncsApbkwV6g1Q+fOu0gqdVw1wYD25LQ1Fm5DnMr9/mXmP0Wxz8Vz6aLdGKhaUJa pneA9+veCPGPqCrpcgMidRVFDQfGyY4c8kQpoc/5yMrfgRec2K0mU8O2/unq6usr9qh52gYP/LK 0MxBlRYS4Rz7gh/x+uTk4pq/TnAJVlTkGhkyKsvkOzNQKlHcjvmqU3p5axtzOx+9i4T2X9GagSJ NHGFg7LtGwxyt4z7YCx7Rpg8mtobt7HAX6scOmnuZEzRR//8XfjOw98ugpn75vOdQtWvh7lHzS4 Q1EiSZ6ys0Emj0q0BsZJ9dSoAvajtWG2+1x6CVosqi90uLVUjmfrvtJEFskpI+BEsJp/7ApDKNT 1+5jAHtGjHzD2wv4Q5tz2CrWULm9hkA== X-Google-Smtp-Source: AGHT+IGM0BGroUFsWn2Kv6PouQHNw7n3uA2Of13nBuo0577q7Fe2ucFSI7S3Oym5/xCIQAf+ZDsd3g== X-Received: by 2002:a17:902:ec88:b0:268:10a6:6d72 with SMTP id d9443c01a7336-26812586017mr965905ad.27.1758066243929; Tue, 16 Sep 2025 16:44:03 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-267e9372e86sm19646765ad.136.2025.09.16.16.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 16:44:03 -0700 (PDT) From: Bobby Eshleman Date: Tue, 16 Sep 2025 16:43:52 -0700 Subject: [PATCH net-next v6 8/9] selftests/vsock: invoke vsock_test through helpers Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250916-vsock-vmtest-v6-8-064d2eb0c89d@meta.com> References: <20250916-vsock-vmtest-v6-0-064d2eb0c89d@meta.com> In-Reply-To: <20250916-vsock-vmtest-v6-0-064d2eb0c89d@meta.com> To: Stefano Garzarella , Shuah Khan , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Bryan Tan , Vishnu Dasa , Broadcom internal kernel review list Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, Bobby Eshleman , berrange@redhat.com, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman Add helper calls vm_vsock_test() and host_vsock_test() to invoke the vsock_test binary. This encapsulates several items of repeat logic, such as waiting for the server to reach listening state and enabling/disabling the bash option pipefail to avoid pipe-style logging from hiding failures. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 120 ++++++++++++++++++++++++++++---- 1 file changed, 108 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh index 183647a86c8a..5e36d1068f6f 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -248,6 +248,7 @@ wait_for_listener() local port=$1 local interval=$2 local max_intervals=$3 + local old_pipefail local protocol=tcp local pattern local i @@ -256,6 +257,13 @@ wait_for_listener() # for tcp protocol additionally check the socket state [ "${protocol}" = "tcp" ] && pattern="${pattern}0A" + + # 'grep -q' exits on match, sending SIGPIPE to 'awk', which exits with + # an error, causing the if-condition to fail when pipefail is set. + # Instead, temporarily disable pipefail and restore it later. + old_pipefail=$(set -o | awk '/^pipefail[[:space:]]+(on|off)$/{print $2}') + set +o pipefail + for i in $(seq "${max_intervals}"); do if awk '{print $2" "$4}' /proc/net/"${protocol}"* | \ grep -q "${pattern}"; then @@ -263,6 +271,10 @@ wait_for_listener() fi sleep "${interval}" done + + if [[ "${old_pipefail}" == on ]]; then + set -o pipefail + fi } vm_wait_for_listener() { @@ -314,28 +326,112 @@ log_guest() { LOG_PREFIX=guest log $@ } +vm_vsock_test() { + local ns=$1 + local mode=$2 + local rc + + set -o pipefail + if [[ "${mode}" == client ]]; then + local host=$3 + local cid=$4 + local port=$5 + + # log output and use pipefail to respect vsock_test errors + vm_ssh "${ns}" -- "${VSOCK_TEST}" \ + --mode=client \ + --control-host="${host}" \ + --peer-cid="${cid}" \ + --control-port="${port}" \ + 2>&1 | log_guest + rc=$? + else + local cid=$3 + local port=$4 + + # log output and use pipefail to respect vsock_test errors + vm_ssh "${ns}" -- "${VSOCK_TEST}" \ + --mode=server \ + --peer-cid="${cid}" \ + --control-port="${port}" \ + 2>&1 | log_guest & + rc=$? + + if [[ $rc -ne 0 ]]; then + set +o pipefail + return $rc + fi + + vm_wait_for_listener "${ns}" "${port}" + rc=$? + fi + set +o pipefail + + return $rc } +host_vsock_test() { + local ns=$1 + local mode=$2 + local cmd + + if [[ "${ns}" == none ]]; then + cmd="${VSOCK_TEST}" + else + cmd="ip netns exec ${ns} ${VSOCK_TEST}" + fi + + # log output and use pipefail to respect vsock_test errors + set -o pipefail + if [[ "${mode}" == client ]]; then + local host=$3 + local cid=$4 + local port=$5 + + ${cmd} \ + --mode="${mode}" \ + --peer-cid="${cid}" \ + --control-host="${host}" \ + --control-port="${port}" 2>&1 | log_host + rc=$? + else + local cid=$3 + local port=$4 + + ${cmd} \ + --mode="${mode}" \ + --peer-cid="${cid}" \ + --control-port="${port}" 2>&1 | log_host & + rc=$? + + if [[ $rc -ne 0 ]]; then + return $rc + fi + + host_wait_for_listener "${ns}" "${port}" "${WAIT_PERIOD}" "${WAIT_PERIOD_MAX}" + rc=$? + fi + set +o pipefail + return $rc } test_vm_server_host_client() { + vm_vsock_test "none" "server" 2 "${TEST_GUEST_PORT}" + host_vsock_test "none" "client" "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}" +} - vm_ssh -- "${VSOCK_TEST}" \ - --mode=server \ - --control-port="${TEST_GUEST_PORT}" \ - --peer-cid=2 \ - 2>&1 | log_guest & +test_vm_client_host_server() { + host_vsock_test "none" "server" "${VSOCK_CID}" "${TEST_HOST_PORT_LISTENER}" + vm_vsock_test "none" "client" "10.0.2.2" 2 "${TEST_HOST_PORT_LISTENER}" +} - vm_wait_for_listener "${TEST_GUEST_PORT}" +test_vm_loopback() { + vm_vsock_test "none" "server" 1 "${TEST_HOST_PORT_LISTENER}" + vm_vsock_test "none" "client" "127.0.0.1" 1 "${TEST_HOST_PORT_LISTENER}" +} - ${VSOCK_TEST} \ - --mode=client \ - --control-host=127.0.0.1 \ - --peer-cid="${VSOCK_CID}" \ - --control-port="${TEST_HOST_PORT}" 2>&1 | log_host - return $? } test_vm_client_host_server() { -- 2.47.3