Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: net: bridge: update IGMP/MLD membership interval value

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@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Nikolay Aleksandrov and committed by
David S. Miller
34d7ecb3 829e050e

+18 -6
+9 -3
tools/testing/selftests/net/forwarding/bridge_igmp.sh
··· 482 482 local X=("192.0.2.20" "192.0.2.30") 483 483 484 484 # GMI should be 3 seconds 485 - ip link set dev br0 type bridge mcast_query_interval 100 mcast_query_response_interval 100 485 + ip link set dev br0 type bridge mcast_query_interval 100 \ 486 + mcast_query_response_interval 100 \ 487 + mcast_membership_interval 300 486 488 487 489 v3exclude_prepare $h1 $ALL_MAC $ALL_GROUP 488 - ip link set dev br0 type bridge mcast_query_interval 500 mcast_query_response_interval 500 490 + ip link set dev br0 type bridge mcast_query_interval 500 \ 491 + mcast_query_response_interval 500 \ 492 + mcast_membership_interval 1500 493 + 489 494 $MZ $h1 -c 1 -b $ALL_MAC -B $ALL_GROUP -t ip "proto=2,p=$MZPKT_ALLOW2" -q 490 495 sleep 3 491 496 bridge -j -d -s mdb show dev br0 \ ··· 522 517 log_test "IGMPv3 group $TEST_GROUP exclude timeout" 523 518 524 519 ip link set dev br0 type bridge mcast_query_interval 12500 \ 525 - mcast_query_response_interval 1000 520 + mcast_query_response_interval 1000 \ 521 + mcast_membership_interval 26000 526 522 527 523 v3cleanup $swp1 $TEST_GROUP 528 524 }
+9 -3
tools/testing/selftests/net/forwarding/bridge_mld.sh
··· 479 479 local X=("2001:db8:1::20" "2001:db8:1::30") 480 480 481 481 # GMI should be 3 seconds 482 - ip link set dev br0 type bridge mcast_query_interval 100 mcast_query_response_interval 100 482 + ip link set dev br0 type bridge mcast_query_interval 100 \ 483 + mcast_query_response_interval 100 \ 484 + mcast_membership_interval 300 483 485 484 486 mldv2exclude_prepare $h1 485 - ip link set dev br0 type bridge mcast_query_interval 500 mcast_query_response_interval 500 487 + ip link set dev br0 type bridge mcast_query_interval 500 \ 488 + mcast_query_response_interval 500 \ 489 + mcast_membership_interval 1500 490 + 486 491 $MZ $h1 -c 1 $MZPKT_ALLOW2 -q 487 492 sleep 3 488 493 bridge -j -d -s mdb show dev br0 \ ··· 519 514 log_test "MLDv2 group $TEST_GROUP exclude timeout" 520 515 521 516 ip link set dev br0 type bridge mcast_query_interval 12500 \ 522 - mcast_query_response_interval 1000 517 + mcast_query_response_interval 1000 \ 518 + mcast_membership_interval 26000 523 519 524 520 mldv2cleanup $swp1 525 521 }