On 4/17/25 16:43, Petr Machata wrote: > From: Yong Wang <yongwang@xxxxxxxxxx> > > When the vlan STP state is changed, which could be manipulated by > "bridge vlan" commands, similar to port STP state, this also impacts > multicast behaviors such as igmp query. In the scenario of per-VLAN > snooping, there's a need to update the corresponding multicast context > to re-arm the port query timer when vlan state becomes "forwarding" etc. > > Update br_vlan_set_state() function to enable vlan multicast context > in such scenario. > > 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 > # sleep 1 > # bridge vlan set vid 1 dev swp1 state 4 > # 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 vlan set vid 1 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 > # sleep 1 > # bridge vlan set vid 1 dev swp1 state 4 > # 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 vlan set vid 1 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_mst.c | 4 ++-- > net/bridge/br_multicast.c | 26 ++++++++++++++++++++++++++ > net/bridge/br_private.h | 11 ++++++++++- > 3 files changed, 38 insertions(+), 3 deletions(-) > Acked-by: Nikolay Aleksandrov <razor@xxxxxxxxxxxxx>
