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

bridge: implement multicast fast leave 

V2: make the toggle per-port

Fast leave allows bridge to immediately stops the multicast
traffic on the port receives IGMP Leave when IGMP snooping is enabled,
no timeouts are observed.

Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amerigo Wang 2012-12-03 23:56:40 +00:00 committed by David S. Miller
parent a573ea56a9
commit 50426b5925
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/bridge/br_multicast.c
View File

@ -1225,6 +1225,27 @@ static void br_multicast_leave_group(struct net_bridge *br,
if (!mp)
goto out;
if (port && port->multicast_fast_leave) {
struct net_bridge_port_group __rcu **pp;
for (pp = &mp->ports;
(p = mlock_dereference(*pp, br)) != NULL;
pp = &p->next) {
if (p->port != port)
continue;
rcu_assign_pointer(*pp, p->next);
hlist_del_init(&p->mglist);
del_timer(&p->timer);
call_rcu_bh(&p->rcu, br_multicast_free_pg);
if (!mp->ports && !mp->mglist &&
netif_running(br->dev))
mod_timer(&mp->timer, jiffies);
}
goto out;
}
now = jiffies;
time = now + br->multicast_last_member_count *
br->multicast_last_member_interval;

1
net/bridge/br_private.h
View File

@ -141,6 +141,7 @@ struct net_bridge_port
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
u32 multicast_startup_queries_sent;
unsigned char multicast_router;
unsigned char multicast_fast_leave;
struct timer_list multicast_router_timer;
struct timer_list multicast_query_timer;
struct hlist_head mglist;

20
net/bridge/br_sysfs_if.c
View File

@ -172,6 +172,25 @@ static int store_multicast_router(struct net_bridge_port *p,
}
static BRPORT_ATTR(multicast_router, S_IRUGO | S_IWUSR, show_multicast_router,
store_multicast_router);
static ssize_t show_multicast_fast_leave(struct net_bridge_port *p,
char *buf)
{
return sprintf(buf, "%d\n", p->multicast_fast_leave);
}
static int store_multicast_fast_leave(struct net_bridge_port *p,
unsigned long v)
{
if (p->br->multicast_disabled)
return -EINVAL;
p->multicast_fast_leave = !!v;
return 0;
}
static BRPORT_ATTR(multicast_fast_leave, S_IRUGO | S_IWUSR,
show_multicast_fast_leave, store_multicast_fast_leave);
#endif
static const struct brport_attribute *brport_attrs[] = {
@ -195,6 +214,7 @@ static const struct brport_attribute *brport_attrs[] = {
&brport_attr_root_block,
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
&brport_attr_multicast_router,
&brport_attr_multicast_fast_leave,
#endif
NULL
};