From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BC852673AA for ; Wed, 24 Dec 2025 00:29:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766536151; cv=none; b=BJU6IGHbDSXji2vtDmS40mPDYwNo2wa9JFA8QZ7kn0LpZ7BRTOm5bQDqiud1LHyALB0e2gqHueEc/Hl2TfyTm7LPqZYyO2mGCNQQbpSlK4lM1N+oB/GzhUVgAlkQAhNM4ldCsndIe1jKOqNJ/PwFqmTTTNNyl77//jwx7W65CE0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766536151; c=relaxed/simple; bh=P4erHizl27nbkGk13UaQgtaMcmfPrCQL8OW5nr9GtQs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eOX/1C7v5IDU7zsoRGdsHzSIUS+mJVkBK14hFI1SF8JW+LRYWH+egY7Cq0EuJPMdQ3neGzwsHukxQr/YQWB0zR+fM469CTBloIg7MKsasRlJHnV7MOK5l3VVzfe9HfHo5engguu7UzjD4c37cjssCvEhzlPLD/p6U9XrznbbrFE= 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=dhgWFr08; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dhgWFr08" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7bab7c997eeso6237712b3a.0 for ; Tue, 23 Dec 2025 16:29:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766536145; x=1767140945; 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=pnWUXZAQs2u/RX1G1g/cLNdC4zcJTVF/JpiRxAH0cLc=; b=dhgWFr08MCIgXvO+gifjtNO0TYYNX6DbBmamwC8C85tyREKMzR1iL8d+VPOIb+EUWW X7eV2K/Jm4KBGdxT80Rjpaa33zOqAZ85w9RZMtmbok5/sUYPEuyzOQiPh/D8phn3TBhc ex/qhdLdsQbofksFkEYCCAuHC9UiuvfsaJD43qqavKAdQ8P+Qiww2OLVMFSQu+Nj+LEK G/E3+RfWr8N+OezmWLmBPdk1xs+Ae8sKY9qKZ7fxLxNH/L4FQ5cJ8VJLcObmmo5JoXlz EfAf9rIhrVc+g8wVcdxJuMHrHyU5qqNw1g1i2girPLHP50Pu/w7Faj+yTuE2EWV6+qYZ 6RkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766536145; x=1767140945; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pnWUXZAQs2u/RX1G1g/cLNdC4zcJTVF/JpiRxAH0cLc=; b=iPJG2zIZuOaPpFKxCCg1mKFIKblqNqmBCJoQG31ubATLvwcx1jJoZXhEmdkztLTC0N QwyWk1AmczgqHmYbT1yTW85HxndPlttL20cbvvEjGJNuWmzbPy5ST1CENn2qrPKjFl61 pGirx9cOOWav7+MkIumOQvhFyQ69pablYOrxQlP70HDOHMpuz+NQlhOxRxiFe7ZUI7F2 fhaG6qS0mrXCScKkOkj53aVxPHZwBayIbLo2In6w9BIotrSYEpBDhJSfAwesTPfHfScz upuM9bDfQFe9GYrKtsv54m4spReb9BuMgXWW+gv4AIpTXMXYdXkAT8nEBsyrRZ/Ziz1+ ClHg== X-Forwarded-Encrypted: i=1; AJvYcCUzL8jWT72s7SpIOhn4ixHpIlVQ54GcmBsu83vSUyER44kYe4SNu6I5cllVaHbccOX06xRIUD4=@vger.kernel.org X-Gm-Message-State: AOJu0YytmuDRZc3qqN1jMkKPja5oSDw/nVW/3Y5RY3HPaOEWUT94nHhm HQWBOnjiRPyU3YArsgXtTvc/AdaD5osGjHD99N2qwP7wLvBrKM7p0EDr X-Gm-Gg: AY/fxX7ZAl+3ew5Rqi+4gsy/sXJdrWAq3z94W22iNsexiGmPSPQ3sZNmBxhtc8TM/bv vDFT0qfqoRLipPjXBYXVifpcNF1syVhUz6koXueqbKczaAmeV5qjdOrMwfILXSnoeDjjotJaXp7 K6v2N9ocd8+v0PwmSFMX/pi5ASoWiz3z5H0Pns4FYFiDksCer/Rw9K6HtO5H2M9b0cf27c75VGb wJ3vJpHgaxMvCl5BPDcKJjLrK+w9jRF715RZZR5YwUYm3Yq8hUfe0JdrLQkGPaMbHwKnKWYjHqu 0lijwQ8JgZ9srrH1V4moKbOh+V6Pu+s+kfuwh1596HozxIupmqQ3f+GFzIH4ldlbrwINs+UO0Iz kfnMnOMPQa1yuWmGWt+qWmBEMvsKmkYk7f7R/vu7kz/LXydVd5lHlsqjdjnoglCn3HdlaBvtq2e fqV3wmqY3GIEJf4ayC2V8= X-Google-Smtp-Source: AGHT+IG9bM40+23m7ksLXlbMaHJ4J5fajkInG27QTdkeyL6rIcjmRvm7kMrKaaEMk9caXe/lgKe2eQ== X-Received: by 2002:a05:6a00:6ca2:b0:7a9:c738:5e88 with SMTP id d2e1a72fcca58-7ff657a1298mr13744515b3a.8.1766536145181; Tue, 23 Dec 2025 16:29:05 -0800 (PST) Received: from localhost ([2a03:2880:2ff:7::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7b423d86sm14802196b3a.26.2025.12.23.16.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 16:29:04 -0800 (PST) From: Bobby Eshleman Date: Tue, 23 Dec 2025 16:28:43 -0800 Subject: [PATCH RFC net-next v13 09/13] selftests/vsock: use ss to wait for listeners instead of /proc/net Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251223-vsock-vmtest-v13-9-9d6db8e7c80b@meta.com> References: <20251223-vsock-vmtest-v13-0-9d6db8e7c80b@meta.com> In-Reply-To: <20251223-vsock-vmtest-v13-0-9d6db8e7c80b@meta.com> To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , =?utf-8?q?Eugenio_P=C3=A9rez?= , Xuan Zhuo , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Bryan Tan , Vishnu Dasa , Broadcom internal kernel review list , Shuah Khan , Long Li Cc: linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kselftest@vger.kernel.org, berrange@redhat.com, Sargun Dhillon , Bobby Eshleman , Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Replace /proc/net parsing with ss(8) for detecting listening sockets in wait_for_listener() functions and add support for TCP, VSOCK, and Unix socket protocols. The previous implementation parsed /proc/net/tcp using awk to detect listening sockets, but this approach could not support vsock because vsock does not export socket information to /proc/net/. Instead, use ss so that we can detect listeners on tcp, vsock, and unix. The protocol parameter is now required for all wait_for_listener family functions (wait_for_listener, vm_wait_for_listener, host_wait_for_listener) to explicitly specify which socket type to wait for. ss is added to the dependency check in check_deps(). Reviewed-by: Stefano Garzarella Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 47 +++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh index 4b5929ffc9eb..0e681d4c3a15 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -182,7 +182,7 @@ check_args() { } check_deps() { - for dep in vng ${QEMU} busybox pkill ssh; do + for dep in vng ${QEMU} busybox pkill ssh ss; do if [[ ! -x $(command -v "${dep}") ]]; then echo -e "skip: dependency ${dep} not found!\n" exit "${KSFT_SKIP}" @@ -337,21 +337,32 @@ wait_for_listener() local port=$1 local interval=$2 local max_intervals=$3 - local protocol=tcp - local pattern + local protocol=$4 local i - pattern=":$(printf "%04X" "${port}") " - - # for tcp protocol additionally check the socket state - [ "${protocol}" = "tcp" ] && pattern="${pattern}0A" - for i in $(seq "${max_intervals}"); do - if awk -v pattern="${pattern}" \ - 'BEGIN {rc=1} $2" "$4 ~ pattern {rc=0} END {exit rc}' \ - /proc/net/"${protocol}"*; then + case "${protocol}" in + tcp) + if ss --listening --tcp --numeric | grep -q ":${port} "; then + break + fi + ;; + vsock) + if ss --listening --vsock --numeric | grep -q ":${port} "; then + break + fi + ;; + unix) + # For unix sockets, port is actually the socket path + if ss --listening --unix | grep -q "${port}"; then + break + fi + ;; + *) + echo "Unknown protocol: ${protocol}" >&2 break - fi + ;; + esac sleep "${interval}" done } @@ -359,23 +370,25 @@ wait_for_listener() vm_wait_for_listener() { local ns=$1 local port=$2 + local protocol=$3 vm_ssh "${ns}" <