[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100428030709.GA12910@gondor.apana.org.au>
Date: Wed, 28 Apr 2010 11:07:09 +0800
From: Herbert Xu <herbert@...dor.apana.org.au>
To: Stephen Hemminger <shemminger@...tta.com>
Cc: "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: [PATCH net-next 3/4] bridge: multicast port group RCU fix
On Tue, Apr 27, 2010 at 06:01:06PM -0700, Stephen Hemminger wrote:
> The recently introduced bridge mulitcast port group list was only
> partially using RCU correctly. It was missing rcu_dereference()
> and missing the necessary barrier on deletion.
>
> The code should have used one of the standard list methods (list or hlist)
> instead of open coding a RCU based link list.
>
> Signed-off-by: Stephen Hemminger <shemminger@...tta.com>
>
> --- a/net/bridge/br_forward.c 2010-04-27 17:51:27.909588950 -0700
> +++ b/net/bridge/br_forward.c 2010-04-27 17:53:18.790721091 -0700
> @@ -217,7 +217,7 @@ static void br_multicast_flood(struct ne
> prev = NULL;
>
> rp = rcu_dereference(br->router_list.first);
> - p = mdst ? mdst->ports : NULL;
> + p = mdst ? rcu_dereference(mdst->ports) : NULL;
> while (p || rp) {
> lport = p ? p->port : NULL;
> rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
> @@ -231,7 +231,7 @@ static void br_multicast_flood(struct ne
> goto out;
>
> if ((unsigned long)lport >= (unsigned long)port)
> - p = p->next;
> + p = rcu_dereference(p->next);
> if ((unsigned long)rport >= (unsigned long)port)
> rp = rcu_dereference(rp->next);
> }
Thanks for catching this!
> --- a/net/bridge/br_multicast.c 2010-04-27 17:51:31.509593914 -0700
> +++ b/net/bridge/br_multicast.c 2010-04-27 17:52:48.209243982 -0700
> @@ -259,7 +259,7 @@ static void br_multicast_del_pg(struct n
> if (p != pg)
> continue;
>
> - *pp = p->next;
> + rcu_assign_pointer(*pp, p->next);
But this is bogus. br_multicast_del_pg is removing an entry from
the RCU list.
You only need write barriers when you're putting a new entry in
it, and only if there is no other barrier between the code filling
in the new entry and the line adding it to the RCU list.
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists