From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3B452A1D7; Wed, 21 Feb 2024 13:42:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708522970; cv=none; b=L7k06UbklXI210Pl5lLZLA7jLdldpiY6mOxXl6g7SCbEtzhLxi7GMehOaV52U+hX3jOKCH55wOl7XF0tnWItt/URsCkn5138IRleRemyQdQt/AYb1egGAZPluNRvYHGcYX+syjjZDP0iWafhJzjTjJnoS+/KmdGHnxCRHHLaspg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708522970; c=relaxed/simple; bh=bg3I3NvyHBMBTfuRU71+giDWkMMN+0uYfDbEd22APE8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IsHUnlF69qvA2NnZmTXiULAELMpTmh87iJeqA8Rk3sno5VXKyJttDAdxDxOVIQvpxEyxgdj5H7t922dLZGaeUC/vqHIHmthvTWWjiSU1pB58SgShBnGHA6dVQOMS6NPqaFmdbI4+pBsNt+yddwWp94Fjirth2s+tE3uG75zQXP0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Dv9R0sSI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Dv9R0sSI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22D31C433F1; Wed, 21 Feb 2024 13:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708522970; bh=bg3I3NvyHBMBTfuRU71+giDWkMMN+0uYfDbEd22APE8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dv9R0sSI7wWZSt/QZqnUr31INMEMh/FuqlNpFvI0ybzuL34okibMpQXvhKyMc90bC e0zDZuenqvGq6QK+ex643oi/mMbDA6I+J9Lehhuo1SNXV4Za6zWmWGjbJleHvR4uhi z8izapdl50YZKCAPDpwiWd5T+tXAFqlRGFP+uJRQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Paolo Abeni , David Ahern , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 306/476] selftests: net: avoid just another constant wait Date: Wed, 21 Feb 2024 14:05:57 +0100 Message-ID: <20240221130019.322947616@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paolo Abeni [ Upstream commit 691bb4e49c98a47bc643dd808453136ce78b15b4 ] Using hard-coded constant timeout to wait for some expected event is deemed to fail sooner or later, especially in slow env. Our CI has spotted another of such race: # TEST: ipv6: cleanup of cached exceptions - nexthop objects [FAIL] # can't delete veth device in a timely manner, PMTU dst likely leaked Replace the crude sleep with a loop looking for the expected condition at low interval for a much longer range. Fixes: b3cc4f8a8a41 ("selftests: pmtu: add explicit tests for PMTU exceptions cleanup") Signed-off-by: Paolo Abeni Reviewed-by: David Ahern Link: https://lore.kernel.org/r/fd5c745e9bb665b724473af6a9373a8c2a62b247.1706812005.git.pabeni@redhat.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- tools/testing/selftests/net/pmtu.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/pmtu.sh b/tools/testing/selftests/net/pmtu.sh index 8797f7b5fb83..31e3d0db7a12 100755 --- a/tools/testing/selftests/net/pmtu.sh +++ b/tools/testing/selftests/net/pmtu.sh @@ -1795,6 +1795,13 @@ check_command() { return 0 } +check_running() { + pid=${1} + cmd=${2} + + [ "$(cat /proc/${pid}/cmdline 2>/dev/null | tr -d '\0')" = "{cmd}" ] +} + test_cleanup_vxlanX_exception() { outer="${1}" encap="vxlan" @@ -1825,11 +1832,12 @@ test_cleanup_vxlanX_exception() { ${ns_a} ip link del dev veth_A-R1 & iplink_pid=$! - sleep 1 - if [ "$(cat /proc/${iplink_pid}/cmdline 2>/dev/null | tr -d '\0')" = "iplinkdeldevveth_A-R1" ]; then - err " can't delete veth device in a timely manner, PMTU dst likely leaked" - return 1 - fi + for i in $(seq 1 20); do + check_running ${iplink_pid} "iplinkdeldevveth_A-R1" || return 0 + sleep 0.1 + done + err " can't delete veth device in a timely manner, PMTU dst likely leaked" + return 1 } test_cleanup_ipv6_exception() { -- 2.43.0