From patchwork Tue Dec 4 09:56:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 203588 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1CFF62C0098 for ; Tue, 4 Dec 2012 20:57:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111Ab2LDJ5S (ORCPT ); Tue, 4 Dec 2012 04:57:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34230 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab2LDJ5R (ORCPT ); Tue, 4 Dec 2012 04:57:17 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB49uqVl012059 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 4 Dec 2012 04:56:52 -0500 Received: from cr0.redhat.com (vpn1-115-96.nay.redhat.com [10.66.115.96]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qB49umcN012042; Tue, 4 Dec 2012 04:56:49 -0500 From: Cong Wang To: netdev@vger.kernel.org Cc: bridge@lists.linux-foundation.org, Herbert Xu , Stephen Hemminger , "David S. Miller" , Cong Wang Subject: [PATCH net-next v2] bridge: implement multicast fast leave Date: Tue, 4 Dec 2012 17:56:40 +0800 Message-Id: <1354615000-19660-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: Stephen Hemminger Cc: "David S. Miller" Signed-off-by: Cong Wang --- net/bridge/br_multicast.c | 21 +++++++++++++++++++++ net/bridge/br_private.h | 1 + net/bridge/br_sysfs_if.c | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index d53e4f4..02da618 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1226,6 +1226,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; diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 6484069..8f0e789 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -142,6 +142,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; diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 7ff95ba..dc484ac 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -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 };