From: "Linus Lüssing" <linus.luessing@c0d3.blue>
To: netdev@vger.kernel.org
Cc: "Roopa Prabhu" <roopa@nvidia.com>,
"Nikolay Aleksandrov" <nikolay@nvidia.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
bridge@lists.linux-foundation.org,
b.a.t.m.a.n@lists.open-mesh.org, linux-kernel@vger.kernel.org,
"Linus Lüssing" <linus.luessing@c0d3.blue>
Subject: [net-next v2 07/11] net: bridge: mcast: prepare add-router function for mcast router split
Date: Sun, 9 May 2021 21:45:05 +0200 [thread overview]
Message-ID: <20210509194509.10849-8-linus.luessing@c0d3.blue> (raw)
In-Reply-To: <20210509194509.10849-1-linus.luessing@c0d3.blue>
In preparation for the upcoming split of multicast router state into
their IPv4 and IPv6 variants move the protocol specific router list
access to an ip4 wrapper function.
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
net/bridge/br_multicast.c | 59 +++++++++++++++++++++++++++------------
1 file changed, 41 insertions(+), 18 deletions(-)
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 6c844b2..839d21b 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -51,8 +51,8 @@ static const struct rhashtable_params br_sg_port_rht_params = {
static void br_multicast_start_querier(struct net_bridge *br,
struct bridge_mcast_own_query *query);
-static void br_multicast_add_router(struct net_bridge *br,
- struct net_bridge_port *port);
+static void br_ip4_multicast_add_router(struct net_bridge *br,
+ struct net_bridge_port *port);
static void br_ip4_multicast_leave_group(struct net_bridge *br,
struct net_bridge_port *port,
__be32 group,
@@ -1689,7 +1689,7 @@ static void __br_multicast_enable_port(struct net_bridge_port *port)
#endif
if (port->multicast_router == MDB_RTR_TYPE_PERM &&
hlist_unhashed(&port->ip4_rlist))
- br_multicast_add_router(br, port);
+ br_ip4_multicast_add_router(br, port);
}
void br_multicast_enable_port(struct net_bridge_port *port)
@@ -2659,28 +2659,51 @@ static void br_port_mc_router_state_change(struct net_bridge_port *p,
* and locked by br->multicast_lock and RCU
*/
static void br_multicast_add_router(struct net_bridge *br,
- struct net_bridge_port *port)
+ struct net_bridge_port *port,
+ struct hlist_node *slot,
+ struct hlist_node *rlist,
+ struct hlist_head *mc_router_list)
{
- struct net_bridge_port *p;
- struct hlist_node *slot = NULL;
-
- if (!hlist_unhashed(&port->ip4_rlist))
+ if (!hlist_unhashed(rlist))
return;
- hlist_for_each_entry(p, &br->ip4_mc_router_list, ip4_rlist) {
- if ((unsigned long) port >= (unsigned long) p)
- break;
- slot = &p->ip4_rlist;
- }
-
if (slot)
- hlist_add_behind_rcu(&port->ip4_rlist, slot);
+ hlist_add_behind_rcu(rlist, slot);
else
- hlist_add_head_rcu(&port->ip4_rlist, &br->ip4_mc_router_list);
+ hlist_add_head_rcu(rlist, mc_router_list);
+
br_rtr_notify(br->dev, port, RTM_NEWMDB);
br_port_mc_router_state_change(port, true);
}
+struct hlist_node *
+br_ip4_multicast_get_rport_slot(struct net_bridge *br, struct net_bridge_port *port)
+{
+ struct hlist_node *slot = NULL;
+ struct net_bridge_port *p;
+
+ hlist_for_each_entry(p, &br->ip4_mc_router_list, ip4_rlist) {
+ if ((unsigned long)port >= (unsigned long)p)
+ break;
+ slot = &p->ip4_rlist;
+ }
+
+ return slot;
+}
+
+/* Add port to router_list
+ * list is maintained ordered by pointer value
+ * and locked by br->multicast_lock and RCU
+ */
+static void br_ip4_multicast_add_router(struct net_bridge *br,
+ struct net_bridge_port *port)
+{
+ struct hlist_node *slot = br_ip4_multicast_get_rport_slot(br, port);
+
+ br_multicast_add_router(br, port, slot, &port->ip4_rlist,
+ &br->ip4_mc_router_list);
+}
+
static void br_multicast_mark_router(struct net_bridge *br,
struct net_bridge_port *port)
{
@@ -2700,7 +2723,7 @@ static void br_multicast_mark_router(struct net_bridge *br,
port->multicast_router == MDB_RTR_TYPE_PERM)
return;
- br_multicast_add_router(br, port);
+ br_ip4_multicast_add_router(br, port);
mod_timer(&port->ip4_mc_router_timer,
now + br->multicast_querier_interval);
@@ -3526,7 +3549,7 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
case MDB_RTR_TYPE_PERM:
p->multicast_router = MDB_RTR_TYPE_PERM;
del_timer(&p->ip4_mc_router_timer);
- br_multicast_add_router(br, p);
+ br_ip4_multicast_add_router(br, p);
break;
case MDB_RTR_TYPE_TEMP:
p->multicast_router = MDB_RTR_TYPE_TEMP;
--
2.31.0
next prev parent reply other threads:[~2021-05-09 19:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-09 19:44 [PATCH net-next v2 00/11] net: bridge: split IPv4/v6 mc router state and export for batman-adv Linus Lüssing
2021-05-09 19:44 ` [net-next v2 01/11] net: bridge: mcast: rename multicast router lists and timers Linus Lüssing
2021-05-11 9:12 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 02/11] net: bridge: mcast: add wrappers for router node retrieval Linus Lüssing
2021-05-11 9:12 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 03/11] net: bridge: mcast: prepare mdb netlink for mcast router split Linus Lüssing
2021-05-11 9:13 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 04/11] net: bridge: mcast: prepare query reception " Linus Lüssing
2021-05-11 9:13 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 05/11] net: bridge: mcast: prepare is-router function " Linus Lüssing
2021-05-11 9:16 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 06/11] net: bridge: mcast: prepare expiry functions " Linus Lüssing
2021-05-11 9:16 ` Nikolay Aleksandrov
2021-05-09 19:45 ` Linus Lüssing [this message]
2021-05-09 19:45 ` [net-next v2 08/11] net: bridge: mcast: split router port del+notify " Linus Lüssing
2021-05-11 9:19 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 09/11] net: bridge: mcast: split multicast router state for IPv4 and IPv6 Linus Lüssing
2021-05-11 9:29 ` Nikolay Aleksandrov
2021-05-11 9:33 ` Nikolay Aleksandrov
2021-05-11 11:28 ` Linus Lüssing
2021-05-09 19:45 ` [net-next v2 10/11] net: bridge: mcast: add ip4+ip6 mcast router timers to mdb netlink Linus Lüssing
2021-05-11 9:30 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 11/11] net: bridge: mcast: export multicast router presence adjacent to a port Linus Lüssing
2021-05-11 9:23 ` Nikolay Aleksandrov
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=20210509194509.10849-8-linus.luessing@c0d3.blue \
--to=linus.luessing@c0d3.blue \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=roopa@nvidia.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).