Message ID | 20240124061344.1864484-1-liuhangbin@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | fc836129f708407502632107e58d48f54b1caf75 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [PATCHv2,net] selftests/net/lib: update busywait timeout value | expand |
On Wed, Jan 24, 2024 at 02:13:44PM +0800, Hangbin Liu wrote: > The busywait timeout value is a millisecond, not a second. So the > current setting 2 is too small. On slow/busy host (or VMs) the > current timeout can expire even on "correct" execution, causing random > failures. Let's copy the WAIT_TIMEOUT from forwarding/lib.sh and set > BUSYWAIT_TIMEOUT here. > > Fixes: 25ae948b4478 ("selftests/net: add lib.sh") > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 24 Jan 2024 14:13:44 +0800 you wrote: > The busywait timeout value is a millisecond, not a second. So the > current setting 2 is too small. On slow/busy host (or VMs) the > current timeout can expire even on "correct" execution, causing random > failures. Let's copy the WAIT_TIMEOUT from forwarding/lib.sh and set > BUSYWAIT_TIMEOUT here. > > Fixes: 25ae948b4478 ("selftests/net: add lib.sh") > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> > > [...] Here is the summary with links: - [PATCHv2,net] selftests/net/lib: update busywait timeout value https://git.kernel.org/netdev/net/c/fc836129f708 You are awesome, thank you!
diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh index dca549443801..f9fe182dfbd4 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -4,6 +4,9 @@ ############################################################################## # Defines +WAIT_TIMEOUT=${WAIT_TIMEOUT:=20} +BUSYWAIT_TIMEOUT=$((WAIT_TIMEOUT * 1000)) # ms + # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 # namespace list created by setup_ns @@ -48,7 +51,7 @@ cleanup_ns() for ns in "$@"; do ip netns delete "${ns}" &> /dev/null - if ! busywait 2 ip netns list \| grep -vq "^$ns$" &> /dev/null; then + if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /dev/null; then echo "Warn: Failed to remove namespace $ns" ret=1 fi
The busywait timeout value is a millisecond, not a second. So the current setting 2 is too small. On slow/busy host (or VMs) the current timeout can expire even on "correct" execution, causing random failures. Let's copy the WAIT_TIMEOUT from forwarding/lib.sh and set BUSYWAIT_TIMEOUT here. Fixes: 25ae948b4478 ("selftests/net: add lib.sh") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- v2: add fixes flag. update possible failures. --- tools/testing/selftests/net/lib.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)