Patchwork net: make namespace iteration possible under RCU

login
register
mail settings
Submitter Johannes Berg
Date June 18, 2009, 11:08 a.m.
Message ID <1245323303.31588.86.camel@johannes.local>
Download mbox | patch
Permalink /patch/28857/
State RFC
Delegated to: David Miller
Headers show

Comments

Johannes Berg - June 18, 2009, 11:08 a.m.
All we need to take care of is using proper RCU list
add/del primitives and inserting a synchronize_rcu()
at one place to make sure the exit notifiers are run
after everybody has stopped iterating the list.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 include/net/net_namespace.h |    3 +++
 net/core/net_namespace.c    |   10 +++++++---
 2 files changed, 10 insertions(+), 3 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
Jiri Pirko - June 18, 2009, 11:45 a.m.
Thu, Jun 18, 2009 at 01:08:23PM CEST, johannes@sipsolutions.net wrote:
>All we need to take care of is using proper RCU list
>add/del primitives and inserting a synchronize_rcu()
>at one place to make sure the exit notifiers are run
>after everybody has stopped iterating the list.
>
>Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
>---
> include/net/net_namespace.h |    3 +++
> net/core/net_namespace.c    |   10 +++++++---
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
>--- wireless-testing.orig/include/net/net_namespace.h	2009-06-18 01:36:26.000000000 +0200
>+++ wireless-testing/include/net/net_namespace.h	2009-06-18 02:17:14.000000000 +0200
>@@ -211,6 +211,9 @@ static inline struct net *read_pnet(stru
> #define for_each_net(VAR)				\
> 	list_for_each_entry(VAR, &net_namespace_list, list)
> 
>+#define for_each_net_rcu(VAR)				\
>+	list_for_each_entry_rcu(VAR, &net_namespace_list, list)
>+
> #ifdef CONFIG_NET_NS
> #define __net_init
> #define __net_exit
>--- wireless-testing.orig/net/core/net_namespace.c	2009-06-18 01:36:39.000000000 +0200
>+++ wireless-testing/net/core/net_namespace.c	2009-06-18 02:03:06.000000000 +0200
>@@ -6,6 +6,7 @@
> #include <linux/delay.h>
> #include <linux/sched.h>
> #include <linux/idr.h>
>+#include <linux/rculist.h>
> #include <net/net_namespace.h>
> #include <net/netns/generic.h>
> 
>@@ -134,7 +135,7 @@ struct net *copy_net_ns(unsigned long fl
> 	err = setup_net(new_net);
> 	if (!err) {
> 		rtnl_lock();
>-		list_add_tail(&new_net->list, &net_namespace_list);
>+		list_add_tail_rcu(&new_net->list, &net_namespace_list);
> 		rtnl_unlock();
> 	}
> 	mutex_unlock(&net_mutex);
>@@ -163,9 +164,12 @@ static void cleanup_net(struct work_stru
> 
> 	/* Don't let anyone else find us. */
> 	rtnl_lock();
>-	list_del(&net->list);
>+	list_del_rcu(&net->list);
> 	rtnl_unlock();
> 
>+	/* if somebody is rcu-iterating the list, wait */
>+	synchronize_rcu();

IMHO you do not need to call synchronize_rcu() here since rcu_barrier() is
called later just before net_free(net). Seems redundant.

	Jirka

>+
> 	/* Run all of the network namespace exit methods */
> 	list_for_each_entry_reverse(ops, &pernet_list, list) {
> 		if (ops->exit)
>@@ -227,7 +231,7 @@ static int __init net_ns_init(void)
> 	err = setup_net(&init_net);
> 
> 	rtnl_lock();
>-	list_add_tail(&init_net.list, &net_namespace_list);
>+	list_add_tail_rcu(&init_net.list, &net_namespace_list);
> 	rtnl_unlock();
> 
> 	mutex_unlock(&net_mutex);
>
>
>--
>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
--
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
Johannes Berg - June 18, 2009, 12:15 p.m.
On Thu, 2009-06-18 at 13:45 +0200, Jiri Pirko wrote:
> Thu, Jun 18, 2009 at 01:08:23PM CEST, johannes@sipsolutions.net wrote:
> >All we need to take care of is using proper RCU list
> >add/del primitives and inserting a synchronize_rcu()
> >at one place to make sure the exit notifiers are run
> >after everybody has stopped iterating the list.
> >
> >Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> >---
> > include/net/net_namespace.h |    3 +++
> > net/core/net_namespace.c    |   10 +++++++---
> > 2 files changed, 10 insertions(+), 3 deletions(-)
> >
> >--- wireless-testing.orig/include/net/net_namespace.h	2009-06-18 01:36:26.000000000 +0200
> >+++ wireless-testing/include/net/net_namespace.h	2009-06-18 02:17:14.000000000 +0200
> >@@ -211,6 +211,9 @@ static inline struct net *read_pnet(stru
> > #define for_each_net(VAR)				\
> > 	list_for_each_entry(VAR, &net_namespace_list, list)
> > 
> >+#define for_each_net_rcu(VAR)				\
> >+	list_for_each_entry_rcu(VAR, &net_namespace_list, list)
> >+
> > #ifdef CONFIG_NET_NS
> > #define __net_init
> > #define __net_exit
> >--- wireless-testing.orig/net/core/net_namespace.c	2009-06-18 01:36:39.000000000 +0200
> >+++ wireless-testing/net/core/net_namespace.c	2009-06-18 02:03:06.000000000 +0200
> >@@ -6,6 +6,7 @@
> > #include <linux/delay.h>
> > #include <linux/sched.h>
> > #include <linux/idr.h>
> >+#include <linux/rculist.h>
> > #include <net/net_namespace.h>
> > #include <net/netns/generic.h>
> > 
> >@@ -134,7 +135,7 @@ struct net *copy_net_ns(unsigned long fl
> > 	err = setup_net(new_net);
> > 	if (!err) {
> > 		rtnl_lock();
> >-		list_add_tail(&new_net->list, &net_namespace_list);
> >+		list_add_tail_rcu(&new_net->list, &net_namespace_list);
> > 		rtnl_unlock();
> > 	}
> > 	mutex_unlock(&net_mutex);
> >@@ -163,9 +164,12 @@ static void cleanup_net(struct work_stru
> > 
> > 	/* Don't let anyone else find us. */
> > 	rtnl_lock();
> >-	list_del(&net->list);
> >+	list_del_rcu(&net->list);
> > 	rtnl_unlock();
> > 
> >+	/* if somebody is rcu-iterating the list, wait */
> >+	synchronize_rcu();
> 
> IMHO you do not need to call synchronize_rcu() here since rcu_barrier() is
> called later just before net_free(net). Seems redundant.

Heh, well, I discussed that earlier with Eric and we do not want anyone
to have a reference to the struct net while the pernet->exit calls are
run, and thus we do need it here.

johannes

Patch

--- wireless-testing.orig/include/net/net_namespace.h	2009-06-18 01:36:26.000000000 +0200
+++ wireless-testing/include/net/net_namespace.h	2009-06-18 02:17:14.000000000 +0200
@@ -211,6 +211,9 @@  static inline struct net *read_pnet(stru
 #define for_each_net(VAR)				\
 	list_for_each_entry(VAR, &net_namespace_list, list)
 
+#define for_each_net_rcu(VAR)				\
+	list_for_each_entry_rcu(VAR, &net_namespace_list, list)
+
 #ifdef CONFIG_NET_NS
 #define __net_init
 #define __net_exit
--- wireless-testing.orig/net/core/net_namespace.c	2009-06-18 01:36:39.000000000 +0200
+++ wireless-testing/net/core/net_namespace.c	2009-06-18 02:03:06.000000000 +0200
@@ -6,6 +6,7 @@ 
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/idr.h>
+#include <linux/rculist.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 
@@ -134,7 +135,7 @@  struct net *copy_net_ns(unsigned long fl
 	err = setup_net(new_net);
 	if (!err) {
 		rtnl_lock();
-		list_add_tail(&new_net->list, &net_namespace_list);
+		list_add_tail_rcu(&new_net->list, &net_namespace_list);
 		rtnl_unlock();
 	}
 	mutex_unlock(&net_mutex);
@@ -163,9 +164,12 @@  static void cleanup_net(struct work_stru
 
 	/* Don't let anyone else find us. */
 	rtnl_lock();
-	list_del(&net->list);
+	list_del_rcu(&net->list);
 	rtnl_unlock();
 
+	/* if somebody is rcu-iterating the list, wait */
+	synchronize_rcu();
+
 	/* Run all of the network namespace exit methods */
 	list_for_each_entry_reverse(ops, &pernet_list, list) {
 		if (ops->exit)
@@ -227,7 +231,7 @@  static int __init net_ns_init(void)
 	err = setup_net(&init_net);
 
 	rtnl_lock();
-	list_add_tail(&init_net.list, &net_namespace_list);
+	list_add_tail_rcu(&init_net.list, &net_namespace_list);
 	rtnl_unlock();
 
 	mutex_unlock(&net_mutex);