From nobody Mon Dec 1 22:36:50 2025 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 984F2325709 for ; Thu, 27 Nov 2025 07:47:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764229676; cv=none; b=FhmjA2kDmIBP9986Rib9XG7wmgly1LThmJEjcl7QA+bJzWIqGNt0bKJBBgOR+17GQY91hHTxH5STIDtJFS0vnqwi5mJNtO7VuGv9faJXu/6My1+6wQUXmiQl9h8Tuxi/OD8MtCy9hj12c/9hFhHayp5zw2AOvoRAK0+wwlHJyDw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764229676; c=relaxed/simple; bh=VXSznUA/qrGw37DlDQ/ITpl+vbnJQhBZAvRQarakHeE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IBnoEiY+bjmnALdTmw5f7B7vTuoPf3O53/yMvuCh7PTJa8li108dmXH8jPzfwpDDZb6YgELMC83L1dULfp59Fr4uInSBj8dLeUPj3nd+pCSuo5hUBt+6fyblRlca5KjkI2UbGF3+qUxGVjYkD39eerGi0y0pA1Kbp2ni6/rbJTk= 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=WikHZaK9; arc=none smtp.client-ip=209.85.216.53 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="WikHZaK9" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-34585428e33so628571a91.3 for ; Wed, 26 Nov 2025 23:47:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764229671; x=1764834471; 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=81Yb0D7xNXy+MdzfxaynPdllQZqiJyMZrUjJeETwoWg=; b=WikHZaK9uCb14sc9tWk1a8ahDKOQyP5MPHTQTTvBDi5x3sUPb7U0JOZRLNS5T0fKdv 7Yl5tInXpO1ZnwaO/cmAkRQ3YIcCRZRfELueqV2YwpDOLKlkSEm/NA1KMa1h026h1PYD QrjmMSLDKVFZIyPue1ElrVhA8L6B/3Ax3o+XOfIY3U8GpPI6CHlLlxItXVa6WINpVrmy 3nu/f/yncbUbXh/iMp+7XAN3CP3/kHXuuHIf6ibWBdFeDqnKuX480DQxAxHZM9zpBn+p Z8hdNBq/XGmEBjp9rNP9w3ZoepkYXgmil3X6/0CVnrR5Ve4F8PVl0eQ8OJ1+yH74JIuy vmNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764229671; x=1764834471; 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=81Yb0D7xNXy+MdzfxaynPdllQZqiJyMZrUjJeETwoWg=; b=KjTN1srpTKnePvMRPxEhkHXAB2S2LHmMdh0HT1uFR7qMnZyTbXtiKVC9Qs5AZS4Gg/ QNd+NHuxoFXWqcSmVRn8nohxjpoKBaL8axz091t/CD5vdI0mVy7gJGuMW/sbe5Qdz7qy q2zyl706R+D7rfAwYdPdzgeBwxpTwsiIioUfRU3fbOiC4X4GEnp9Ggzk9z7dUUX1j2R6 7vUMdp/zJy87K/w8nYEwze5FO4icMqc9uyxWThvpW3vC7mWTVnyXEkb3rcFACdoOFCXQ 5uAH3HXcSMoMfKuQTVZTlUWal0TudV+2mCIZtVQk9GEZcOWXcXgn5amLduJ7Mjd/1DfR FNCA== X-Gm-Message-State: AOJu0YySJYOPaJNrePbXIhXizWttu1wtc/G9it/I2nSXBxnBvogXGStH q9i26GdyFwZblzafMaCE+ddKvBvGV7nX+PEqx9pGlhm+pE+ICcZOSIxt X-Gm-Gg: ASbGncsVWWyO3wWtECX1Y2upmC0sJPLdR5VvPU+xwHjBWpFcUleHea5Aop3NucjRbEj Zul+AfsWbz7S/QN5P9zqh7n0jD4dbODIsG1lDpXo0hF3EBKCEJ7/h0maV30yMSdHV4vtTToPpBB +AjnT32px0vK2+nLdpQkEDf09qZMLZbyVbupq5poFxTmHgDJrU9ZZRe7eQFTWfYi4mvGk2mnC1v nOYlG8qVJWHOFr0/4bUaRuUidPYMzHncmrycWPcAGUmoqem61J068MxkuVieS2TSRZAiQVzdkhx 0QjUmf55RdIvNo/iKJ3wPt5Vfx15KAysenktVZLJ0dqV9q0xjkAAWRFMjxl9WWjblJhuix41Jr5 R53Xqv3QOnSj0+nCw0bRvPVdgf66zTWI1vEpV2GFLWuXaD8H1buwR02MrinJPDDtTCvqobQ5j8r OBLSJZa2g0I+85Ww0grAQ= X-Google-Smtp-Source: AGHT+IHm9n1hN/MXgqh8Fst0OOiMbfzgNDndic/dBuz4wSklQZaHZ2bC0MkEgH2q8ls+YwLmQfHTOg== X-Received: by 2002:a17:90b:4c48:b0:32e:5d87:8abc with SMTP id 98e67ed59e1d1-34733f3f6d5mr19204188a91.36.1764229670667; Wed, 26 Nov 2025 23:47:50 -0800 (PST) Received: from localhost ([2a03:2880:2ff:3::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-be5095a0e65sm989665a12.27.2025.11.26.23.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 23:47:50 -0800 (PST) From: Bobby Eshleman Date: Wed, 26 Nov 2025 23:47:37 -0800 Subject: [PATCH net-next v12 08/12] selftests/vsock: use ss to wait for listeners instead of /proc/net 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: <20251126-vsock-vmtest-v12-8-257ee21cd5de@meta.com> References: <20251126-vsock-vmtest-v12-0-257ee21cd5de@meta.com> In-Reply-To: <20251126-vsock-vmtest-v12-0-257ee21cd5de@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 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/selfte= sts/vsock/vmtest.sh index 1623e4da15e2..e32997db322d 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -191,7 +191,7 @@ check_args() { } =20 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}" @@ -346,21 +346,32 @@ wait_for_listener() local port=3D$1 local interval=3D$2 local max_intervals=3D$3 - local protocol=3Dtcp - local pattern + local protocol=3D$4 local i =20 - pattern=3D":$(printf "%04X" "${port}") " - - # for tcp protocol additionally check the socket state - [ "${protocol}" =3D "tcp" ] && pattern=3D"${pattern}0A" - for i in $(seq "${max_intervals}"); do - if awk -v pattern=3D"${pattern}" \ - 'BEGIN {rc=3D1} $2" "$4 ~ pattern {rc=3D0} 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 } @@ -368,23 +379,25 @@ wait_for_listener() vm_wait_for_listener() { local ns=3D$1 local port=3D$2 + local protocol=3D$3 =20 vm_ssh "${ns}" <