From: Bobby Eshleman <bobbyeshleman@gmail.com>
To: Stefano Garzarella <sgarzare@redhat.com>,
Shuah Khan <shuah@kernel.org>, Jakub Kicinski <kuba@kernel.org>,
Bobby Eshleman <bobbyeshleman@gmail.com>
Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Simon Horman <horms@kernel.org>,
Bobby Eshleman <bobbyeshleman@meta.com>
Subject: [PATCH net-next v2 02/12] selftests/vsock: make wait_for_listener() work even if pipefail is on
Date: Tue, 04 Nov 2025 14:38:52 -0800 [thread overview]
Message-ID: <20251104-vsock-selftests-fixes-and-improvements-v2-2-ca2070fd1601@meta.com> (raw)
In-Reply-To: <20251104-vsock-selftests-fixes-and-improvements-v2-0-ca2070fd1601@meta.com>
From: Bobby Eshleman <bobbyeshleman@meta.com>
Rewrite wait_for_listener()'s pattern matching to avoid tripping the
if-condition when pipefail is on.
awk doesn't gracefully handle SIGPIPE with a non-zero exit code, so grep
exiting upon finding a match causes false-positives when the pipefail
option is used (grep exists, SIGPIPE emits, and awk complains with a
non-zero exit code). Instead, move all of the pattern matching into awk
so that SIGPIPE cannot happen and the correct exit code is returned.
Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com>
---
Changes in v2:
- use awk-only tcp port lookup
- remove fixes tag because this problem is only introduced when a later
patch enables pipefail for other reasons (not yet in tree)
---
tools/testing/selftests/vsock/vmtest.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh
index 1715594cc783..da0408ca6895 100755
--- a/tools/testing/selftests/vsock/vmtest.sh
+++ b/tools/testing/selftests/vsock/vmtest.sh
@@ -251,9 +251,11 @@ wait_for_listener()
# for tcp protocol additionally check the socket state
[ "${protocol}" = "tcp" ] && pattern="${pattern}0A"
+
for i in $(seq "${max_intervals}"); do
- if awk '{print $2" "$4}' /proc/net/"${protocol}"* | \
- grep -q "${pattern}"; then
+ if awk -v pattern="${pattern}" \
+ 'BEGIN {rc=1} $2" "$4 ~ pattern {rc=0} END {exit rc}' \
+ /proc/net/"${protocol}"*; then
break
fi
sleep "${interval}"
--
2.47.3
next prev parent reply other threads:[~2025-11-04 22:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-04 22:38 [PATCH net-next v2 00/12] selftests/vsock: refactor and improve vmtest infrastructure Bobby Eshleman
2025-11-04 22:38 ` [PATCH net-next v2 01/12] selftests/vsock: improve logging in vmtest.sh Bobby Eshleman
2025-11-04 22:38 ` Bobby Eshleman [this message]
2025-11-04 22:38 ` [PATCH net-next v2 03/12] selftests/vsock: reuse logic for vsock_test through wrapper functions Bobby Eshleman
2025-11-05 14:25 ` Stefano Garzarella
2025-11-04 22:38 ` [PATCH net-next v2 04/12] selftests/vsock: avoid multi-VM pidfile collisions with QEMU Bobby Eshleman
2025-11-05 14:32 ` Stefano Garzarella
2025-11-05 22:42 ` Bobby Eshleman
2025-11-04 22:38 ` [PATCH net-next v2 05/12] selftests/vsock: do not unconditionally die if qemu fails Bobby Eshleman
2025-11-04 22:38 ` [PATCH net-next v2 06/12] selftests/vsock: speed up tests by reducing the QEMU pidfile timeout Bobby Eshleman
2025-11-04 22:38 ` [PATCH net-next v2 07/12] selftests/vsock: add check_result() for pass/fail counting Bobby Eshleman
2025-11-05 14:41 ` Stefano Garzarella
2025-11-04 22:38 ` [PATCH net-next v2 08/12] selftests/vsock: identify and execute tests that can re-use VM Bobby Eshleman
2025-11-05 14:45 ` Stefano Garzarella
2025-11-04 22:38 ` [PATCH net-next v2 09/12] selftests/vsock: add BUILD=0 definition Bobby Eshleman
2025-11-04 22:39 ` [PATCH net-next v2 10/12] selftests/vsock: add 1.37 to tested virtme-ng versions Bobby Eshleman
2025-11-05 14:48 ` Stefano Garzarella
2025-11-05 19:24 ` Bobby Eshleman
2025-11-04 22:39 ` [PATCH net-next v2 11/12] selftests/vsock: add vsock_loopback module loading Bobby Eshleman
2025-11-05 14:48 ` Stefano Garzarella
2025-11-04 22:39 ` [PATCH net-next v2 12/12] selftests/vsock: disable shellcheck SC2317 and SC2119 Bobby Eshleman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251104-vsock-selftests-fixes-and-improvements-v2-2-ca2070fd1601@meta.com \
--to=bobbyeshleman@gmail.com \
--cc=bobbyeshleman@meta.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sgarzare@redhat.com \
--cc=shuah@kernel.org \
--cc=virtualization@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).