On 4/18/25, 11:38 PM, "Nikolay Aleksandrov" <razor@xxxxxxxxxxxxx > wrote:
>On 4/17/25 16:43, Petr Machata wrote:
>> From: Yong Wang <yongwang@xxxxxxxxxx>
>>
>> When a bridge port STP state is changed from BLOCKING/DISABLED to
>> FORWARDING, the port's igmp query timer will NOT re-arm itself if the
>> bridge has been configured as per-VLAN multicast snooping.
>>
>> Solve this by choosing the correct multicast context(s) to enable/disable
>> port multicast based on whether per-VLAN multicast snooping is enabled or
>> not, i.e. using per-{port, VLAN} context in case of per-VLAN multicast
>> snooping by re-implementing br_multicast_enable_port() and
>> br_multicast_disable_port() functions.
>>
>> Before the patch, the IGMP query does not happen in the last step of the
>> following test sequence, i.e. no growth for tx counter:
>> # ip link add name br1 up type bridge vlan_filtering 1 mcast_snooping 1 mcast_vlan_snooping 1 mcast_querier 1 mcast_stats_enabled 1
>> # bridge vlan global set vid 1 dev br1 mcast_snooping 1 mcast_querier 1 mcast_query_interval 100 mcast_startup_query_count 0
>> # ip link add name swp1 up master br1 type dummy
>> # bridge link set dev swp1 state 0
>> # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]'
>> 1
>> # sleep 1
>> # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]'
>> 1
>> # bridge link set dev swp1 state 3
>> # sleep 2
>> # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]'
>> 1
>>
>> After the patch, the IGMP query happens in the last step of the test:
>> # ip link add name br1 up type bridge vlan_filtering 1 mcast_snooping 1 mcast_vlan_snooping 1 mcast_querier 1 mcast_stats_enabled 1
>> # bridge vlan global set vid 1 dev br1 mcast_snooping 1 mcast_querier 1 mcast_query_interval 100 mcast_startup_query_count 0
>> # ip link add name swp1 up master br1 type dummy
>> # bridge link set dev swp1 state 0
>> # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]'
>> 1
>> # sleep 1
>> # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]'
>> 1
>> # bridge link set dev swp1 state 3
>> # sleep 2
>> # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]'
>> 3
>>
>> Signed-off-by: Yong Wang <yongwang@xxxxxxxxxx>
>> Reviewed-by: Andy Roulin <aroulin@xxxxxxxxxx>
>> Reviewed-by: Ido Schimmel <idosch@xxxxxxxxxx>
>> Signed-off-by: Petr Machata <petrm@xxxxxxxxxx>
>> ---
>> net/bridge/br_multicast.c | 77 +++++++++++++++++++++++++++++++++++----
>> 1 file changed, 69 insertions(+), 8 deletions(-)
>>
>
>I feel like I've seen a similar patch before. Are you sure this is not v2? :)
>Anyway looks good to me. Thanks!
>
>Acked-by: Nikolay Aleksandrov <razor@xxxxxxxxxxxxx>
Yes, this should be V2. Petr is helping upstreaming this patch. Thanks for your acknowledgement.
