Skip to content

Commit

Permalink
selftests: net: bridge: increase IGMP/MLD exclude timeout membership …
Browse files Browse the repository at this point in the history
…interval

When running the bridge IGMP/MLD selftests on debug kernels we can get
spurious errors when setting up the IGMP/MLD exclude timeout tests
because the membership interval is just 3 seconds and the setup has 2
seconds of sleep plus various validations, the one second that is left
is not enough. Increase the membership interval from 3 to 5 seconds to
make room for the setup validation and 2 seconds of sleep.

Fixes: 34d7ecb ("selftests: net: bridge: update IGMP/MLD membership interval value")
Reported-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Nikolay Aleksandrov authored and David S. Miller committed May 15, 2024
1 parent 8bd67eb commit 06080ea
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions tools/testing/selftests/net/forwarding/bridge_igmp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -478,18 +478,18 @@ v3exc_timeout_test()
RET=0
local X=("192.0.2.20" "192.0.2.30")

# GMI should be 3 seconds
# GMI should be 5 seconds
ip link set dev br0 type bridge mcast_query_interval 100 \
mcast_query_response_interval 100 \
mcast_membership_interval 300
mcast_membership_interval 500

v3exclude_prepare $h1 $ALL_MAC $ALL_GROUP
ip link set dev br0 type bridge mcast_query_interval 500 \
mcast_query_response_interval 500 \
mcast_membership_interval 1500

$MZ $h1 -c 1 -b $ALL_MAC -B $ALL_GROUP -t ip "proto=2,p=$MZPKT_ALLOW2" -q
sleep 3
sleep 5
bridge -j -d -s mdb show dev br0 \
| jq -e ".[].mdb[] | \
select(.grp == \"$TEST_GROUP\" and \
Expand Down
6 changes: 3 additions & 3 deletions tools/testing/selftests/net/forwarding/bridge_mld.sh
Original file line number Diff line number Diff line change
Expand Up @@ -478,18 +478,18 @@ mldv2exc_timeout_test()
RET=0
local X=("2001:db8:1::20" "2001:db8:1::30")

# GMI should be 3 seconds
# GMI should be 5 seconds
ip link set dev br0 type bridge mcast_query_interval 100 \
mcast_query_response_interval 100 \
mcast_membership_interval 300
mcast_membership_interval 500

mldv2exclude_prepare $h1
ip link set dev br0 type bridge mcast_query_interval 500 \
mcast_query_response_interval 500 \
mcast_membership_interval 1500

$MZ $h1 -c 1 $MZPKT_ALLOW2 -q
sleep 3
sleep 5
bridge -j -d -s mdb show dev br0 \
| jq -e ".[].mdb[] | \
select(.grp == \"$TEST_GROUP\" and \
Expand Down

0 comments on commit 06080ea

Please sign in to comment.