hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: bridge: mcast: split router port del+notify for mcast router split 

In preparation for the upcoming split of multicast router state into
their IPv4 and IPv6 variants split router port deletion and notification
into two functions. When we disable a port for instance later we want to
only send one notification to switchdev and netlink for compatibility
and want to avoid sending one for IPv4 and one for IPv6. For that the
split is needed.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Linus Lüssing 2021-05-13 15:20:50 +02:00 committed by David S. Miller
parent d9b8c4d8d9
commit ed2d35971a
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
net/bridge/br_multicast.c
View File

@ -60,7 +60,8 @@ static void br_ip4_multicast_leave_group(struct net_bridge *br,
const unsigned char *src); const unsigned char *src);
static void br_multicast_port_group_rexmit(struct timer_list *t); static void br_multicast_port_group_rexmit(struct timer_list *t);
static void __del_port_router(struct net_bridge_port *p); static void
br_multicast_rport_del_notify(struct net_bridge_port *p, bool deleted);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
static void br_ip6_multicast_leave_group(struct net_bridge *br, static void br_ip6_multicast_leave_group(struct net_bridge *br,
struct net_bridge_port *port, struct net_bridge_port *port,
@ -1354,11 +1355,26 @@ static int br_ip6_multicast_add_group(struct net_bridge *br,
} }
#endif #endif
static bool br_multicast_rport_del(struct hlist_node *rlist)
{
if (hlist_unhashed(rlist))
return false;
hlist_del_init_rcu(rlist);
return true;
}
static bool br_ip4_multicast_rport_del(struct net_bridge_port *p)
{
return br_multicast_rport_del(&p->ip4_rlist);
}
static void br_multicast_router_expired(struct net_bridge_port *port, static void br_multicast_router_expired(struct net_bridge_port *port,
struct timer_list *t, struct timer_list *t,
struct hlist_node *rlist) struct hlist_node *rlist)
{ {
struct net_bridge *br = port->br; struct net_bridge *br = port->br;
bool del;
spin_lock(&br->multicast_lock); spin_lock(&br->multicast_lock);
if (port->multicast_router == MDB_RTR_TYPE_DISABLED || if (port->multicast_router == MDB_RTR_TYPE_DISABLED ||
@ -1366,7 +1382,8 @@ static void br_multicast_router_expired(struct net_bridge_port *port,
timer_pending(t)) timer_pending(t))
goto out; goto out;
__del_port_router(port); del = br_multicast_rport_del(rlist);
br_multicast_rport_del_notify(port, del);
out: out:
spin_unlock(&br->multicast_lock); spin_unlock(&br->multicast_lock);
} }
@ -1705,19 +1722,20 @@ void br_multicast_disable_port(struct net_bridge_port *port)
struct net_bridge *br = port->br; struct net_bridge *br = port->br;
struct net_bridge_port_group *pg; struct net_bridge_port_group *pg;
struct hlist_node *n; struct hlist_node *n;
bool del = false;
spin_lock(&br->multicast_lock); spin_lock(&br->multicast_lock);
hlist_for_each_entry_safe(pg, n, &port->mglist, mglist) hlist_for_each_entry_safe(pg, n, &port->mglist, mglist)
if (!(pg->flags & MDB_PG_FLAGS_PERMANENT)) if (!(pg->flags & MDB_PG_FLAGS_PERMANENT))
br_multicast_find_del_pg(br, pg); br_multicast_find_del_pg(br, pg);
__del_port_router(port); del |= br_ip4_multicast_rport_del(port);
del_timer(&port->ip4_mc_router_timer); del_timer(&port->ip4_mc_router_timer);
del_timer(&port->ip4_own_query.timer); del_timer(&port->ip4_own_query.timer);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
del_timer(&port->ip6_own_query.timer); del_timer(&port->ip6_own_query.timer);
#endif #endif
br_multicast_rport_del_notify(port, del);
spin_unlock(&br->multicast_lock); spin_unlock(&br->multicast_lock);
} }
@ -3538,11 +3556,12 @@ int br_multicast_set_router(struct net_bridge *br, unsigned long val)
return err; return err;
} }
static void __del_port_router(struct net_bridge_port *p) static void
br_multicast_rport_del_notify(struct net_bridge_port *p, bool deleted)
{ {
if (hlist_unhashed(&p->ip4_rlist)) if (!deleted)
return; return;
hlist_del_init_rcu(&p->ip4_rlist);
br_rtr_notify(p->br->dev, p, RTM_DELMDB); br_rtr_notify(p->br->dev, p, RTM_DELMDB);
br_port_mc_router_state_change(p, false); br_port_mc_router_state_change(p, false);
@ -3556,6 +3575,7 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
struct net_bridge *br = p->br; struct net_bridge *br = p->br;
unsigned long now = jiffies; unsigned long now = jiffies;
int err = -EINVAL; int err = -EINVAL;
bool del = false;
spin_lock(&br->multicast_lock); spin_lock(&br->multicast_lock);
if (p->multicast_router == val) { if (p->multicast_router == val) {
@ -3569,12 +3589,14 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
switch (val) { switch (val) {
case MDB_RTR_TYPE_DISABLED: case MDB_RTR_TYPE_DISABLED:
p->multicast_router = MDB_RTR_TYPE_DISABLED; p->multicast_router = MDB_RTR_TYPE_DISABLED;
__del_port_router(p); del |= br_ip4_multicast_rport_del(p);
del_timer(&p->ip4_mc_router_timer); del_timer(&p->ip4_mc_router_timer);
br_multicast_rport_del_notify(p, del);
break; break;
case MDB_RTR_TYPE_TEMP_QUERY: case MDB_RTR_TYPE_TEMP_QUERY:
p->multicast_router = MDB_RTR_TYPE_TEMP_QUERY; p->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
__del_port_router(p); del |= br_ip4_multicast_rport_del(p);
br_multicast_rport_del_notify(p, del);
break; break;
case MDB_RTR_TYPE_PERM: case MDB_RTR_TYPE_PERM:
p->multicast_router = MDB_RTR_TYPE_PERM; p->multicast_router = MDB_RTR_TYPE_PERM;