From nobody Fri Dec 19 10:56:30 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 0B68D31352E for ; Tue, 4 Nov 2025 22:39:10 +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=1762295952; cv=none; b=lTcatgOLDB5Cg+QOL3VncaKloLf//ylefS6/1xMliCeFcy7WjEHasqjMvAWQK1blL4pz9sETurY4si+R44SHcS+YqEui0UQLgeCHftcWXH6uSYWbln8ZAkP/a1uSYFdfy9WFrdUzZmOd62n9Pbp5SFd+/fEr3X7fSKR6gFSkcOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295952; c=relaxed/simple; bh=d0lXSaAPV1hSCbv4riJfsbPBoHPeUelaGN5Zg0VyKzs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ls/fcbbdXraLaInT+yNtNkWdy2+mr+taH5D5aetl6eRCTj9SEkYOSfOpIP9z4dxijieMdTEwCJ41yPCWs3Xpsy3+PPQZt3RXk+SX9850vG+8H2QMcF7uIInl1d+tp4lJSZqkBZa5fskEOLaEIq0FmmaeKmqRZyOrk1GO2+ZONE4= 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=Tq+IaYBH; 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="Tq+IaYBH" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-294fc62d7f4so58395235ad.2 for ; Tue, 04 Nov 2025 14:39:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295950; x=1762900750; 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=8SCnFxkAKvo4bMRASv7XIHpGepGtL4M3i1ZyZegDajE=; b=Tq+IaYBH1ZvjquGGM6pV2Uxv+rsFwYW4p2GqoKwwitOgI+xMa1/O2vLTYJ6XT8/s1V HFOkXieNN7z7q9GWlRxw07kPuDTYblPzlQdpE5w7G7yB8cCaQBQxLnRVOAx3x6GWOf5R HbeeeQ4IJNAD+X28gpbMphlI/EJCEoxuClVhp4EA11oEaVghVV+dQNgQwt8WKbTljgoi jMyNqZtwqgPpRmj2qXF3jhh4+Vbo/N5K8Qmx+EpEtrdX2kxbKI+KnPjCuw5PnlSsxXd5 MXdAitSt4wC4u4mJYsmiSb4ytUEeujIRXAjUrZqUZhV58Vb/q6AAe4YzwuBdTXpDrSeT z/6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295950; x=1762900750; 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=8SCnFxkAKvo4bMRASv7XIHpGepGtL4M3i1ZyZegDajE=; b=YmDreOdC84LbbVWhk9So6Dvb/AqI3vrz8Cgs4GlxQBlGFbWZgDYmklA5egI1a9Qs62 Q8YftNy4InLjf50FKDwypTs2VCdBq4888XJSSTMic7LCeF55GzvX9cVtZieDEJ0NiFvx /mzVUb5mTdZpGNaAJQjHUJh9dWD1g90IgqQWvGWkvMlOlzQp1+ThbGs0mjyp13MzQ2FD YqN8uCocnNZvJC/umrirC9Ua7hCqc1b4GH/hf/0yas8vz7HFt/MBGmyaCibmKOPJ6EFb zzDiULjYnA+d2xzJKN2N0P4lhhbxkiL21RZcWcBhat5DXsk0sSXLFwMrgzqAgv3WuFDt 5UdA== X-Forwarded-Encrypted: i=1; AJvYcCVdEPJlB+qbnDEJyEv9VT9kKSnj+9FVl18jXi2r4KEQeSwCW1mnpJjEe0pjsgRK/z1Co/BqTQrNwkQGLe4=@vger.kernel.org X-Gm-Message-State: AOJu0YwmWChjZfHvOw2jPLbdDAfJl6ORmpxau4Q9o5yvdl2uKLw/a0qK Qzfd2TIfuPBj7UR7uW8Jk2CYel3apIdt5Mm2ZWHMwFnNwkQmersFtJj+IJoeyw== X-Gm-Gg: ASbGncsV2502B9ZnZ4rhowMWTLkJ1cp9xAU3SNDRYaO0hfLIUUXgxAo+WJEuBGMFGka xyIpk2Crrr6DljcwtHsJQx3pP2dAUXMr9z+fGh68nNAKBxkidoajp/oOd4bOdYMZYo3hRq2cT2W VO5AGoBuQmbKZaT4Y3skzQeJSp0diBM6Ul+PglLwzEJbNJVr27SO1iP8mDZfW+vkl2DkMkGYOwl AwG6UuY3r/x1PfRPR/gvrc5aWiF7FgoIx5Pjq+U60CcK++Q61wHp5WFHbWZnfyNcZ2T/xgPC2yQ Xi2e2WmxzlC1VykotgbjBArADW9UfUoeg6Yvy2WmAf/ywLmaJdz9Cjx+0OnclU+xnbTnrNf8lqz NWwzlFbY7kJaVwlMSzB91RYe+F3AG8WX+EYOpn68UVYyqZCYpNNXcLaWC1iodWS1aToOMm+Gf X-Google-Smtp-Source: AGHT+IFj0ralhxCw9gtXMNxyl9Kpp7b0xZeMtfhdxLBXWpHqRS7iX83xZgLhRxoK9y2BWDEiCj0m4A== X-Received: by 2002:a17:902:d2c6:b0:295:7453:b58b with SMTP id d9443c01a7336-2962adb29cdmr12165085ad.4.1762295950273; Tue, 04 Nov 2025 14:39:10 -0800 (PST) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601a609c8sm38264015ad.92.2025.11.04.14.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:10 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:51 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-1-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 --- 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 edacebfc1632..1715594cc783 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 | wc -l) 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 | wc -l) 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:30 2025 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 ED70133F365 for ; Tue, 4 Nov 2025 22:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295956; cv=none; b=UFjLeXsZsMr/Ot047ifazAhEQdR2fQUxmG1mGDwvwDXLRQ+iphZ0TgBtwSGM3D8+kEg5jRb/vENe2a4/YB6772xmj4nX6JJ/qozTO3deE6Qa16Jsg7ie8xUtlE4kl1xolv6D1QS8mS0vZKXrB6FBUm/5V+ROIlAgo7RagIZp1JY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295956; c=relaxed/simple; bh=MP2KoZXX+79Mi4EOxuj0JaxBOJBdoc+sCYGsGHNCwUo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B6HeppY0gZ5EEmRv+P5ZokYEebwslBMUAuNQkf9du9RUpc4zA8sOz22faEqjAiuOyrpYlz/Wrqf6DI+QxZcb0uMRbiUavrCCIc2TIMzpYiBjQREvpn1dWVnENdMyWRkSmaVgkQsTDgFF40W2YdLLL2ICxoFUAx6Lf1KoYxaSpP4= 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=Ghumm7Pj; arc=none smtp.client-ip=209.85.215.179 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="Ghumm7Pj" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-b5a631b9c82so3763407a12.1 for ; Tue, 04 Nov 2025 14:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295951; x=1762900751; 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=j2TtF77uA9Y6v8jmRi2a/W5oTLXZ//NRPnuqn89vDsU=; b=Ghumm7PjRqXPAsnxOBc2oQIiGww/tpfuDykkyRIgzJ+5rMGZX395wg4T+TEasn/6nO KZ1UHkU9oAci8OcLg+7qGS1hJgnmzFCSi3N4W/1Ji4P2E8SAG3KwjhgeLtGa7sMEAZiW fJv5x7DXAnvgAQXqtqTNfrlKjew+n6k12B7ufE4Yn1zgQypFfF+2KoQXY32G3rlx1nWL BGkCGQAXbBKrj4dvrH9rcwvl/vUo1U+n6D8snWKNrxrzWAPD6gEIfXGWN+ek40ITjoew Vd7Ghxbm2uJE0V8pOuBLxJfM3XXRsQrV2oxJK9jUF6F5FBUzEhfIRwnEcw5DbKXZmudD UFrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295951; x=1762900751; 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=j2TtF77uA9Y6v8jmRi2a/W5oTLXZ//NRPnuqn89vDsU=; b=qKFsrip47CLYCnTO2yKxNWVX0tk/oLnOVYrgkM3VBovSctwkjPwiY07ujqAEBVKkS+ Bih46YxHTV7aNk6FGaD0uF0gUZW0azv4/VhV0bIdUtdXKIL4JEPCHv5y7+aFym6Ni6vU DkuODzwOWKC7Yd7NEziun2uH3uL7v1t9JnJ0Fcpl23C2fsJpSMPYt8LSftFKwk6KK5f5 NmYVJtLL2tO7QlocEIo4n5N2VLsvTxAKdCiqyLYQhcVdggpvI6DxbbIk/Qf0vc1ppu4R sb0Timm/UpN9g0yRHzuhwOv4rymzEMJ6iGpr2NYBOGIcu+iK+bhZ8bN852UgR1bbTU/O 92Rw== X-Forwarded-Encrypted: i=1; AJvYcCVN6TDEwbWG28rTtw+GW5UPQiEd/R3ZJ2MjQFfH9+62GNsdRNWNaNOTabgMZBSnEh/E/Wx16L+1OHYUylY=@vger.kernel.org X-Gm-Message-State: AOJu0YzgcvnIxd5XayCpPAu+pe6iY4CYZKYa7E20q3Su4QcrHtX0z2JI jMZQRIBn9FcoFrk46gE18PIvf6eZMmKffZUjtThJO6KhkH/vaEk/NGlf X-Gm-Gg: ASbGncsIRtIEI7kAWDel3Nrgj1cLUkoYZA5edaR9EPiCi3QrLrJ/5QRV3eDfhs+Rzfu iT0otjgwu4ZRiRfxkgrst4YKxtaeiFeWpkGYeHtWkzJPzVXIF/qJspNrWtcT5pUsQrhFlP8QQso iw60+nVuJyO7RRugkAF9E9dEgSbifJHJGaFWF1TJ2CvAavdwf6tfzGicYcM0FzkCnEIdtPceGFt SkmBfhqsfC9h7unqVrtA2WZj1rJyoHJ2Dn3V+b0uPv1vRzVDSypItNmeihKnMNt87NtWdYsy1Fi rteagn41eqvMQD6kK3jgtPWLV78zMYxOAyhwqb2jSywhZpBxzE+SKNdjExQJvLHm2CEtrVSAqLf c4gRnxusEZMFKssxsCs5ucGR9WKm+56AP/PjqqTeefhNL/mHZLxz1F3xyeoGwvs4aKAKlPQmr X-Google-Smtp-Source: AGHT+IHjLept3ve48AUPW/GiyFbQHZFSoms2OQFSZb1ZP3j5dSJ+0pBWFTSSrVMg5PH2kQRmlJsbhw== X-Received: by 2002:a05:6a20:7483:b0:34e:63bd:81c1 with SMTP id adf61e73a8af0-34f839f5a57mr1249874637.3.1762295951213; Tue, 04 Nov 2025 14:39:11 -0800 (PST) Received: from localhost ([2a03:2880:2ff:8::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7acd324680asm4163732b3a.1.2025.11.04.14.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:10 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:52 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-2-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 exists, 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 --- 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 1715594cc783..da0408ca6895 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:30 2025 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 E58C131D741 for ; Tue, 4 Nov 2025 22:39:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295955; cv=none; b=YYold1Uznapvlgp8ukrrJpdKSnIvZ0v1X8NbgCro9akyM1qCkNiMFrtxqExPp3Hj2GJkJtdVPo9+QZ7uWsuxZ8UT9BQz7A/zivHPK7kEezIiAgCAUnK7gAlB2KBSPsoSLMckjU0GWU8Me5yX8CkS+upgvT0mYbmAYMg+/rP5FrU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295955; c=relaxed/simple; bh=/8284WgqZBkmvYo7p6HbzA4BQ9SwpvVlj048Ne45Jpk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K9kd3QQ1FeGvRcuU5+l0BIXvLHFJFBavyqLjmzw+MoaXPa6Kzv3x+jEzB7tZvuLnM9Zjgq6O9j42Dk5Id0UknOeHn8rLdGy5IkMJwWEzO/hdmGdksnEdfxL4EtODqt61/S4YfluvrciWAlujN/et+QuM3wBrSaPu/+4t/m/ovlo= 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=HpGdT9ZZ; arc=none smtp.client-ip=209.85.216.54 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="HpGdT9ZZ" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-33067909400so4336918a91.2 for ; Tue, 04 Nov 2025 14:39:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295952; x=1762900752; 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=IZp+C4CcVFJXBROG1xENTNsT1iMwKGcBzeNVL/tTmVw=; b=HpGdT9ZZSUGCLKyD1inkdmnlnbkltkD0Q4GGENk3x2FP/lJKQ3wUVv1HHiLHHKJOs6 R68ku1OWN2PdHS/5S7qX+Cmpbt+MSaGjNm7qmkeL2wxKxELCH6lCubqQ5f3u0hFDePLy lr8VvhQiZdupBi5wZYTeLrUGrmEp5sb/cQSOdFKlkjVRasYgET2h4Q5uY2uxQrpyp+Rx fxL6tcDMCdULiTtFCTU2kLsL8KI7nfiPBavXk5eallKdpJKqI2yIw7naRvkOoRyqn1+M pwiAwsPKkzZPUX7mA82sV2S6D/HvkQufp9p3caNcTeg1nEa20xS1XWLOV6HxYLMsxBDB Ox3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295952; x=1762900752; 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=IZp+C4CcVFJXBROG1xENTNsT1iMwKGcBzeNVL/tTmVw=; b=vUXkoB7JuJFiCMRwtFxthkftyC9EBtOfY9/WIlw8X3kbKzez1T75ndKVUlz1+1YtVQ W1XAo15ELPMAzINj0PXwEhXmzsI2DQpWG0zA9zoyuCY3m+oE9g++BCH0GhuUkQHTeDQo /mj00aX4W3rb8U8T49ZLb84+fYWFM2hV0p49mROYuZjdcg44KyuhHYbwfZUTLI5ZDEeD 0eviLDLz+jFFT2DIHq9p7Vf3fHulydZ2iwe2k1I9xWwvNt74ovfcsDEDiA4GZsBqOQ3F 57aM1CojpIHJKmeL9ECozK6u+P81hwE0pV8viUhb6lBAabqLnLppe//wXkElmBXecxav bvWQ== X-Forwarded-Encrypted: i=1; AJvYcCXbgE9BR2QnVry8It8Jz24flRNjbI8m2BnKaSXwEY4L5kQwNp0QZKRYMKQJwz1kkWpztLXb/d1Z0TIKybY=@vger.kernel.org X-Gm-Message-State: AOJu0YyCR+7mjN2QaJ0UPpcFIPgmdwI6uo6XhQrC1AwkuK0MvW1Ynivv dk0K0mSdokcDE3YY+v1r3xYBeW+APNt9wyFAS0NJMjmZNMFYzoLyQJHz X-Gm-Gg: ASbGncuXK5+MNGiyTNjvqhqRN3BODQon2JmIs1LRgBxAyT44B4kHdXvyj/9WGHOX97J vyw8AXQ60RY/qATckp15Qywpz6MF7ickGWsP7dV5uSiArDcAKf6tugWqS+hBL48qYB+iD4bOWtR mVdukdoLOOd00ZmJpcWzGXMFcRktnmSutN0wjQTFBstjGENmXPlncgtgCJxUaZRqE5eKM3t9jpT qi92IWaNlp7/1+AjS4/sY6Ipv4BGnZOrXBFgNtvfa5K3Nt3GIlXn0qjMKSSmr/YbjbMOhvtI3oq JDLZ6mCZvIjk9MsUSFlNKbyOv721+V0op1gZq18hJU0XiHawIWcbNDvlsBq1bngYEqR6yL3fwsg 7llribKw7lY8PCD56e+EqUCyIUjQVbx42kOwTNkv3F9ZjFlWW96WwnFKiq8w+i0NdO6nz33LLQw == X-Google-Smtp-Source: AGHT+IHtBPG9OeMS+uLaPZ7VQjgXPmnJkhyPQNwSqGa6hD901ItTF9A+GhcbDo+Uvew9U846BuIvcg== X-Received: by 2002:a17:90b:3751:b0:341:194:5e7c with SMTP id 98e67ed59e1d1-341a6dd6953mr825767a91.24.1762295952118; Tue, 04 Nov 2025 14:39:12 -0800 (PST) Received: from localhost ([2a03:2880:2ff:72::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ba1f18315bfsm3432766a12.5.2025.11.04.14.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:11 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:53 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-3-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 --- tools/testing/selftests/vsock/vmtest.sh | 130 ++++++++++++++++++++++------= ---- 1 file changed, 91 insertions(+), 39 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index da0408ca6895..03dc4717ac3b 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -273,7 +273,77 @@ EOF =20 host_wait_for_listener() { wait_for_listener "${TEST_HOST_PORT_LISTENER}" "${WAIT_PERIOD}" "${WAIT_P= ERIOD_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 =20 + 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 + return $rc + fi + + host_wait_for_listener "${port}" "${WAIT_PERIOD}" "${WAIT_PERIOD_MAX}" + rc=3D$? + fi + set +o pipefail + + return $rc } =20 log() { @@ -312,59 +382,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:30 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.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 9FD09334C25 for ; Tue, 4 Nov 2025 22:39:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295955; cv=none; b=sfQmMCFAoi+SeP0LefgPYEmd/FNEBIpJvMhv/AaExYuhyjDwEF4lh3ZmC28EgmqFUpqU7AjUemxOWUDe5YkVUDwc8cBg94m06rG63TXxDQ8gqOiB6T9kAGWr2J7a80ZGfxlNATCaVkFoZxyEucjw7e77g2meeuOec2WSF3g3GCU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295955; c=relaxed/simple; bh=qaM/YycVu4RVy+bT1TrwTWoAn6/Kw7T+6Ey2I1qpe/o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nx40KLOsCjYiHq0WIcJfzzVB7jEy6QCMv7DMKaZlaVwiDo4MNHU9RnIfxLU24NwaAp1ZHrbVtjur7m1v2jRNEjkzljaFzvHFT9jD1jIDlRaUuhgWCK+4rBPQ6B940xvTdy9CR/OK/QzqvsLnpyC4YOy2flqwZbMr+sPGMGvX4fk= 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=RYMDxhOF; arc=none smtp.client-ip=209.85.214.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="RYMDxhOF" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-29524c38f4fso57772065ad.2 for ; Tue, 04 Nov 2025 14:39:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295953; x=1762900753; 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=rPomieP6y6cKKzxkcHQHYffWFCMJSj6awEpxYtimWiU=; b=RYMDxhOFseWUuK4ZoO6Q4IpPqgVPdE2SlsRFQpakBaVDpcGimutcZHApQ0z4phW8ea C4H6iQkYEwCdgGeED0o7m8tEL5AI9FoS6ReiQ/rjAcsmcdD61RsZppNP4HqNxQxP+cYS TUQzcdwqSiEpSMbIcICfT3tSdzwcTYIhIJB9N6LNbWXCnj2krvY5nNyw+6XgctPc8umM kNr6oR5THiOQanRxh7rcPfDFbGNmPdKP3N1dVmH05G4w6bZUJ5YJAj+VJK2q3OdMnWJC B8dozfD9+/qOZKy9ZrRF880mJuJ3rXOLi+QE110AxPo6RrbUEFc9tTzUM+Uk8cpYIQ9w un9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295953; x=1762900753; 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=rPomieP6y6cKKzxkcHQHYffWFCMJSj6awEpxYtimWiU=; b=hu2awfUPMpT3ZAeOn8kwb5CPUjU7zFcudHle1EIsaE381ZKIAJL5IWP+bvbOeN6iqO XqKXx54msdULbhGKv+HsbPTeUU+DCpSaERD+h3ARKvCL/2SdW6mdczQ10cGPcIkJ8Jqi qarnV3FfAl1tCJHBFDqPo2Ahs6j42gm4A3dtido27PGBOK0du36sqWghe7ypauYL7Rp7 SloQiZLi53HeVxU8+1aoeMzi1AeJKDkKWyDlBIUiAZsApJY1MXDPqdQyg+jk9e5al0iH xD58zKm39EbS11yLxQO661izTEUm54AUiO03AVmVKzBDdD3nreZ2vlZUuay3B07Iu4BI ejKQ== X-Forwarded-Encrypted: i=1; AJvYcCWHezE2CsiG4KFQlyOL8LSH9tczne6NglFZ/RVZuKEAlCjIcT30ZlQNbWxhgug/aakn5K9Vq8IStKzBUHQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxVfzu0UCynYKqDv0ekYhdSlxR0MuvMZIbpGem4JqgUWrs5xv3S vxvPbegx2YEkWEpdBmWUI4UkmIyKg1mv+Ya81U6Z7h0TckkR6LOKXnO4 X-Gm-Gg: ASbGncuMcWbddwQR6fU1Ki+YwnOimLcssuUVAcx/vnHacn4DxkhL37kGEAZE7bkOEUX EZFT5a1M2vf6kawRPG4H74zpkC+DKfG5SqFORujLU3pDn9sGQikk1lnyMtBx7zSaLsPwGZVYaCj gdwheFhxbch9IVJTmBKi4v0VUXeqmzomaVkkhJ+heNiUWbC6r42crdNaVVvm/9kH2/gl/nIRVP3 5FI2l9R1+pnqyt2M7jEDeEZvcX3n+sGHNEtKrPhtiIc+t1znuh3yBnpMacZ9bBcbvfwcTCiCjuQ 2FBSMguKNBm9am+uYmqD8h2iC+Z6vqhrwVAM/LZ6LJq3YpPc9Ida4Uge7SHoes/EIr+b+/kvc6W Twxg9iU3SjhbdMEnw5k1YveLUTNrfruqdMq1M7F6iljdnw7VmhvVSvAnVv/Rmnq9JqB8UsvD+dA == X-Google-Smtp-Source: AGHT+IHD3n38ktdMLAtQTdG9dlRMpp5+qaB/a5F/5Hc82s9u1whde0uAmROI8lO0PC79msxpg9QR4Q== X-Received: by 2002:a17:903:19e4:b0:290:cd9c:1229 with SMTP id d9443c01a7336-2962ad1f5d4mr15355965ad.19.1762295952976; Tue, 04 Nov 2025 14:39:12 -0800 (PST) Received: from localhost ([2a03:2880:2ff:45::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601998336sm38421705ad.31.2025.11.04.14.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:12 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:54 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-4-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 passed to the string assignment, and prepares for future vm-specific options as well (e.g., cid). Signed-off-by: Bobby Eshleman --- Changes in v2: - mention QEMU_OPTS changes in commit message (Simon) --- tools/testing/selftests/vsock/vmtest.sh | 53 +++++++++++++++++++----------= ---- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 03dc4717ac3b..5637c98d5fe8 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -23,7 +23,7 @@ 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 =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 +33,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 \ @@ -89,17 +83,6 @@ vm_ssh() { return $? } =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 -} =20 check_args() { local found @@ -188,10 +171,26 @@ handle_build() { popd &>/dev/null } =20 +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 + 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 +200,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 +215,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 } @@ -480,8 +486,6 @@ do done shift $((OPTIND-1)) =20 -trap cleanup EXIT - if [[ ${#} -eq 0 ]]; then ARGS=3D("${TEST_NAMES[@]}") else @@ -496,7 +500,8 @@ handle_build echo "1..${#ARGS[@]}" =20 log_host "Booting up VM" -vm_start +pidfile=3D"$(mktemp -u $PIDFILE_TEMPLATE)" +vm_start "${pidfile}" vm_wait_for_ssh log_host "VM booted up" =20 @@ -520,6 +525,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:30 2025 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 9317B3469EE for ; Tue, 4 Nov 2025 22:39:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295957; cv=none; b=D6H3/xAFpz46zTc6nGXJJ0C6mzcMG4GAmowvRlsKSAPg/n+VbTklhZ3XKGjrnKIrAE8pah33g+ZuqHz08iP2EnGqlMepln1Z30QnpP8l9xLtyBdn3ZdXAXdV+NU6iASsc+gPogZZSe0dgZCLpPyledNe3SWUcvuXIBFaMIDH1ME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295957; c=relaxed/simple; bh=dKYcrUk99CdeL/H3uIfsCxfnuKjJF+qFwDzoOr7kT4o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UITTtUrKL7PI8XAdbp1tabMc75x54TlxkZPp6006xGdgpinlWaIdRAbMDILEO0nfsrYL9MVN1+KUvJlaWbR9Dulc7pYtcR9A64mJ2FE5ce9ZTNPxLW4zxoe9BnXskvKAAMihk5SoWJ2wcM0bO0E1yG1tntMCF/qhpX2E871Zlog= 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=CzY0SXqV; arc=none smtp.client-ip=209.85.214.172 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="CzY0SXqV" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-28e7cd6dbc0so78611805ad.0 for ; Tue, 04 Nov 2025 14:39:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295954; x=1762900754; 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=UDZPS+JOEPYnU4eck4h/T1RWdETtnpWwlslVEykWAIA=; b=CzY0SXqVwyO1GCzWMmjfNiQTq99E/p1LfzZkggbERkoMjPYz9sP/AVKSOa7Hok5Lhl vvH5npWNZVEBO/GQeBie7IwylCiwqBtSV+rxXNPrXjLTARr/9f0Wtjrf7Ynnn6uLrsv+ czHhQA2Zy0xaMT0GJHiwNxlisk/MRuZyTWAsM5eXL3UwHsAtqv6gng0kBY7xEjnui9O3 YwOnMoUfR7zo2yWTfn1zooEzEMqSRNnTsKjr7eezuKvrEhnfhpUGnCDp9TESuE86vPrb BMrke6JwS3NRyH4IlcwT6uq/ITVse6DCjYqMy8YkW5ZJMYiMXS40VkfUd9/ZR9Q5MqPA 7mqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295954; x=1762900754; 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=UDZPS+JOEPYnU4eck4h/T1RWdETtnpWwlslVEykWAIA=; b=k6KnL/7+HnSup/ClKU1uMVbJpdJAI38D/jUCKJzMkUrX1P2RdathJaQgcJzsO5Dm1w X0KomfYlIkgGt97FURfXcgpFacapJ3ItL479ohroiVHjaEaE7ab74T73Pgj/KU2EF7SH Ka6kzj0bVCMmOaDgFKbilqFHLIIMb7yZEDnEmIfYow2uURRYQzxJkummODTL5+euwWq9 XhLYZiA5jLSLZpTAx0YfajiyMNPE1pbPTSDSsiK9NutJnRKlFmu3EnOQcZ3sz4urB67e i1FFVcvx9Fr4L4XFrYXGBarO0qqbDNhFAxLC0jfavSKkYomxI2JJRu0Amq2KhTXbSbYi mWfg== X-Forwarded-Encrypted: i=1; AJvYcCUwknqX/mdQY/fRO/8byFDVcyor2J0UnkwHW8e44dyoLIFCvIZ3rtr2FmuwSr5+HP30nrENSBPpHeOAfKI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxssm61EYLJVXe8sFRLC8miwzOKWqQP7g17x7aEY7CxbdKW24ad xSWcw+VnNJ2mnoqd58IFFkLklEDbx9LApMJ0+/i+xDImEe5D+DqkjD5W X-Gm-Gg: ASbGnctRy2dTlgVulz0MgTK0wRhZzOM162EI1cBnkkdHBNx1VaOIh+N0PREKl4MY6e8 HqyaPl30Ttq/izamR/oAWToZCdqfSPcdKARi5Vhi1VipHB3KhCYLNmnTdqKrBm50fiX8DnFAQ/G CjThuPOXfNJpz3s5xBfNNA5fdsbNVMhDVp5QX2KOSGmQnjhz5fVIWI1TplLEw2oypNrogBq4Je7 rVxgt4JFmHqCZ2/OPaxF90U7NBcsIVcyWnhDpWnj8KDDU5NToe/jQvOxYq8jcaO6lcBG1LTAlyB WovpKSJV3ctTnCePy54IuJFGbhO3ucuiLXvqM9Kx6cQ5Ki7dVL1hprTHJyuf3gUFMlhQvJULxAj woHgxSZ8tn/l0vzpL+YgZdMqM1QtQCHH8DQkgCc7ZyP++pKQiKtvhMCrrWC1BuDjppumLYqdL X-Google-Smtp-Source: AGHT+IGfGmQ8EXplL0hPzNqnOeWP5or72IZ12giPyrZz4vb4nazXJcS6uZFq2FRiYWZU3H7Y1pH3yg== X-Received: by 2002:a17:902:ce89:b0:290:b14c:4f37 with SMTP id d9443c01a7336-2962ad95560mr17604575ad.30.1762295953856; Tue, 04 Nov 2025 14:39:13 -0800 (PST) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601972a36sm39340475ad.1.2025.11.04.14.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:13 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:55 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-5-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 --- 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 5637c98d5fe8..81656b9acfaa 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -221,10 +221,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:30 2025 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.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 8B3F1320A39 for ; Tue, 4 Nov 2025 22:39:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295959; cv=none; b=RlViI85S+QaHf9YH28eATe75MtrGF0/nIuHp9FklKx2KFhrPw7Da0dAhqHqPkg4tA6+tIixOvydcw0mm8Ekx9Xi3e28uQBCjtSh/6TICQZpv40/VZqShUX8TuNgM5O4BozHg1QQicZhAmmjHlxiQejWvmy6/gKnEimbRuuI/bbY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295959; c=relaxed/simple; bh=hLx98oFksm1euOd3gRvzTKc2fkdp8CNEeWRtz4krUsE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aQgCohFH9/3Ke0xaaofc9Qn6On+FmVOHjqMZVDjxQd7whkTkdjxm00jZnQdc0aNqh91qQZTk37IyGdaufE30aUrU2jJSkh9rLCcFQt8GTAEFVN12s79nPsic07eGJFdX9l09J+oU4ElwzHokSozgsRA59/wqxugHKLETnjQrtj0= 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=HMLbSDWH; arc=none smtp.client-ip=209.85.214.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="HMLbSDWH" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2957850c63bso3073665ad.0 for ; Tue, 04 Nov 2025 14:39:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295955; x=1762900755; 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=7NPOoIdp5+m43RuZesJ5XJFKTqD36Mp7WZTcw49QJWI=; b=HMLbSDWHK18Avq74DI56BBSgIkRB2C/MfQ2JDwb8qjy1/Ukni4jFk6QZkjR+FXwzX8 nNwUaMT306RKmz0Yr1I+ipGPg7c2w8HeYEfmpjXLGnGUqCo6QOMdBSR+oFlf0YTScCvM IEKWT1HKomSIRLODBZAfoDjImqNd6VZEcFmaSv3Ij2nZE2GxnvFrNJSNpG8TF0pyG5Gc sKSjbQ5kx/rF7b4/emj+U0gdEEgNj0exMS/44IaF2xDRMikgPqUNiZiF4Q+45mVYD6Uw C3gd9xqpoOVqw07SyeClO1Utou6poiEo17vC6Qt63HBlQQVQK8/u/epWSEL+XIb3pC61 lugg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295955; x=1762900755; 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=7NPOoIdp5+m43RuZesJ5XJFKTqD36Mp7WZTcw49QJWI=; b=SVLTKSY8a5XxTmFhsYBGyH/wiGkWDcA4zZBVnq22rlf/mFvVFANeSAz0p8v2D/srLv FX11AKO1yKdMKeDt77yuCT1CTAUFfXhETkl8BSVgNFZH/H1UY/xmMzjBD6gu5aIxKb+T WlPEnohgFFO/C0CofpVqs171BKGuCHMy5LrKkjxT7Vy2wsDk3aeUh0uMmUFaZVVg2SUu 1f0XnlA45PUuJgStgsnB4OwUlmUhc2/AxOHri7kPClDsn6XuEzMBrZDWD/xD3o9BWrJX HmuJ7dINMJA532NLKsYZv3+dI0Pk50OvoRG251/wcm6x6LAjkZT+Au7HFpie5gwRy5Dv 7lMA== X-Forwarded-Encrypted: i=1; AJvYcCVWwgdfYsLW8ZQIdORoEQYBX0gTGb0YDV0EJJl25ZEFrYeu35geHMUfSt3y7LtzxQQBPy1jsswBHdk+XFw=@vger.kernel.org X-Gm-Message-State: AOJu0YzHmVCtB5sZSH4h6Hdy9/YoT4q9lRtHjhvZN9T2QBahSk48mTOT wIeiljBmwG7f0xFvicVh0vW74s3AZiDhsMKgjsQOfYlnMDZoqVFuykfV X-Gm-Gg: ASbGncsRfLtbtXEyOWO/g1lOvpqVqBH44mKo3kPRwGPyY3i2/nYUU41QBemXv8cqsW8 x0IkFFjZYlQxYyb5hSLK13CDZ1H9DzKr549YYPSywseYO9gjY90GdnFMRBsd9jI7e1yHzJpElEu JuAm1j2z5F01rwG9VGJHnN5d0fhso4deqdNTDbYvS9Qb0lY/cyjS4LgRf77E/rdFO9RyEBP2Fn3 rmcxiiENbtUjnnmVUfYxYX4g70fKl3ba0g3UvGQTwTAa9UM85YzrbwS/USORMhuLaf0Ey7EPnx7 uUWYTmRgS+Ab0L8I+Ze6NdwbA5rkpF2TUJmLtAyzYtV1KVeZsYRBlB3dmUSi1Y/NzWukrxSa3fc SxDfNZxr8chZpmAPVtHVsP7kHpnJF+5xfpJmI8kFBKKVjoWQx03PEmHkZjYwpbb8a56sm9fenhw == X-Google-Smtp-Source: AGHT+IFcWJCIHYENfyxIioaojYZp29/Ndik7t8pPlyOLj+vibXcfDiidJwI3fcQfTIxtp/Uq8IFSMw== X-Received: by 2002:a17:903:22cb:b0:295:55f:8ebb with SMTP id d9443c01a7336-2962adb7080mr13883295ad.21.1762295954777; Tue, 04 Nov 2025 14:39:14 -0800 (PST) Received: from localhost ([2a03:2880:2ff:47::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601972ac6sm39637535ad.8.2025.11.04.14.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:14 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:56 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-6-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 --- 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 81656b9acfaa..940e1260de28 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 =20 # virtme-ng offers a netdev for ssh when using "--ssh", but we also need a @@ -221,7 +221,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:30 2025 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 96678338F38 for ; Tue, 4 Nov 2025 22:39:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295958; cv=none; b=u0fx4ZytZHFOWsDHnYUAP9uxhE8++2zJ62bl4zCltqGXJuaBgo4uoas9USxTvvRSdb/dN7dKG61Z3baf4bJBe5QqdDHCiFSsX07zAlqg4Fhn6gZaLCWF3fHm9znAHc6yUxTIK0RU6+h+8GAEp+3nB3jj/N0wEWZkr1tX8cUfroc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295958; c=relaxed/simple; bh=ZD+kE7Km9hitPWcu6/+QvjzHaUtwlQLzQuuF071Kneo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IIpeNp/bc8sAUiK8UflFZMpHe8AzFbHDBddbrN386n4tpjXdE0OkytCTdCb8Z7XvJl25lIEoJWrLhRNrDNUKDj7TQSYPpTOZM9f8VMH+jLAnKciutHZ+iHiTQ2JHpSzdukaLBgCSMDk6PQ6O+i8vR3Ij0f5j1YP72WPV1/ks76U= 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=boJMujHm; arc=none smtp.client-ip=209.85.214.175 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="boJMujHm" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-294fb21b160so42881395ad.1 for ; Tue, 04 Nov 2025 14:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295956; x=1762900756; 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=+FdVSUjHTikcWcPgapXwx/mSIY+mfI9o+bTGGuyPCvg=; b=boJMujHmu6Bt3LKiTEKgcbvVBfY7HcPy5K9KmLyUNkJUwTk265Cmn7PMMtaPVPgvPT LvofcFT5lMfzwyGMvdGbYom+GUft2Z5DycWraiGGqDmDXqcsmeG00ItEEmsi0YygeyUX wO9z3lMt/h+5S9P4xdTX7fRrmGLeJq3KSS2UdwC2Q2nVx3PcWMrHE9ujSEF0SeLSrX9H CeOx97xEPD5sgQOcqL3l0LT8SdNkf2nXZQihKdQRyTHAV7J8oRF/PIm2pXsGMBGtQgbX pIQiE1cuoIOxaIdqLsePaij/BsvjVbNTYLUZKaybC2v2zEiMoFTTUJ1qcyXVq8C+REU8 jW6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295956; x=1762900756; 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=+FdVSUjHTikcWcPgapXwx/mSIY+mfI9o+bTGGuyPCvg=; b=DEZYh4idbE5HXExi+Qn662SDC5/nUc198EXuUco3QWLyqJ6oJjPON2v2ixOZTKKx5w gC8DnK+rybcDm/m0Q8NIWlt0nzHFBahxUPZ+AFveaMeOoRDT6sSjkVZlLEM5TZesJC6r IxlEOEQBv+PL+pBuXx+XExRVphXgsVIaO6MTHQOZ+DfxbvgkkWlSlr8g7WmK9Z+iQh+l 4CwecDD3vtm/hZad6vE66pc2TTfAs87YSjvc6v8VxqIUrdCRNDaXVZNgJkNCJfFzjJVM YbS4sZg5RNAkL41mMGYIF4XCEXgjCYKUq7FHcOjiO2yLh2NHCoWdCUTJTXw+3Ylfu5Bd ikcw== X-Forwarded-Encrypted: i=1; AJvYcCW7sdBkAVyj+BZL9pvG3HKYSb2ycliPVrAR10l3b4228JgErOl3xN3/gfyT5k5kWi3FU66EC7YOmTPwiyc=@vger.kernel.org X-Gm-Message-State: AOJu0YyiPGrtKVrBOhJlfp/g3fUPnOXdzykeUV231/0fBGcf0OIAJrfz XGoZTbOFO4rkmmuxkMkzSQkQlw4pNA1j6+zsmXnE5wBnEFzY2yi5Q3rZ X-Gm-Gg: ASbGncsJKDNLEP7i3r/BX337ro9MRIIlO47WkHFqGGKNm4xKFZ2KAh/07D5Hy+t8s3n /sNNO6hhABLElUCTAq2MP+lFEYYRL0RxZSVsAeI9lkthxJBVbhkmUAgPNfc6cZ204X7tb5DUfhM 230dcyFkKTq7qsLImD2jZcGzIOKbfkfrrlIeGqCe3Pj2dCO1x3V1uLFR2xq9ueVYmW57wflu5XW n7lWFz0Mn7LbbXM/0MVkasmK46xPwO6Vxxr0Aglp+IMjDCfCcq5BKtHCFo2d34THW6uSf51zqOj eKJB7MvRvAKM+s3doHk4HHERn2x9FcRkNYsgEi0RMYacil0t6ahvxz2r5keVqs6HZsT7Soxceaa b8yi/ABCiGwhVWjbbftRh2QkAplWyZTVtMZrz/AYIqgjZo3py3W5Aq9mSWxNnGPUOngJneBo+yQ == X-Google-Smtp-Source: AGHT+IGE2AJdLQ3ih5rbl3nytu4JYVPoufSf2/AeWyCovMJpVIx4Pfkn2JQACMKcx394CGEglGnVnw== X-Received: by 2002:a17:903:2447:b0:295:b490:94bb with SMTP id d9443c01a7336-2962ae75808mr13019465ad.50.1762295955674; Tue, 04 Nov 2025 14:39:15 -0800 (PST) Received: from localhost ([2a03:2880:2ff:45::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601998893sm39091575ad.40.2025.11.04.14.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:15 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:57 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-7-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 --- 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 940e1260de28..4ce93cef32e9 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -78,6 +78,26 @@ die() { exit "${KSFT_FAIL}" } =20 +check_result() { + local rc num + + rc=3D$1 + num=3D$(( cnt_total + 1 )) + + if [[ ${rc} -eq $KSFT_PASS ]]; then + cnt_pass=3D$(( cnt_pass + 1 )) + echo "ok ${num} ${arg}" + elif [[ ${rc} -eq $KSFT_SKIP ]]; then + cnt_skip=3D$(( cnt_skip + 1 )) + echo "ok ${num} ${arg} # SKIP" + elif [[ ${rc} -eq $KSFT_FAIL ]]; then + cnt_fail=3D$(( cnt_fail + 1 )) + echo "not ok ${num} ${arg} # exit=3D$rc" + fi + + cnt_total=3D$(( cnt_total + 1 )) +} + vm_ssh() { ssh -q -o UserKnownHostsFile=3D/dev/null -p ${SSH_HOST_PORT} localhost "$= @" return $? @@ -510,17 +530,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} done =20 terminate_pidfiles "${pidfile}" --=20 2.47.3 From nobody Fri Dec 19 10:56:30 2025 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 7C0B43148D8 for ; Tue, 4 Nov 2025 22:39:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295959; cv=none; b=IOXJowtKU5prHZcttNhIE1a6rUGDAJ7jTL2tNAoT4uJJH6i8TGduNHSSHkCCPvm3d3zlG5yeuf+vgk2mMkwgg3cZ0N5TDWNc8DIThvIN/ob4LpliHHKQ70JyZW/lGRXQGxG1v25jehZhyETAlqYdCS9SSW7rh3nAxGjOrx95z1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295959; c=relaxed/simple; bh=6JthngltpkcWftejwxT4QQ+XaYtKnwnkggaq1rsEx0E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XRPAV70M23Cdl9KChS5MGpTJZva0rQXS8TCW1dX5ee+0AxJpVrIXW05J4P3LLr1IL1aZpgDTLt1t9QGZVs5uIgiOgsnfB2MympNeTfZWpspCpONW2i7VbNFOekN0P4/lIIl3hqKfrsRnV9OvpMz5GhxTL7gIdIyoh4UO0Cmhlzg= 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=Tx/F4HeD; arc=none smtp.client-ip=209.85.216.48 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="Tx/F4HeD" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-33be037cf73so6249927a91.2 for ; Tue, 04 Nov 2025 14:39:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295957; x=1762900757; 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=xDsH9kNNXBt4JKt5mitfCe2Rq8PZuvGot+36QHyMJvw=; b=Tx/F4HeDm+BFKSyBmuLkmH5BodI95/gSDjsipVOfv/1NFukSwECQX8AkHkfoW84fUv M8mflcwUkBtSASZAh/IsaJnrZlhTJbDgsEF+NHTcLtKPKH0R3ow7J6p5ucBl2EEOQCbQ xs4lmoD1VuuG3yvLAsm2ef9ELx2oc5RPWHEe80LmGPsM8rXcslXx8WBMvXbaG7gJ0ZGf PSpjxCY9Tkitb7ShVKCgiimy4bzjxUiJr+oomoAdaCNhOa8ocNnsLcXgSJeyflhxca36 x0rTLFYaiw6augijMlOWnaph9Clpdirpu3dexf/xi9laVdfpLeBG7UnzOR69znv5ocLt wK1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295957; x=1762900757; 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=xDsH9kNNXBt4JKt5mitfCe2Rq8PZuvGot+36QHyMJvw=; b=j7V2VUNxYWT6GNqN/Am197hZv2Nr+tXroB5swuSnTsGUgstq8jeAx3rsIjw3v/XvEh exJoVLr3U8oLBdzddCGL6o43JeWTBVx9oeaVHR46PmSPGjm7uYhiex1Q/MkjdhjX3V7v AM6DMvfN4bD63znRJIrtbHVvvCrrVOiRorXYd8KwMvdf9ISIObAL2qzAi0dZIDDpYg8g veg9Z2UQ0x5O0BBIDY0HwZHN9W2O5QqzPiQAZ95LK3EBveO1wSEoJ6p7MhLQlBxMZFQn Gst8xnnkIsWV81zWFbyaQnpk2NCs8ZJ+6DEGghmoG7f4mMzasi/B4MtylMs4PCGjbtVY oMEQ== X-Forwarded-Encrypted: i=1; AJvYcCXfobgQkUYDArDyjRhkqNGOAV6SlJgNDXrtDOGUnfj3wbOFJ7BneDZgK7LKp+4GP6q3NTS5BR8AMCdp8T4=@vger.kernel.org X-Gm-Message-State: AOJu0YwThTAJa935K07crREUEosj2p9rSgZ7wxl7ejA3hA/SjElqstzA ILZeq3oAzETqqNKdlopEg0pFz8iRDUdDgpp3VY4lGzALbTouTlbRum9f X-Gm-Gg: ASbGncuBpq4TDYsr/sTXlrJbx0hYOkGsr9IY8j4kAox4OIsbU2FwbwNUbFPFviqjnmT Pr3Dbbiz9NZdkQQ8oueZOpdoY+A8Hy8lioZJ479NuJjSbjYxuD8RSUUrEuTiTPIKsnPj/+54YV5 cmqWcXq+HLR4OpDQjiICHd1DamxmtfDGbnnKcdHv8ylzHzO5VUEjTvXThKnvgweLlJAoRA7qMVf JaqmZIjxkPteRXihlPX07IKueFs7rMNenme4oh/fxUCFWsdgyYuRJ3953qqMnVXTOhmsuJsaHIj B+GhDhAf4zElA1q38zQ9WMXdp/Yor3vzUQ/b+8Ug2N84i8Xh4011XLHXuXTn2smzy+FjH7jAfvl E2Jtnq5TA1cDl3JbOtLdkQVX/LhlFS4DURUC4IdIDWZgsbWnCe9cbM4fFVudlZuG58e6j/1rOdw == X-Google-Smtp-Source: AGHT+IGmcX9KQhrwLWD8vDeS4NjjuNE+rklNtcRnYnJAg/yp6Cd7qau2TSc8kt5ZpkI4HpwFXvMX9w== X-Received: by 2002:a17:90b:3e4e:b0:33b:b078:d6d3 with SMTP id 98e67ed59e1d1-341a6db60ebmr937766a91.23.1762295956648; Tue, 04 Nov 2025 14:39:16 -0800 (PST) Received: from localhost ([2a03:2880:2ff:45::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-341a68e4149sm638270a91.16.2025.11.04.14.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:16 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:58 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-8-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 --- 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 4ce93cef32e9..678c19e089a2 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -45,6 +45,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() { @@ -443,7 +445,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 $? + done +} + +run_shared_vm_test() { local host_oops_cnt_before local host_warn_cnt_before local vm_oops_cnt_before @@ -517,23 +556,21 @@ handle_build =20 echo "1..${#ARGS[@]}" =20 -log_host "Booting up VM" -pidfile=3D"$(mktemp -u $PIDFILE_TEMPLATE)" -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} -done =20 -terminate_pidfiles "${pidfile}" +if shared_vm_tests_requested "${ARGS[@]}"; then + log_host "Booting up VM" + pidfile=3D$(mktemp $PIDFILE_TEMPLATE) + 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:30 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 6618F347BB1 for ; Tue, 4 Nov 2025 22:39:18 +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=1762295960; cv=none; b=NGLmlt0j4WgpirvJc49jQg//qn68r4pWpRc/OUNCBoJ2tP1OzNDvuRl6k297mtHFCyToNzuwMZpEVPDkU1tD3xnt0l02jlPWIOvnlHAv0Aqi5rfhQeDA0EUoZfb9WsTynQVZk2MjDcIBS13Uf/u8u9XhQRGBaSYs762GJA2OqbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295960; c=relaxed/simple; bh=7hS5R8uladJKmxaJNfzO1x6DQikjdO3QEQ54fQGP0Vc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KSXXGxjyMi7/k+FxB8D09RE5XJUSKDiOhe/pHNxxOplDzTIJIt5sjUw9CFrZbTK1J/B01VgjxwYmd53clPHJLAkCq/o3kLFEiwRECAF57R+/3+dFp6Pc0KPAmzGaZWPoDkdcQPxq17nKqlHB2lOrm8aoxvT5ZX2E2tg98UA6rB8= 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=aZjn6vaH; 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="aZjn6vaH" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7a9fb6fccabso2619191b3a.0 for ; Tue, 04 Nov 2025 14:39:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295957; x=1762900757; 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=9VT1vOKbccZAqGQoV04Y8d/n2OP/f/9vyCKaFedGSLY=; b=aZjn6vaHRogYVyAK/WuCWfshe4SPG0wBvertMFrVtsB7U7WG47JSpNKb6r1IjkAGTF TqFsDr/PXwNpJQ7v4EVqkTAxv+3mb61vW6g+KcqcZKpvEXR4hFQUHXEiEBsz7ySexFBJ HwE056DDm+6OJnA6fM4MIBNYx9FCs9yaNGkUPEmVWoBsukQhIIUv5eiqyX+GLAlJ6RWk Nl8TKvf56vhYfUp/Sh/EpumRRp5URmZV27NmOzvbNkT0i9ZKkX5g4r+Xv35ux3BKmeVX 1byXklnEmS3K9R36qCgwaCLm9yZbRP5I26OWK/Nn8gEOnhuwyJSIDhpOiTjTGoDx10KH Cuqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295957; x=1762900757; 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=9VT1vOKbccZAqGQoV04Y8d/n2OP/f/9vyCKaFedGSLY=; b=Av3E5D4B3YOJdfbin0JyhRzCfEDaibzs7SY+DEduXgsRsyPumrQ66k3/sZMjIFGwml ivLHNTzOmAOF/8T897aKNprvfhhA98qFDwe6hF3K/pCmshUagY6ExZ4CDUmiqlxYRhHv icCF1yWmvfIVw4TYka7e5X8p5lLa8fDAxbgatmKJaB4+JiKW7Q/lGO31jxOBJZFw4Xb/ gdQ84RjQeP5CWMDATtzqCQTJ2At3cbku6o9h628YsEBpvkb3nPvI8KpHNGTuVYpNY7zY dJPPzEW7MRo4p2bdgsng73aHOebMtxV47Tex4hMBRPqxzeIXHaiLLZOvMuJ9lKAUbtPM iqpg== X-Forwarded-Encrypted: i=1; AJvYcCXvAEqWXxMWHPHAF71aGuyJxVDHxdTZwyUHoaoSWTjQ8P1lXaPp/0IOHvvaHKmbYF5Z7L9GL4BYtUmIf1M=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0/YD75GTUsw5EBZhfbWg06BY7Z4rIa0V2HsCLdp/4ecSpJyrW NbRCij+EiLLfe+WrSutMNr8UnVmZAtGB0yenK653ljKx6k+qiTZTbQt2 X-Gm-Gg: ASbGncucZ+DqgzugnRppQbypQMfroDdGyRfxw8lMEAGNu1CwQbK+qphvcJpkqEqjFP4 C2vVFyFJ3AGkGWB5gq3ssgkCFfjbXbifgvhkGcoc7oZj8ZdoLHu9OH/LZX03lxpQsa9kuFJltBj jqZ8nr2xRVGKTUOF4EovrYoSHE5krg5nJGIHFklNTojtdUnVCogNDLGpZrKZ+JGdmLWrZrwGcyX Y8VE2Rb5hWTHZBqMv5No0uPFKBG66CdDAFNiDdrpROxFq9KD71OzZhsW4K5W/t9lhWuTbvlK4hy wv37RFgn6azL1zlDH4wufmkhsZOK5nrh242mgB9GsuhtDbVRsGWBhb65D61G3RGaq5Jp+kgTCW3 57OnJAvU/48KgEfF3qgfVHH/CaCb8d+dC8bmo1fl1/RNah/q3ZizMr9IFzCw7fXCojf90sFqUrg == X-Google-Smtp-Source: AGHT+IEBJAtsIuttdN50ovmDUWQDLmggku0Oz7uskPksnqBRyI0KQxzEkePGlcc8A5fgJ1MA9GtMgQ== X-Received: by 2002:a05:6a20:914d:b0:2f5:ba02:a2a2 with SMTP id adf61e73a8af0-34f853f6c97mr1247028637.36.1762295957592; Tue, 04 Nov 2025 14:39:17 -0800 (PST) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7acd392040csm4046430b3a.19.2025.11.04.14.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:17 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:38:59 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-9-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 --- 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 678c19e089a2..3ba9a0dfdd01 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -530,6 +530,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:30 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 3D257347FD4 for ; Tue, 4 Nov 2025 22:39:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295961; cv=none; b=GfoX1iuxr2OtL/zMX0QLcgERZEbH9Rxx7I4u4ehgxID/53OQV3C0i0AnEJha/ItVTJi7+KT7rK00is3yBtNyXjeZ9h2OcjTqO/5rUdVXGv5bQsISrqNhAQxiwAUzSAyiaSl7bBgxjI9yj7cu3sJUPG7AiUGnt2QcincleXnIcvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295961; c=relaxed/simple; bh=XlP32tEwpZirdMr7sqd9mNrUqkac/qnWShul7Fw9yow=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ajgtjq1G1Uy2fiAZnPi0LyPS4q4/snGqxs+rm3f+QaXQhIfHkb0Wkzpfsl+KqMgbTxu5Q6DH8yfTiZCuQpRF+Et57u+HXo2Tok7wZb7Kjxp/R52rAbWL0rZ7w9q6XwAPr6PzkQ7/9ZB3EcZ6rN0w8Vk3T2A1fclcoHMKNuTCh0Y= 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=G0ADkr9B; arc=none smtp.client-ip=209.85.214.182 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="G0ADkr9B" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-295247a814bso66332715ad.0 for ; Tue, 04 Nov 2025 14:39:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295958; x=1762900758; 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=/TRuhdOoSSGipeIAHAxq+HN65/ys/fdjImQ5W470jiE=; b=G0ADkr9B9NpB2Bim0ypTHP3Mt/+mWa4mBYdFMoZrgxG+XmDpZ4hxIQwde8PAioo9vj YzWPL8FeNcoFD23u2bvudw/FoErDIYepIqTHQGYgnXvZd+Yy2XdPBl9JEBZIfTzViE7u 20/XwvC3PtnqWzZhKFLt2QpsT4Jb4Y3y6tg/xeN/sh9XPR0EGPg2RgMab7SaIPSttdMK OHNp5LZuPDjU4fHufrYI1mA3kimf8JACMa+ejHdhNWAyPLOc5qHmuCxQLXTZmc3HDy/Q 94rr1MV5GJxDgVezXdBZUzW7K/V9WZXIe/Ea9FpIsWjpPMfLJFWa+jjjsKWtYd38diIh Mxgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295958; x=1762900758; 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=/TRuhdOoSSGipeIAHAxq+HN65/ys/fdjImQ5W470jiE=; b=Dj1l//85UzCwFnzf7PCXaTllvewvfEljuwZcb9FrFZEG47UiJW/5rxv3OorjV+fEkk pAryBmZ3yiD6e05Ucp6QTVrobU9qoainOhYMAiX8im00FWtqodCs5irG5BPVVqni10S7 5QVUVS3PVxDqlwwaGUIana1uUswA3sLGANuorFir9svfiVkw9Jp4aab/EXbNj0Rl2UCJ bHBf47r22cm6k2ImkGNR4YR77+6/x9cMeV7LGbXS2B3FZe8ALSUavhRt+LxTRfkpJrea MGclXsamspslNfc+KZmyeKRrRyl9Np+zr1GPdqr8BnYqogfLJVhp8ceFEfyNzpE+6slT lJZw== X-Forwarded-Encrypted: i=1; AJvYcCUkcid3mQBgHXPqAZ/FitOkZAajtbUX70qWkE8VNDFV4wiWy/m2vJIJzgH7Ef9bVvK2W55YDMSIVUvBRHo=@vger.kernel.org X-Gm-Message-State: AOJu0Yym2WQBsdD/iaT7Sa/KfnGuGH6okjikm502x05O3wH1vMSdIJw9 /LBxHgPsW1lUjDzWanVuT0Rc1b0aviOxFi674ZhOAkSmyu+EYx/BH8tm X-Gm-Gg: ASbGncuOxY3intQIi0R/O/mLIELDvpDx+uMhPYBwCWY41OuugkQ3ZKT4xDQlgMTjk0W zkYZ7Cb28Rir26SxfAAsOttKTDXltn/nlcBYG8dQXfy9MLAvf7t5dyr6hIx7twO8I+Bh5jtyjAn CavMb4eejZcl9jUho+1um9mHExqxG4WTNmf2dO6e+T/c4VKpJcsDkdZi1z3rzxGzT0yJ177qGSu r5i//ZWXoa28LArlIBJxI1fQ0gxeAgOA02pzwXMB5oxLSaCZ2aSR6k+HZcJzK6pre16QC5nPu3o H03qli4exBtdp/SqxT9IoHtejkdyY/8WKebb9KqjZPENhQiE6yBtap7WHFZBXajURg84qpuVcWD 9fqbZz1WLZkiqk4il1GJGtiN/CIVDyLuTOWaj6ihdNm8d1jsQCanW3G398nnD2KJu988W96sF X-Google-Smtp-Source: AGHT+IGkcKOy3RYFgLwyd/NR+t0Lm3XzaO4mSqwdUYhsWqQ4Xq3qCSzgiAZO/1PlUw5asRlhZe6BpQ== X-Received: by 2002:a17:902:d488:b0:26d:d860:3dae with SMTP id d9443c01a7336-2962ad83389mr16923805ad.3.1762295958422; Tue, 04 Nov 2025 14:39:18 -0800 (PST) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29601972a36sm39341705ad.1.2025.11.04.14.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:18 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:39:00 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-10-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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 Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- 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 3ba9a0dfdd01..0657973b5067 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -152,7 +152,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:30 2025 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 15B15336EC8 for ; Tue, 4 Nov 2025 22:39:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295962; cv=none; b=KigJfwvRtgwxg8/2nEc8E0EibRe5shKf0CMDWFkEzGIrTDVytaoHbe4hLvJvsBgt7OkGzJ3FnNC2ofdWiFM419LUgc5+ajJr2TQCGbeIiOULP8GbKLMWRSLLjQxb02xAfMxAyQCyyUF0y/Hb81Pxacd6V6POZF/zJIUO57vplN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295962; c=relaxed/simple; bh=u5DCKGRI4IXZokQzlkyrjLd6GRAOJx9KYjbavhXUqwk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hqeGSlUNJKXO4MGL/ZsDFfYOEuCGc9D2WSXIYYzeKkSDcmXQkt34psDXx0BLA1uJrWtUmuOqne4hD2U7xgWUsrwMP3adeTGyt1ZS9C18xBuZ0E76NefVKgkzGfmqAxe8KWYirRWXPFlk2FiCImJV6TNmFK2zQNj+FiIhjxmjFPs= 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=ejuBuseI; arc=none smtp.client-ip=209.85.215.172 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="ejuBuseI" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-b6cf07258e3so3899962a12.0 for ; Tue, 04 Nov 2025 14:39:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295959; x=1762900759; 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=cnQ+dtcwjsJ29cwDu8qPf9gVDNI9igpgmiF2m60jenM=; b=ejuBuseI87JgAOzxRxrvLReQMp0JqqTJuPhOkvguFpn5nVDSO7/KW3d2+gTEIvk/Oc AOpa9KH6TvDYhKlesIMiiLBYkMxZtMPHTwRAwRCUCkiBuKKDQF3dFntCgupiT2YJI5pF gGd8AaCHIiE/qjqhsZNMMIpgxWZmt2OUSMACWpEVymnRkQZF56QYfBYLL+lm0cx1g9j9 zuiGhe83Vv55T0wkVszwmb0WqD0CS9KYJ5eiGlBxBtgcCcDzO7eR37ES22neTVCf+Dx0 ZENQLGCNuYhnuQnecfWarMcK6EzySMaiCnjkZ4C59HODLcdv5jNKo3fxBQHa/mKw68EV q/ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295959; x=1762900759; 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=cnQ+dtcwjsJ29cwDu8qPf9gVDNI9igpgmiF2m60jenM=; b=Y6hbmv0svPlntSen0ftgBAawIxz1CmTxbRWGqLm6/BTVpxBGiGFlCFXIw8IBfV/zGP b22QVdxY1fx3gPvHdaiK5qfgNbH23hRlvvYLoj7AMx8yOYIHmX32z52jeq3+TjmqusjC DfRZCFT3gBus0zyUOd06ZwQ/Ykasd3u9sNPvrf2JMaYxoxblzC5oUtcpO2BiChXJroJl N+lQ3oQoSPSv5JvDNH6sFJeWqP8ugb8XjKGVOn/7NlYFvC0ixJiNX/T8amN3/h3WPqQt mOAVjhTqepuO5ioT65flKrd9pScxr/xUNlktT7pbLJk+js8Yrs4zM3IOoCK6Zffn0L4U ei+A== X-Forwarded-Encrypted: i=1; AJvYcCVdkrhVdPMNR4RFKkD3wFEpRBog5A+XRR/ZOiEhB1yywl4ss7c3xkhA5M1ZNv2EEd4mc0VyAE21yKWZ5wM=@vger.kernel.org X-Gm-Message-State: AOJu0YzhwytlUkMEQ0ZIMMz7MN/NPmIKn9gpkmCcjP7kfIZChmvoPq4q GjzLcI2JejZa04NbmzB+4rHgVe00N6AoomX3XLZDdSyskpA5HYQfJnh7q1+zRg== X-Gm-Gg: ASbGncsU56OSfNvuFAUIPeW5ScZ3dgZ9oplxIecAO/Vww9EXM5Wiep5mgC5Wg2ReJQh VqKG/cIDvmT4taCby9qUH14S3ClEDNqSlk3B7FVj52SmruwiAxmixKAT0SOtekxr7rrGGQ2F3eo IOIk/YI02Uxn+4hQL5PWwyMvDRQLJoJU4Va4AYhzk5Z1fAcnVMBg5+xdFLnslBIu+iyvNSopagF 97S28r2LPNL0HMYSlYlVnzzo/nFBCFi8UaKeR2MV0bsMRCGdmNCTSZQrLOLbmC9W/p6SqL+LHoM XYzcqzlZmQQ2YFv5dGgrcfPew1UUeDpHLEoocws0xZw3b4qowZT85vJytmFN5EPnIlyFO4Hroz1 ndbCo7kdpOeSr54nNQmjiq3TJr8Q8yhpOvZ7oJoSvOXgB+tt781u/Uq8hdKIZy4zEwtP2JA== X-Google-Smtp-Source: AGHT+IESw972+NQugcgnm78ZKTviYmRok4BWA0JCtmd+JQgIjTPldLbnjKbimXu6x1kSemHZnD8cAQ== X-Received: by 2002:a05:6300:218c:b0:34e:63bd:81b6 with SMTP id adf61e73a8af0-34f865ff9f0mr1241428637.57.1762295959215; Tue, 04 Nov 2025 14:39:19 -0800 (PST) Received: from localhost ([2a03:2880:2ff::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7acd682163csm4050602b3a.61.2025.11.04.14.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:18 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:39:01 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-11-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 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. Signed-off-by: Bobby Eshleman Reviewed-by: Stefano Garzarella --- 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 0657973b5067..cfb6b589bcba 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -434,6 +434,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:30 2025 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 13AEC3491E9 for ; Tue, 4 Nov 2025 22:39:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295963; cv=none; b=YzXadRfZfKiSFGqRu0oxP9N5C5LQ1ed2+XaxOT+ood9oggYyUxNNwSlHBE3X6UuUQiCLkD2a6V0EKzihh16dLHH+VmTJbFfkKykgtbwZ00r2JvyXzN+b9t2EtPMz6ngcA+QQhuPxc81eHFoFD2+7jkicc19cG/Owbtzj/D+tdyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762295963; c=relaxed/simple; bh=n+S3IdSADlP9+aYaZkaHpgaj3HAWH7tJS0ebxViFg4w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N/H9zo6bo5FRyEF2KFY4BQfRcM1XLiX0FEts5A4Fb3q4Os6CuRaQgqDpxULw0sWiPCkl2YAhj8CWbZoCjFTz35oAg7Guh72bS77hdxIGElUyCf4mvu2L4SB9e3D/Mt8V04MGI7TBwpLmaUV1t9t43RAPt449ljA64o3RyafT9GY= 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=jlnCmINT; arc=none smtp.client-ip=209.85.214.172 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="jlnCmINT" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2951a817541so67784295ad.2 for ; Tue, 04 Nov 2025 14:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762295960; x=1762900760; 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=louJU79g2eVK8rdbuOIXqwqI8nr9ZueJcAcohNn7EZQ=; b=jlnCmINTbpWQSbKj8zW/Mh98969tNXgDbMZtEWFo19Cs79huIExaTv+VDxiOBDNFWA o3EsPAJYCQXDENMrMJEJEz3drbXNSJNDNq5qFd1o4gWy6XV6u3ojCw+u/IDlkqOXbCqW u5tJkiM5X9Nk/oLY6pGbi6VW+RLQqfNB8T2uJsNBNEceeJ67IKZy28AOtB1/qHRn4nbL FquzmjelJ8GXNdKHT6xh0TK0773IXq09RJxVKTgPLwEjyCb9FDEI2a5UdVwiMXWcabQK ROSz5if01uIT6ddKWnaJjN79QOlxFin5WOViwObl7wb2WGaBvVRDdcLC6DpEqbVgLSYE Y6BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762295960; x=1762900760; 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=louJU79g2eVK8rdbuOIXqwqI8nr9ZueJcAcohNn7EZQ=; b=ctGEPkRkklZp/YCJYDmYlg2hAKcvolcC+XZQPyegXKLVTHC2PiisP8jfTgHtMnEoCR sQlkGjKYJ56xVgppD1gVYB6YB4uEss6krvygrDUnDXSLnE4/PFIT53/CXAfVSASh3zXB 8vFCi16s9hCK4BBtdXBLsNEo9vAe+qGHBIAzEK1aSuYIvEwaWg2AotkSmqkRP/OERx5R daK4LBGK0rWwGeFagiY+ZqnvfhDgUmfD2059cyIkPAhS/aBrFd1gX15MukrUo/dgYHBx gfFVU13Qjg4l4GDUtgz655JpWw5RfK+JIof4YyvRTbf1pfh5ym9QgC9sdcN6A60kHuXU +8Zg== X-Forwarded-Encrypted: i=1; AJvYcCXkgml5GnXHbpSZSPkH4vxotAw/Ao0rxKF8R3E/rJqk5jfFG/LUYe3WVWWHuLABxOWHhgxkbdabJOhkx2s=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8VlK6Mrb/gfc62/nh3j1zAvlrhcMSYPw7+cz+hACrdOB1VPaR AFOv8dbsM5kd3cKz88jPjiq+2wG6zkOXcx0/yNOtvZTcz1txCBpVlq0/ X-Gm-Gg: ASbGnctMzdbwX80aPaBxkWSjLxNQkUmqgfFgp6M75vjPVkyGC8k8s7/GyNavO+pIipP iRGKmPUrspOuVOA3b/TBhHM2pNeLbqRBJL9B7A0FAqSt8iDlxieP1hkDa6bdGQU7b4yDN3n1odO KCW5epLJpWEQfIAOSn0JNZesGedltTOD6PMSzAx6wrctcK0H+/ygmYmpo6qYoMNHoeq+P28AEd0 uQxcWfjegZejbaxq8sdLCKzp6PqiHJz15HqLJweriOL+JXFGBjNBOUo+ki0iD4+YTBhx07yAEMD UTZTHa8C0Vhgm+350VPMeOmZ+qYyxhq81qK4Lu/3ziZpfc2UUc/xulwtkF+5hdU4mARojpiMG+s uqdGiQNSTP4Bn0QyF4xBQt5tRO9E5X55K2b7TylXlHHJ5iZuVTIy9P+sLDtSFkS5eNcetqWWB X-Google-Smtp-Source: AGHT+IGqM/yITUFIcVMiTb5JYv2w0Kqx9gT7akPgWVpAVZ8aDi3SBcd1PdYtAWJDT/UIWXG9sHA8og== X-Received: by 2002:a17:903:41ca:b0:293:e5f:85b7 with SMTP id d9443c01a7336-2962ad0c942mr17413335ad.11.1762295960355; Tue, 04 Nov 2025 14:39:20 -0800 (PST) Received: from localhost ([2a03:2880:2ff:2::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ba1f2a7db8asm3463802a12.14.2025.11.04.14.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:39:20 -0800 (PST) From: Bobby Eshleman Date: Tue, 04 Nov 2025 14:39:02 -0800 Subject: [PATCH net-next v2 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: <20251104-vsock-selftests-fixes-and-improvements-v2-12-ca2070fd1601@meta.com> References: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com> To: Stefano Garzarella , Shuah Khan , Jakub Kicinski , Bobby Eshleman 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.13.0 From: Bobby Eshleman Disable shellcheck rules SC2317 an 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 cfb6b589bcba..6085e4cf56d5 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