From: Horatiu Vultur <horatiu.vultur@microchip.com> To: <roopa@cumulusnetworks.com>, <nikolay@cumulusnetworks.com>, <davem@davemloft.net>, <bridge@lists.linux-foundation.org>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <allan.nielsen@microchip.com> Cc: Horatiu Vultur <horatiu.vultur@microchip.com> Subject: [PATCH] net: bridge: Allow bridge to joing multicast groups Date: Thu, 25 Jul 2019 13:44:04 +0200 [thread overview] Message-ID: <1564055044-27593-1-git-send-email-horatiu.vultur@microchip.com> (raw) There is no way to configure the bridge, to receive only specific link layer multicast addresses. From the description of the command 'bridge fdb append' is supposed to do that, but there was no way to notify the network driver that the bridge joined a group, because LLADDR was added to the unicast netdev_hw_addr_list. Therefore update fdb_add_entry to check if the NLM_F_APPEND flag is set and if the source is NULL, which represent the bridge itself. Then add address to multicast netdev_hw_addr_list for each bridge interfaces. And then the .ndo_set_rx_mode function on the driver is called. To notify the driver that the list of multicast mac addresses changed. Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> --- net/bridge/br_fdb.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index b1d3248..d93746d 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -175,6 +175,29 @@ static void fdb_add_hw_addr(struct net_bridge *br, const unsigned char *addr) } } +static void fdb_add_hw_maddr(struct net_bridge *br, const unsigned char *addr) +{ + int err; + struct net_bridge_port *p; + + ASSERT_RTNL(); + + list_for_each_entry(p, &br->port_list, list) { + if (!br_promisc_port(p)) { + err = dev_mc_add(p->dev, addr); + if (err) + goto undo; + } + } + + return; +undo: + list_for_each_entry_continue_reverse(p, &br->port_list, list) { + if (!br_promisc_port(p)) + dev_mc_del(p->dev, addr); + } +} + /* When a static FDB entry is deleted, the HW address from that entry is * also removed from the bridge private HW address list and updates all * the ports with needed information. @@ -192,13 +215,27 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr) } } +static void fdb_del_hw_maddr(struct net_bridge *br, const unsigned char *addr) +{ + struct net_bridge_port *p; + + ASSERT_RTNL(); + + list_for_each_entry(p, &br->port_list, list) { + if (!br_promisc_port(p)) + dev_mc_del(p->dev, addr); + } +} + static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f, bool swdev_notify) { trace_fdb_delete(br, f); - if (f->is_static) + if (f->is_static) { fdb_del_hw_addr(br, f->key.addr.addr); + fdb_del_hw_maddr(br, f->key.addr.addr); + } hlist_del_init_rcu(&f->fdb_node); rhashtable_remove_fast(&br->fdb_hash_tbl, &f->rhnode, @@ -843,13 +880,19 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source, fdb->is_local = 1; if (!fdb->is_static) { fdb->is_static = 1; - fdb_add_hw_addr(br, addr); + if (flags & NLM_F_APPEND && !source) + fdb_add_hw_maddr(br, addr); + else + fdb_add_hw_addr(br, addr); } } else if (state & NUD_NOARP) { fdb->is_local = 0; if (!fdb->is_static) { fdb->is_static = 1; - fdb_add_hw_addr(br, addr); + if (flags & NLM_F_APPEND && !source) + fdb_add_hw_maddr(br, addr); + else + fdb_add_hw_addr(br, addr); } } else { fdb->is_local = 0; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Horatiu Vultur <horatiu.vultur@microchip.com> To: roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com, davem@davemloft.net, bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, allan.nielsen@microchip.com Cc: Horatiu Vultur <horatiu.vultur@microchip.com> Subject: [Bridge] [PATCH] net: bridge: Allow bridge to joing multicast groups Date: Thu, 25 Jul 2019 13:44:04 +0200 [thread overview] Message-ID: <1564055044-27593-1-git-send-email-horatiu.vultur@microchip.com> (raw) There is no way to configure the bridge, to receive only specific link layer multicast addresses. From the description of the command 'bridge fdb append' is supposed to do that, but there was no way to notify the network driver that the bridge joined a group, because LLADDR was added to the unicast netdev_hw_addr_list. Therefore update fdb_add_entry to check if the NLM_F_APPEND flag is set and if the source is NULL, which represent the bridge itself. Then add address to multicast netdev_hw_addr_list for each bridge interfaces. And then the .ndo_set_rx_mode function on the driver is called. To notify the driver that the list of multicast mac addresses changed. Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> --- net/bridge/br_fdb.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index b1d3248..d93746d 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -175,6 +175,29 @@ static void fdb_add_hw_addr(struct net_bridge *br, const unsigned char *addr) } } +static void fdb_add_hw_maddr(struct net_bridge *br, const unsigned char *addr) +{ + int err; + struct net_bridge_port *p; + + ASSERT_RTNL(); + + list_for_each_entry(p, &br->port_list, list) { + if (!br_promisc_port(p)) { + err = dev_mc_add(p->dev, addr); + if (err) + goto undo; + } + } + + return; +undo: + list_for_each_entry_continue_reverse(p, &br->port_list, list) { + if (!br_promisc_port(p)) + dev_mc_del(p->dev, addr); + } +} + /* When a static FDB entry is deleted, the HW address from that entry is * also removed from the bridge private HW address list and updates all * the ports with needed information. @@ -192,13 +215,27 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr) } } +static void fdb_del_hw_maddr(struct net_bridge *br, const unsigned char *addr) +{ + struct net_bridge_port *p; + + ASSERT_RTNL(); + + list_for_each_entry(p, &br->port_list, list) { + if (!br_promisc_port(p)) + dev_mc_del(p->dev, addr); + } +} + static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f, bool swdev_notify) { trace_fdb_delete(br, f); - if (f->is_static) + if (f->is_static) { fdb_del_hw_addr(br, f->key.addr.addr); + fdb_del_hw_maddr(br, f->key.addr.addr); + } hlist_del_init_rcu(&f->fdb_node); rhashtable_remove_fast(&br->fdb_hash_tbl, &f->rhnode, @@ -843,13 +880,19 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source, fdb->is_local = 1; if (!fdb->is_static) { fdb->is_static = 1; - fdb_add_hw_addr(br, addr); + if (flags & NLM_F_APPEND && !source) + fdb_add_hw_maddr(br, addr); + else + fdb_add_hw_addr(br, addr); } } else if (state & NUD_NOARP) { fdb->is_local = 0; if (!fdb->is_static) { fdb->is_static = 1; - fdb_add_hw_addr(br, addr); + if (flags & NLM_F_APPEND && !source) + fdb_add_hw_maddr(br, addr); + else + fdb_add_hw_addr(br, addr); } } else { fdb->is_local = 0; -- 2.7.4
next reply other threads:[~2019-07-25 11:44 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-25 11:44 Horatiu Vultur [this message] 2019-07-25 11:44 ` [Bridge] [PATCH] net: bridge: Allow bridge to joing multicast groups Horatiu Vultur 2019-07-25 13:06 ` Nikolay Aleksandrov 2019-07-25 13:06 ` [Bridge] " Nikolay Aleksandrov 2019-07-25 13:21 ` Nikolay Aleksandrov 2019-07-25 13:21 ` [Bridge] " Nikolay Aleksandrov 2019-07-25 14:21 ` Horatiu Vultur 2019-07-25 14:21 ` [Bridge] " Horatiu Vultur 2019-07-26 8:41 ` Nikolay Aleksandrov 2019-07-26 8:41 ` [Bridge] " Nikolay Aleksandrov 2019-07-26 9:26 ` Nikolay Aleksandrov 2019-07-26 9:26 ` [Bridge] " Nikolay Aleksandrov 2019-07-26 12:02 ` Horatiu Vultur 2019-07-26 12:02 ` [Bridge] " Horatiu Vultur 2019-07-26 12:31 ` Nikolay Aleksandrov 2019-07-26 12:31 ` [Bridge] " Nikolay Aleksandrov 2019-07-29 12:14 ` Allan W. Nielsen 2019-07-29 12:14 ` [Bridge] " Allan W. Nielsen 2019-07-29 12:22 ` Nikolay Aleksandrov 2019-07-29 12:22 ` [Bridge] " Nikolay Aleksandrov 2019-07-29 12:50 ` Nikolay Aleksandrov 2019-07-29 12:50 ` [Bridge] " Nikolay Aleksandrov 2019-07-29 13:14 ` Allan W. Nielsen 2019-07-29 13:14 ` [Bridge] " Allan W. Nielsen 2019-07-29 13:42 ` Nikolay Aleksandrov 2019-07-29 13:42 ` [Bridge] " Nikolay Aleksandrov 2019-07-29 13:52 ` Allan W. Nielsen 2019-07-29 13:52 ` [Bridge] " Allan W. Nielsen 2019-07-29 14:21 ` Nikolay Aleksandrov 2019-07-29 14:21 ` [Bridge] " Nikolay Aleksandrov 2019-07-29 14:35 ` Allan W. Nielsen 2019-07-29 14:35 ` [Bridge] " Allan W. Nielsen 2019-07-29 17:51 ` Ido Schimmel 2019-07-29 17:51 ` [Bridge] " Ido Schimmel 2019-07-30 6:27 ` Allan W. Nielsen 2019-07-30 6:27 ` [Bridge] " Allan W. Nielsen 2019-07-30 7:06 ` Ido Schimmel 2019-07-30 7:06 ` [Bridge] " Ido Schimmel 2019-07-30 8:30 ` Allan W. Nielsen 2019-07-30 8:30 ` [Bridge] " Allan W. Nielsen 2019-07-30 8:58 ` Nikolay Aleksandrov 2019-07-30 8:58 ` [Bridge] " Nikolay Aleksandrov 2019-07-30 9:21 ` Allan W. Nielsen 2019-07-30 9:21 ` [Bridge] " Allan W. Nielsen 2019-07-30 9:55 ` Nikolay Aleksandrov 2019-07-30 9:55 ` [Bridge] " Nikolay Aleksandrov 2019-07-30 11:23 ` Allan W. Nielsen 2019-07-30 11:23 ` [Bridge] " Allan W. Nielsen 2019-07-30 10:04 ` Ido Schimmel 2019-07-30 10:04 ` [Bridge] " Ido Schimmel 2019-07-30 12:19 ` Allan W. Nielsen 2019-07-30 12:19 ` [Bridge] " Allan W. Nielsen 2019-07-30 14:34 ` Andrew Lunn 2019-07-30 14:34 ` [Bridge] " Andrew Lunn 2019-07-30 19:00 ` Allan W. Nielsen 2019-07-30 19:00 ` [Bridge] " Allan W. Nielsen 2019-07-31 3:31 ` Andrew Lunn 2019-07-31 3:31 ` [Bridge] " Andrew Lunn 2019-07-31 8:01 ` Allan W. Nielsen 2019-07-31 8:01 ` [Bridge] " Allan W. Nielsen 2019-07-31 13:45 ` Andrew Lunn 2019-07-31 13:45 ` [Bridge] " Andrew Lunn 2019-07-31 19:38 ` Allan W. Nielsen 2019-07-31 19:38 ` [Bridge] " Allan W. Nielsen 2019-08-01 14:22 ` Allan W. Nielsen 2019-08-01 14:22 ` [Bridge] " Allan W. Nielsen 2019-07-26 13:46 ` Andrew Lunn 2019-07-26 13:46 ` [Bridge] " Andrew Lunn 2019-07-26 19:50 ` Allan W. Nielsen 2019-07-26 19:50 ` [Bridge] " Allan W. Nielsen 2019-07-27 3:02 ` Andrew Lunn 2019-07-27 3:02 ` [Bridge] " Andrew Lunn 2019-07-28 19:15 ` Allan W. Nielsen 2019-07-28 19:15 ` [Bridge] " Allan W. Nielsen 2019-07-28 23:07 ` Andrew Lunn 2019-07-28 23:07 ` [Bridge] " Andrew Lunn 2019-07-29 6:09 ` Ido Schimmel 2019-07-29 6:09 ` [Bridge] " Ido Schimmel 2019-07-29 12:43 ` Allan W. Nielsen 2019-07-29 12:43 ` [Bridge] " Allan W. Nielsen 2019-08-01 19:17 ` Vivien Didelot 2019-08-01 19:17 ` [Bridge] " Vivien Didelot 2019-08-01 19:48 ` Horatiu Vultur 2019-08-01 19:48 ` [Bridge] " Horatiu Vultur 2019-08-01 20:08 ` Vivien Didelot 2019-08-01 20:08 ` [Bridge] " Vivien Didelot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1564055044-27593-1-git-send-email-horatiu.vultur@microchip.com \ --to=horatiu.vultur@microchip.com \ --cc=allan.nielsen@microchip.com \ --cc=bridge@lists.linux-foundation.org \ --cc=davem@davemloft.net \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=nikolay@cumulusnetworks.com \ --cc=roopa@cumulusnetworks.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.