Nikolay Aleksandrov
2021-Oct-29 11:48 UTC
[Bridge] [PATCH net] selftests: net: bridge: update IGMP/MLD membership interval value
On 29/10/2021 13:53, Nikolay Aleksandrov wrote:> From: Nikolay Aleksandrov <nikolay at nvidia.com> > > 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: fac3cb82a54a ("net: bridge: mcast: use multicast_membership_interval for IGMPv3") > Signed-off-by: Nikolay Aleksandrov <nikolay at nvidia.com> > --- > tools/testing/selftests/net/forwarding/bridge_igmp.sh | 3 +++ > tools/testing/selftests/net/forwarding/bridge_mld.sh | 3 +++ > 2 files changed, 6 insertions(+)Self-NAK, sorry for the noise but I'd prefer to have these values set by a single command, no need to be different and also to reset to defaults afterwards, I'll send v2 to do that.
Nikolay Aleksandrov
2021-Oct-29 12:05 UTC
[Bridge] [PATCH net v2] selftests: net: bridge: update IGMP/MLD membership interval value
From: Nikolay Aleksandrov <nikolay at nvidia.com>
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: fac3cb82a54a ("net: bridge: mcast: use multicast_membership_interval
for IGMPv3")
Signed-off-by: Nikolay Aleksandrov <nikolay at nvidia.com>
---
v2: set membership_interval in the same command and reset it back to
default after the test
.../testing/selftests/net/forwarding/bridge_igmp.sh | 12 +++++++++---
tools/testing/selftests/net/forwarding/bridge_mld.sh | 12 +++++++++---
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/net/forwarding/bridge_igmp.sh
b/tools/testing/selftests/net/forwarding/bridge_igmp.sh
index 675eff45b037..1162836f8f32 100755
--- a/tools/testing/selftests/net/forwarding/bridge_igmp.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_igmp.sh
@@ -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 \
@@ -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
}
diff --git a/tools/testing/selftests/net/forwarding/bridge_mld.sh
b/tools/testing/selftests/net/forwarding/bridge_mld.sh
index ffdcfa87ca2b..e2b9ff773c6b 100755
--- a/tools/testing/selftests/net/forwarding/bridge_mld.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_mld.sh
@@ -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 \
@@ -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
}
--
2.31.1