From nobody Mon Feb 9 00:38:59 2026 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 2BB0919F135 for ; Thu, 23 Oct 2025 01:00:26 +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=1761181228; cv=none; b=KVsFQhmFye65UcSbrMHCfZDPcbfDy2bzAB8RyBKeHJ7lGQQ11WMG3pYYPQCQVXwysSHOBuZ8zbCwHG67nJXp5BI2LuukvTA/3+ZzAuFH3ML8ncesXGxiaj+utBw+2HKY6SFxBji6W7MkLW5ZZ6CBeah+kLDZ4hJtp0DVrtIeXP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181228; c=relaxed/simple; bh=U0+iogbO2NAE9Gz/LUnVfHwQ3vHz0eclu+dJB7jTvdQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ucFpqh6Vlt1u/DV0iKGyPuY7Rm5NKfHXQZQwYSYY3/3QfVfY9R57c89DGfNbBrpgPUZEYFox7APP3Mhr568e4kdtftuUAl84kE4iQsPLZa2jxvZh13RUxk+/GgoPrkQupSMF8Aj3dcB2EBUZNbRIB0Jlaw4wGjuYeWF0ApCgFuI= 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=lityToyL; 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="lityToyL" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-290cd62acc3so2595705ad.2 for ; Wed, 22 Oct 2025 18:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181225; x=1761786025; 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=oW0MnMyTuve6rQX9Tu+VETj6VkCGFjnMpCoeDie56zE=; b=lityToyLvMUq8FlSUl6Tsxm1qVzadU4iTan/Sy0y02mIdMe8/NyGkcc9Uw13L1Q9Z1 Z3Zr8RJdu43IArHWkdWmLS0XOinSs6TcBTwyCC3kzhS8PpZhaLpSkrxS0E4vN1tIlrre QK5o1x8E059pa1Cva1o4ryPlWKX49Tb2JaBe7pvsZNJ1VMZj4mIdWkU+AEtUB2bKlxXQ RnU3TqseRWA4TmG6WlXy6SMunph7OmDWh+JyTqFCok/WnaSdIiYJCHCde4eo1k9N0sQj HztylMnXU98k6JmEJTc4BT0SABWPg9iy+IVqfs605WZuZWaJvGN+GQXEHaPo4vZnXjs0 04DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181225; x=1761786025; 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=oW0MnMyTuve6rQX9Tu+VETj6VkCGFjnMpCoeDie56zE=; b=oWf4lIth0d1xEigxcrD87El0eGB4l1tDqTG5SrRAt7YmxNYXsDFlIiYYcG8lnO3Ul/ e3c++YY8oKSAOLCHqVltNTb/ezJnkHp6MpWy567Qab3mqTDsjCZ6RS4P3KvCu/vH+/W8 B0ttYfMEwe6hXoc/G+j9iDTAy3pG3Pc5hYqoH/f6VvkkTnDZQ3HgH9mo6lRbZejvV93Y 9uwvkJjQV8GW0IoIUijRqgF7+OqPQnjXwRB7SX7SFAlQtmh2Dnbn+arvkAN9RJhN/rp3 ws6Lt4T9ppLSIZd6vq6W/q7sgmPYeO9V9bPaF2uftgHQo4vKbvnYN0Vbf+YU/27BK//1 MUfA== X-Forwarded-Encrypted: i=1; AJvYcCVg3mLWWFxoQplCF2UJ9OPVTkdgdEsdJtjyuyv7TJMxbJaEU6vcwO3i+ZgG+bj66JZLnnz/tUNqkOmCmLY=@vger.kernel.org X-Gm-Message-State: AOJu0YxfVwXNAO1kRrsAB/YQ2P/L+Zkz7q8Ngl9nzlPq3yEjBM2Tk1AZ E23w77UXSWzIEj7gK3KHCKBkILRFidTmKRIAjvjG8qBLShXG4mt+xVe8 X-Gm-Gg: ASbGncuvQvYPRcEm2LMJVJNN1xtZmkUTByRInoRNk9vpKovQDT7rmrvltc5zEROGxPj /WaSqz/tB/ppuE5iKbSDj28ryYaMLgqGgkgDNZzg6noCIdwKAiwRaqwNx3Oj8LJrLEeMZmvt+yn 7+i9M+1EFlRZ7cSgk1Nwhxla3p8J5ZUmJrcKLF6HrENIsZkLiX1Uu6bbPW/1n+fWYdGdGPiPcLH dEqx0iOD2WpTo84gKzIrvu15SmfEYqSOR9cIn6L4kyw/jq6bkS9v64++dxTo0xP1/PxJPO+caH9 FLH0mUMKqUORFixvXv3Ca7+YDFThr5/dur/FDH4imnx8XZUDHMV4XnPZlEDKN3QgiTLjqKrVxQC ueVDtTVgB7S4HdulP8MUGhvIlpOWj+Ynyw+iUONfpC2PM7cbxHxTZRFRwV5JSCEKsFuO9sJKeLT llgXfHP30= X-Google-Smtp-Source: AGHT+IHG++8q7Kb1lCEC8iKHKpMzuHPgGkCaxiytL35YQPpXEzIYeu+Im2bo6LwrLWNlMz3x3oU9yA== X-Received: by 2002:a17:902:d492:b0:293:623:3246 with SMTP id d9443c01a7336-29306233744mr52514715ad.13.1761181225265; Wed, 22 Oct 2025 18:00:25 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:1::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2946dda86f8sm4582525ad.1.2025.10.22.18.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:24 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:05 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-1-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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 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..561600814bef 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 + cat | 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 Mon Feb 9 00:38:59 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 3C8991D63C2 for ; Thu, 23 Oct 2025 01:00:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181229; cv=none; b=VtdhL3KmvqwRlcfY2OtfH3BX4UEGeDh8jMrteLiH4Q6KBejAVh/+zZQK61DUlVzrluRhuPY65kirqAKvmIQJ866yuTToiKqBVbOAsIqATEA2A4baec3XS6B5q1/MDfK4mQutBOWPCIi2S/70/Q60BuBWiOQubvOew7tTRTSemno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181229; c=relaxed/simple; bh=WLRIEtshDzL84rzcliCGLW0ha/QAvCdjX7baGObipwo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A26rMo+Hj5ScJUTNr6pujEnQzrCnUI+x9PW/6L1qULPP7i4Y1cSu5NNzFaxSXbu5P6O8mx6ZsSYbJpnAxh9vKHI4SWsKBsYi0cRQrYa7oUQ26bZKxBGjCG18fs6AEPHPosYkALMF/4vhdE5/UraIi//LX1miudeJc1GOV3yp2uM= 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=G7Zg7hB5; arc=none smtp.client-ip=209.85.210.171 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="G7Zg7hB5" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-781206cce18so221188b3a.0 for ; Wed, 22 Oct 2025 18:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181226; x=1761786026; 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=qRr57c0ypvpAqUCBQClyFAT6EHQRTScPRNGmNmK0UxI=; b=G7Zg7hB5B5G45aKO6sGu+HGKhvFnVHLdPiId/ttbkZ6v+Zll3y72h8s8Wr665LO85B I3iw4/PfcphvrSF8G7cnjKKMP9RXmlgEDHF9uALyCBg+OdVX/SOpEap6o0Ui4SMkc19U obrFFAm876jJwFx1VLZUOrAEfoHIxP+mlxgukO45L+pqlvsU5uM+tui/zOeB02cd+0Kd nkNBUH/W5ocT+Zn0Vw5ZPmz1uwVKxq19dVrS8Qr99BhNtE/01ftfMkOvOVukgWeg01oE TyTzaIOgfN96ex5WoTh6SZ2UW2A5Yeb6mM6gI10AyKAsz1Acx555DTNINgeT3vFn0KMD V7Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181226; x=1761786026; 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=qRr57c0ypvpAqUCBQClyFAT6EHQRTScPRNGmNmK0UxI=; b=WEk8EUebX3dMzSmxa4X3+j/Qh/5REH5rl2qcZog0D26nsZHt2kmH2LrZZl6rRef2mz AwM4glcYCNhu2A29bXOdfsSDYVk3TmEtksJjGmNPlP5YQkULRPAyngx3M/41Nx59Zn0l HdA+oXadLfl0pdXQXrbi5EmjpG40/ykYcrkCUsVGVguU6v3/iwHBoXRvOxZkxZJwoPrq pEAghBmbYRirICZdWkmnSTWLp5Og1BXOuGm+G6ua+zc24xL92jkFtFS/qZMhS5Od/Avw pPJGtdADAYmSaqDUr2ZapTVznwQElBjojp95aKnYChGC9F2HrUEvdyk9+AQEcx0PeDjO 6NMA== X-Forwarded-Encrypted: i=1; AJvYcCWfiMNqMh7ahcGGRSphTIvKe/ePlSJ4yDdo+CI0eDE/u9NHCoDr5uRfKQDw8ewTeO9o4iObHkZVM/2PpTg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx18Vd8jJvXUG13cnjIaQJhT2yKTdWtuHKDyG1yUbbin4J0c45q SXmzEGifH60OY103zp7rr3vFh2UdE5Jk4Wb0g1oFDTccQCOhpDv19otf X-Gm-Gg: ASbGncvFy7ULCKaww2GhEb0erXJ57GodkPHlahjOQZ9YnM3G7lDKXbnZGw6o3oyhO2e 4t4RoTc4i1+7iGg7ylTu3D4dv3X1XlJ2IVUdTuh8oLYym9J7fSApcq54e4BTCd2nOjcc0Fb9oER 1JPH33jHKMSpzOSfO95L1hFmQsOWU56Cbhz74PaQ9RGtdNibrgvN3sGtsBMl7ChNEagrpNoxHbp clcZ3ewBEwHzAjcCA+J7qF+0xkdKa9zZbWM8nZ/YM0PQHVl+lbxSc9sNiePQdh6xoqTjO/id9pk YyGULQ5vre6A1XZ9K9sBxlP578WtvpAV6ttk5FCSuCXT8IqGqGjDY6aNlLY6vGpGgvgtQ6Z/1U4 hrjt98H3qT7y2oGkY8NniB3krjqRFZDkz5VijT+gLZIJ2p6LJLWUrKLamOnw8HIYETnnZYxi5 X-Google-Smtp-Source: AGHT+IHg3+CWJSd/e6BOgzi+f6DN5y9Cs7OSFyBJFrkPqO6Uo3OZWXDmlV8rzUOGTzBmE/tvar48Sw== X-Received: by 2002:a05:6a00:859d:b0:77d:c625:f5d3 with SMTP id d2e1a72fcca58-7a26b3137a2mr3513332b3a.1.1761181226239; Wed, 22 Oct 2025 18:00:26 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:5::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a274a9ce15sm576231b3a.23.2025.10.22.18.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:25 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:06 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-2-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman Save/restore pipefail to not mistakenly trip the if-condition in wait_for_listener(). 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. This will enable pipefail usage, so that we can losing failures when piping test output into log() functions. Fixes: a4a65c6fe08b ("selftests/vsock: add initial vmtest.sh for vsock") Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index 561600814bef..ec3ff443f49a 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -243,6 +243,7 @@ wait_for_listener() local port=3D$1 local interval=3D$2 local max_intervals=3D$3 + local old_pipefail local protocol=3Dtcp local pattern local i @@ -251,6 +252,13 @@ wait_for_listener() =20 # for tcp protocol additionally check the socket state [ "${protocol}" =3D "tcp" ] && pattern=3D"${pattern}0A" + + # 'grep -q' exits on match, sending SIGPIPE to 'awk', which exits with + # an error, causing the if-condition to fail when pipefail is set. + # Instead, temporarily disable pipefail and restore it later. + old_pipefail=3D$(set -o | awk '/^pipefail[[:space:]]+(on|off)$/{print $2}= ') + set +o pipefail + for i in $(seq "${max_intervals}"); do if awk '{print $2" "$4}' /proc/net/"${protocol}"* | \ grep -q "${pattern}"; then @@ -258,6 +266,10 @@ wait_for_listener() fi sleep "${interval}" done + + if [[ "${old_pipefail}" =3D=3D on ]]; then + set -o pipefail + fi } =20 vm_wait_for_listener() { --=20 2.47.3 From nobody Mon Feb 9 00:38:59 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.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 0F1571DF256 for ; Thu, 23 Oct 2025 01:00:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181229; cv=none; b=jHq2Q3l+0R21Fwc/HUN+sjSwtWBDgdMe/3eucYCyB/tqbifidHiVWvixvAdLp4huHAUMqIOhRWvlhjSm9hFhSpgGb1TdRkD9ogpNebF+96ykZbNwDiprWfDAuA0OA0sg3k0+Il8g9/AI4tZ7l6I8+6DSG8gWQgnS78qAK7R2rP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181229; c=relaxed/simple; bh=bLgJRj0B3l4I9LRxTwg4ipTz6i5xRpftUXJZZBIn7VI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tjA04oEpATG8/B58fIVFT6MnvMcLRGeUGJ18/Usx6eg2fRuVPMZYwv0edre10vyKLoHzIDpXGw3pQ5JKE2bkX7K9cNNX1NLl4mYZ1Lunw7nenx+Ob1qHW2y7qaqV1KxpQQHYhspB4m3BjCmh0veUpRLmvOM51X+2Zpwr1RAjBgk= 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=flCqHk1m; arc=none smtp.client-ip=209.85.210.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="flCqHk1m" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7930132f59aso308345b3a.0 for ; Wed, 22 Oct 2025 18:00:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181227; x=1761786027; 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=ysnAf5Q6/F37oVxnktahtq8MWGwMsYn3elO8YpXbx58=; b=flCqHk1mDLdG9p/ErVgof8Zm1i7YjDT5YgjAFh3ysADTpr8bR5SXu4xYq1AHEBi3Vc 3p/19KGyH1ABCaoQHxQMeZjEWLgylM5wNjVJv0/dJEyYQpayiz+fLd275/kq99Gan46n 8KkQ41Ny9HrlivebrJuY5a0BARWuYbmm0MvoO7Hn529x8SCHYvmaK5RFV5qkOq/satQx OxdRSOduuVDIat+TDTJA1Ne0byneZCYPyGaGuOLpphlOoKu3152D/SJjDcPiQh5dC5Ap eDmx9Hz4Honp21eveZbxYi4XU0vuo7jRaJAVRYSpZ/BqlI/mHKFqwzs7XmQfs7qTB5/S bkNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181227; x=1761786027; 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=ysnAf5Q6/F37oVxnktahtq8MWGwMsYn3elO8YpXbx58=; b=Ui8DswpK9tRwGKZxfLJcyxixJJ7pjmV7sNpGqCB6V/Is+yEsU7aulPpZZq/ZpVZ1a1 e04Pmwm8y5tfHn2lkDAxkqhkCnI0U5fmxl9hLxX0JuojqxXvujDscS2aUN3HbM+XU8UI td4zk+XV+i2bzxe1fWaXmtLcAZJcO7oR/Lnmek5Wna7pOhUXKXazYlvjI0TxsgzMCStr 1pjlmNha2vFmTVs4B/Fh525+EgCVmxJOxDLhq/AZ8zsUg95sNbovhFABgYxGl0wCom51 3K7ZX6fcdZ2b2Q/I69ZH8CdFRlema3NyhOcaufORFINfqhcCNWRkPC4+pR+56dnWlU1q sC5g== X-Forwarded-Encrypted: i=1; AJvYcCWj1IvOKwzmDwuAJJjU+jyb72tovFLydoofsLXn2BCDdNAEpVTt0U2H2NjOPIYNX3neEW6QNB6BNmbEUHg=@vger.kernel.org X-Gm-Message-State: AOJu0YwZUn6+VLZv2OWgQB2SDjERyOH2vtHUUIoZ7Pbor4UMcHjJr1bw XC1kgRzzUc9XaZuz+9tr9QI3HZ14gUwAOZ5C/7qIZ4K6MmJOgBm4LJKv X-Gm-Gg: ASbGncs83lH0EV1UfRy/tYQ8pAQ5Z+HYeemqqN629RBkZwzJ8n7fs2a/TQXK726OOio yxpzEaJCdtm84ZqoZflE4Snmzple4jHBXqMgzqGwTTm4OlZrfshawfgGo8WJIaW89YcJbtQdZeF ZslBDi8XZWW5ecUOlS7LlQiZP8GUllTJarlCNfUNlWdg0nkDMZgzbt14nR1V3RtdTt1ezuVlygK RlssH3xFi75QLgwisRE4itNWML0nGPog2wxxJttA0r3p4lNU60ohVJxRAIC/Xh2GYDzRYR/VnKg VN7AmRGDRVB11UtJ1U66tbaFij8oZpv9pjOXi80Vmjn4WBE3/Ka3/YYTynolNrs2OEmkC/9eVk2 McIzrvpDo8nQEzXEiOSkz+UfExwleUx5y344DyUt15YOefNmvNZDkInrcjMbTdUKZEbvOwOAqBz y1AlaXX5xr X-Google-Smtp-Source: AGHT+IHOazPmZapnzVoec11my1SEQGOMvfwZs/K9HZJGzOPAxbA0ZzCZ6eN45sS9QYFtvW0q4Wovgw== X-Received: by 2002:a05:6a00:4652:b0:77f:11bd:749a with SMTP id d2e1a72fcca58-7a220d2330amr21377015b3a.20.1761181227244; Wed, 22 Oct 2025 18:00:27 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:74::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a274abf6d5sm563573b3a.33.2025.10.22.18.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:26 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:07 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-3-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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 | 131 ++++++++++++++++++++++------= ---- 1 file changed, 92 insertions(+), 39 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index ec3ff443f49a..29b36b4d301d 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -283,7 +283,78 @@ 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 + + set -o pipefail + if [[ "${host}" !=3D server ]]; then + # log output and use pipefail to respect vsock_test errors + 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 + # log output and use pipefail to respect vsock_test errors + 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() { @@ -322,59 +393,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 Mon Feb 9 00:38:59 2026 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 169891F0E3E for ; Thu, 23 Oct 2025 01:00:28 +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=1761181231; cv=none; b=O0oh4LKFQElEC/Poi+taC15lE6YXBdQO9U7rgcTX2pbqrzdHM/D+K94BtahVK6H/56+A1B8LJLFN7d/gDPw6xy9zYXUjKUgpUBVpE+o8IPrPh+MD4jKqundnu/x4+CnDNJQnKB47sdXUUEC0goZL6EfVHdBVcikryOYqq/99NwA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181231; c=relaxed/simple; bh=FRgbksM3HIGYkwx36Cagrg47zhk41xhggIZrcI5RpEY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ilYZG1IYCfwBrIVPFIu0pJRCezt3xB3i/XMgmlQ8xOcUh9LblPSDv8L/RI2LzEnW/aMQZV/b0Vxy/nyBKv1fvhfv3BCJvbm+lMDbACmmbAt5NwVo2yVjEBFHSHNkQ6yRyT9XhoLY47SY+FRBbfxG8SMNTzhr6wL0fmNdydUea2c= 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=U4ss6YHl; 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="U4ss6YHl" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-781ea2cee3fso254183b3a.0 for ; Wed, 22 Oct 2025 18:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181228; x=1761786028; 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=psdpZrmw9QO6xTkaBDSFoh7/I56QbRl0HPRaHD7JNxQ=; b=U4ss6YHladEgtC7kcVHqZgsO1MZwLwRCELSCBV/nYhsooNEz4GXej5NiogqpDNL62A X5uVsD2p+IMASJHhdPAjFKwrho30ftGsagbh1iABjCajVSqh2a4BRrbwmksEadksiB4q nzsnpaY529coywzXS0OcjjTAj739jZr5dn4N7oC//VpmvqNfE6jI3G7kzGmJoghj0hfx t21MSPqUINE39rRiMGL+FT+UVbqsVmmSF9544GFNiPEP6XwrgMKw7YdDQUAKomc5wzME xrUT8oSSd/w+sIf0WCWkXdQC4NndzTNGyvnCPm5e/JG8fTI/i/FeaL2oHV8OGHapb/RK vU2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181228; x=1761786028; 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=psdpZrmw9QO6xTkaBDSFoh7/I56QbRl0HPRaHD7JNxQ=; b=Pwf/eN+yQs52L0nUyjy8AJ5GTHJr0UMVAt9axWWJViudmlrUPrWwcKSPaAYEyXfDIs eJ7zAK5PgYXyLVjquh3faq6wave3+WmZ2wAOho1Ef69rE1Ij1f7VGdxkL+9ghzFbydiF nKQLlMkTeqGqoLW3YlsHm8gcwEitVbvge956bAcvmYUmRJTJEcZzu5kNIMNYFmpTFHL3 rYKce6sNnQTBo68riuhZapLMsiQDfepuJPhEThsLwG624X+46ypGl+/R/6TMOp2yKaOc gfJur2n9ElnKyuvjGNDV5H6u9Ms2pYFo+KAXQ+MrnG+UG9hRaOHd54r3rzlIbUs4VNZF XVQQ== X-Forwarded-Encrypted: i=1; AJvYcCUPdSMXz9Y1BhwOqCmSbiZQQYlWJPQQf9YKOdZq8ROdi3aMV33ksEc3bEzJByLLuUOzTq4/ckkQgTKW04Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yxann2hGLFT6wkZf86b7Z9I3maVRUqwczUK3uum6t7lDlKQzkQD t+cIiokdf78xVJfPynLHlUIXxzjC55jmvCIcWEN315njd08eIrrT8Lbs X-Gm-Gg: ASbGncvVpsoRliI1H2OWF4aEAySe+TETCzZNwju/Qhw9PAhsCWf4j8HguRmwUynyQjO U96nFA1rTev3PRaR9n631O32zy/rzU59A71WkRc0eQnlT9Hzbusc28IDtqzsmNfgiM5Cf8MpHsL 5PhjMGhLzDsokgWJRNzg4F8MDeqmAO/lftFkhhLy2ZujeCaGL8wbo4TSSCzb5LpZiDXZjSFJEG6 Rjq8bSFIbS4ZVotFa/rqQPjfXzxaY8k0lKjLUGgtV/IGm5xop1HBc6+L+HAULxD60V8smRE2e6S xbHjoXETOHk3dzL2hiwNJEdEPp7/8MbHj/I48xoCjO7Se8M/Q/IDTv3JNKbfpomSNqvW3FRXSJR 5eTsL0QqeO3fa/tX8jFpMciTRMQ7hXExjz1TToZNs84kSsNVLldmH4pOVuJfZMiEYZsKnt6l2oU 2R8pqrg4k= X-Google-Smtp-Source: AGHT+IG2lMzcFjc7REx0pi6nhktqcdfljQ9tGmdpXH2R81kak7XIbbuULliQHZiUSV0Oy/z29QS5Nw== X-Received: by 2002:a05:6a00:9518:b0:782:ec0f:d273 with SMTP id d2e1a72fcca58-7a2208fe6bfmr25768343b3a.1.1761181228171; Wed, 22 Oct 2025 18:00:28 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:8::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a274bb3bdesm563096b3a.64.2025.10.22.18.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:27 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:08 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-4-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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. Signed-off-by: Bobby Eshleman --- 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 29b36b4d301d..9c72559aa894 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 } @@ -491,8 +497,6 @@ do done shift $((OPTIND-1)) =20 -trap cleanup EXIT - if [[ ${#} -eq 0 ]]; then ARGS=3D("${TEST_NAMES[@]}") else @@ -507,7 +511,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 @@ -531,6 +536,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 Mon Feb 9 00:38:59 2026 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 C984221D3E4 for ; Thu, 23 Oct 2025 01:00:30 +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=1761181232; cv=none; b=UZVTIMq61Boxqxw16tmhthqLhDiptLp3jcTwU2bBruddyzzDANFyjGPVb5QeLuHX5Abdf8pHmtPjmw+3N+Dh/PEiKgLxA28Joo6voeiQuGsANpkZuGzfC2moY8W8Q9DSXkrBR7y7DGr54Iw8HXv1mu8hZbaJ3M1sWrCo+HctNXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181232; c=relaxed/simple; bh=4pbEdZWO3naganJPGX2hHH04O1jq6bd0JAXIDNigrjk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XP9JWNI6+vM22rMLy2z6/q0GwcRvq4sSEn8QVJvHu6tn5n66QAkbjSIy3zzxIy1Y7Hs70CIGqkxkZGaUAY9Zt1gU59hAyRp5ydkza9GGHCXBE7GTJU32KyeiO0G2ufE1iUsVjjmCU5hdf0+YkHtCtkcIRktT2+L8GLJk8/Maxy8= 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=dWanEwaX; 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="dWanEwaX" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-33ba37b3ff7so238833a91.1 for ; Wed, 22 Oct 2025 18:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181230; x=1761786030; 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=oXOvnbfPKIC6rRblSxQAXqJxbJ18ywkGP6EdCLVk0Qg=; b=dWanEwaX4qyY4otH9BIzAq4fA1PfDUzVMnAhcpgGxSQyKL+3vz8DfW0CJNO3jDzZHW 6AznwGs1VHGdF9gJcRWkbMC4eGVyGrf8raqGZNC7HiarvVLWYIeMo3/Dr+0nRUcH+++u wOLkjgy+6PMi8T0Q4WpXsNpW/QTkOW+PS4X9ziI+/tvkvpKMwrHFMV2N699B1th2lLD7 ENwQOy763hnuGy+8o1Hgrgz7zC9GPWJpBFTHdBe7Xku7NcgBfyXHhBZv6jFJ/f7YLIVX MxpAsD8tPLnPust3OQtJKjMn1Wc5bdkahzrF2Ez6Ivq7XW1YzCeoXMD5Ok5QEQVxkv6a EPig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181230; x=1761786030; 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=oXOvnbfPKIC6rRblSxQAXqJxbJ18ywkGP6EdCLVk0Qg=; b=R4u9qGXRN92hFwK+lZpF4smycezNqcUjCdWQEh6WgzSSWwUkGFztNHX0K7QCVQZYWz lNt5HRwf5lLnNqqsEU5cIMhKNppEBp9ND5NVq0pecr81BJwe9Xi0wUGGh+mpKR+t3sGO iI54kiMy7Djo2D9zlf9i7qbsaBhGzHKh3L6ozAt5If5tmhhitmOLH34HAyPALcdwfmCf LAP36XXfWNt6ujZqscX+vdSD20YaX8gwjDTiwoP5CX2Yj2tWQj1H6WspzraoIVRb4zu0 sgbX0Hg7rAoELsKuqcxyWkOVcZiEMOP4nNkiD2l/WMtdGnQZ1Sn4MDf5mkfdkhrifqiD 6VwA== X-Forwarded-Encrypted: i=1; AJvYcCUf0TWR+l0z6I6pJJak4w4WTzfwJWNh7+6hPRbi2+dbI9TCWNBEfiCqviYId08EPWuR+RV8Lu1mTb8oss4=@vger.kernel.org X-Gm-Message-State: AOJu0Yxs7VBU0aVf5XC8QSah8z+cwrU/+u2gB1u/d8dd/ZNMZoHEhpYv TnOO0L86FaAjdSIz6D6iE1DDofFUsR5Q7CJzgkmQTS8hKRUXHdqmbPmY X-Gm-Gg: ASbGncs9Eg0++s68fqJDTCID54NV4EKOgIt8wQgb6B6BYJAUVfntgDo6gxRWdOlmp7M l63iGsOc2NmmiYBznu5Ith7RYtlzvNfZ7qeISDZyhU/oSsNqLklf5F8PQSG55raiNvWo6xhkHUo uhjfTJ7/HR3OTNpvBodHMWnZhSq67385vg5JrlYZ3EziT+fIsYWZOoUJagsyfT9SZwzvD/11HEK /H+9KcYkeefpm7iSxyPUtDTvCdY2hlBIBxui6TmBiuwbVrLJKbU28xzWxCPXS2iwWDkpAy+9gO2 oTbD5X+TyVssbIzLqBYoSh/eaaLGphggWjrg44pUM4eODI+wMqhv1iH46ljTy9uAJsZY0y3h1El PBqgs44WvK29XTuJl4uggwJuzlfyH2S0YcnxgkOfJM+lidREgNNSJDOsFGOAQDGrXAW9ShOT9Bm RzfdHwZoc= X-Google-Smtp-Source: AGHT+IGDhjee3qb0RmCmk094kyxxRhSnp6cpHy/pZvteX5hCRnyEn25K/Mo2iLuTUZkw6wAqEltkkw== X-Received: by 2002:a17:90b:4a03:b0:32e:7277:9a81 with SMTP id 98e67ed59e1d1-33e21ec3286mr7594732a91.4.1761181229218; Wed, 22 Oct 2025 18:00:29 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33fb016f865sm491272a91.11.2025.10.22.18.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:28 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:09 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-5-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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. Signed-off-by: Bobby Eshleman Reviewed-by: Simon Horman --- 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 9c72559aa894..6c8f199b771b 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 Mon Feb 9 00:38:59 2026 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.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 739A422157B for ; Thu, 23 Oct 2025 01:00:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181233; cv=none; b=b+28nueJGAlT4YdvtemOAIXqhpFa0idbntkRXlbZBTPTuIQdtjVnB9Os+WUu5JIy+W++iic0iJ1MLj54LUQrZsgk6avfEU3LTX7ENnFdlxSYKt+zhwUOwXACtag+22jAZ5AH3U12LYivcTcXs2dFmnIAhpVDiUCKVNDTf5vA0TU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181233; c=relaxed/simple; bh=53S5Zx5/+dq3CxymSoKg3PxckRbS+/iJdEXFwbACpeo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AGnmtAdycHqmpoZkAATBtf12ZUqp04FMpafXOzg9v7NK1gjNR03hu5GNuhLU/KygAVdcocQNJTjjRxVWl6wmvPfI3Z9rBc3g6kb5RKL0CY70cuTLn8VGBqovVjLQKcVgWbDAzV6jyTbTMYgWekmOv2Xg2lYa7N/uprP0C8UF0eE= 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=VcfT/tLC; arc=none smtp.client-ip=209.85.210.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="VcfT/tLC" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7a265a02477so176302b3a.2 for ; Wed, 22 Oct 2025 18:00:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181230; x=1761786030; 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=6hhytdydN3st1fvO6O+FLwguIsO7CYdeOMt51FRiMAY=; b=VcfT/tLCM9qe93/s9wsAmucZa7SSwKxk8qkYaI5I93SRF0N+TGfTwwu5PDNEhkYqhS JWK31iSk4WICz+bvPoVUW53zHVBSYoAyg+iaxwp8NsrdI0JkxrEs0A1CKuMahafjhKJD 7547O6hlO+eIOkaTEifFj1li4tk9Tuh70zSLJSGXuYBsG0LXvH0bPuBu84MiGck2ip4H F5WqniA03/2cZq3P26FPqZZFNJe7w7qTdNEUqjZBp1XPHjoOi3IPHhhblVaP3QAkrOP1 Ryp35MorM7iq4DIySQaVOAHTUFN36koedCBpu9PQc8PXNOzE2ktYhHYdNPrPUUkPyKeH E2hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181230; x=1761786030; 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=6hhytdydN3st1fvO6O+FLwguIsO7CYdeOMt51FRiMAY=; b=HoBpa8X9zDx18QGwpX3krrd4EGzT7TLUCKXtbqcdy9xPMV0kxBZ54FU8f/dzoDCEYq ep+5bZqyUa4wCTtyRFy2Yn7YMQfUsjo/qRzqG66K4CxmtYdADF6zsGn5r9zrT0A91oN6 GEpBLw6ANi2LCSBu/GxigBmZcwg6sOXv15FzALxJf7ctYQIY5WYfNE/05Z918tf6K5ek ukalNfmRsCdpQRxLNqZjUw/anzX7LzdZEkCnyZPX67sA0qAeYqU/kpLq0J6lfa2vxi9O rVEOk3pPwG1k0BcQR3oB2AGH035oEJwamtnTAMZP4xv3qO0Xd5p3Kf8TSeV3l0wr3Ahq UKHA== X-Forwarded-Encrypted: i=1; AJvYcCUKwMKiByUQAWdHPDupxBmJLzZcAPBcQNrA3m6JN2z/2+ClYl1JHl3BUQCDV2Bovv6weHax6A9A26P8vfI=@vger.kernel.org X-Gm-Message-State: AOJu0YwY4r1W6ZzHt//FFWX55+p2SyFAGL78SFzV08AKzoLb10LxQ+5t 71PmYLBK7TVcxNPgqnB+MQ8UGDMX4yD9dNVrV913cYj3kC87eGb+bxD1 X-Gm-Gg: ASbGncuweXwSC2+wNqOjgBRcCMAw15YdVaDrD3YcjfXLoZeP7fqWBzWBQZzFBRx/5qt KLc5fDG7fsEz2gok6SiT1bN2XHkyNXS0n5pTKeng4yeOOTZhwxCS0WY+MOpsPMR+PyoUKRTuruj UoViEracfF/01gaJx+2ECgvd72G56XsnVGTnJcpI/N+084d2nHDhGv2ORB/dI6izPhRI9nyPa47 xA0uh3wcLAb8cWQdhfVG3mQ6h8fpKz+2ZwLyQgQCxCNF7dnSWtjOaFEIJLx3KZ+/aFAsu9hJl7H AkXWEgUOadTkXDP7LQOOu472PojyIXzBh5EWXJPve6EGqcj40QkBVnhcxwq87/4fY3Z+mf4imzz fbJlMDfEOA/S4uE+aJ8oALDsrJ6CiNvqetOMucgsSjJpLSukHy1zt6VG3bpPh3UYr5rIhPYgH9C Z5YqaL4M2y X-Google-Smtp-Source: AGHT+IEOLFrEwrP2Rf2uPvi/YyHr9hHzHgOPOlWS5DL5z4avx5Oje0geKjvDdLHF1RWLtx4Gg/89VA== X-Received: by 2002:a05:6a00:4fc9:b0:7a2:7458:7fc8 with SMTP id d2e1a72fcca58-7a2745880c9mr1173130b3a.13.1761181230338; Wed, 22 Oct 2025 18:00:30 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a274b8a0edsm560059b3a.35.2025.10.22.18.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:30 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:10 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-6-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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. Signed-off-by: Bobby Eshleman Reviewed-by: Simon Horman --- 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 6c8f199b771b..99db2e415253 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 Mon Feb 9 00:38:59 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 2B37A1F4262 for ; Thu, 23 Oct 2025 01:00:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181234; cv=none; b=Cl2ME3xUPdfeCO16bL3zdf8H1drSGoKmkx3++ftrrnajo88Xm9aT9o5ga/SMwMEMWUmJy6K/iCc97aNSuDWHXqd7hVTzYQutGLWIYyzAjUngKAn2C/yXwcfIIKm5LspCH1VVCSDc4Amsw++n53wf/aylPuKI3UbI4diGd1Xdq5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181234; c=relaxed/simple; bh=2VNGM+ga5+4lCYxn8srmIsIAGhhW4pu5Ux2Lzg8IB3g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XRTNoeBo/wP2fUHuAcRs/MN4GnmEDIgpTfvg2QLcGjqTQYTJ9AqXNwIwBP6M9E5G81NT4BJMT+xPGNVyiJNVQRIAg1B7CN7tmkPB+Kzmcv8QWYA8LZ1CXzMHEy5HBS+fcvtRgMKBWUcW/67T94l6k3qdlk2r5tmivkTih6vIak0= 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=El1/f/6/; arc=none smtp.client-ip=209.85.216.46 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="El1/f/6/" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-33bb1701ca5so236894a91.3 for ; Wed, 22 Oct 2025 18:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181231; x=1761786031; 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=Vj6nuzkY1lA64LuLbEa1jW/rmfdvccJ8fRwNCahhULY=; b=El1/f/6/OI3b5aTOLrzoZ4iyO1kqu94o5MvF253BFVSKNjd5v5NWlktZcORp5ZsQv2 XrTgGSE+WXiRbi4fGGlhG+j7W7Mn7EXn9oGg1WVsn/pd9OmycV3AGOrWZbhjT7ewamRd Wziek7GAGgQu488ac+3J/c1ruAfUDjPTOT6F8pmKGssir1yx7TG3NxAZpn+TRFajasR8 HyIqbVbRIQ5Fj2nlL7KcL3K55fOwUykkki78gwMF70tFqPEi2tsr34G08kIKrId9pfcg fIIjM80w8I7POvnPxee82O20tUk759gGHOvDJ9zCeFb4viA031FqQUrfvzgr91AFaaOF SaWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181231; x=1761786031; 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=Vj6nuzkY1lA64LuLbEa1jW/rmfdvccJ8fRwNCahhULY=; b=u6OnMNOFazRE8mm4ylugqUt8gsRuZuS47kHbnwSQjZ1IsTfy2WR1dELvcbjBSDzz0W vcyP5aOJcco7/ij6w1qNMGVoQ0uU4qHaUx0Q8q4spT+tjaMrUFLqR9CYsjLonwiCwDle aqlMyhxTFrAqZfdUY/5M27NEYhWRmXnY59dl8YjvTHGTA/IzKxqTqTfh6dVnDD2y8L1N FMvyFkZsMYQhbVQWNj/VixKsqpbeXiT12hzyFqD7HkhPkdvwRRKFb2U+JNXovhi30RHg V4EkR/4YslnGB4lK+3TPk8akSeoyo3bTlqkoYx70JshHZO9d4HIIpRZnnCMHTHk0m761 a/Tw== X-Forwarded-Encrypted: i=1; AJvYcCVUa9LB4eTQHWC4kO4Y1p4ZmRI5skR840g+64WgfhE9DeicUFbxUO+HHvGya3Zyv/zeUWpu6PCFZg3X3yo=@vger.kernel.org X-Gm-Message-State: AOJu0YzKOfL1ZR2yUiD5gDavQgK5CiCc9WnrSjRuvUMuSGEsa/uqHIj1 R3aqS/O284kgV2FqcrclEW1MCiR4p1eLPqFORtmZ0F8apvTojV2SLgAE X-Gm-Gg: ASbGncuQ042tEoxEuGBDCOHM9bZhuAMQ/pLW51kTuzbbXe4NAj8uJ6mRAILMZBe8gbl /+aSEsmBfXlgACsOCTwNRziyZTsLjhrJtuzXDXGAh7PzipiTdVtjT5yDTP7QussBd+dzreVyWk3 0UHzs5id7PFuVxx/OcguAf1QGeQ53Ss7nEQylGzKTCGzL0qy6QrCi477qPjv6D6OUHtknUcE/VN BSU6aIoLCRN69n6rjhjjMRAGj+a9Q+tgwEv36zd7lrLdRoxeea9GQzCv7o3YHd18wF1BuxVkhTX 8/CM8cBxrt6tdI8N+HQt6s9vyuqNVwCFQzvamZ3lRXt3VFK3i06c5N2FbYc0aVtHUztWrxtPlO/ 5lQtE3hM3Omz9A9S8dueIIL1FRMvtessm/gDG2cjTSsNiqYlkNySK2l+FhVY7xJZAPHGqFBu4h6 TMn2Gvg/9C X-Google-Smtp-Source: AGHT+IGKtTFJtpQ24tkehAeG1F60BvFty13fIYOS2AypXorCFytbWHehPyoCNC+kjaMOPOaFRHtOew== X-Received: by 2002:a17:90b:2d8f:b0:335:2eee:19dc with SMTP id 98e67ed59e1d1-33bcf8f94b6mr28354305a91.28.1761181231262; Wed, 22 Oct 2025 18:00:31 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:71::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a274b8adc8sm552212b3a.39.2025.10.22.18.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:30 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:11 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-7-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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). Signed-off-by: Bobby Eshleman Reviewed-by: Simon Horman --- 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 99db2e415253..0957d6a41d08 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 $? @@ -521,17 +541,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 Mon Feb 9 00:38:59 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.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 AF03C19882B for ; Thu, 23 Oct 2025 01:00:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181236; cv=none; b=b2Ltxpak6knoszkkw/yXhlDbLkbYwMbAMRfD5b4XZCQZai0w9qRrC6VPiYkX8nkSFqsPoVMTgiYtS3vSE0O3DKKPfuJVPN/4eUgBDJ01so7Iw8U+HYEE6GdMYq3z3506MmpuZjqYe+uLrSZMwka4OO2tDx/CqlFv1ssAtq5lSi8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181236; c=relaxed/simple; bh=ldMhDtJSqTF6HhjHdYlIqeC6EPSyMpf4Tz0FTZQLeGE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tLJiDJ7W6TtTKVwqJESl+5i5q1G1zOgJE2JnE+GIfGJWH931yX+HKSUsDKU9UbFmSRfVVI/iDjvq1qQlPS2O4de6UHjLaDgUK/McHaEHGWwQ3qALyv5aQ726anZesmn2HJ++mkvYgqJGEAro+hXa4DXyZshbYPkrmzGxCjOsJN0= 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=iG58bxwn; arc=none smtp.client-ip=209.85.210.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="iG58bxwn" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-7a26b04bfc8so282038b3a.2 for ; Wed, 22 Oct 2025 18:00:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181233; x=1761786033; 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=jHfkVNY88Sc0q4SntuKgstPkJPF0CfHaltJaUqfEVbY=; b=iG58bxwnX7C7JqE/CWdLFV3SbWnqyj8cGBp6FVFwyVkxd1jxRh+kdAVmAILWTEVEU2 rLQwYY6sYmDHCPDoMXEQHeNepJ84oY2gtXJ8GVGtDR1QF1siAE06njR8pkzxwPLQrAIh ree/ZXUkR/U9HtzKtKp2KCfRCKZrfgS+4Axz5S501yITlFWngUKHbdgBGLJif7+gzsUY YL7HQ2I9QYUpfNzrqW/hAhCmvycrzD2G/vYc5M6hZwMqkpUjAS1PEdvrCN7hkm3CGIAG KTo4GvpZmxPzPmPfQ4Y3iM6eXAYob/PkMhhnJZQJzHzaGw5lskvCDbJ9v7MgwDNvjnDQ bsYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181233; x=1761786033; 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=jHfkVNY88Sc0q4SntuKgstPkJPF0CfHaltJaUqfEVbY=; b=Zr2OakT/LiAhd8w4qj5S3L5aH45EcqsSIvLxn5yKrkFbLFXi8nOf4Wa3/cJgudNTL+ rPpNkKqwleDxLBqIkZ0noonmZr+n+wvj89hoJhVUrbSUTTD2/kigSDJ3YwZYCnG5EzKE KPgS2GmJYQ/WQqX08EzvyHa7Bm3katDl5ExRTwtCGhthkePVEOpu543yiMpS2ic3IEr+ WZhZGsztU5xay0XqDApJpnILaD7stZqQq7O3iOGFaxSvjLc4ENfUIbNCGtsPlrkJ9O86 ku45JMkxGzhRaQltDnxvsLuftCBMxuFMSA+iXo5qJEALD62bVmUVExivioaBmhsi7xa7 cpDw== X-Forwarded-Encrypted: i=1; AJvYcCWcyxg+uUYLfR//uCncr2mxIirGKkB3zyvoGiu3cP9DC7RfD5mZyUb8xWuDwTwztPpxI9cbqtJD043h/5A=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6Gi1P48BUUF3J24c1VblsHANEKS1JeBne5peRc+9aZplI+ohI 6ZNeqQyarM8lTGdingIP/kaqipJYDv97BL4XEYA4uvyi1KFRhnzgvixC X-Gm-Gg: ASbGncsvzxvXLfK9i3zeG+D4LywsrspOsvbY5QoRGvE8hfbuhP0Wkqg6aEO5roIraxN AOfS7H/zzFb4QSCxxsdEDAO/a48XlGHXJ0MZmSvxv68w6jOPzaf1bgTBA2vEvrhEy2TkT3ql4s2 X0v027UcocbeUmcXZBILrkZRTWbZGL7xnf7ryIvLIUqLTBd9M5ZztxVceI8FHqg5DPZq4po2rF6 HGqk4tVISO0w6Jh5OLQY4mmkfvytVktGVcnjQjNCqxucH7Rs0cDFqwlyYtKUcdI2AvKEbU/wLgw ifTjZ6SuezS0fm3LRv7t8c50WIEhs8iT0BaIyYqotRnDG97YpAxnYqYO0InMuiql/nqRio/mPl8 6BFNtoqBgzZr/FAxygiqhvy1aK1x2Y9W26n4pyzdEXN+OJQl/n7pgsRAHnHJFv/AfmRHyrqbX X-Google-Smtp-Source: AGHT+IEmheK4A1ko5QFpEBWLeWSltnMrHAw98m3F5BI5tqmt9PtwcLSEEh61GZCfGXRvh2RHxgaMVg== X-Received: by 2002:a05:6a20:1611:b0:334:a820:be1b with SMTP id adf61e73a8af0-334a8565b08mr28701692637.17.1761181232651; Wed, 22 Oct 2025 18:00:32 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6cf4c0e4e6sm362698a12.11.2025.10.22.18.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:31 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:12 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-8-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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. Signed-off-by: Bobby Eshleman Reviewed-by: Simon Horman --- 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 0957d6a41d08..a728958c58ee 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() { @@ -454,7 +456,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 @@ -528,23 +567,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 Mon Feb 9 00:38:59 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 BB9D11D6DB5 for ; Thu, 23 Oct 2025 01:00:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181236; cv=none; b=TWX/Rbr12JSqJf/PfiR/K6kxH38ktKlctgqctQ2+6r+tstkDYeYtxclyh5VglHBlbge8yCEt5sHuHhWXnJkq8+b57BD5JaPB+wuG+ctxyTqMrUoL12ko4DR22jhDaiF3vkNBzAh93oVWLrEyJxyuciK70fpa0Fbiu6SAZwv1u0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181236; c=relaxed/simple; bh=A7Pia+kzD9m0J27kf4ph64d7fzH2Tfv7wW9zOoywfI4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HH5ZDkFgSMBlHA3A8WKs5ATKQ9tjQ0YP/4AOH/LDusaBv3sfXJ7PDcG2nvk7rZEcQhHHHMGg4FpnrHvsK/bsxBCf80bovl58aeg+1l909z/am3p41BhIWSnBGtsvy7jewIY//QeuMC6o+gaibX3WEgUt3D35dknJcqgbnOYdwX0= 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=R0kpUtE+; arc=none smtp.client-ip=209.85.210.174 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="R0kpUtE+" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-79ef9d1805fso232800b3a.1 for ; Wed, 22 Oct 2025 18:00:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181234; x=1761786034; 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=qHVaMWRrmEBE/SxfIGFnLx0j8jRM6x/KUMvxwGUNtCA=; b=R0kpUtE+4xPX+wPqgen1bjgNVxcgtTj69D7Rjudq5oeMR3J07j7dqjIZJ3Q4E6w9X3 vxgiT9sLvpbMjE9kt0MbO6dhkeaUBZ0cwmExCUMa1Zaeumg6ErwTP/2DwyFNatfWoWNi //SOtiIKYI/zFdcxuYzd8f3UTQmpvKeZ8UMPNofw2VxlOxqEOYg91/sxbs4lZJG/H7KT 0raKiLZmfMmG3ON/ONu8zV9G76Hc7nnVVt2svrQA8tUeTig72vN4OYeu1hk+OBIc/4IV SduR9PA0tLVmF0Sq2zLAVJUecLj/UAwTeojbMNKEEMbQQBfEAnwN8Y9kyop0kFHjmUup Pc+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181234; x=1761786034; 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=qHVaMWRrmEBE/SxfIGFnLx0j8jRM6x/KUMvxwGUNtCA=; b=NYGiEFAeKOMQXbXNW779wO5e25UsO6XSDt0R78Tlcr0a+7DkeLysm1TCXURpmehpgp 5lq+xp0ikMQ5f8bvA8W2hChfNUILKyBqbgJ/+IYIHRWBd7I9fhPlguGYV/a+HKqiWTWQ uhclE0eiQH2hjmIqPN2kHaBfj+LdqHaejYrFvQRlvI5u/o/H9jRZe6/iEhrA7XryLLFY wNwUFMemlTWtoU3wa1008Mxuh6Iv/smK3TQUhlakh8+WMgmDt2fcmrNA4vbLpFi/g4Ut T0H5tpb/eVdaLiKmxeyPiSJJZx/P94MimT5eQr6vRnbs8ZOLi9Mzrngy2HglSfBLHnXP 42hA== X-Forwarded-Encrypted: i=1; AJvYcCVKo7JmlyuZW5thyFHPoApB7l2qERiM/WV4Kzq7s99OAhN9rkhM41BPbpg1lKt/mkjw8gz0IUeN0RH5q2o=@vger.kernel.org X-Gm-Message-State: AOJu0Yzjhj2aR8KZpIvAzjYmY+ok9jiaUVZ8Q94KNlYIxKU5aEXHABuw XIZL3vqre0LV3s+WywMdDdMRh4xbGiZcFrvugdKV/Hojku7NDwO4Jkos X-Gm-Gg: ASbGncvrx2NBDXUkB31MuBaJZHl96qiVtygXiSF9k312yB6MsMfkgyD797w72ULGSpw R9q3khRpqal8IckzNG0z88pwh8Q7zdQWJvjxGHpK3sVaTJZ/sa02KAa4Cwc97JVTjdLvcyk6Hl9 OqL2K12vGp69KHDmam+9t7cZvTsRF3IxzBzm2pbecxV2ZAZKfM8A2xcEHzrW6i+v9PWjZ6qzhZB 3Z19ptZqJstQrpxZxh/SEoJccWTYvBebO94py2JQGkkI7v30A7PgfUmsI1Km3j3XMV2wMhtyaPH n5ejzwdfre/nLVW2vHP85nOlJoZjjV+k6veCHhT9W3W/18ud5Ge78vlWPJYCyMOf7XJAvanz9pe zQQLKob2pVtyRvddoitzSvyiiA9crvYv8EuKxDiKlUGoODjrQcwmvdj7UrGZKnaefpuFSzv6rFA 422NKhgTc= X-Google-Smtp-Source: AGHT+IF9GCZ5yEahtQVlZaXsqCeQjg9YU+w5E/EIvNEWA8qffUUmtOI33IKw7GAAlLb31mw7tG5+pQ== X-Received: by 2002:a05:6a20:cd92:b0:334:a916:8b4 with SMTP id adf61e73a8af0-33c5fbaab59mr766832637.8.1761181233861; Wed, 22 Oct 2025 18:00:33 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6cf4c0e4e6sm362737a12.11.2025.10.22.18.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:33 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:13 -0700 Subject: [PATCH net-next 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: <20251022-vsock-selftests-fixes-and-improvements-v1-9-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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. Fixes: a4a65c6fe08b ("selftests/vsock: add initial vmtest.sh for vsock") Signed-off-by: Bobby Eshleman --- 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 a728958c58ee..a312930cb8b7 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -541,6 +541,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 Mon Feb 9 00:38:59 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.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 E4008265609 for ; Thu, 23 Oct 2025 01:00:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181238; cv=none; b=QxLo2vu+qCIDpszFAKD+A8Bbjfb56GdcpPRKG1HJlqFoxYpc0P7vMqn3CbzmIFhA1gALI0PvmB6FwgGGJan20VYKHE0p8syA2jN9dB79dbi7I01ajewLDcOP9va120tBNwRnYz1/aHSr0GnbF9jbiEmQ/VZTqoFyQZ40TupHLWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181238; c=relaxed/simple; bh=pCmUOoe9UEmIapGX09RMEqNq2xABcKupn8YH5c6OHyk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ErMFUxWpiRXtX0b3mh20CFC2QcZ75l4YMRxxDUmERCFPvxWjsYu1iXgaVIEhyjkktpJhP+ODrHrKSar2f/VHEHpEjkxW1n9b0xMxRc1HARmadkGwQbxL8txMh6DhvC8bo6XTarmKuC6JFtn3UhqKgFQ3C9hqRacmm99OCJfY7h8= 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=kEV28/Rn; arc=none smtp.client-ip=209.85.210.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="kEV28/Rn" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-782e93932ffso221869b3a.3 for ; Wed, 22 Oct 2025 18:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181235; x=1761786035; 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=kIqQl1yXpGD0T6lxJ76Go260cGhEq3Pe6FtGbdnc7zE=; b=kEV28/Rns5coJ3X5E4a6p02RCeuolU4ylPiMB+XyiMs1XlcLmodlQnakG015JngvrX Zm4CgaUWvlRgrc6cuH+UdxwvTmtHkTGRHQTs17EZb2UPfusIoHlf1nmroc0szh22xsNL AoTSa3IN3Sn60vYlWs4W7DXCm0ddpaUfjWVG80fVUqjO2YdeDkMDmSUkZgcNvMsUYhQP A3SrKdsV9U5tdPKg4E8jY0wOlwXD0JXQXS0TCyfJ5klo11OQOadvzpeNQbgD2/3WVhPZ OiI7c7xyzj1xTxA2rS0oZdC7XNM4kzkOMQS24hI4iXIP3Zgy2Nel6cNzNmss/xzz4O54 aTpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181235; x=1761786035; 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=kIqQl1yXpGD0T6lxJ76Go260cGhEq3Pe6FtGbdnc7zE=; b=oxLaQg6H0oSM6rj3NImXy/cRseCQs5jAu4Yap5DHZ3w0Rr5nVYh2aSNegd85w/xNf0 My2wumMF4WgcEVJORy888rDyR7qm1dd+frnbeZT2VXvhEhZpsc6NPsDZ2uFBUnwr8KGn 4EjR0/DsZ+gzHoq1jkblmfjo8rc/DzHZxoJble8e/6oc1Jzzjjpym0eNxuZKzW0HHTss gmZ2uNLsX4dcb7zYw5IkQA77sEAa6awh2XEgxzyvA27AzK8Fq2bk9hj7hZIY7PqjcVkf 7SeKrsw+ardS9TCBSLvqcjO4ec57EIIaAZEDzeuuAVMy8yPfIh9CYVRHjO67MWStDYut Wi1Q== X-Forwarded-Encrypted: i=1; AJvYcCVOFT9ac+Z1DnzcBsKrlMdEMiPaLat8usaTZONOLYoLvGpBs0ZMPds6NaLFtXpOhQrozdrExEZSjuB/jMk=@vger.kernel.org X-Gm-Message-State: AOJu0Yzba8nlatZqKh8S4sXKOnRZyl3X1tqFYHM3C0Xe0l0UrxX4LFGV 8LB86muQdWzsKsUYAejbI3EVlKe4PUpLwC8cVIZovGuHTxY70IcnuQoJ X-Gm-Gg: ASbGncvBv9TtRUaOU0Z+YRHw4W6BqGXnyz9NDaKLToFWAiftQIezvZ8qJEDA5emPTew nv1GUbjrFtchlyoI2z+vSwC4NN+30mu57UDskXpNDWYtOXMHpL76dtk8kSptxYMFlU0c8vy1rv+ bObkLAItFDSCITWVoalD+9bJy+kVmA9pMLwS3KsVJrw6vjDEoNa3lCZsU/2IYVH7ci0zcVQNWpB T63xz/FKQnQN9eRKOn2bD1ACvGHrNwrEscE3SGnKzTdSv4jsBLuv5+Tc1X1LRaf6UNNW2W8mIro dNbO1ITjnFBxdJJWrx58LZQEVNTqOqczfmpHoU4JQH9EpDL4rvIYBc3U28QgWPawMQ0Hjn7GAwT nNKxs6/ROpikPnj/vv4xcqVBZna9tARC+seGb2S373A/7Voi2gIUEbMn5XCljls/6Eqaoqi68Yw z8ADUXEpe6 X-Google-Smtp-Source: AGHT+IFah4xKWnPJdJQRrSTe40MUJQKUAPG67skaDGCDDAujY8FssP4vUeP2QuBI2KiQcE2PGKu37w== X-Received: by 2002:a05:6a00:2301:b0:78c:99a8:b748 with SMTP id d2e1a72fcca58-7a220144d3cmr26283193b3a.0.1761181234838; Wed, 22 Oct 2025 18:00:34 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a274a9ceddsm584787b3a.24.2025.10.22.18.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:34 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:14 -0700 Subject: [PATCH net-next 10/12] selftests/vsock: avoid false-positives when checking dmesg 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: <20251022-vsock-selftests-fixes-and-improvements-v1-10-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman Sometimes VMs will have some intermittent dmesg warnings that are unrelated to vsock. Change the dmesg parsing to filter on strings containing 'vsock' to avoid false positive failures that are unrelated to vsock. The downside is that it is possible for some vsock related warnings to not contain the substring 'vsock', so those will be missed. Fixes: a4a65c6fe08b ("selftests/vsock: add initial vmtest.sh for vsock") Signed-off-by: Bobby Eshleman Reviewed-by: Simon Horman --- tools/testing/selftests/vsock/vmtest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selfte= sts/vsock/vmtest.sh index a312930cb8b7..aa7199c94780 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -506,9 +506,9 @@ run_shared_vm_test() { local rc =20 host_oops_cnt_before=3D$(dmesg | grep -c -i 'Oops') - host_warn_cnt_before=3D$(dmesg --level=3Dwarn | wc -l) + host_warn_cnt_before=3D$(dmesg --level=3Dwarn | grep -c -i 'vsock') vm_oops_cnt_before=3D$(vm_ssh -- dmesg | grep -c -i 'Oops') - vm_warn_cnt_before=3D$(vm_ssh -- dmesg --level=3Dwarn | wc -l) + vm_warn_cnt_before=3D$(vm_ssh -- dmesg --level=3Dwarn | grep -c -i 'vsock= ') =20 name=3D$(echo "${1}" | awk '{ print $1 }') eval test_"${name}" @@ -520,7 +520,7 @@ run_shared_vm_test() { rc=3D$KSFT_FAIL fi =20 - host_warn_cnt_after=3D$(dmesg --level=3Dwarn | wc -l) + 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 rc=3D$KSFT_FAIL @@ -532,7 +532,7 @@ run_shared_vm_test() { rc=3D$KSFT_FAIL fi =20 - vm_warn_cnt_after=3D$(vm_ssh -- dmesg --level=3Dwarn | wc -l) + 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 rc=3D$KSFT_FAIL --=20 2.47.3 From nobody Mon Feb 9 00:38:59 2026 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 B1A3722A7E5 for ; Thu, 23 Oct 2025 01:00:36 +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=1761181242; cv=none; b=qvErRqT7M5WaF30GjRbNVW7RqiA3QaX07qlp1FUq5UeU34uO5HEjX7zdR1CD/HG3ruM2Tzxtjxn8UcB11CVrhyDHtKLY30UmeFt4yLSum2bQ6HmUrKxVQuO0m6cxlRu+RNhOGxN+DaJsK+MT4aA60Hul+8KZSY0owMAVA/ZeaEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181242; c=relaxed/simple; bh=94uzV3VFEsNc5hciZIog7zBBbpwZzL3cEkwJ4Knqo18=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fvZtuwh/85CEMuc8XPPb3wQ1vt+NtbL1/8RUa/JV4vYKOcVWCYhixOfYt09vL2d7geTO3gznHRCmDkP1e5XDWPfjApeabrtxRvwEcrDBcfdjNjpcHCwr/YwuKXoTtwHflgAtlw6PvJuoAMOVtp24phKBd6tTRFs5kd5w75/OSBs= 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=ISHve6E3; 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="ISHve6E3" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-33292adb180so223718a91.3 for ; Wed, 22 Oct 2025 18:00:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181236; x=1761786036; 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=9KyrEoOAeZKPRfbyTnz5cosCWFxdbO0nbS1ytMd/2Og=; b=ISHve6E32hhuWJDWyvQvUFboTItF6+IRHd0M1Zi8dO/ngsEfaOqXuN+pIMCJrztSfU O+Hmou4a8pmogV8zTi1m5eHhXdWgi+FujR1jeA8iYSHz9+JkejtR4hok5/t4kBgfYXvK lAeoot42z63rJCbX1xSjdUkuA5ENWuH7CnZxWaO4+d0coZzbpiHcsMavTpFeKD9ueWqk fkz58+mhhWUdhyKZtd8CdqVIC0uVUg8QejlVkbMRTGSZFTPFh51p1OnUzTOcGdpm53Pf DMSRPDDX1kg/LnMqpVd4koiTkhUD1vo4OLOJe5vbnMyuqWIRFgN68dYQ4qwUSwx+aeG6 B4XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181236; x=1761786036; 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=9KyrEoOAeZKPRfbyTnz5cosCWFxdbO0nbS1ytMd/2Og=; b=fmjChKlQdGFbElYN4VD1FOp0Oz1D+5ibxMQ+SJOAPbFQ9gFOuj60G9NZSyLFLCzO7C u0HqkxYfdlURaKl0Lb2L0On1Hg521zH7k5n9lUbs2elWcVd764dNwUKgckjoHMsAB48N SqNVLnB3KymD2w2VM2C+3yFUa3SXpKb9dHaCeIS43At7+o3Cn0HyQae+OXQLET0CtoZ5 Uu66ml3kvCnqWxRbYY7gRT3tbtExkd6C3b9xlArsIkdd5VbEWdwvrtdPXbfab4VBZ8ks V242t29Uor3YnPfhvFUBmkyWqVEI5Phm0cIPbZu1Flo1jIWaBwVdF3S/qEeJ4l9gBEoE AxEw== X-Forwarded-Encrypted: i=1; AJvYcCUzVktHjswy/ecKxY0Fl7LvJfdQS8762HVC6wwStdu7pOBlbJfdGBy0ATNeYm8zGymP3WZpK51t4gfZxfY=@vger.kernel.org X-Gm-Message-State: AOJu0YwrI3dCUriBKSp8ZzJRpsTa3AbxVPYHXBm44VIhJHtB5ApXbxlf B5iSAINLnvNvwiLxJtNk/qsVMT24BCRblHFmk6qR+C8tNgVkUm8gkjtz X-Gm-Gg: ASbGnctwjjg4PT15KQhQMj0lUFl2/3DmURCcgxQt2L9WAkcNEF4VDHJAPWtpi5C9P8M Q4Eup3U1Vx58hyzw51EzrE2XntH2IE/gMw+NukrXxbhe9E+2mvmtloGSk+gbjlAiBZrEy0/PPbT REDcug1QdEpaZMKlcRdKCKYG21/Sb6nm3Db5Cv3EkSamXvOsZbBi9D8hyEVTM5NIXornwyNb41R stq0jTSO/iH6gXoQ46mjXhCbzbAO1DNB5e6wb3/RuEFNpDkDonREUwk6O5AWdv864gjhDK1Egka zEoIbaYXgzwDkjprvyJ7+JYxzA31YjHKzHsM4Z1qNvjITvwCK6D5OB9rxTx+QvGxX7v3IsNt1p5 LS/+CZvtsbsPq9jIwn+hRFot6XcwuWQy6pGkVFijEIchkar7pocDwRPex7Kq5MHdgYWh2p3wTIE yu3jsjrizslYKYXYgkVw== X-Google-Smtp-Source: AGHT+IEOXbL7VuQGK4ycx5x+XFWwQbZrBd+2XbxwOLCxBAkNJU5f38Hm416YN0mJLPBe2ibivOPQGg== X-Received: by 2002:a17:90b:5343:b0:32b:65e6:ec48 with SMTP id 98e67ed59e1d1-33bcf84e1edmr30854960a91.8.1761181235816; Wed, 22 Oct 2025 18:00:35 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6cf4bb9027sm360734a12.6.2025.10.22.18.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:35 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:15 -0700 Subject: [PATCH net-next 11/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: <20251022-vsock-selftests-fixes-and-improvements-v1-11-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, 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. Signed-off-by: Bobby Eshleman Reviewed-by: Simon Horman --- 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 aa7199c94780..038bb5e2b5e2 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 Mon Feb 9 00:38:59 2026 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 C40471DE4CA for ; Thu, 23 Oct 2025 01:00:37 +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=1761181239; cv=none; b=MOrerG9sTOr+h74bPWK9S6DidBGPanSRME6y02GlOmBmqQ1hpVVU4TFhO5uFQcVLW8VKEUS9v+dXEdiJWRfcpLxdFnPY5pTYwzN7L1Y7UwZSn8G0CIU6SGNbdPPRUOvy+DXexE6nGfU0I9zI4bRfc/wIt7v5IX3DZJ+I79Ygzwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181239; c=relaxed/simple; bh=0gdl78nLUN6qDU9c49g00gHfPsOWu9yWlnAwLxCpxsM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KvgroV0+s2/3a/MZyqritd08yxXmhM3V6ZZaa9Df/vTB00laKxophWSMlrMy0xy3Rgxd3t6b7UmDvOGaivZvGHW4Zo8xykosmkfNPeEGU443fAWxkjtK1N2adBMi71+Tq/9lM8lm7prHJWsXI+kHzGCLlxmXEuN/25sSJsYSIFg= 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=LTarZ7Ql; 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="LTarZ7Ql" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-33e0008d3b3so291973a91.3 for ; Wed, 22 Oct 2025 18:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181237; x=1761786037; 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=+cswws6nw1UcLqOlSgHDjsHbmmRPUE9+8RNFOhZ/bbU=; b=LTarZ7QlXgJC0csl3gaT7S9YAatvTMy6Jsm4TgDLsRlWUiJPTcDr4DvaDkSM550oME J7LATX+3xtjdP5zJuwb3pr68XHLTbrq/KQ61fdkuVWXVAepqtVo3hpnfehikItxBBnBM 1wtMthWMtZz5im8pGYOq6u/cgwJPZ23n2K49dwPkrHpxoHXWhaXX1X8zEmNCyeHtflrY +US+59b7b+bhkUCBqZ/xnwX1tZ2P2KWpR7+V3oBoOEoyhyjKiqZnQGci5i7geYb+GpIs EQWtydSCH51kqpojWNoComjEiA0LdDFqON0LXytY3dBURMJpn+/1ZGPaU0Xq338zq6pD DI1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181237; x=1761786037; 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=+cswws6nw1UcLqOlSgHDjsHbmmRPUE9+8RNFOhZ/bbU=; b=U7Bk6gJLBbdaZDPltZNor8wwDGpbKx/nXmvWoCfq28AdXdq6Xe3dqJl9QOE2D0OQju nXKdQNJqAFXLjqvE5pjahYNVVuy7NR1jCDFn0Ra9olpC1PHMw9CyiwAbo9LaIYNSg5M4 hHI+UIqTkGy5N2G2Zg3HPffZuh8rtG9IE9J7hOwHNKD6P0T/427LCJqzhPUBIF6coq37 tZ/TP5yg7xfy7NSihsPLlWzbHAUUQiBsOo1hA/kQ6wZ8HiUgN9Ve8i6z0480VdRMUlc7 ZV5MU2f5rEPE9Ds2wrAjvQOreyDymgxLY23L+Gxp8JoWx4F8mGt83FosoFP0D+Xf70Wk ndgw== X-Forwarded-Encrypted: i=1; AJvYcCU3l0c+2pZGsI7ewYRmVS69+RGT7mgtlmv+yEqz7XVnr2ScKMVqBLdrCrNmK3UFuPRNC/fce+UUOugzFZg=@vger.kernel.org X-Gm-Message-State: AOJu0YxKCGfsQetIjHuQvEvzkKiC+NoNJrPppAzN3BfgdomNtBHt8sES WfZU+LIe2y86k96bKMlLIP8aX14rV1a8NKXTjOAm1hD3hhYOPFPTM2Xk X-Gm-Gg: ASbGnctUWO5GIdN9AfqnExB4ZizhDtM2DoT4XLANLPbd/p/NJ2apXCwG40XGTxsomHK ASCbua9+ThZs/XAa6qxv8zfzZx0WvnGUpsa3sIhute6zzMOMWq1qPxsg/reKZ66j+bVLzeu/gnt 4KlKNYwTHGIF81OLQYACuJp3yG/im3eKCDx8NtGNIKBPKsMgdUOfbjvKrqUEwn6tekrZVKueH/f kSfYYQ6ayrQrS4eH2AkcCBLUqJsrv0VOgL7slyBJn/FlOfTX8A7244yXJfx4mQN5E3x58ZEAScU P0xmbqh8XmIsaO5gYTZhbTk1AZc8PXV6Ycu6y9iOXZcqkLt0O9vqRyK+gi1VxWF7XHj7AGceYzd EFRQZIcmxXeCVt25U+uG919k+mXQJqRA9GRWnieEjtRGVBki5rLS3bgdDib+h6gmQi1NWA0zujv uSVes/IUU= X-Google-Smtp-Source: AGHT+IHFMWz/k3rf0exIhdMWgyBNfPBQLd//9lK2ixQKJ308LaXrH8yGDSVFtVxEd+3WBYMDTmigrg== X-Received: by 2002:a17:90b:5105:b0:32e:749d:fcb7 with SMTP id 98e67ed59e1d1-33bcf87a85amr32540449a91.13.1761181236821; Wed, 22 Oct 2025 18:00:36 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:9::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33dfb67f151sm3310254a91.2.2025.10.22.18.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:36 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:16 -0700 Subject: [PATCH net-next 12/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: <20251022-vsock-selftests-fixes-and-improvements-v1-12-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman Add vsock_loopback module loading to the loopback test. When testing vsock_loopback as a module, it must be loaded before the test executes or else the test will fail with errno 110. 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 038bb5e2b5e2..62b4f5ede9f6 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -445,6 +445,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