From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 CBBB720E334 for ; Sat, 8 Nov 2025 16:01:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617714; cv=none; b=B/g6q5xZuvEodo4XX50ZfgzK1mqhHZ7+j3+LayWcB4PsQd1Uuwv8pZnZ1g6QXIvjUBuwpgaoZpL9TgcDGFRUZLsO9tfAGS/wm3IlCI4bEaoN2lqLqNSJElGp6fto6pRBi4lPZ6bjYXFqUr4kXncVBmuf2o7IQ4IJ7BWN03o1N58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617714; c=relaxed/simple; bh=KaZPXYApVo3gzuCQZxOqqdj7Oefz16QZ4HcopRgoUyE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SgMJqlulPgcRc47h8fjDZPSPWd2pFUHO0ZLcSg0HgTb+7zuQ8w0nECrQbVZ4vVoQ1OUMbQspJ837MOSXHhKl0MtiAW28dgo1BTI8h4wkIHKVnSkFdpuZZLrTAqvjJln1WfArlStDenoUKj0acHU6bhH643s2ZWJbv4P4tWtre8A= 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=W2nYmmAi; arc=none smtp.client-ip=209.85.216.50 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="W2nYmmAi" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-340ba29d518so1088694a91.3 for ; Sat, 08 Nov 2025 08:01:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617712; x=1763222512; 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=KuFcuN4dciZC8eK8448U1zaLcwyfmGMtaq+xAMSDgTg=; b=W2nYmmAiA/Ru3TG/OkEGb4o7wuwewiw8M/MCOegkyCdB7IoXzVcJqZiMi0W18+3REV Oic4WsypsL5oZmUtDYoZOBoEYkTNo38GCLY73dOmrtSK/DPyZayF56ZEkpEsVbv6eHfX +gnXjpJT3di0TZFNH42qb9UUUwgcUGgyw7q8WjEDr+hkDGm497YgNJhgGGDrzgNvyfQb JTnGMvFVf7bFjTGyQCImuABdUZ9TaQCXkVYXjVn/qbi7vPRgunSYFkTDznkGpjeKJjRu pP1pa4U+mkfRe/BQ9ugslOiWzEBU4XteDFCKHmkUjTu6O25eIOcFTXUyr6SCLVghz1rm h7xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617712; x=1763222512; 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=KuFcuN4dciZC8eK8448U1zaLcwyfmGMtaq+xAMSDgTg=; b=pvAWbL5G2xaiHxXMSy7LYJ4hqy5ICBSfE+0apgz3WX/iVNlE9UTmRFoMfoxSNr0h7+ isqiVCWUWlAuFfIWDCZ+pWnRAUoFjkuCeMsHkk9+JznD6w2730F1NuRuoLpG/aY9TGWs ff8SlEye5l1ASm1nX0pXvXpuprsY9LqJY8ZBf5jhhJtOoL+jY+TFG/eKa+3Hh7q9CA5L v/oeUDthNgr/eD2Qr9EwmvgR7WBzR9ym6jTQt7MdnJnbsYZELCU2X2izJjHOIubyDjG/ 74Pkg9YvrxwURT9nNJ8Kydr4JnXZcKGqRRrzL9gH/fFQLYXKUClckoH+9aH1LD0nO0qF qqhw== X-Forwarded-Encrypted: i=1; AJvYcCWXvA5GtLpZKmrLPIY+M+N8maskVBRCb3x3LvIUQmphFwmD57NzO6yIDn7Vul5iCQhwmoDpoFir/imioNc=@vger.kernel.org X-Gm-Message-State: AOJu0YysTKEG9gWGkfJetLYt/Qe8kC9eI4nIu38ID3SHuqB6gaH80nim nZmfEvINwgz1LE0+oz2OgHtJLP63QaZltQI8xZche0oUBXXerCOBLo5F X-Gm-Gg: ASbGncs78pbhNWu+orVZE0jbVaZ9yjJqqGtld2xRWLkcrqxGQxtytYOZXwI1Qq1mEM8 TqIg0j8kaB28HP1U+tc6C9W0NEj6kBH6smvIlpBjOu/T/G0Wg96IwUT1xNjnIeWTqSM98EHXRU6 MM5XcdEdte3wayAiHeLQVz/DfCYpJRmYa00Oa+l/LZsJp3sQaIeVvhW8z7iFx1c+1cvNXwG2dNE 4308UDtkJ0EkhANzuBnSBwp8bYomciYDQsGiiKbpAZbgHmRuC7eY0T2eiF46ACHnT8bvw/01GzL hM3OCkyGD4CIePokBZliHewPnxtkXD2Kvd5TN04SJhAPin5tMZBCNDB/iqCaW4/Bgj4XYSc3GzR Y+RXAkcql354/Us1py0a1/NdUtMmcKao2YNTvBSK+Sg4zahS7V8qvny6EXbICi7FCWXdR2zXdgA == X-Google-Smtp-Source: AGHT+IFfAGmgLKI4wsdRP449UjnWCEHQ8HjRd06GWOlMDD2Oh5K2oGmSXaRp75cZh2HiCmppgc3Cvw== X-Received: by 2002:a17:90b:4a8d:b0:340:f05a:3ed1 with SMTP id 98e67ed59e1d1-3436cced91fmr3307290a91.21.1762617711672; Sat, 08 Nov 2025 08:01:51 -0800 (PST) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3434c30b96dsm5767493a91.5.2025.11.08.08.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:51 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:00:52 -0800 Subject: [PATCH net-next v4 01/12] selftests/vsock: improve logging in vmtest.sh Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-1-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Improve usability of logging functions. Remove the test name prefix from logging functions so that logging calls can be made deeper into the call stack without passing down the test name or setting some global. Teach log function to accept a LOG_PREFIX variable to avoid unnecessary argument shifting. Remove log_setup() and instead use log_host(). The host/guest prefixes are useful to show whether a failure happened on the guest or host side, but "setup" doesn't really give additional useful information. Since all log_setup() calls happen on the host, lets just use log_host() instead. Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- Changes in v4: - add quotes to "${redirect}" for consistency Changes in v2: - add quotes around $@ in log_{host,guest} (Simon) - remove unnecessary cat for piping into awk (Simon) Changes from previous series: - do not use log levels, keep as on/off switch, after revising the other patch series the levels became unnecessary. --- tools/testing/selftests/vsock/vmtest.sh | 69 ++++++++++++++---------------= ---- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 8ceeb8a7894f..bc16b13cdbe3 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -271,60 +271,51 @@ EOF =20 host_wait_for_listener() { wait_for_listener "${TEST_HOST_PORT_LISTENER}" "${WAIT_PERIOD}" "${WAIT_P= ERIOD_MAX}" -} - -__log_stdin() { - cat | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }' -} =20 -__log_args() { - echo "$*" | awk '{ printf "%s:\t%s\n","'"${prefix}"'", $0 }' } =20 log() { - local prefix=3D"$1" + local redirect + local prefix =20 - shift - local redirect=3D if [[ ${VERBOSE} -eq 0 ]]; then redirect=3D/dev/null else redirect=3D/dev/stdout fi =20 + prefix=3D"${LOG_PREFIX:-}" + if [[ "$#" -eq 0 ]]; then - __log_stdin | tee -a "${LOG}" > ${redirect} + if [[ -n "${prefix}" ]]; then + awk -v prefix=3D"${prefix}" '{printf "%s: %s\n", prefix, $0}' + else + cat + fi else - __log_args "$@" | tee -a "${LOG}" > ${redirect} - fi -} - -log_setup() { - log "setup" "$@" + if [[ -n "${prefix}" ]]; then + echo "${prefix}: " "$@" + else + echo "$@" + fi + fi | tee -a "${LOG}" > "${redirect}" } =20 log_host() { - local testname=3D$1 - - shift - log "test:${testname}:host" "$@" + LOG_PREFIX=3Dhost log "$@" } =20 log_guest() { - local testname=3D$1 - - shift - log "test:${testname}:guest" "$@" + LOG_PREFIX=3Dguest log "$@" } =20 test_vm_server_host_client() { - local testname=3D"${FUNCNAME[0]#test_}" =20 vm_ssh -- "${VSOCK_TEST}" \ --mode=3Dserver \ --control-port=3D"${TEST_GUEST_PORT}" \ --peer-cid=3D2 \ - 2>&1 | log_guest "${testname}" & + 2>&1 | log_guest & =20 vm_wait_for_listener "${TEST_GUEST_PORT}" =20 @@ -332,18 +323,17 @@ test_vm_server_host_client() { --mode=3Dclient \ --control-host=3D127.0.0.1 \ --peer-cid=3D"${VSOCK_CID}" \ - --control-port=3D"${TEST_HOST_PORT}" 2>&1 | log_host "${testname}" + --control-port=3D"${TEST_HOST_PORT}" 2>&1 | log_host =20 return $? } =20 test_vm_client_host_server() { - local testname=3D"${FUNCNAME[0]#test_}" =20 ${VSOCK_TEST} \ --mode "server" \ --control-port "${TEST_HOST_PORT_LISTENER}" \ - --peer-cid "${VSOCK_CID}" 2>&1 | log_host "${testname}" & + --peer-cid "${VSOCK_CID}" 2>&1 | log_host & =20 host_wait_for_listener =20 @@ -351,19 +341,18 @@ test_vm_client_host_server() { --mode=3Dclient \ --control-host=3D10.0.2.2 \ --peer-cid=3D2 \ - --control-port=3D"${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest "${testna= me}" + --control-port=3D"${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest =20 return $? } =20 test_vm_loopback() { - local testname=3D"${FUNCNAME[0]#test_}" local port=3D60000 # non-forwarded local port =20 vm_ssh -- "${VSOCK_TEST}" \ --mode=3Dserver \ --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest "${testname}" & + --peer-cid=3D1 2>&1 | log_guest & =20 vm_wait_for_listener "${port}" =20 @@ -371,7 +360,7 @@ test_vm_loopback() { --mode=3Dclient \ --control-host=3D"127.0.0.1" \ --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest "${testname}" + --peer-cid=3D1 2>&1 | log_guest =20 return $? } @@ -399,25 +388,25 @@ run_test() { =20 host_oops_cnt_after=3D$(dmesg | grep -i 'Oops' | wc -l) if [[ ${host_oops_cnt_after} -gt ${host_oops_cnt_before} ]]; then - echo "FAIL: kernel oops detected on host" | log_host "${name}" + echo "FAIL: kernel oops detected on host" | log_host rc=3D$KSFT_FAIL fi =20 host_warn_cnt_after=3D$(dmesg --level=3Dwarn | grep -c -i 'vsock') if [[ ${host_warn_cnt_after} -gt ${host_warn_cnt_before} ]]; then - echo "FAIL: kernel warning detected on host" | log_host "${name}" + echo "FAIL: kernel warning detected on host" | log_host rc=3D$KSFT_FAIL fi =20 vm_oops_cnt_after=3D$(vm_ssh -- 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 "${name}" + echo "FAIL: kernel oops detected on vm" | log_host rc=3D$KSFT_FAIL fi =20 vm_warn_cnt_after=3D$(vm_ssh -- dmesg --level=3Dwarn | grep -c -i 'vsock') if [[ ${vm_warn_cnt_after} -gt ${vm_warn_cnt_before} ]]; then - echo "FAIL: kernel warning detected on vm" | log_host "${name}" + echo "FAIL: kernel warning detected on vm" | log_host rc=3D$KSFT_FAIL fi =20 @@ -452,10 +441,10 @@ handle_build =20 echo "1..${#ARGS[@]}" =20 -log_setup "Booting up VM" +log_host "Booting up VM" vm_start vm_wait_for_ssh -log_setup "VM booted up" +log_host "VM booted up" =20 cnt_pass=3D0 cnt_fail=3D0 --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 D376C2253FC for ; Sat, 8 Nov 2025 16:01:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617718; cv=none; b=bLQ4quNpQrXHXc9mNg6TzkUCbBv7Km9zBGtJYIM/da6mbLBFq1BOGu9q84qs32UP5KcdtUQVudm/I55sDR8BHBFJK9IskWIGaQiNOabh2Mw3mqTfkEntbpgxfsdioCssVYFk8+qmdMsHKozjqbOCPzxY5YJhigiQ5qylkGC0Ays= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617718; c=relaxed/simple; bh=km2A2/M2INKPEdopMbzPv/EYa58WkO98Q3inMzUAOZU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QYHGfnWkou6XbQUhmBMH2ySYpspNVFJNp1SMSxai2t2IlX0UGTjWIILY4x7pi4ddt4rVkQM6ilGGLngy8DcI9aw112xppTp5uLb4JRLeEvGsxIrmWdHOUy5euwUhypU+mrJm+tYparg4Zz0nYskgYr7Cd0TSoLba47/O/q/s99E= 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=nEz1gbYN; arc=none smtp.client-ip=209.85.215.178 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="nEz1gbYN" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-b994baabfcfso1048507a12.3 for ; Sat, 08 Nov 2025 08:01:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617713; x=1763222513; 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=zMGzupop1iknPIaEBH2NS/TEyMs9rxoF1a5s3QxnVbI=; b=nEz1gbYNZTr+rY281OkDfVTVMJOLc4X6QjFxBC9LAZ6BQlvjldWNY7MC51maNxajvv K76ixutlesig4bGJn3/tQbTAZD+9LjqXfkYN3ZNkPv9YMmx9R1TWTYiTkP4jMfbVfbMj QPQofkdom/dslCxMGfDjmeCG2jFWqc95wNhhomCJwYCYvEBi7vPakUaO4Go9soQbDxX/ 85Qgbw1LR6y5VBWmiukoCMv2pfiv7mj32mtj5SBiPwpbGgiOG4Is8KWic90lyB2fZaxD 6wckIObZNl0douKZYkw2e+f+aUateFRu9xWBu4SVhQuf+MtkZpE2g+NIAK0o2Y0I1S6z RoIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617713; x=1763222513; 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=zMGzupop1iknPIaEBH2NS/TEyMs9rxoF1a5s3QxnVbI=; b=obyDy773WeRaUryHJkp0f4lpFIp+A4bEjkq9M0v1C0DAl6FNzHcKgX60K0OPDhAiuF r+hzgrfmTdGE20uBVvUGoVwrhxTcOZKPXG+zBV+BLygDy12BP32Ubl2d+hrTvR2CCzKh Y9F4vg1Z/AjmEkPWDAGAqBJyEZtPgvUWR8nKCsVGAbAdxwG2kISrfcRYGblD/WiEsbJm Q4BK8nKYbjTtA2FcKvL2xc59QF5YcNQmFgeFYaNcuz8paGcELKT5qSZjEXTL8WFu5u23 /Jj5x+13uB6Lfmt90ZKMfPjdMVYTSjkI0CGPFIUokNwskalGxAvXRiGKQcYKgrgU7qdN kxhg== X-Forwarded-Encrypted: i=1; AJvYcCUl5oiXNBheazD2z+x7DLYwsVANMULvV/UMl/QnDtxakyVu2nhdAmbLJx6hqP5IwNBUtg1SPnUhmbD3tHg=@vger.kernel.org X-Gm-Message-State: AOJu0YzL+jmK9+11fFNRT2mlu0V4IyfE7AGrIh2i17ugdusxjQBfthyu MLK3IqM3hmpzFSVrMGKDdXOXNhVAGYn9R5bHodZQAmTuy0pZZQD1RKrpGXP6dIza X-Gm-Gg: ASbGncurqF/6zRZ7g0Z20WHQ+GGP1mOJZyCcKRvSKDtTqVAlO3817+y3dkv1LQgEvCu 3RyY91tNNrUJmXVl9jdkZRONMFeZphBqrPvbnFQbzxrpL7y4BAyxUBwFHzTYzl6TKvgXAPGmw3I Jv70HAzag5wsIkv9w4R2ykgajzypSuN2ZLkoRd8txxOfsIB7NfAv2f6CKpFy4yWcedpRyyxWMxu 7yiz0V11NDnPqUg3eotI7+LlClQh5aND6MLuj/mKen2R1ixH14soSJ/XuPOdOH0fq/+tINevOEM hghA2wJ8Ckk6zbN/9+jGI0EL/RPcbjTmANebMP6qgJ1z+w9cSuz2PPJzTqcq/0CEC+vVnTlm3o/ ect8I0vlelzhCAbtbsz36bGTCcOmMKWGE/GhX1eNh0rHaHfAU3CUwV8o3wy0d0NJVFXTRIKuL X-Google-Smtp-Source: AGHT+IEXDETrGkQl7MwHVPnvPebwCXZubSUcSknCNmpO3Ei+QqK+KDEUJEIjXX7gb8KeZQyo0pNbCg== X-Received: by 2002:a17:902:d507:b0:295:6a69:4ad5 with SMTP id d9443c01a7336-297e571bce3mr36484105ad.56.1762617712966; Sat, 08 Nov 2025 08:01:52 -0800 (PST) Received: from localhost ([2a03:2880:2ff:2::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29651c6f6cdsm95463135ad.71.2025.11.08.08.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:52 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:00:53 -0800 Subject: [PATCH net-next v4 02/12] selftests/vsock: make wait_for_listener() work even if pipefail is on Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-2-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Rewrite wait_for_listener()'s pattern matching to avoid tripping the if-condition when pipefail is on. awk doesn't gracefully handle SIGPIPE with a non-zero exit code, so grep exiting upon finding a match causes false-positives when the pipefail option is used (grep exits, SIGPIPE emits, and awk complains with a non-zero exit code). Instead, move all of the pattern matching into awk so that SIGPIPE cannot happen and the correct exit code is returned. Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- Changes in v2: - use awk-only tcp port lookup - remove fixes tag because this problem is only introduced when a later patch enables pipefail for other reasons (not yet in tree) --- tools/testing/selftests/vsock/vmtest.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index bc16b13cdbe3..01ce16523afb 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -251,9 +251,11 @@ wait_for_listener() =20 # for tcp protocol additionally check the socket state [ "${protocol}" =3D "tcp" ] && pattern=3D"${pattern}0A" + for i in $(seq "${max_intervals}"); do - if awk '{print $2" "$4}' /proc/net/"${protocol}"* | \ - grep -q "${pattern}"; then + if awk -v pattern=3D"${pattern}" \ + 'BEGIN {rc=3D1} $2" "$4 ~ pattern {rc=3D0} END {exit rc}' \ + /proc/net/"${protocol}"*; then break fi sleep "${interval}" --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (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 C358922ACE3 for ; Sat, 8 Nov 2025 16:01:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617717; cv=none; b=BZ3IdklV2eB+iIF7vF+b3xszKHbx+TlbXQqnMfgDztd8STGEHfITz7W5oJ1Hybrr+ZTxs8l7fiazoXaIPWnS72lIVW63B/ADPU8/B9YLxn7YbkTAwECzj1i+aoQkHsBpNYBp95OmdzxlQ+B0rQhO058QxvBhVIkQ19z/pejevj0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617717; c=relaxed/simple; bh=eLu5JMiHu7of9BZggEGnla9HL0md05KgCo8UZ0w6Q1M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=d/ftEZcyPt+BYLCCFIc/5YWt3yMcEY1suxqUHoUTSB/f5saC7gW6Q6P5t/F7VMZ2hEViViML+rzbasaRz8Ybs0fwKiaNQAr+xkkaoNuVdM24mEx9Ypa6OvJxhOEAIgC+rjoHbDJtcVdBgkM9apZRQEYpKc7wGKnbFmjycDiZYPc= 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=NPCTxuIJ; arc=none smtp.client-ip=209.85.215.180 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="NPCTxuIJ" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-b994baabfcfso1048513a12.3 for ; Sat, 08 Nov 2025 08:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617714; x=1763222514; 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=ld63LQM/QM5aoQNbMBPk41vQtmCfRJO34YdHJwziNzk=; b=NPCTxuIJHabFaOwD2E4GVIOm4tOLkz+JO7jeDFu9psOHQjSKpxoEW5W1b80bihtYMs tlJ/e8vY+69SSVQWcPMVX0t8wDFTmfJdCYorNr/dPQ6s2J7lfSqoeNod/K+pNt2azs+2 erHAPwGH+ZZotQNrfwoMkdOpc5RrpUwvVsTpRRGqMrrt3bfCJr+Hl8XI9P/KNmN1zhqh sI3g0hClh6MH1aQ6o+xMuuviw+4MjAWZMOwvD82vA+0GWaLTVPrvGeK79pFbYYIkexq1 zmRGgWoYlVyjn7fr3+NaD6aRstT8l15i7JgTX1on/UvTiK1lr7wI4IqWPeEboN7AE97c VuwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617714; x=1763222514; 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=ld63LQM/QM5aoQNbMBPk41vQtmCfRJO34YdHJwziNzk=; b=izuZTZ1vnvpmi4WGBsuOUyWhvXv176a/bokl6K9Tzlktrp+MWw9hn5wHtpFa1kAvAx wZZqOUWPMdae0Hu5fO2KjttXbcvO4Cag1g/R4i5f9JKW6coKWCJARxdTNYN2XLYxZujO XLDIegtIf9e7ku9/pWDSMwxJEs784HpNfZEfJrfwri+irkeszVWjV292oUUrHT5IhMNh xqfw/Q0+BEqSfmg4lwU0s/ohKS9mjIg3YAtlhXJY+ivl5S3uY1RhXf9SFuv9b+3B10WS yEK1dnTWJQmr+WiWPmdRVL891jvdXx2y3n2wFyw2DfEg6Wku2HNCfQCZ0Gmh7ri+v/t/ /CIA== X-Forwarded-Encrypted: i=1; AJvYcCVc5G5+UJuVx49KPjlXKgrVmj52nnlg3pAcElawN2ma4DqsHMN9/RbP6LxGUjEb3xWSkJfRyf19t9ZkQvc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw18nP34GUcOhkX6OUgJ1H7N9wWM7JEyA3XhKZxRtCeCBQ5Wq+f aTIzkbvU5hwSXWqRXEkwnAKVyCnmaewa9D3AttZ9hPT+JlRF8rSQtXJ8 X-Gm-Gg: ASbGncuIdEjeuoQNPtgT4pqkJnLJvDdL0RYz6LKvGSV44SmyE6oKPzQGU6X8S8lUHHa PcBHI9KG23wZ6WKf6gyuNT5r+T3TsyldOubts+Hph6b055KuI0Lc5SzxVNAl0XTiWN2WJ/GFH9n 26UpWEBSWEsZTY7rR5V5ezrsSG+r1ABV3DMwq3rQdHkFLABQva8mxhxenpKOLAAoJlggCkWlMUZ DgbatjH/S6iLJPQ1LrZoe2EoDJBroBdE1SriVglV55M33fRoMOg8LRpq0rpkTwUEnPO1rqp+aCp mnY47NP1aMoQC+1raetgF9MgZ6H3cmooGJ3RsvIjy2ogU/ZvzsWCLZKJgX6z6HpukEMa5hih2fv 2hnSt9qWqsmFKnt0SnyZlLuPHru9VjVFrtOI+j+3obRYRe/PZEfPJRVV1fYyldsMIDOfCJLhccA == X-Google-Smtp-Source: AGHT+IGifjrTmGVD9wlbbooqM+v0wrdw8qePPIjfo/9CbYLQnx0+xdbZOZ5/Z/0HPHNkoo96/RnkPQ== X-Received: by 2002:a17:902:ea0d:b0:288:5d07:8a8f with SMTP id d9443c01a7336-297e5665a51mr40532995ad.24.1762617713853; Sat, 08 Nov 2025 08:01:53 -0800 (PST) Received: from localhost ([2a03:2880:2ff:45::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29650c5d66dsm93126765ad.37.2025.11.08.08.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:53 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:00:54 -0800 Subject: [PATCH net-next v4 03/12] selftests/vsock: reuse logic for vsock_test through wrapper functions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-3-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Add wrapper functions 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 Reviewed-by: Stefano Garzarella --- Changes in v4: - remember to disable pipefail before returning from host_vsock_test() Changes in v3: - Add port input parameter to host_wait_for_listener() to accept port from host_vsock_test() (Stefano) - Change host_wait_for_listener() call-site to pass in parameter --- tools/testing/selftests/vsock/vmtest.sh | 135 ++++++++++++++++++++++------= ---- 1 file changed, 95 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 01ce16523afb..3bccd9b84e4a 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -272,8 +272,81 @@ EOF } =20 host_wait_for_listener() { - wait_for_listener "${TEST_HOST_PORT_LISTENER}" "${WAIT_PERIOD}" "${WAIT_P= ERIOD_MAX}" + local port=3D$1 =20 + wait_for_listener "${port}" "${WAIT_PERIOD}" "${WAIT_PERIOD_MAX}" +} + +vm_vsock_test() { + local host=3D$1 + local cid=3D$2 + local port=3D$3 + local rc + + # log output and use pipefail to respect vsock_test errors + set -o pipefail + if [[ "${host}" !=3D server ]]; then + vm_ssh -- "${VSOCK_TEST}" \ + --mode=3Dclient \ + --control-host=3D"${host}" \ + --peer-cid=3D"${cid}" \ + --control-port=3D"${port}" \ + 2>&1 | log_guest + rc=3D$? + else + vm_ssh -- "${VSOCK_TEST}" \ + --mode=3Dserver \ + --peer-cid=3D"${cid}" \ + --control-port=3D"${port}" \ + 2>&1 | log_guest & + rc=3D$? + + if [[ $rc -ne 0 ]]; then + set +o pipefail + return $rc + fi + + vm_wait_for_listener "${port}" + rc=3D$? + fi + set +o pipefail + + return $rc +} + +host_vsock_test() { + local host=3D$1 + local cid=3D$2 + local port=3D$3 + local rc + + # log output and use pipefail to respect vsock_test errors + set -o pipefail + if [[ "${host}" !=3D server ]]; then + ${VSOCK_TEST} \ + --mode=3Dclient \ + --peer-cid=3D"${cid}" \ + --control-host=3D"${host}" \ + --control-port=3D"${port}" 2>&1 | log_host + rc=3D$? + else + ${VSOCK_TEST} \ + --mode=3Dserver \ + --peer-cid=3D"${cid}" \ + --control-port=3D"${port}" 2>&1 | log_host & + rc=3D$? + + if [[ $rc -ne 0 ]]; then + set +o pipefail + return $rc + fi + + host_wait_for_listener "${port}" + rc=3D$? + fi + set +o pipefail + + return $rc } =20 log() { @@ -312,59 +385,41 @@ log_guest() { } =20 test_vm_server_host_client() { + if ! vm_vsock_test "server" 2 "${TEST_GUEST_PORT}"; then + return "${KSFT_FAIL}" + fi =20 - vm_ssh -- "${VSOCK_TEST}" \ - --mode=3Dserver \ - --control-port=3D"${TEST_GUEST_PORT}" \ - --peer-cid=3D2 \ - 2>&1 | log_guest & - - vm_wait_for_listener "${TEST_GUEST_PORT}" - - ${VSOCK_TEST} \ - --mode=3Dclient \ - --control-host=3D127.0.0.1 \ - --peer-cid=3D"${VSOCK_CID}" \ - --control-port=3D"${TEST_HOST_PORT}" 2>&1 | log_host + if ! host_vsock_test "127.0.0.1" "${VSOCK_CID}" "${TEST_HOST_PORT}"; then + return "${KSFT_FAIL}" + fi =20 - return $? + return "${KSFT_PASS}" } =20 test_vm_client_host_server() { + if ! host_vsock_test "server" "${VSOCK_CID}" "${TEST_HOST_PORT_LISTENER}"= ; then + return "${KSFT_FAIL}" + fi =20 - ${VSOCK_TEST} \ - --mode "server" \ - --control-port "${TEST_HOST_PORT_LISTENER}" \ - --peer-cid "${VSOCK_CID}" 2>&1 | log_host & - - host_wait_for_listener - - vm_ssh -- "${VSOCK_TEST}" \ - --mode=3Dclient \ - --control-host=3D10.0.2.2 \ - --peer-cid=3D2 \ - --control-port=3D"${TEST_HOST_PORT_LISTENER}" 2>&1 | log_guest + if ! vm_vsock_test "10.0.2.2" 2 "${TEST_HOST_PORT_LISTENER}"; then + return "${KSFT_FAIL}" + fi =20 - return $? + return "${KSFT_PASS}" } =20 test_vm_loopback() { local port=3D60000 # non-forwarded local port =20 - vm_ssh -- "${VSOCK_TEST}" \ - --mode=3Dserver \ - --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest & - - vm_wait_for_listener "${port}" + if ! vm_vsock_test "server" 1 "${port}"; then + return "${KSFT_FAIL}" + fi =20 - vm_ssh -- "${VSOCK_TEST}" \ - --mode=3Dclient \ - --control-host=3D"127.0.0.1" \ - --control-port=3D"${port}" \ - --peer-cid=3D1 2>&1 | log_guest + if ! vm_vsock_test "127.0.0.1" 1 "${port}"; then + return "${KSFT_FAIL}" + fi =20 - return $? + return "${KSFT_PASS}" } =20 run_test() { --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 DE73A236454 for ; Sat, 8 Nov 2025 16:01:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617718; cv=none; b=Cw9EkAwWj6JNmpVr6h6O1hJzxbV5tQZ20KMt13PIi0lRVcjySX5jkbGsuXSltvAV50ypVS9qFm7XRMXnIzhYUfLDnQQ+1fyN6pfAi3l5rE9OeZz92DrzT0rYPPSr6K9OQe7ybO0Jm4Wp/46w7hsCvdiIk0VLTfFEYcEAgSBO6Ns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617718; c=relaxed/simple; bh=/dJQ/7I3OQhP+yWr0bsAI2cwjILzUHF+RHQ7fT+3XdY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jxFgPIECD+tHUyyS5m26vpTFwuKNuV+hzEp7lK9ZRQBKkuRpbR+NuIz15s59yE4g8kto5f//muwTLUN9gsocJMTOGAM1sfUv/OxF9G+H6rnKpu9UDqIKrZEbry8ltjsBTu5/LS7mwrsLrejH0oq9e/HhCfwuotSAfFTMO/Us/lw= 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=iKCOaJAb; arc=none smtp.client-ip=209.85.215.176 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="iKCOaJAb" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-b9f1d0126e6so1081900a12.1 for ; Sat, 08 Nov 2025 08:01:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617715; x=1763222515; 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=Q4Urawj2//n5SfHIkQ4jAkZb6mHY043f4lqvaETaRcY=; b=iKCOaJAbaWz3jjJ+vz/274KDozpscf4nxIsqSI14wQ8prQ9cbrvrx+WGq39caurwmq vML4wcdp8EPkEG50k2zqdWEg85mMfCk0MTG0ZEwa6fu7g4ElSSFS1LMB89AfM+nZQmIt kJSmn8jl7rCzjaRBTBB9zlW6H5Oz0kGdArc3mk7OyeY3dBBMowxPMZ6vfjMwAq7n3L3t Yalzv8KMiiNZlDz3+maQStZR3YQhrvC6FHIUBd7yVqy5USFFaoAT1sMk1XsCoPAlICXj V08JlT5mmk9lyoEC9F42fnXipWW/KpUwY6mnV8N3SWPxjxd2CBzf9D6m5+9m7KPab/b4 XhJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617715; x=1763222515; 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=Q4Urawj2//n5SfHIkQ4jAkZb6mHY043f4lqvaETaRcY=; b=EXJVti2KYuUFKdZI7vm68SqNrK5GPvIzpiWbDw7PI5ni056mwsXvyI1mekxG6nVCiN 2jWtHZc2LJPHoLaRbdrPGPM9Ewkn+FWgOY2qWNIR13ZvFbWhc+JAJcvKwfeaAmSyMRSv inQN+S4xkjWZUJ5qDWTt5Oyy0NPqoPZXG/wYzlV6ipOp8l/9L42Cuj+fyb++6vA3ySq0 t3ggecgY7nyiiC0F7ldSZm+/ye/yStHFYDEgKpgivh1zbk4MPHCX9OJ/mDPmcksbMNyF yhGXRdyF7KPHYKDyvpm/6yB0azrZpDrnnl+MKbfh7fKNONmZImBiFQPDcA4xrHQTZ18W Uyhw== X-Forwarded-Encrypted: i=1; AJvYcCU5Df6i0nP9bWYlHGWIwBml7c9r8T5jvCLo1qFBrhGQvfC2wkjbfN0wtCenX+B8FjKTH/Rg2z4YCLMtR6s=@vger.kernel.org X-Gm-Message-State: AOJu0Yxq1GN9U6/JJr6ElIo+VFM96vpAbtmTZCZAtl+kznPxzpeLYJc7 1xchxl30mGj/gSSy5GsXM/yIScj5nb3ZYS1YE7HIVjZ1jDvIMhsxl8Ud X-Gm-Gg: ASbGnctdgsXXkUpNTDryPDZUepqi6/tJATuPhB0lTS6w70vmG7L278IZKasGdG5lTb4 fHgTOZOu5gjIGT2QddiogUilyS45cPdeRzJHqrxpFNa40R1ERfPvevqEdrizydfP9G1k769mFBE DvFfl8IUs+DK+oz0vMHKdjtd306fTGAYfvNvue4VBgvQCDr8hJGzTno0jE/91WaQxZaajjRMuq6 +jxjDYbzbFjFqajjr4HxEfkXKT8fV0xVGjB2bfuqgXh9+oeyGhpia7Z9ZpzNgaSEwWH07Az2lj9 nL+MLFMRFl17mWon/MKfte+ZxMykQTA1SwXfj5uM/T7lcJJgKxjeWnYxR/GDS8kinjzqcC/OH7U oOT6N8lC6P/2cezLwW6hOVy7yqOhZib31So5AxJhsw4r245H3ayMw9dVyrITPGSG1MrCSoqOfky L1pMv/3/PJ X-Google-Smtp-Source: AGHT+IHjnaq10HvTrkjlIQLeEstGDQ+eD2zoexE9N95h5RNKlq4D/zv3drStG+s5wuj4edCRNY4UGg== X-Received: by 2002:a17:903:2cc:b0:295:82d0:9baa with SMTP id d9443c01a7336-297e1e34090mr44306595ad.17.1762617714935; Sat, 08 Nov 2025 08:01:54 -0800 (PST) Received: from localhost ([2a03:2880:2ff:72::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2964f2a9716sm95897525ad.0.2025.11.08.08.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:54 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:00:55 -0800 Subject: [PATCH net-next v4 04/12] selftests/vsock: avoid multi-VM pidfile collisions with QEMU Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-4-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Change QEMU to use generated pidfile names instead of just a single globally-defined pidfile. This allows multiple QEMU instances to co-exist with different pidfiles. This is required for future tests that use multiple VMs to check for CID collissions. Additionally, this also places the burden of killing the QEMU process and cleaning up the pidfile on the caller of vm_start(). To help with this, a function terminate_pidfiles() is introduced that callers use to perform the cleanup. The terminate_pidfiles() function supports multiple pidfile removals because future patches will need to process two pidfiles at a time. Change QEMU_OPTS to be initialized inside the vm_start(). This allows the generated pidfile to be passed to the string assignment, and prepares for future vm-specific options as well (e.g., cid). Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- Changes in v4: - use terminate_pidfiles() in cleanup (Simon) - use associative array for PIDFILES and remove pidfiles as they are terminated (Simon) Changes in v3: - do not add unneeded -u to mktemp (Stefano) - quote $PIDFILE_TEMPLATE (Stefano) - do not remove cleanup(). Though it is expected that vm_start() does not exit(2) and its caller is responsible for pidfile cleanup, retaining cleanup() on EXIT is worth keeping as ill-timed kill signals (i.e., during manual runs) may leak those files. - add create_pidfile() function to generate pidfile and automatically add it to array for cleanup() to terminate and remove later. Changes in v2: - mention QEMU_OPTS changes in commit message (Simon) --- tools/testing/selftests/vsock/vmtest.sh | 62 +++++++++++++++++++++++------= ---- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 3bccd9b84e4a..13b685280a67 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -23,7 +23,8 @@ readonly VSOCK_CID=3D1234 readonly WAIT_PERIOD=3D3 readonly WAIT_PERIOD_MAX=3D60 readonly WAIT_TOTAL=3D$(( WAIT_PERIOD * WAIT_PERIOD_MAX )) -readonly QEMU_PIDFILE=3D$(mktemp /tmp/qemu_vsock_vmtest_XXXX.pid) +readonly PIDFILE_TEMPLATE=3D/tmp/vsock_vmtest_XXXX.pid +declare -A PIDFILES =20 # virtme-ng offers a netdev for ssh when using "--ssh", but we also need a # control port forwarded for vsock_test. Because virtme-ng doesn't support @@ -33,12 +34,6 @@ readonly QEMU_PIDFILE=3D$(mktemp /tmp/qemu_vsock_vmtest_= XXXX.pid) # add the kernel cmdline options that virtme-init uses to setup the interf= ace. readonly QEMU_TEST_PORT_FWD=3D"hostfwd=3Dtcp::${TEST_HOST_PORT}-:${TEST_GU= EST_PORT}" readonly QEMU_SSH_PORT_FWD=3D"hostfwd=3Dtcp::${SSH_HOST_PORT}-:${SSH_GUEST= _PORT}" -readonly QEMU_OPTS=3D"\ - -netdev user,id=3Dn0,${QEMU_TEST_PORT_FWD},${QEMU_SSH_PORT_FWD} \ - -device virtio-net-pci,netdev=3Dn0 \ - -device vhost-vsock-pci,guest-cid=3D${VSOCK_CID} \ - --pidfile ${QEMU_PIDFILE} \ -" readonly KERNEL_CMDLINE=3D"\ virtme.dhcp net.ifnames=3D0 biosdevname=3D0 \ virtme.ssh virtme_ssh_channel=3Dtcp virtme_ssh_user=3D$USER \ @@ -90,15 +85,7 @@ vm_ssh() { } =20 cleanup() { - if [[ -s "${QEMU_PIDFILE}" ]]; then - pkill -SIGTERM -F "${QEMU_PIDFILE}" > /dev/null 2>&1 - fi - - # If failure occurred during or before qemu start up, then we need - # to clean this up ourselves. - if [[ -e "${QEMU_PIDFILE}" ]]; then - rm "${QEMU_PIDFILE}" - fi + terminate_pidfiles "${!PIDFILES[@]}" } =20 check_args() { @@ -188,10 +175,37 @@ handle_build() { popd &>/dev/null } =20 +create_pidfile() { + local pidfile + + pidfile=3D$(mktemp "${PIDFILE_TEMPLATE}") + PIDFILES["${pidfile}"]=3D1 + + echo "${pidfile}" +} + +terminate_pidfiles() { + local pidfile + + for pidfile in "$@"; do + if [[ -s "${pidfile}" ]]; then + pkill -SIGTERM -F "${pidfile}" > /dev/null 2>&1 + fi + + if [[ -e "${pidfile}" ]]; then + rm -f "${pidfile}" + fi + + unset "PIDFILES[${pidfile}]" + done +} + vm_start() { + local pidfile=3D$1 local logfile=3D/dev/null local verbose_opt=3D"" local kernel_opt=3D"" + local qemu_opts=3D"" local qemu =20 qemu=3D$(command -v "${QEMU}") @@ -201,6 +215,13 @@ vm_start() { logfile=3D/dev/stdout fi =20 + qemu_opts=3D"\ + -netdev user,id=3Dn0,${QEMU_TEST_PORT_FWD},${QEMU_SSH_PORT_FWD} \ + -device virtio-net-pci,netdev=3Dn0 \ + -device vhost-vsock-pci,guest-cid=3D${VSOCK_CID} \ + --pidfile ${pidfile} + " + if [[ "${BUILD}" -eq 1 ]]; then kernel_opt=3D"${KERNEL_CHECKOUT}" fi @@ -209,14 +230,14 @@ vm_start() { --run \ ${kernel_opt} \ ${verbose_opt} \ - --qemu-opts=3D"${QEMU_OPTS}" \ + --qemu-opts=3D"${qemu_opts}" \ --qemu=3D"${qemu}" \ --user root \ --append "${KERNEL_CMDLINE}" \ --rw &> ${logfile} & =20 if ! timeout ${WAIT_TOTAL} \ - bash -c 'while [[ ! -s '"${QEMU_PIDFILE}"' ]]; do sleep 1; done; exit 0'= ; then + bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0'; then die "failed to boot VM" fi } @@ -499,7 +520,8 @@ handle_build echo "1..${#ARGS[@]}" =20 log_host "Booting up VM" -vm_start +pidfile=3D"$(create_pidfile)" +vm_start "${pidfile}" vm_wait_for_ssh log_host "VM booted up" =20 @@ -523,6 +545,8 @@ for arg in "${ARGS[@]}"; do cnt_total=3D$(( cnt_total + 1 )) done =20 +terminate_pidfiles "${pidfile}" + echo "SUMMARY: PASS=3D${cnt_pass} SKIP=3D${cnt_skip} FAIL=3D${cnt_fail}" echo "Log: ${LOG}" =20 --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.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 A22F223AB88 for ; Sat, 8 Nov 2025 16:01:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617718; cv=none; b=JtSNT0r+PImCqPYQ/4SbmIexDluProo74nWlTR8909RV26a8kHrso1h3zxVhGynjeIMHq5GdMB6h/9//8Pr0X0hvUEGHR0gjAigi7KxBAk8EnwvJy3Kc223H4fTBSt3KfOYuvF7Pylsl5acgE9GDPqPzluFTVD5hLGK+5U87JgQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617718; c=relaxed/simple; bh=vFLZWv/FUrDafqhdvi7+WMCrHvjI3U/d+lidxcdSdHU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sIAgo+h1kq2M2OHcr8kL+J2GC49P8DcXtV8TLJAn8KoBQ7gIt4dZ6W3jsnCXObQhXDCbHqkMkJrS3wApUCbbQQqFkHhNDnfAPPVVnW2sk+etiz/jOxFGXbEP+oeQDaFzmAQ/3v7lATF7o4T9Xd2/u5z3zgnf9+api2QyVVMUf9c= 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=jnQLgxIs; arc=none smtp.client-ip=209.85.214.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="jnQLgxIs" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2953e415b27so15036665ad.2 for ; Sat, 08 Nov 2025 08:01:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617716; x=1763222516; 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=8TzgGQWG9WGn9L//XYwS5wGYUOE0Hzr54Zzu6AsNpCQ=; b=jnQLgxIswzz0nLjG+u0WujrtVyeGbMRC+j2q7GE3Yn+R02GssqD+BkAksaYf97VlHX tl7ePsSEzgYrxm9fV/q7ufil+ri0cW7gAxv3sRmXRd6M5tJKOPR6dJN6YkCdDkCIxB/D CjnwlOF23bluccGhNiZrb/4lDoI1iUsNU5YUyguPev0gElKN9hZmZqZpTMTy5xdY5A16 B+reFJgK3yh/GW3EHuQWz3jkssTxbyhyLJz3NmtMDGQrHBaY9MTXllnucRu64IVa5knc 4ve7XVVl6m40dxi7EopsM6SbTt+55LPrLf0xk8BZm/DFltpQKt9aogdqEoQEXrBU0AEc KauA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617716; x=1763222516; 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=8TzgGQWG9WGn9L//XYwS5wGYUOE0Hzr54Zzu6AsNpCQ=; b=jb+omzpa8WACdLZmg1M7c/7+e3JbXpobaTFJw1ZPnMhyuToBpfyBSweruknJxMJDOr vbdrBzlg5rwgjBlklNvwse9TJzB6ihWIHRzhbOvxRgIZYz0hEtThplYP4UUSOqiVHXcf XpcRaInKNvkuBAfgp5XvKMOZ/32ZAdUoaVtlAvGcP/rQVr/eZAAnGAvuBLPi55XjrLV4 a9Q8K/zX15D2AwTaHXvJEbN1I/jc3SHYM2t9XyvTU+hW9jJroZW4Vyl3TuiJDJC2Wg6K +0WQMMnIQaSLSQft8Rv0m+wolhMlN00/sRkLl2GKzM96KyPW9QuKRUV8Z8onuuJteo1E Wgxw== X-Forwarded-Encrypted: i=1; AJvYcCVRApL9IUbtG0Efppd0U/b/EOMIXvchTxndpPU7uHPbKp+lghVyj/es9nwPQ8NhER934Pu3AF+xsMqut3A=@vger.kernel.org X-Gm-Message-State: AOJu0YzE4ObVf7FrJ+NyGdFoq5jEis/Pt3gUGYt4ZE6vtVYaseZl4ZE+ uPNGA+QVrEVvJsmE29ZC1SrME6xYOqmMhzmNURkd5BRGLi2U8TNXfhQY X-Gm-Gg: ASbGnctENhKS2U+1NBp/pzcsKlsvtFuI0gQ//DUPAyts/MFzKv6OGEhNhI3fbQ1YFUP xL3DslyyCqKrYAFTNnuYkDcePzzzdeP6tP5kHPZ8aMVmFf7Ed3m6+IuMJLAZNh9/rIuGT2K/zqO OnEdvqSTxP//oO3GL3zFCGa8+/Xl/NlT8D14SI/zqGBa/4q9FTNQBBJU4PHqLfyd2oU+2tyHvoN YgCSv3pJWM0xuPlQlHGz/Pq21jG2erKwlUXUmLU44nJ+DHsSDwo2YQcBdTpI+7EUSYKtX8OQx1F Gwo9kYEDT5pMcHpfjQUg5CdDIeas/8abAj13+3wp/huPp93c4s9e2Prmmy9bNIQSBPDFUtvdm5l DGzscKQa612gdjKEBYAmuRk/IToVlo9s/qDSSusOVpYwKX/c1TXjkSNV+NqbeFifgqq4YacxjWm qKeQSAFGUd X-Google-Smtp-Source: AGHT+IEfqRtwhtlx9re+8tiJC6AWXgiAQTuALNt7ZHJZ0Q9RkasCM/u0W7yOilEslz3OhmJAdBVkcA== X-Received: by 2002:a17:903:244a:b0:295:592f:94a3 with SMTP id d9443c01a7336-297e57101bamr32706755ad.48.1762617715878; Sat, 08 Nov 2025 08:01:55 -0800 (PST) Received: from localhost ([2a03:2880:2ff:49::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29651cd0060sm92578535ad.108.2025.11.08.08.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:55 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:00:56 -0800 Subject: [PATCH net-next v4 05/12] selftests/vsock: do not unconditionally die if qemu fails Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-5-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman If QEMU fails to boot, then set the returncode (via timeout) instead of unconditionally dying. This is in preparation for tests that expect QEMU to fail to boot. In that case, we just want to know if the boot failed or not so we can test the pass/fail criteria, and continue executing the next test. Reviewed-by: Simon Horman Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- tools/testing/selftests/vsock/vmtest.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 13b685280a67..6889bdb8a31c 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -236,10 +236,8 @@ vm_start() { --append "${KERNEL_CMDLINE}" \ --rw &> ${logfile} & =20 - if ! timeout ${WAIT_TOTAL} \ - bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0'; then - die "failed to boot VM" - fi + timeout "${WAIT_TOTAL}" \ + bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0' } =20 vm_wait_for_ssh() { --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 AD71623D2B8 for ; Sat, 8 Nov 2025 16:01:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617719; cv=none; b=gf2uitc1ilgHk7fBJ6PBygsUTUc83LNNFm/9VSszXDK/Cz3bRedMOIxnwiRrVKaU/fRjb1CY1mQgZA47qH4HfZ+OFTT6E0CBfL1Isk2VJnDUGDY/HLP9BTt93XcMj+dIEhswCXX56DQHlOUJboCEawpfs5HE42u0Xh2QYlEnsqg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617719; c=relaxed/simple; bh=o4MlQeDS6auM9P4kHNQ3k9pmc0q9lYi9e4vGWiCOtnc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UnzjfPn1XOyO21G3rZFxEj3nOw7mojrlFkwkhoWlkoU5KpqWR1s1d6tlT4M9FlC5L7mgYXO0O0ZKt9H3k0ySp9YtnFRc3Exvv/jFiR81GDtVN/BTGvbnHosD8O7qZYOkP01s1y7FLAwsjlyVwPQZiOAtGyxvrb6sY89Z7JP5Th8= 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=hVTEjkGv; arc=none smtp.client-ip=209.85.216.47 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="hVTEjkGv" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-3436a97f092so1002755a91.3 for ; Sat, 08 Nov 2025 08:01:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617717; x=1763222517; 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=WAjRw7PTsJ0iELJkuhd3H4m56at8173dELtud6Xr4j4=; b=hVTEjkGvapsKmGpxS5+PsTRLGx9RFWSF2NeCVEcJo3kTsjGYY6aasCcUCtaLSC1ArU jUBY5iS7mzudJ2YK0bwCWUVvNr8+n2LrMM34xoYoOVMAlB+OXBDV34ou5b8cLT9RIFPr vzQM0EHWB2MKfePDZKXZCoqLmltzC6chlG6+vNvhzAqBNiQfK6r9wSG0wqpN21pX3WFx vPoAgEGN+PsTmgLGmR1sML7KMpwHkVmAKhx+tWY0abW9eAxIZrmnkFyjLZHc0I/zABt3 3hJbseaYCIVJIUN+U6hHcqMSErDe+e/DfIkJaX+k9sywSU4AZ1nbQTs0fyyP3sWLhssQ Tkvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617717; x=1763222517; 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=WAjRw7PTsJ0iELJkuhd3H4m56at8173dELtud6Xr4j4=; b=Icm5MSqgIb/DpZkhwt5jxaE7WvC+sCMKP2DEiEm34hqm00b5iA5nJXIxfGn7nTjPoV 3BUHmpHn1o2x8DISKZlqDoYtXLrusBabR/8sXJjdzzfQWTNfs0rbYkhEnTmnSBzdbpPe mkRS46CrfxiKDH2wR5G40ocL3UmxNrFZMUvgJwlN4PvUHRUWaPnQa1FMLi3mxhdAkqqq NLJQOBE8/6MD4TtayBJdmzTOQHhSXDuCFcNzUy0/Hrbs0jEDXO4wyAfqV9/h54f6Szyd bgrk9RJcJACtKvIWYeDv8eZldmYl3aAO4+TeXibr0EedAe2/U2I7TvWOJ8RVzsrB4ggr ewng== X-Forwarded-Encrypted: i=1; AJvYcCU+KvL5eWUtpwXm297URN15lBl7aiwP6lonY0v+ZihOr7Kvt9rpmU6Zoh3Fw8W6yqDNVv3iNkTagHoW5QA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/sPLm7z9RFpt1+Qon03+S0fFSNgJVwhAOkQZ/3a+q5vokPHix HvruUUIiAAWA+fLpOwk12kk/+bCLm56HxTo1AonQPRIJX7ndMjS0xZgy X-Gm-Gg: ASbGncuRcK1SEhi8DW8JP8UwnJqhle0AigvTsDvv7wlL/2Sd4J/DNDMPEXg23X7aycV qwSCoJQY5F4Lciawk9ZhL9C9qEvOqlGO9osbF5WbpBLHPdT4mW35nDUgRs9K5FNaqu0WhewoBok Har/ezybpRbWYEjdOTAl+/MnrRj90CpUAbDFCHSBJji7bL4vaTjfgt4LWwIc7dp7q00Ytei35un hPkaW2iQdDQ3bn+4ts3v3+qthwnI5jvdzlAZy9xuxYj3FBT9+VlER/BHO4q3y4pakeMIMzQzWAP BAw9KtpNNKoWzUnUH8tnCh5PwuzuNsZImAn7Jqq7WH1gJupVSvzK5WmADTfWMjScFTQk/sJBsji cnCUEETGAgqLv+29fdTPfJu9EQ5KMF/MC68K90T0Ts5zYfZh39i4WAAVfMbkIJ4R+GnxOqn3BPA == X-Google-Smtp-Source: AGHT+IFJMiSDPJLEVgezSpGbFJbQVVjV01QEtUzeI+pmHkqds9NcgUya4c0r1u1o+ppTnMUl7FVAsQ== X-Received: by 2002:a17:90a:dfd0:b0:33f:ebc2:634 with SMTP id 98e67ed59e1d1-3436cb3d256mr4326835a91.9.1762617716780; Sat, 08 Nov 2025 08:01:56 -0800 (PST) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3434c3357bbsm5935730a91.12.2025.11.08.08.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:56 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:00:57 -0800 Subject: [PATCH net-next v4 06/12] selftests/vsock: speed up tests by reducing the QEMU pidfile timeout Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-6-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Reduce the time waiting for the QEMU pidfile from three minutes to five seconds. The three minute time window was chosen to make sure QEMU had enough time to fully boot up. This, however, is an unreasonably long delay for QEMU to write the pidfile, which happens earlier when the QEMU process starts (not after VM boot). The three minute delay becomes noticeably wasteful in future tests that expect QEMU to fail and wait a full three minutes for a pidfile that will never exist. Reviewed-by: Simon Horman Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- tools/testing/selftests/vsock/vmtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 6889bdb8a31c..bd231467c66b 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -22,7 +22,7 @@ readonly SSH_HOST_PORT=3D2222 readonly VSOCK_CID=3D1234 readonly WAIT_PERIOD=3D3 readonly WAIT_PERIOD_MAX=3D60 -readonly WAIT_TOTAL=3D$(( WAIT_PERIOD * WAIT_PERIOD_MAX )) +readonly WAIT_QEMU=3D5 readonly PIDFILE_TEMPLATE=3D/tmp/vsock_vmtest_XXXX.pid declare -A PIDFILES =20 @@ -236,7 +236,7 @@ vm_start() { --append "${KERNEL_CMDLINE}" \ --rw &> ${logfile} & =20 - timeout "${WAIT_TOTAL}" \ + timeout "${WAIT_QEMU}" \ bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0' } =20 --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 9018B23EAAB for ; Sat, 8 Nov 2025 16:01:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617720; cv=none; b=dnkwAx/LkZKMSARnIeqy5yiXqCxT2iCB6viXtMTyWk2irOzJQn4lCBTmOzX5WlDgNAaMs3b4Z7eCaUmwYAkgSfOGTt008zw8qGHp+omznCaFoMcS2hJ7+eVcuIgLFwVndglYOD95Yg6Nx9xJdcFXnJoHhCLVC+g1qNhLEovdxf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617720; c=relaxed/simple; bh=kXti4VlF9If/Jhp5cw6M/i3Lzb+2XXWTFOdTl0a0yx0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ouPF5491tgB0sHy3dHNqAap2O50+/IP2vrWwyVkikK8j5aoOzjjvrLe1ujCYPW9vzTlOucbv6AACEvS70RwtGEp975Jz8KMrD/BK9t9VDh6g6mOJN7/FNU9tXfQpHISm5CQ9w4zokl2M/5Xu1PC2Ls3MbvN9aVWsjrrYzOxhp1s= 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=J3Pyj4cW; arc=none smtp.client-ip=209.85.215.181 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="J3Pyj4cW" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-b67684e2904so1066839a12.2 for ; Sat, 08 Nov 2025 08:01:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617718; x=1763222518; 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=lu3g3vSYUjY7/DxTl1+mYZ9eGfURyr+RcPBMpaSL4zc=; b=J3Pyj4cWtJm9KrnVOSVNSUxcGuo8cAwmkNeIo5p+ersOUlhzTahndiwj8f/1UVxnLB U/yFgVt1woo6RnqAd0TRV9tcq9hrAc0DjPbgYwWz1E1V6HBekZ3D68Y4hIXrzF6vWxHJ TrCL8z8xj0VTWvzQfC9Nr1/uexwB7VP28lW/5MgpbiK8wOuiDXF8GSx+0IR3XMCTgBRc DP65PoZtKgQbbBqF5O2X/pcFRcqFEgQWXeZwQ/OTXlkXNoTmlqQcsJtD5BKetbHMupuc gfyJ65l8S4eobmO1twEvbXTR/XMzm876qCRVdxwoaOPcZe9rNWWHlrj2lNxFaOaXinSp 2RNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617718; x=1763222518; 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=lu3g3vSYUjY7/DxTl1+mYZ9eGfURyr+RcPBMpaSL4zc=; b=OqD5pBEISpGBGX8sEogNuvCOS14sP4vjBJoxVyn/ZmKLsXhJeZaleoHIR678iFy7WT KrxEyOIo9tDgerONOl2LGaqmGjlETHWPd+Dbffn+foengZ2BSZ3qUNSfLvfcv/yqTgDm KSe2TLU20KLOejegScYpDFde7le33vbFew8i2Pml1Qwu1e6LSSYyae42Kzn21QVyN8rc nvdQXaF6Gx1UyoiWGjf4DUETx2pq8aVqBm26T2FGUO2dt1L9lMDqbUo3/XonvKeV/RWt 7b1UXsM9zQSAEsZIC8AZZcgDqTekM91o67EmqZmN5c9ocARmHNKcEvgAfU1RHjqE56Fh tpcw== X-Forwarded-Encrypted: i=1; AJvYcCXfZ+AzGm4OryF3IhgmbXVmtf3mBS8D3g9mHmZf5qKttfCzsLVjwCxbAFZdloDk3N6hOaveie8VYG/d50c=@vger.kernel.org X-Gm-Message-State: AOJu0Ywqvd/AD0NigoFCPnVKuDDOecv/vlOsSnTcZZtUiNG4yHsFy8e/ ZlLmVwM5GfjgBzDYYTVq7t8cvi7nCpgPIRJLyQGZ0vq84xFKXVT62Wnc X-Gm-Gg: ASbGncsV/4ucICdLGL9ggely1MdXgNIoLcvPFNZfk3/Hcun3Q7F1Vx18ylZ+LbFPpNJ 6ueCyXhavlUJ1av1d4253icUs5aCY9B5NJL7Q68UO1BC/nHBi0N2pOrCmM7YrxJXQukmrfxTPMR EmWqhPIeC6UmDwJtD/i7dU5POLl2u4YCfGWx+k8Yti1K3LYGhuAGtnovyNDdtPJjdrRYWCdZLwZ 0jUJwEnXlJ39rors19JdYYrIZT9+k1xBEeFiiJFT1LH+hNLzmlFIjKwCrFa+XqeyRLun4LGSBel CAjErNmIOqVLoDZ+iKhPx2cLa8H5AUvAp8uyQz6TtDzxdKB7tZqh+Q8Woszccwyy/ieip68MQGW anxus2m7g9QQJzb34+3uJQ1UB+iBJyD9RMTFYKvebrx6Hsm7vn67N3nL0adKm54NPXGH0kkY60R eg++MP+bN52jBRVh22Fwc= X-Google-Smtp-Source: AGHT+IHDIYzATzCHfhG57FblbDFeYnwOL/4oaPCyboie4iuVOegKtbCQgew0dvzNH4sWmPXvWF1Gyw== X-Received: by 2002:a17:903:238e:b0:267:f7bc:673c with SMTP id d9443c01a7336-297e56d0401mr33795955ad.44.1762617717613; Sat, 08 Nov 2025 08:01:57 -0800 (PST) Received: from localhost ([2a03:2880:2ff:73::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29651042c24sm93002675ad.50.2025.11.08.08.01.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:57 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:00:58 -0800 Subject: [PATCH net-next v4 07/12] selftests/vsock: add check_result() for pass/fail counting Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-7-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Add check_result() function to reuse logic for incrementing the pass/fail counters. This function will get used by different callers as we add different types of tests in future patches (namely, namespace and non-namespace tests will be called at different places, and re-use this function). Reviewed-by: Simon Horman Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- Changes in v4: - fix botched rebase - use more consistent ${VAR} style Changes in v3: - increment cnt_total directly (no intermediary var) (Stefano) - pass arg to check_result() from caller, dont incidentally rely on global (Stefano) - use new create_pidfile() introduce in v3 of earlier patch - continue with more disciplined variable quoting style --- tools/testing/selftests/vsock/vmtest.sh | 32 +++++++++++++++++++++--------= --- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index bd231467c66b..2dd9bbb8c4a9 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -79,6 +79,26 @@ die() { exit "${KSFT_FAIL}" } =20 +check_result() { + local rc arg + + rc=3D$1 + arg=3D$2 + + cnt_total=3D$(( cnt_total + 1 )) + + if [[ ${rc} -eq ${KSFT_PASS} ]]; then + cnt_pass=3D$(( cnt_pass + 1 )) + echo "ok ${cnt_total} ${arg}" + elif [[ ${rc} -eq ${KSFT_SKIP} ]]; then + cnt_skip=3D$(( cnt_skip + 1 )) + echo "ok ${cnt_total} ${arg} # SKIP" + elif [[ ${rc} -eq ${KSFT_FAIL} ]]; then + cnt_fail=3D$(( cnt_fail + 1 )) + echo "not ok ${cnt_total} ${arg} # exit=3D${rc}" + fi +} + vm_ssh() { ssh -q -o UserKnownHostsFile=3D/dev/null -p ${SSH_HOST_PORT} localhost "$= @" return $? @@ -530,17 +550,7 @@ cnt_total=3D0 for arg in "${ARGS[@]}"; do run_test "${arg}" rc=3D$? - if [[ ${rc} -eq $KSFT_PASS ]]; then - cnt_pass=3D$(( cnt_pass + 1 )) - echo "ok ${cnt_total} ${arg}" - elif [[ ${rc} -eq $KSFT_SKIP ]]; then - cnt_skip=3D$(( cnt_skip + 1 )) - echo "ok ${cnt_total} ${arg} # SKIP" - elif [[ ${rc} -eq $KSFT_FAIL ]]; then - cnt_fail=3D$(( cnt_fail + 1 )) - echo "not ok ${cnt_total} ${arg} # exit=3D$rc" - fi - cnt_total=3D$(( cnt_total + 1 )) + check_result "${rc}" "${arg}" done =20 terminate_pidfiles "${pidfile}" --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 6D24B244691 for ; Sat, 8 Nov 2025 16:01:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617721; cv=none; b=BhwYePsv5gc1ltYNwVDdzewVM7sFy0LsFcUAW5dr/OVWwbovJ/Gz2H3eJ9LBklILV8LUVWkocpmiqGR+JK238SowVbjRNGJmCpPwaT3nE+Qc+y2ngvVAfWU6UJ+YN9lA5/lgsrktJp9uhuRZffmeAL8ej39uQrTUnXmwXCwgyZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617721; c=relaxed/simple; bh=F9FsVtLt7rSsC+SslDdvx9EYIxO2ErB70trA08f7qAE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Xr8Arw5/DZdgDG9mcrcfmO92zT61Dg4bqCejDeLqZn0c6vS1RPD2hGIJaaZ0bBf6ijAqxLMR0lKdMdWG9asTmunrLOrJPXFyIJK+QO4d8GoMEBOZnCz4eztdombV3MQRVbPocIfAaRvX1zwJQiRHsQ3+iPKdHVxZK/ca2LLVXbw= 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=EzlaOoEF; arc=none smtp.client-ip=209.85.215.177 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="EzlaOoEF" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-b98983bae80so984773a12.0 for ; Sat, 08 Nov 2025 08:01:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617719; x=1763222519; 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=2/1yyOZn8r1C2HMNNmP8ItI3UkC7xFO+t2DlRUjrTgM=; b=EzlaOoEFGnQtWtAUK6QRETa5cr68VJ9uGYfHind4UB0drUaox0wHjkivoFsFuJenFp 9AICGVsBtIUsaRZn9cOd9l8Anaa89KxldxiYzWAaeSgnzFTwSJiM7zY5TpLGnxwSSWdn m5dwQgysbz2CiywgJ9frT99wavGveNEp/y3ZqqXj9gWrS944EZrDz5FaendwuDI6xtii tQHk7NP9wIoBchac261RXLICQjcRAmJfSxO25HIpUxR9ZUT+e6SQSqDXKC83HdMljk21 6gqIBElBgphRHF1xug/9LOMPNIcvqJ1cVZM9NShpvs9y4zhmP1Ni5H6uX2Ixx4MlhxlG 0tTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617719; x=1763222519; 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=2/1yyOZn8r1C2HMNNmP8ItI3UkC7xFO+t2DlRUjrTgM=; b=VfZJ/mGDbJBETwiZH4sN35YXigNcQC8zYVEyeb1tdgYAmcF3BxGylf22+OkxEf9hD/ ZO2gc9sGPIMajOBjh/A47RmTt5LnOXebNT3djCPlIvBE+nX8HxfBiOM/2JuMbFF4zbRy v29qXCgtYdriZU+VAOLM2DWk1c9FXYCSJ/UoZ7TqG/ZFiya4hFzf03oNGbk5vUB/ypcY bZgjCdXYUkscByYcqosjQK2JmxqcAkykhwDLANJnRRUihRcCiikJJodnqdHUYlKmJf6D 5zXzX2OFuRz4gkBhBM3AgLYnCoj7mDTrm7GKZFHt07hhsSLQ6UaNv8OG7Otkr8QMCnwk Lt/A== X-Forwarded-Encrypted: i=1; AJvYcCVOpvMla/XSbm8nx4nDk/9hF2wAAPNbuNFTP47aqvG/ixfDDhgbyCm4V9ivIjCUuozqvxskXGX0MGvdfcI=@vger.kernel.org X-Gm-Message-State: AOJu0YwJM0CLUmJ7HE8so0ydXhdBxa3H56U+l5Ymy7kxQBvaXEvxiDji 58oC35u84p4cCVeiq5wTjhCapXSXp4nLVWKzIXxM24sCiP2YnrkGgS9E X-Gm-Gg: ASbGnct9HkEVQsFpw+fM54pvHWqZMFI7+9iNxk9eMyAutaNXBjXzcJc1f5jAKrX5Dp/ 8PrGanPMt8MTJS742msXa/B6ZsKfv5hV8BLd9Fy7fJEu64U2iHrsGVDdznaZdfrHnLbC/V0p5i8 BzGMzVR9gm+H02JaPk6hh5zq3jvQagBt0j3+BOm1UFV2NjyJVfqJwOoSqHjTcidHxeiEFsX45NW CRK9erwymsS2yp2u+4Jn0aFG43F1dKfSWxP/BYOipLzC7mh56Cdyc+mn7AQgHvJ36s1cJAeJXFp xGh7zXoIEbb82MJj2v9QyckbAXmv6hDxj79mDJnLDahH2SyiXfZ0ScmGwKDakj4VGAb5Ezwt8zc /re1SEs1Ty1WSW1+VXvg/6usAWSVZQIq3+gNGstk/xzrrLbQP133pQsRfXXxgCa2D+3x/39vPer 0q1Cofbi4= X-Google-Smtp-Source: AGHT+IHomY4YyVD8KS6qtG7MNKX+4x/II1DuyBNIdKkYHuI5hzRRInd+7+JdQ5vyk3YIsOnkaHnafw== X-Received: by 2002:a17:902:ebc1:b0:294:cc8d:c0c2 with SMTP id d9443c01a7336-297e5663a67mr35112645ad.27.1762617718558; Sat, 08 Nov 2025 08:01:58 -0800 (PST) Received: from localhost ([2a03:2880:2ff:5::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29651c94ac5sm93090585ad.92.2025.11.08.08.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:58 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:00:59 -0800 Subject: [PATCH net-next v4 08/12] selftests/vsock: identify and execute tests that can re-use VM Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-8-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman In preparation for future patches that introduce tests that cannot re-use the same VM, add functions to identify those that *can* re-use a VM. By continuing to re-use the same VM for these tests we can save time by avoiding the delay of booting a VM for every test. Reviewed-by: Simon Horman Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- Changes in v4: - fix botched rebase --- tools/testing/selftests/vsock/vmtest.sh | 63 ++++++++++++++++++++++++++---= ---- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 2dd9bbb8c4a9..a1c2969c44b6 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -46,6 +46,8 @@ readonly TEST_DESCS=3D( "Run vsock_test using the loopback transport in the VM." ) =20 +readonly USE_SHARED_VM=3D(vm_server_host_client vm_client_host_server vm_l= oopback) + VERBOSE=3D0 =20 usage() { @@ -461,7 +463,44 @@ test_vm_loopback() { return "${KSFT_PASS}" } =20 -run_test() { +shared_vm_test() { + local tname + + tname=3D"${1}" + + for testname in "${USE_SHARED_VM[@]}"; do + if [[ "${tname}" =3D=3D "${testname}" ]]; then + return 0 + fi + done + + return 1 +} + +shared_vm_tests_requested() { + for arg in "$@"; do + if shared_vm_test "${arg}"; then + return 0 + fi + done + + return 1 +} + +run_shared_vm_tests() { + local arg + + for arg in "$@"; do + if ! shared_vm_test "${arg}"; then + continue + fi + + run_shared_vm_test "${arg}" + check_result "$?" "${arg}" + done +} + +run_shared_vm_test() { local host_oops_cnt_before local host_warn_cnt_before local vm_oops_cnt_before @@ -537,23 +576,21 @@ handle_build =20 echo "1..${#ARGS[@]}" =20 -log_host "Booting up VM" -pidfile=3D"$(create_pidfile)" -vm_start "${pidfile}" -vm_wait_for_ssh -log_host "VM booted up" - cnt_pass=3D0 cnt_fail=3D0 cnt_skip=3D0 cnt_total=3D0 -for arg in "${ARGS[@]}"; do - run_test "${arg}" - rc=3D$? - check_result "${rc}" "${arg}" -done =20 -terminate_pidfiles "${pidfile}" +if shared_vm_tests_requested "${ARGS[@]}"; then + log_host "Booting up VM" + pidfile=3D"$(create_pidfile)" + vm_start "${pidfile}" + vm_wait_for_ssh + log_host "VM booted up" + + run_shared_vm_tests "${ARGS[@]}" + terminate_pidfiles "${pidfile}" +fi =20 echo "SUMMARY: PASS=3D${cnt_pass} SKIP=3D${cnt_skip} FAIL=3D${cnt_fail}" echo "Log: ${LOG}" --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 2CFD9231842 for ; Sat, 8 Nov 2025 16:02:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617722; cv=none; b=jZt/6eyvm+Qdww32c0vXRYi/p9hybfeGub8danz08MpjB8zUNPiRUjhJeXDZ5P6od8+qIyojwWZ1LFF4i/f4Oko2ZIZuf7KckRIb0rhGLM9jkFvnpoB63w/liJfFFf+CkUx+SnSOIoQBYs1Os75wJLY9xlmGenKCcyI35oieh+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617722; c=relaxed/simple; bh=rsJoOi2cJHjVoFfWem70mON63FeGD3+bDKAfH1rnKVo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hUwjoA0K/BPxv20OafEYSK4nY6kigKSKDihw7jtNwKC9jAH00+tcGrYQ1hakL03Jq0lU3PtlbSA5rOPrMzIrm1KdoY5j8e3esJ1qTViwJZae98H/TUsDfmV0sppzlZhwrw6fxDpELUX5FELCLu0dqLnZSO2oFcltpNqJDj+fiR0= 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=FbEHNJ87; arc=none smtp.client-ip=209.85.215.176 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="FbEHNJ87" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-b9f1d0126e6so1081922a12.1 for ; Sat, 08 Nov 2025 08:02:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617719; x=1763222519; 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=zCZpbzlgXNaHUfpJgg5bp7RfyHhboSaGeDqGPcpEBV4=; b=FbEHNJ872s4MpsK3sUgApvMq9Fl7KA5ribPexY6YEakaXYugX+SxvySyj+WgJ5PGLr trcMHQkT4TBI2ezTRgl6GQ+YzoZnO8VGPGQ3osNDe4iZ4E9jkZ5oLZZIGcw9ixO4KZMg 1PTDh5jPZhjX2wjUfNGb2+1moqTVp41rIC+PZYReBUxZcRrTn5NCIdtplun36V+Xpbok KlLpgo0Xil5rGQW3b4dQmrnKC4I+ib207dXJMjzyQ6bf9y2gjHFTTYpQWfjIHlBsXlnu 1NYZ9AMuZfRDlnFKn+tP4GI2285o5K8AnJHNcfc2hAy45ZvsBnn3q5BZFYbwhDHoaWN3 RwFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617719; x=1763222519; 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=zCZpbzlgXNaHUfpJgg5bp7RfyHhboSaGeDqGPcpEBV4=; b=Yi2LdAiAMwidcYnn1yZt7E3t11Tp6drM4BRII+U6Z8GV0aaZhUGCuj/XVMeQcA/ABx AybtjVLeP/7oAJNn87V6zw71ZKC4J5LGuS0J9OZvxEI2NARsaDUGtxAWcV6lTwqBEceT cyokQj5m8n+h/D95ts5IOjK2FZr3X6JIT3lIRjch4ZHvHUuY0NgvU0vw7x1Pu2l3Iw3u hy1kmPj0WSa7KcQ9orYvs0B3m/jI6c93wlhjil2cG69LQe6bKEng2CfJ6l9HjQ9Fpnxq 6iE2961ke+onkLLREOsXPZj3Et0fHd60HN+xbNvLWpTvlnP8oc6yAA0yPPGsNkJCKyp9 8PiQ== X-Forwarded-Encrypted: i=1; AJvYcCXyr+Dhf0ZUsdA2W6TDzC2iIfSfvl7WUKUGDm9L7PDu+o7nEFNQox+gV0l7anNypmxipy327qrSJugULw0=@vger.kernel.org X-Gm-Message-State: AOJu0YwZJDLSNoWp+Yt3QCgA4+Xv4fFm8+pD6NwG4cXX084B/ykYgN4V DTIUnvtAfleHx244S5/6RtWuBn/Psri/gp/HqmkO8frMVvIrJUysMI18 X-Gm-Gg: ASbGncsc3rnla1BvZSWZ9gnU4UwjwjJ4tSp5onT1Am6jOLcQ2YGngtHr9LfrW2L0RcZ bfDkAuGI+Iz3yuLBii5nqqOgBI4WvVcWQ1gwc1VOXEjEpfzDqnCyR5bldUrRTYK8gQdcClnul5r PI8rQbeVgq/lba/T9KGQb+0q4WYeWfNLJPO6yqc3kCZwPMMThK8vCpCJi4KXqvfkP36nAh1t3MQ IkepFwhUowUgTePsOhnZbGkwxnF53mcGws0D/RxaIdBeBDilmpAk1A9h1LUmQPXekMCj7f57oQr x+brVIJZa4NL8VyUhxy/jiDduFGP6J7kwou1nTZVgKPlxHix7qJMkces5KrOUYWC7X472o6qh23 iGvLaVgSTtV/cYAbkxqgRHo8/OvhSEzzOVHz7Hm5ibgKF8OJx9NwcWYEc8UwYSVc+XdexjCF6 X-Google-Smtp-Source: AGHT+IE4yGWFg0aIBwiA4LPoKZBjaoo7gZDrHFJPuzyKYWyf6FZGig58eJBXmK4vcD8oY5wVdHAoBA== X-Received: by 2002:a17:902:f707:b0:295:6850:a38d with SMTP id d9443c01a7336-297c95b383emr64698465ad.19.1762617719452; Sat, 08 Nov 2025 08:01:59 -0800 (PST) Received: from localhost ([2a03:2880:2ff:3::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ba90138f614sm8137032a12.27.2025.11.08.08.01.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:01:59 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:01:00 -0800 Subject: [PATCH net-next v4 09/12] selftests/vsock: add BUILD=0 definition Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-9-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Add the definition for BUILD and initialize it to zero. This avoids 'bash -u vmtest.sh` from throwing 'unbound variable' when BUILD is not set to 1 and is later checked for its value. Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- Changes in v2: - remove fixes tag because it doesn't fix breakage of kselftest, and just supports otherwise invoking with bash -u --- tools/testing/selftests/vsock/vmtest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index a1c2969c44b6..e961b65b4c6e 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -548,6 +548,7 @@ run_shared_vm_test() { return "${rc}" } =20 +BUILD=3D0 QEMU=3D"qemu-system-$(uname -m)" =20 while getopts :hvsq:b o --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 6F3891A9FA8 for ; Sat, 8 Nov 2025 16:02:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617723; cv=none; b=No0dy+9TquTEVd27fcACjqhuco4UdgYtl0b4WksEOI3+OduPks2CcEyVTFqZdWY7TiCCozaVVdBv7ypCVkUN8t8SaOw5hMmPPiGXNRoCAB5eMpMhdLbmZtHpXb9d2MdVUQhfaPqem7jPXYUVWzIlbTBqSvTQx3zc/gXLY9i960o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617723; c=relaxed/simple; bh=w7gg8llTsk8i6LDemrCF1OsQjSqJGBnLeZ97AFtyVxA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hezeGeA+KTUL0DW64aeRnoK0o+X/vr4dRPD1m6NmGj2cDbHjErYJ0WYdL7gN2EOKIPc9Lo8JucVKIvPfAztzxBKXIBNM5/rtFznJf4K0J07SlIs3DfSjuNSxz7ebEidE4DRBn2kWhDpxbYq/qPkFTZHmEdzjY5cawxnflRLsDHw= 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=Vzlad3n9; arc=none smtp.client-ip=209.85.214.180 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="Vzlad3n9" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2955623e6faso15269705ad.1 for ; Sat, 08 Nov 2025 08:02:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617720; x=1763222520; 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=7ihp9KzVuRiSrcet5QhKAfVQH/3aU+LQAUyp3hAm1VY=; b=Vzlad3n9aZsPEf0JRbj4ZO2xRyXLvh7hC7Wx+14o+RX4qHi2P5dzXQOSKeQW+5UhMt 1unUXywopmn+vwhfMNeKoM+N1TGHrh4twPhhF31FLlrAhxb7bUH9YixAuLS1IPI/N9bj Rsly4K4Mm7be2EW3YsnBWG8gPhFy8Z4CWQVSRdSoFJywLqQaPdtBcvzM/PNMZB7K/Q/4 uDCSVQG1oPrqni7rkdblk/5SSQPL1Bt3/OHL+j/ouxIc82PEpQvCUl6sRjx2MOLk1DLs PYJ4xRlJ79hAD9sWoun+TmoqDeSzC7e5jBBVHXbIJuDcKZyyEJPuPh/dtwBh0mzH8UnC Mf6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617720; x=1763222520; 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=7ihp9KzVuRiSrcet5QhKAfVQH/3aU+LQAUyp3hAm1VY=; b=FnpoAgpQPYJsqoNkzIZ4A2R4TlgASLOm/7Syhe9Vc8hX5axm/sJrvOhc/9e6IvGge2 dMNQxUTP8Ao9slZw/uym9paYOWDydHnXp/AJXLYxPZP7aayB0K1FuW9Wa5G6nhHjIoqR zGki/8FkRLrs/FeHsQTckTdLRvCq8Wpvmaaog5V+YNHrUj/0LDJFYs0SvctI/qj2tYra 3CSJTaR/VX+RN+2WdAKuhwFy4/6uMB7sXoE3lDcf5eUgbdJCW5/Vt3yoooXXjcoOK+WS cRtZhRKsuoOe4TYgjkTYNtMjLVUWcn/uNAU/90pSycZQaMIaIVQJzpSWfUSd6DZLahY7 t93g== X-Forwarded-Encrypted: i=1; AJvYcCUFAbfIdUEekBUm+VSp64WgAs6t2Avjv3Js9ATKqm8W2/i6oZxl2xgqLl/mpkzyzbor2GXMazV3hPuXuHY=@vger.kernel.org X-Gm-Message-State: AOJu0YzCvs1xqjo+QHgip2Vn+7MoPUUQwUh6H1nfEXcnezbbLqPgBJPd xjbqxbSYyz8aoOzck/pAJJYcMnGNp263K8Y/2+JTOTsNfRCqOJsWzztjyBJgyoxz X-Gm-Gg: ASbGncu7trQKTA3i2t6khiaggYUKKDqw7ZWpvGX13ijnAOOvXOpW2m+pTmfpyi7JQ/m e21TfPUmg/ac+W2wvO7PDu7OCO4ohcSBa4zGPCJkTeZYR5AcPh+7KpRxe2Ec8AjQ8ekdjzth1gr 4w0pJ9PsS5fqh2rBVxhTmmslZcEtYLG4JYJpOoSa34S08S6jbOcXExTu6yWQIZwEApyfpuiu3n4 OtaqQZv9vxU4pnWxuA0w4N2p9kj5VhNCO5g39qzYXOajExuB9iSAMTh3PFhvydVAZhgRB4JKEMJ yt+PNi/1/b4IIOUnaivGr3b3SuM30slCXhSXrvC4HgVaKEd2fhNlX/4fKDBEuIiubZoeU3UYP4G MM0e3J7WYVfBLYNbWW7KuE6+UoCDovifDqFKZhiWz1DJq3kdNg6X8+MhpmSbULuj0OaBmKfKzOB HSaG2QulNv X-Google-Smtp-Source: AGHT+IEsWYP5FLryBdHCq6QBhKzU01pCZcyukJfx4pdeg3dtTL07KkZygsC7aczWVHGVLKqYDFo3Gg== X-Received: by 2002:a17:903:46c5:b0:246:e1b6:f9b0 with SMTP id d9443c01a7336-297e562489emr34699235ad.18.1762617720451; Sat, 08 Nov 2025 08:02:00 -0800 (PST) Received: from localhost ([2a03:2880:2ff:42::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29650968602sm95152215ad.9.2025.11.08.08.02.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:02:00 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:01:01 -0800 Subject: [PATCH net-next v4 10/12] selftests/vsock: add 1.37 to tested virtme-ng versions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-10-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Testing with 1.37 shows all tests passing but emits the warning: warning: vng version 'virtme-ng 1.37' has not been tested and may not funct= ion properly. The following versions have been tested: 1.33 1.36 This patch adds 1.37 to the virtme-ng versions to get rid of the above warning. Reviewed-by: Simon Horman Reviewed-by: Stefano Garzarella Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index e961b65b4c6e..b611172da09e 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -156,7 +156,7 @@ check_vng() { local version local ok =20 - tested_versions=3D("1.33" "1.36") + tested_versions=3D("1.33" "1.36" "1.37") version=3D"$(vng --version)" =20 ok=3D0 --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 2235525A630 for ; Sat, 8 Nov 2025 16:02:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617724; cv=none; b=JSRPC/IIwoAw+Ac5uh0QPtmLIfTPlDF6EosOOKnpaTS6ajg1y4z06KXSNkAvlFnUwfdMh/L6YU5x5BFOeFeka3Slv4pEM5p4WHFecwGPAVy38B/Mr6/Wo89Vs0HeYyeX6Q8cC3jsmUael/BHkrfdpU0uz7QQBvAqUXHLAly9nhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617724; c=relaxed/simple; bh=SP8z1T+qlVVpgOEY39bC1ez51Ud9AdASTxD/jvP34Z8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CUMRL5e6TLwqj6hmVB0ysw4LLbrEeaEhMuONRZx8EKhU6NLJSBtqsCythzat4P6Q6jf99d3ge7bXx9Or8QUSAT2n63RkhLUwQ3ieYLb8EgcGE4Mu/PvkJu2Djg4/e64XQd6WtPV+Lbby+10/sDoKWbauicWQLjW34PYpHlTi4TI= 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=MZbUjJAS; arc=none smtp.client-ip=209.85.214.170 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="MZbUjJAS" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-297e264528aso6556725ad.2 for ; Sat, 08 Nov 2025 08:02:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617721; x=1763222521; 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=FYpbI2qDd2ToMrlc8dBEHmpGvANrMWIZX9h8c/Keihk=; b=MZbUjJASGHq9WCKo4LZ1khD6kB7doIIxixKz+6bZKWnzkA6k6hSFS0wDRqcNBtqFqQ 9BxDXM7NARwLpEBlQq292/UWZEniqibqq14boMsKTkRyEwI+GcoXhFw9GCR4ZYbIQ+U5 v9R7zD7iZ9kj8lYsAvLtcErJNy3Rljt6QyKIoD/VpTOGQDv812MVRRKbUqQWndDPZOeX Zw7w/5rEUndx9GtucHQCq/eS/l+ZCW2bbVvy5CrfkxxroauCMRXvKzzI2FU8MjmfC7md suaGoiVrzYgtZq0K+E4qNI/JAG06iMLj7GBl1xK0u4QVw/safJJS3meESN7B6J/tbEeY tAYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617721; x=1763222521; 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=FYpbI2qDd2ToMrlc8dBEHmpGvANrMWIZX9h8c/Keihk=; b=Gveplei8JSj/HhDakkE4FigLmn8Hnsmz5PGD8B1mIuV9QdHNREkbH86Q7YjI2C53pn jdPcNAio0havS8DaDkMASC/xmjmBkFJBiZcMxzg9exXIBG7AlffN7/rw5Tx+dWovMdLS cmkqFWvOtlrN7ZWXeAwXHhmRvsp9WGVvNj8RWaDNlR2guFFo6Ut7JrTxdirrTs/UWgcs 0PJNxDwsgrpePNuskm/+afxEX4s+7ApVvOUNmBLyq4jtG9bu2hZLnxU34PrF9kL7+Exy Sj4tXzpNPFA0dyJSU+rLbRaGBjjGX9irQUTDZVEPCzKoSBqRIGj/BHNf6E/LJPzWjCGQ sXNg== X-Forwarded-Encrypted: i=1; AJvYcCXTZZBN9UiSGt3yBwjCy+2/S3JURTIUCBMXBd7wt34V+4sdCbv0miLK1egYi60a0vN4/zwUDCaatARvnf0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4L0NLdsVvmuN74p00U2mDjYYfMWr+8/2hLHWNt7CQgE4iRUvw /EAGab8KValx3kOT8SuRdAsJtGLXeBumNYY6gNG2lS4OxbXkFEOSWlll X-Gm-Gg: ASbGncvNfZ3uc51ozZPEyUwXbS1RLaMoBnKCvcZEYqlfK0CvZ/5kqhtYu+RgqmSmAq6 8Dxc2FHrH89e8VrK+05OmmdpT9Wt8iZMRYb44QJi4HYjyHciJeIezsLOUSww3huilJOWWZ7mtth 1rNk8auN2EjgLdaTllr1nBrboLEdIkn4fmhaVAhFGq5m49BUBoAcFj2xNRLkAzJ2eHWj3jiWZjm xpplUWWWeJLALIdS72z+J0dPyuQo3zuJVkYas/bcNGxRQbRkX8G4TtKyLj1RR7najsFb1NeMtb3 k0GdxrEsahVe9DO1ibS76YvE47UPihyMu8W2o3cDAc9kAOsPX5ETZ6+1F/D5CVOxW+yc7gTQ5vg +QWPXbgPHyucov7pr0/mi79KxADYCdLls7lwTq3Pt3bUstlQ8wUhccV4COYdwOD+m6yq6zmsFUW OMuye69JM= X-Google-Smtp-Source: AGHT+IHCGCSZhbNlxrVbkMXRN4C1nK7xsiQfSpEwGwQVUYt3YG8Lt+frrWDbMAZVEikAd86U4GMidg== X-Received: by 2002:a17:902:cf4c:b0:297:eca3:cee5 with SMTP id d9443c01a7336-297eca3d0f4mr25654655ad.39.1762617721363; Sat, 08 Nov 2025 08:02:01 -0800 (PST) Received: from localhost ([2a03:2880:2ff:3::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29651042c24sm93003605ad.50.2025.11.08.08.02.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:02:01 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:01:02 -0800 Subject: [PATCH net-next v4 11/12] selftests/vsock: add vsock_loopback module loading Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-11-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Add vsock_loopback module loading to the loopback test so that vmtest.sh can be used for kernels built with loopback as a module. This is not technically a fix as kselftest expects loopback to be built-in already (defined in selftests/vsock/config). This is useful only for using vmtest.sh outside of kselftest. Reviewed-by: Stefano Garzarella Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index b611172da09e..42e155b45602 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -452,6 +452,8 @@ test_vm_client_host_server() { test_vm_loopback() { local port=3D60000 # non-forwarded local port =20 + vm_ssh -- modprobe vsock_loopback &> /dev/null || : + if ! vm_vsock_test "server" 1 "${port}"; then return "${KSFT_FAIL}" fi --=20 2.47.3 From nobody Fri Dec 19 10:56:09 2025 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 18753227EB9 for ; Sat, 8 Nov 2025 16:02:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617725; cv=none; b=h5atOmfgI8MahnyQ9DVFJv5Ru7ATPyaK7VXKWOu1N8mIPTrLxh+M4DDGzFHoMGwxDMN67uFu6fSkjIPJVYAk3dXvgVBCeMBMLNICgMPFH7vkzy0X+/L/5XwvnypRTet0uoMV44btW1cZ8Aq6taKjWhTjPHeu+fnvDTVFIuLtqwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762617725; c=relaxed/simple; bh=oHgjWws1DBoTOYU7ER4ATIFMREmAxgb84D48zVV5FD8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZjBoQaoe0vj9iEEH2boHOE4nDMrp7mEHUG8rriKI9oMlM4h6fYfH2BT4twQ/dEkI4fetyXVUaxH/+zf+bQ3BRI8hUZi3RKGrLZp7sOT3lVd0HTthTyeK8MzYBPqiz7J9tBVXp1w6dtD8ma/0ba8T/QFJbvrKGMl7laNR5kwxhnU= 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=CkMf05om; arc=none smtp.client-ip=209.85.210.180 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="CkMf05om" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7a9c64dfa6eso1303006b3a.3 for ; Sat, 08 Nov 2025 08:02:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762617722; x=1763222522; 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=golzAGu/U48hdgp+/GOKuXZcnB4/AsbzkE6v0RidcZk=; b=CkMf05om2Vg00vdJ06rUhgEfh+e6dwVRfhLlnYsa8Z5CtlplWPMkFWtPvn2If8z7WS +g+XeMeqp+cszK1pdutUhoBLlvrAGhujpZlNI/LG6dc21YGhqB7dDVepQ3nkwcwGpL07 mMMBx/MTYs+ldOHIeafzi3uV8nYeFAjLU3tgVwOqSlzSD6X47sYlgWV3QsMPddeED21N ZCR4nGepg1o1cTgllW6sZpPxsMsXLOO+CgcIocAvXcvK4uGwcmDLdq1qA1ktDth0dRKm Ed9siiIBSO7s6E7Juq7y7ETuYcVVxhsxQbn8S/h3n0/r2H5YjRmEXu33lw7C5kvpEqCK bS6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762617722; x=1763222522; 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=golzAGu/U48hdgp+/GOKuXZcnB4/AsbzkE6v0RidcZk=; b=QH2OZ3HwcE2Mz5qKYUPUKzU3bX0V0J0jlVaP4d+yDJF8mvoVgP1lGO4vIwMzWmAbxD ecGDKFhX+CDc/GdrPczt1mTb7QHxfW0ZU1GDLXSHX0FvJRIvmW7ikBurfg60QdCHDAau Ecyvi3ZBcKfjYtylQrvFzLmx/AZT77tugBRBnHrT1fOok5jqGTwHDAH4v2CMi/1P2R2K u7ont/ijy2n+wPXZVCNjm0xvDzLAK+JFUzNcNq1HkdcynNMtpG5VmCBznevBrimGHM4G svdQNxQUQQPCAefYBZu4oMBkJke2L5ENF8B0+ZqU71/5khQs8f8GcEl4rjvGJ7cqLIRs jrCw== X-Forwarded-Encrypted: i=1; AJvYcCX7jKk9JaHF0mD7fTORAo/gmPr/6cCzqCDGRtFXZSoExSdAbXv0d4qXQWI2aIiSwy9DA2Z7q8tnVMwMuqg=@vger.kernel.org X-Gm-Message-State: AOJu0YzXz3l9/2c1wKcCd9L8vfO+ZLncqa1vf5B1rvblsylmoFbkbcZN 8yO1fWb7ic6pkhJFdL/PT2svw8WK4Y844zB4iE25qUadl/nD2DksXYDp X-Gm-Gg: ASbGncsg0dl6EGV3Uk57Ojqg73SCrAx1ZT1MCF+CqpX5UGgLtz18H/7Y74q6tVSMIie eFyfJjoj8NAX2mFNK9HiQxy3JAW4ID4Di2JnVI5EOhAPE/68bO81P7pSQQMTcWlwiZQVHPld8Ma 7BqtlKP5G54IaJHNZm6WSEPCzNev+jcTFyFIBgQKI/NYRAPJdf8OI/Jiqi84shlfw8QQ4kC49J/ pPxMbIHGyDiKhSH77o+GoigRJa22XDYegRVu2zrTgsyH3wsUUQ7fJJkyTqUtpOCvPdAg67BEHHt FaWZ/tSl/2tQ4yeCVfqW58mDlsYbojnjvFTniZfhlTi7rYFyt93gQ+K8GBbIfDHfRlepgl2FgFa Tas1KrV/RhNgG+WAUVcUrIMWduvRuskYG9Q5CI3jJl+Zba51qx94X3FUn66AZ6gfftIzC9gG8hJ 8xUPSb89E= X-Google-Smtp-Source: AGHT+IH+Vi5K6pMe8JfFAOXim3vTcOSLSn5qC8SzCV1Ipfc/i/Us/WTXuuK7P37jiIt7Ll9os7AY0g== X-Received: by 2002:a17:90b:2708:b0:340:f7d6:dc70 with SMTP id 98e67ed59e1d1-3436cb89b05mr3302246a91.13.1762617722221; Sat, 08 Nov 2025 08:02:02 -0800 (PST) Received: from localhost ([2a03:2880:2ff:7::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-343727dcf3dsm2104024a91.19.2025.11.08.08.02.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Nov 2025 08:02:02 -0800 (PST) From: Bobby Eshleman Date: Sat, 08 Nov 2025 08:01:03 -0800 Subject: [PATCH net-next v4 12/12] selftests/vsock: disable shellcheck SC2317 and SC2119 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-vsock-selftests-fixes-and-improvements-v4-12-d5e8d6c87289@meta.com> References: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> In-Reply-To: <20251108-vsock-selftests-fixes-and-improvements-v4-0-d5e8d6c87289@meta.com> To: Stefano Garzarella , Shuah Khan Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Horman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Disable shellcheck rules SC2317 and SC2119. These rules are being triggered due to false positives. For SC2317, many `return "${KSFT_PASS}"` lines are reported as unreachable, even though they are executed during normal runs. For SC2119, the fact that log_guest/log_host accept either stdin or arguments triggers SC2119, despite being valid. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 42e155b45602..c7b270dd77a9 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -7,6 +7,8 @@ # * virtme-ng # * busybox-static (used by virtme-ng) # * qemu (used by virtme-ng) +# +# shellcheck disable=3DSC2317,SC2119 =20 readonly SCRIPT_DIR=3D"$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && p= wd -P)" readonly KERNEL_CHECKOUT=3D$(realpath "${SCRIPT_DIR}"/../../../../) --=20 2.47.3