From mboxrd@z Thu Jan 1 00:00:00 1970 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 0BB402EA743 for ; Fri, 7 Nov 2025 00:49:53 +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=1762476595; cv=none; b=lk570YRQdz7cM/iJ9suiDOMf/LwpMVbif/YBohfrL2bjwLnM8IklQyb7tBO92kRecPViWZjHVruClxMCpYd4oNty2ukUpRqg0mBIJiADOG3ILrx5X+uWKUhLdhNtY5+EE5BCpuxVUOi8cim/I4uyFWx4EnQRL4NEogcKkbW/n3w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762476595; c=relaxed/simple; bh=koFlOU8nPr40dYCnNR2Kb1hX/evxzyHNeLTqs2N9DX0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XxMlpaZZC3KPrf5UNKUAFLVn8oiWs0JKY03tpPcKtBeqQdonz+UPPMLilq7bcs76h1hjjjRlg084xcEuFOno2VdVMVkx2hYJnhvqnAd0F0C3aLKrjlr9OsJHkUyAVU+saab3lVw5wL+aohnppCxbWVR9EeUaN/9gUIkP6dV87+Y= 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=b0CYzKgT; 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="b0CYzKgT" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-33ff5149ae8so138188a91.3 for ; Thu, 06 Nov 2025 16:49:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762476593; x=1763081393; 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=+bHLKHBydWD3BQnmasHq5DNEmPhWMbiyT3gusZiID5w=; b=b0CYzKgTztdTUUKCxanJqUiW7J1jEflGOXLWEC4l6OaucJJmU2qFO3Vr0ljJpeNidS H5SL8CokydlM4MepEhgZfMw+yM4uvQTYw80/qgBsdq4/c05vOKxsmEDvV4vPNMmigk/w g9+d7edhYqaTtl0ywojnUjCFoM91mImK5JcFlxS29UjJURmHCV0lYTTSRYLMfhkauLJS 2gOwLBcc0nakf+Hbq4RWUN4JnjRYVvbbQfpG2r2cINOVyBFU5y0VANB8ITaFOFd/7j1Q XBGc+Cx/cdY0LL8fi6L0WpIbrXWiTA04hQ3lVX+ypb0GsbmfZ+JD6xUVwX8JEFeLpBar bUZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762476593; x=1763081393; 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=+bHLKHBydWD3BQnmasHq5DNEmPhWMbiyT3gusZiID5w=; b=B33dvLoZl8Q9v650ux4eIXsO3a9fh48cxP/L7YJcd7b6mqteWMh8SuhiBZqHaKu2l5 GZuAB51VWo7jwd9TBF0xH+dmdwMUJ6QKd/ZhdKX+rIHJ2A4+rKlxN4+dq7WraYdOA6lZ eT6PjKDcp3ynmwQT7S2lmWKI2mp7OKFAuh5DXNbwgqgGMnmI3ss/Dg7X3Jq7ZhTnGIvb l3kABRf+XmSwBUUwFe75y3FZxySXgLkQjLRgO0dmus2jhkfjg4z0N+9LS3qHGrZfYQrE Vxio3kUO9gQRb8jwHvYVjZTe/ApNN/v3ZD9vLVPnZd1qzqCx0dDZ7VZ+JGP1r+F5kXeV r+Ew== X-Forwarded-Encrypted: i=1; AJvYcCWrZak2tLBYhykSzzreBAAsaHwsfcCvx5foy9dDQZ5EaENr67yGxAtc5GkWVOu8kQvWRDoSaTKW3V2UJ7X/kO4=@vger.kernel.org X-Gm-Message-State: AOJu0YyWCkPxsw6OxTyJVneH/GlwFHVQBDr1WdB08mh5+JlA+HVcc/L8 OEKy0s94G9GPnVur0e3oq6/gbb/wZuDL1IMmiTt++pAybhkcl5XC8ARz X-Gm-Gg: ASbGncsiS6HOIklqbI6TgKEgIDmWvU8KC5PHVjyQ7HjKbeX9o2KWCE6nyN5JK41Wwid yEmJFaVd7ydbvhI9Ln6MjsFzfIVqprn7/eTcPaPeYC0pDEX+WUW11kUm3BHHpYOWe0igwIrsquo ML0rnk1YSCm5I2FbuqXCN3s5Lx606dyIzMKocXbgSbt83I7GUfFWv8PFaLaNtAEbNjUsqk8WOAk YFXaBfUYGUP+fF3Wpw0y+4/Ow1hMQo87GyQIg6TPUaVfQMEpIV0ULSpO7C30FuWbwCOw3hZji8P 7TGl0p21CZVywj2tVYQ4LaThgX4AJfCXgeMb/ggS2UuD2QG++iYVLtn78LcOW8LO6pH3/fw4EJB l3+aMrnUFXaci/7bygg76/Ds95H12JB44WAYFs7PXfTnuqByh3Q+jUEQCJZ5NFwvsf4hN0q7PyQ XxrtLXfzO0 X-Google-Smtp-Source: AGHT+IGGoy9wEEdfN0EFLwAgMu/11l3zKvwUuDnYxOVJXD1G2hGNpGxEh0fLCyEjaIvkGIR6LPuB/Q== X-Received: by 2002:a17:90b:2ec7:b0:340:a19f:c25b with SMTP id 98e67ed59e1d1-3434c55b5b5mr1365389a91.24.1762476593115; Thu, 06 Nov 2025 16:49:53 -0800 (PST) Received: from localhost ([2a03:2880:2ff:70::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-341d08afb02sm2233539a91.0.2025.11.06.16.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 16:49:52 -0800 (PST) From: Bobby Eshleman Date: Thu, 06 Nov 2025 16:49:46 -0800 Subject: [PATCH net-next v3 02/11] selftests/vsock: make wait_for_listener() work even if pipefail is on Precedence: bulk X-Mailing-List: linux-kselftest@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: <20251106-vsock-selftests-fixes-and-improvements-v3-2-519372e8a07b@meta.com> References: <20251106-vsock-selftests-fixes-and-improvements-v3-0-519372e8a07b@meta.com> In-Reply-To: <20251106-vsock-selftests-fixes-and-improvements-v3-0-519372e8a07b@meta.com> To: Stefano Garzarella , Shuah Khan 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.14.3 From: Bobby Eshleman Rewrite wait_for_listener()'s pattern matching to avoid tripping the if-condition when pipefail is on. awk doesn't gracefully handle SIGPIPE with a non-zero exit code, so grep exiting upon finding a match causes false-positives when the pipefail option is used (grep exits, SIGPIPE emits, and awk complains with a non-zero exit code). Instead, move all of the pattern matching into awk so that SIGPIPE cannot happen and the correct exit code is returned. Signed-off-by: Bobby Eshleman --- Changes in v2: - use awk-only tcp port lookup - remove fixes tag because this problem is only introduced when a later patch enables pipefail for other reasons (not yet in tree) --- tools/testing/selftests/vsock/vmtest.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh index 54bae61bf6d4..d936209d3eaa 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