| Message ID | 20210504182259.5042-5-Joseph.Huang@garmin.com (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | bridge: Fix snooping in multi-bridge config with switchdev | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | fail | Series targets non-next tree, but doesn't contain any Fixes tags |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 21 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index d7fbe1f3af18..719ded3204a0 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -2680,6 +2680,21 @@ static void br_port_mc_router_state_change(struct net_bridge_port *port, switchdev_port_attr_set(port->dev, &attr, NULL); + /* Force mcast_flood if mrouter port + * this does not prevent netlink from changing it again + */ + if (is_mc_router && !(port->flags & BR_MCAST_FLOOD)) { + attr.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS; + attr.u.brport_flags.val = BR_MCAST_FLOOD; + attr.u.brport_flags.mask = BR_MCAST_FLOOD; + switchdev_port_attr_set(port->dev, &attr, NULL); + } else if (!is_mc_router) { + attr.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS; + attr.u.brport_flags.val = port->flags & BR_MCAST_FLOOD; + attr.u.brport_flags.mask = BR_MCAST_FLOOD; + switchdev_port_attr_set(port->dev, &attr, NULL); + } + /* Add/delete the router port to/from all multicast group * called whle br->multicast_lock is held */
When a port turns into an mrouter port, enable multicast flooding on that port even if mcast_flood is disabled by user config. This is necessary so that in a distributed system, the multicast packets can be fowarded to the Querier when the multicast source is attached to a Non-Querier bridge. Consider the following scenario: +--------------------+ | | | Snooping | +------------+ | Bridge 1 |----| Listener 1 | | (Querier) | +------------+ | | +--------------------+ | | +--------------------+ | | mrouter | | +-----------+ | +---------+ | | MC Source |----| Snooping | +-----------| | Bridge 2 | | (Non-Querier) | +--------------------+ In this scenario, Listener 1 will never receive multicast traffic from MC Source if mcast_flood is disabled on the mrouter port on Snooping Bridge 2. Signed-off-by: Joseph Huang <Joseph.Huang@garmin.com> --- net/bridge/br_multicast.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)