From patchwork Mon Dec 10 12:15:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 204859 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 25DE32C00F3 for ; Mon, 10 Dec 2012 23:16:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752539Ab2LJMQX (ORCPT ); Mon, 10 Dec 2012 07:16:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:65163 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751968Ab2LJMQW (ORCPT ); Mon, 10 Dec 2012 07:16:22 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBACFmQh014730 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 10 Dec 2012 07:15:49 -0500 Received: from cr0.redhat.com (vpn1-115-244.nay.redhat.com [10.66.115.244]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBACFfe2029662; Mon, 10 Dec 2012 07:15:43 -0500 From: Cong Wang To: netdev@vger.kernel.org Cc: Herbert Xu , Stephen Hemminger , "David S. Miller" , Thomas Graf , Jesper Dangaard Brouer , Cong Wang Subject: [Patch net-next] bridge: fix seq check in br_mdb_dump() Date: Mon, 10 Dec 2012 20:15:35 +0800 Message-Id: <1355141735-19576-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang In case of rehashing, introduce a global variable 'br_mdb_rehash_seq' which gets increased every time when rehashing, and assign net->dev_base_seq + br_mdb_rehash_seq to cb->seq. In theory cb->seq could be wrapped to zero, but this is not easy to fix, as net->dev_base_seq is not visible inside br_mdb_rehash(). In practice, this is rare. Cc: Herbert Xu Cc: Stephen Hemminger Cc: "David S. Miller" Cc: Thomas Graf Cc: Jesper Dangaard Brouer Signed-off-by: Cong Wang --- net/bridge/br_mdb.c | 6 ++---- net/bridge/br_multicast.c | 2 ++ net/bridge/br_private.h | 1 + 3 files changed, 5 insertions(+), 4 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_mdb.c b/net/bridge/br_mdb.c index edc0d73..ccc43a9 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -117,10 +117,8 @@ static int br_mdb_dump(struct sk_buff *skb, struct netlink_callback *cb) rcu_read_lock(); - /* TODO: in case of rehashing, we need to check - * consistency for dumping. - */ - cb->seq = net->dev_base_seq; + /* In theory this could be wrapped to 0... */ + cb->seq = net->dev_base_seq + br_mdb_rehash_seq; for_each_netdev_rcu(net, dev) { if (dev->priv_flags & IFF_EBRIDGE) { diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 68e375a..847b98a1 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -37,6 +37,7 @@ rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock)) static void br_multicast_start_querier(struct net_bridge *br); +unsigned int br_mdb_rehash_seq; #if IS_ENABLED(CONFIG_IPV6) static inline int ipv6_is_transient_multicast(const struct in6_addr *addr) @@ -338,6 +339,7 @@ static int br_mdb_rehash(struct net_bridge_mdb_htable __rcu **mdbp, int max, return err; } + br_mdb_rehash_seq++; call_rcu_bh(&mdb->rcu, br_mdb_free); out: diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index ae0a6ec..f95b766 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -411,6 +411,7 @@ extern int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __us /* br_multicast.c */ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING +extern unsigned int br_mdb_rehash_seq; extern int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port, struct sk_buff *skb);