Skip to content

Commit b6dfcdb

Browse files
idoschSasha Levin
authored and
Sasha Levin
committed
selftests: forwarding: Fix ping failure due to short timeout
[ Upstream commit e413785 ] The tests send 100 pings in 0.1 second intervals and force a timeout of 11 seconds, which is borderline (especially on debug kernels), resulting in random failures in netdev CI [1]. Fix by increasing the timeout to 20 seconds. It should not prolong the test unless something is wrong, in which case the test will rightfully fail. [1] # selftests: net/forwarding: vxlan_bridge_1d_port_8472_ipv6.sh # INFO: Running tests with UDP port 8472 # TEST: ping: local->local [ OK ] # TEST: ping: local->remote 1 [FAIL] # Ping failed [...] Fixes: b07e995 ("selftests: forwarding: Add VxLAN tests with a VLAN-unaware bridge for IPv6") Fixes: 728b352 ("selftests: forwarding: Add VxLAN tests with a VLAN-aware bridge for IPv6") Reported-by: Paolo Abeni <[email protected]> Closes: https://lore.kernel.org/netdev/[email protected]/ Signed-off-by: Ido Schimmel <[email protected]> Reviewed-by: Hangbin Liu <[email protected]> Reviewed-by: Jiri Pirko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 62b1f83 commit b6dfcdb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ __ping_ipv4()
354354

355355
# Send 100 packets and verify that at least 100 packets hit the rule,
356356
# to overcome ARP noise.
357-
PING_COUNT=100 PING_TIMEOUT=11 ping_do $dev $dst_ip
357+
PING_COUNT=100 PING_TIMEOUT=20 ping_do $dev $dst_ip
358358
check_err $? "Ping failed"
359359

360360
tc_check_at_least_x_packets "dev $rp1 egress" 101 10 100
@@ -410,7 +410,7 @@ __ping_ipv6()
410410

411411
# Send 100 packets and verify that at least 100 packets hit the rule,
412412
# to overcome neighbor discovery noise.
413-
PING_COUNT=100 PING_TIMEOUT=11 ping6_do $dev $dst_ip
413+
PING_COUNT=100 PING_TIMEOUT=20 ping6_do $dev $dst_ip
414414
check_err $? "Ping failed"
415415

416416
tc_check_at_least_x_packets "dev $rp1 egress" 101 100

tools/testing/selftests/net/forwarding/vxlan_bridge_1q_ipv6.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ __ping_ipv4()
457457

458458
# Send 100 packets and verify that at least 100 packets hit the rule,
459459
# to overcome ARP noise.
460-
PING_COUNT=100 PING_TIMEOUT=11 ping_do $dev $dst_ip
460+
PING_COUNT=100 PING_TIMEOUT=20 ping_do $dev $dst_ip
461461
check_err $? "Ping failed"
462462

463463
tc_check_at_least_x_packets "dev $rp1 egress" 101 10 100
@@ -522,7 +522,7 @@ __ping_ipv6()
522522

523523
# Send 100 packets and verify that at least 100 packets hit the rule,
524524
# to overcome neighbor discovery noise.
525-
PING_COUNT=100 PING_TIMEOUT=11 ping6_do $dev $dst_ip
525+
PING_COUNT=100 PING_TIMEOUT=20 ping6_do $dev $dst_ip
526526
check_err $? "Ping failed"
527527

528528
tc_check_at_least_x_packets "dev $rp1 egress" 101 100

0 commit comments

Comments
 (0)