Skip to content

Commit

Permalink
selftests: net: bridge: update IGMP/MLD membership interval value
Browse files Browse the repository at this point in the history
When I fixed IGMPv3/MLDv2 to use the bridge's multicast_membership_interval
value which is chosen by user-space instead of calculating it based on
multicast_query_interval and multicast_query_response_interval I forgot
to update the selftests relying on that behaviour. Now we have to
manually set the expected GMI value to perform the tests correctly and get
proper results (similar to IGMPv2 behaviour).

Fixes: fac3cb8 ("net: bridge: mcast: use multicast_membership_interval for IGMPv3")
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Nikolay Aleksandrov authored and davem330 committed Oct 29, 2021
1 parent 829e050 commit 34d7ecb
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
12 changes: 9 additions & 3 deletions tools/testing/selftests/net/forwarding/bridge_igmp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -482,10 +482,15 @@ v3exc_timeout_test()
local X=("192.0.2.20" "192.0.2.30")

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

v3exclude_prepare $h1 $ALL_MAC $ALL_GROUP
ip link set dev br0 type bridge mcast_query_interval 500 mcast_query_response_interval 500
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
bridge -j -d -s mdb show dev br0 \
Expand Down Expand Up @@ -517,7 +522,8 @@ v3exc_timeout_test()
log_test "IGMPv3 group $TEST_GROUP exclude timeout"

ip link set dev br0 type bridge mcast_query_interval 12500 \
mcast_query_response_interval 1000
mcast_query_response_interval 1000 \
mcast_membership_interval 26000

v3cleanup $swp1 $TEST_GROUP
}
Expand Down
12 changes: 9 additions & 3 deletions tools/testing/selftests/net/forwarding/bridge_mld.sh
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,15 @@ mldv2exc_timeout_test()
local X=("2001:db8:1::20" "2001:db8:1::30")

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

mldv2exclude_prepare $h1
ip link set dev br0 type bridge mcast_query_interval 500 mcast_query_response_interval 500
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
bridge -j -d -s mdb show dev br0 \
Expand Down Expand Up @@ -514,7 +519,8 @@ mldv2exc_timeout_test()
log_test "MLDv2 group $TEST_GROUP exclude timeout"

ip link set dev br0 type bridge mcast_query_interval 12500 \
mcast_query_response_interval 1000
mcast_query_response_interval 1000 \
mcast_membership_interval 26000

mldv2cleanup $swp1
}
Expand Down

0 comments on commit 34d7ecb

Please sign in to comment.