From: Stephen Hemminger <shemminger@vyatta•com>
To: Herbert Xu <herbert@gondor•apana.org.au>
Cc: "David S. Miller" <davem@davemloft•net>, netdev@vger•kernel.org
Subject: [PATCH net-next] bridge: multicast router list manipulation
Date: Tue, 27 Apr 2010 10:13:11 -0700 [thread overview]
Message-ID: <20100427101311.2f445227@nehalam> (raw)
In-Reply-To: <E1NlbuX-00021m-Bq@gondolin.me.apana.org.au>
I prefer that the hlist be only accessed through the hlist macro
objects. Explicit twiddling of links (especially with RCU) exposes
the code to future bugs.
Compile tested only.
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/net/bridge/br_multicast.c 2010-04-27 09:54:02.180531924 -0700
+++ b/net/bridge/br_multicast.c 2010-04-27 10:07:19.188688664 -0700
@@ -1041,21 +1041,21 @@ static int br_ip6_multicast_mld2_report(
static void br_multicast_add_router(struct net_bridge *br,
struct net_bridge_port *port)
{
- struct hlist_node *p;
- struct hlist_node **h;
+ struct net_bridge_port *p;
+ struct hlist_node *n, *last = NULL;
- for (h = &br->router_list.first;
- (p = *h) &&
- (unsigned long)container_of(p, struct net_bridge_port, rlist) >
- (unsigned long)port;
- h = &p->next)
- ;
-
- port->rlist.pprev = h;
- port->rlist.next = p;
- rcu_assign_pointer(*h, &port->rlist);
- if (p)
- p->pprev = &port->rlist.next;
+ hlist_for_each_entry(p, n, &br->router_list, rlist) {
+ if ((unsigned long) port >= (unsigned long) p) {
+ hlist_add_before_rcu(n, &port->rlist);
+ return;
+ }
+ last = n;
+ }
+
+ if (last)
+ hlist_add_after_rcu(last, &port->rlist);
+ else
+ hlist_add_head_rcu(&port->rlist, &br->router_list);
}
static void br_multicast_mark_router(struct net_bridge *br,
next prev parent reply other threads:[~2010-04-27 17:13 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-26 15:34 [RFC] [1/13] bridge: Add IGMP snooping support Herbert Xu
2010-02-26 15:35 ` [PATCH 1/13] bridge: Do br_pass_frame_up after other ports Herbert Xu
2010-02-26 15:35 ` [PATCH 2/13] bridge: Allow tail-call on br_pass_frame_up Herbert Xu
2010-02-27 11:14 ` David Miller
2010-02-27 15:36 ` Herbert Xu
2010-02-26 15:35 ` [PATCH 3/13] bridge: Avoid unnecessary clone on forward path Herbert Xu
2010-02-26 15:35 ` [PATCH 4/13] bridge: Use BR_INPUT_SKB_CB on xmit path Herbert Xu
2010-02-26 15:35 ` [PATCH 5/13] bridge: Split may_deliver/deliver_clone out of br_flood Herbert Xu
2010-02-26 15:35 ` [PATCH 6/13] bridge: Add core IGMP snooping support Herbert Xu
2010-02-26 15:35 ` [PATCH 7/13] bridge: Add multicast forwarding functions Herbert Xu
2010-02-26 15:35 ` [PATCH 8/13] bridge: Add multicast start/stop hooks Herbert Xu
2010-02-26 15:35 ` [PATCH 9/13] bridge: Add multicast data-path hooks Herbert Xu
2010-02-26 15:35 ` [PATCH 10/13] bridge: Add multicast_router sysfs entries Herbert Xu
2010-02-27 0:42 ` Stephen Hemminger
2010-02-27 11:29 ` David Miller
2010-02-27 15:53 ` Herbert Xu
2010-03-09 12:25 ` Herbert Xu
2010-03-09 12:26 ` Herbert Xu
2010-02-26 15:35 ` [PATCH 11/13] bridge: Add multicast_snooping sysfs toggle Herbert Xu
2010-02-26 15:35 ` [PATCH 12/13] bridge: Add hash elasticity/max sysfs entries Herbert Xu
2010-02-26 15:35 ` [PATCH 13/13] bridge: Add multicast count/interval " Herbert Xu
2010-02-28 5:40 ` [1/13] bridge: Add IGMP snooping support Herbert Xu
2010-02-28 5:41 ` [PATCH 1/13] bridge: Do br_pass_frame_up after other ports Herbert Xu
2010-02-28 5:41 ` [PATCH 2/13] bridge: Allow tail-call on br_pass_frame_up Herbert Xu
2010-02-28 5:41 ` [PATCH 3/13] bridge: Avoid unnecessary clone on forward path Herbert Xu
2010-02-28 5:41 ` [PATCH 4/13] bridge: Use BR_INPUT_SKB_CB on xmit path Herbert Xu
2010-02-28 5:41 ` [PATCH 5/13] bridge: Split may_deliver/deliver_clone out of br_flood Herbert Xu
2010-02-28 5:41 ` [PATCH 6/13] bridge: Add core IGMP snooping support Herbert Xu
2010-03-05 23:43 ` Paul E. McKenney
2010-03-06 1:17 ` Herbert Xu
2010-03-06 5:06 ` Paul E. McKenney
2010-03-06 6:56 ` Herbert Xu
2010-03-06 7:03 ` Herbert Xu
2010-03-07 23:31 ` David Miller
2010-03-06 7:07 ` Herbert Xu
2010-03-07 23:31 ` David Miller
2010-03-06 15:00 ` Paul E. McKenney
2010-03-06 15:19 ` Paul E. McKenney
2010-03-06 19:00 ` Paul E. McKenney
2010-03-07 2:45 ` Herbert Xu
2010-03-07 3:11 ` Paul E. McKenney
2010-03-08 18:50 ` Arnd Bergmann
2010-03-09 3:15 ` Paul E. McKenney
2010-03-11 18:49 ` Arnd Bergmann
2010-03-14 23:01 ` Paul E. McKenney
2010-03-09 21:12 ` Arnd Bergmann
2010-03-10 2:14 ` Paul E. McKenney
2010-03-10 9:41 ` Arnd Bergmann
2010-03-10 10:39 ` Eric Dumazet
2010-03-10 10:49 ` Herbert Xu
2010-03-10 13:13 ` Paul E. McKenney
2010-03-10 14:07 ` Herbert Xu
2010-03-10 16:26 ` Paul E. McKenney
2010-03-10 16:35 ` David Miller
2010-03-10 17:56 ` Arnd Bergmann
2010-03-10 21:25 ` Paul E. McKenney
2010-03-10 13:27 ` Arnd Bergmann
2010-03-10 13:39 ` Arnd Bergmann
2010-03-10 13:19 ` Paul E. McKenney
2010-03-10 13:30 ` Arnd Bergmann
2010-03-10 13:57 ` Paul E. McKenney
2010-02-28 5:41 ` [PATCH 7/13] bridge: Add multicast forwarding functions Herbert Xu
2010-02-28 5:41 ` [PATCH 8/13] bridge: Add multicast start/stop hooks Herbert Xu
2010-02-28 5:41 ` [PATCH 9/13] bridge: Add multicast data-path hooks Herbert Xu
2010-04-27 17:13 ` [PATCH net-next] bridge: use is_multicast_ether_addr Stephen Hemminger
2010-04-27 19:53 ` David Miller
2010-02-28 5:41 ` [PATCH 10/13] bridge: Add multicast_router sysfs entries Herbert Xu
2010-04-27 17:13 ` Stephen Hemminger [this message]
2010-04-27 19:54 ` [PATCH net-next] bridge: multicast router list manipulation David Miller
2010-04-27 23:11 ` Michał Mirosław
2010-04-27 23:25 ` Stephen Hemminger
2010-04-27 23:28 ` David Miller
2010-04-27 23:44 ` Stephen Hemminger
2010-04-27 23:51 ` David Miller
2010-04-27 23:27 ` David Miller
2010-04-28 1:51 ` Herbert Xu
2010-02-28 5:41 ` [PATCH 11/13] bridge: Add multicast_snooping sysfs toggle Herbert Xu
2010-02-28 5:41 ` [PATCH 12/13] bridge: Add hash elasticity/max sysfs entries Herbert Xu
2010-02-28 5:41 ` [PATCH 13/13] bridge: Add multicast count/interval " Herbert Xu
2010-02-28 8:52 ` [1/13] bridge: Add IGMP snooping support David Miller
2010-03-01 2:08 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100427101311.2f445227@nehalam \
--to=shemminger@vyatta$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox