OpenVZ Forum: Devel » [RFC PATCH 0/31] An introduction and A path for merging network namespace work

Home » Mailing lists » Devel » [RFC PATCH 0/31] An introduction and A path for merging network namespace work

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

[PATCH RFC 24/31] net: Make rtnetlink network namespace aware [message #17362 is a reply to message #17338]

Thu, 25 January 2007 19:00

ebiederm
Messages: 1354
Registered: February 2006

Senior Member

From: Eric W. Biederman <ebiederm@xmission.com> - unquoted

After this patch none of the netlink callback support anything
except the initial network namespace but the rtnetlink infrastructure
now handles multiple network namespaces.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
 include/linux/rtnetlink.h |    8 ++--
 net/bridge/br_netlink.c   |    4 +-
 net/core/fib_rules.c      |    4 +-
 net/core/neighbour.c      |    4 +-
 net/core/rtnetlink.c      |   74 +++++++++++++++++++++++++++++++++++---------
 net/core/wireless.c       |    5 ++-
 net/decnet/dn_dev.c       |    4 +-
 net/decnet/dn_route.c     |    2 +-
 net/decnet/dn_table.c     |    4 +-
 net/ipv4/devinet.c        |    4 +-
 net/ipv4/fib_semantics.c  |    4 +-
 net/ipv4/ipmr.c           |    4 +-
 net/ipv4/route.c          |    2 +-
 net/ipv6/addrconf.c       |   14 ++++----
 net/ipv6/route.c          |    6 ++--
 net/sched/cls_api.c       |    2 +-
 net/sched/sch_api.c       |    4 +-
 17 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 4a629ea..6c8281d 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -581,11 +581,11 @@ struct rtnetlink_link
 };
 
 extern struct rtnetlink_link * rtnetlink_links[NPROTO];
-extern int rtnetlink_send(struct sk_buff *skb, u32 pid, u32 group, int echo);
-extern int rtnl_unicast(struct sk_buff *skb, u32 pid);
-extern int rtnl_notify(struct sk_buff *skb, u32 pid, u32 group,
+extern int rtnetlink_send(struct sk_buff *skb, net_t net, u32 pid, u32 group, int echo);
+extern int rtnl_unicast(struct sk_buff *skb, net_t net, u32 pid);
+extern int rtnl_notify(struct sk_buff *skb, net_t net, u32 pid, u32 group,
 		       struct nlmsghdr *nlh, gfp_t flags);
-extern void rtnl_set_sk_err(u32 group, int error);
+extern void rtnl_set_sk_err(net_t net, u32 group, int error);
 extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);
 extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst,
 			      u32 id, u32 ts, u32 tsage, long expires,
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 85165a1..372fb18 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -94,10 +94,10 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port)
 	/* failure implies BUG in br_nlmsg_size() */
 	BUG_ON(err < 0);
 
-	err = rtnl_notify(skb, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
+	err = rtnl_notify(skb, init_net(), 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
 errout:
 	if (err < 0)
-		rtnl_set_sk_err(RTNLGRP_LINK, err);
+		rtnl_set_sk_err(init_net(), RTNLGRP_LINK, err);
 }
 
 /*
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 00b4148..5f65973 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -418,10 +418,10 @@ static void notify_rule_change(int event, struct fib_rule *rule,
 	/* failure implies BUG in fib_rule_nlmsg_size() */
 	BUG_ON(err < 0);
 
-	err = rtnl_notify(skb, pid, ops->nlgroup, nlh, GFP_KERNEL);
+	err = rtnl_notify(skb, init_net(), pid, ops->nlgroup, nlh, GFP_KERNEL);
 errout:
 	if (err < 0)
-		rtnl_set_sk_err(ops->nlgroup, err);
+		rtnl_set_sk_err(init_net(), ops->nlgroup, err);
 }
 
 static void attach_rules(struct list_head *rules, struct net_device *dev)
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index d89c6fe..6f61207 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2453,10 +2453,10 @@ static void __neigh_notify(struct neighbour *n, int type, int flags)
 	/* failure implies BUG in neigh_nlmsg_size() */
 	BUG_ON(err < 0);
 
-	err = rtnl_notify(skb, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);
+	err = rtnl_notify(skb, init_net(), 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);
 errout:
 	if (err < 0)
-		rtnl_set_sk_err(RTNLGRP_NEIGH, err);
+		rtnl_set_sk_err(init_net(), RTNLGRP_NEIGH, err);
 }
 
 void neigh_app_ns(struct neighbour *n)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 9be586c..29a81bf 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -58,7 +58,7 @@
 #endif	/* CONFIG_NET_WIRELESS_RTNETLINK */
 
 static DEFINE_MUTEX(rtnl_mutex);
-static struct sock *rtnl;
+static DEFINE_PER_NET(struct sock *, rtnl);
 
 void rtnl_lock(void)
 {
@@ -72,9 +72,17 @@ void __rtnl_unlock(void)
 
 void rtnl_unlock(void)
 {
+	net_t net;
 	mutex_unlock(&rtnl_mutex);
-	if (rtnl && rtnl->sk_receive_queue.qlen)
-		rtnl->sk_data_ready(rtnl, 0);
+	
+	net_lock();
+	for_each_net(net) {
+		struct sock *rtnl = per_net(rtnl, net);
+		if (rtnl && rtnl->sk_receive_queue.qlen)
+			rtnl->sk_data_ready(rtnl, 0);
+	}
+	net_unlock();
+
 	netdev_run_todo();
 }
 
@@ -151,8 +159,9 @@ size_t rtattr_strlcpy(char *dest, const struct rtattr *rta, size_t size)
 	return ret;
 }
 
-int rtnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo)
+int rtnetlink_send(struct sk_buff *skb, net_t net, u32 pid, unsigned group, int echo)
 {
+	struct sock *rtnl = per_net(rtnl, net);
 	int err = 0;
 
 	NETLINK_CB(skb).dst_group = group;
@@ -164,14 +173,17 @@ int rtnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo)
 	return err;
 }
 
-int rtnl_unicast(struct sk_buff *skb, u32 pid)
+int rtnl_unicast(struct sk_buff *skb, net_t net, u32 pid)
 {
+	struct sock *rtnl = per_net(rtnl, net);
+
 	return nlmsg_unicast(rtnl, skb, pid);
 }
 
-int rtnl_notify(struct sk_buff *skb, u32 pid, u32 group,
+int rtnl_notify(struct sk_buff *skb, net_t net, u32 pid, u32 group,
 		struct nlmsghdr *nlh, gfp_t flags)
 {
+	struct sock *rtnl = per_net(rtnl, net);
 	int report = 0;
 
 	if (nlh)
@@ -180,8 +192,10 @@ int rtnl_notify(struct sk_buff *skb, u32 pid, u32 group,
 	return nlmsg_notify(rtnl, skb, pid, group, report, flags);
 }
 
-void rtnl_set_sk_err(u32 group, int error)
+void rtnl_set_sk_err(net_t net, u32 group, int error)
 {
+	struct sock *rtnl = per_net(rtnl, net);
+
 	netlink_set_err(rtnl, 0, group, error);
 }
 
@@ -649,7 +663,7 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 	/* failure impilies BUG in if_nlmsg_size or wireless_rtnetlink_get */
 	BUG_ON(err < 0);
 
-	err = rtnl_unicast(nskb, NETLINK_CB(skb).pid);
+	err = rtnl_unicast(nskb, net, NETLINK_CB(skb).pid);
 errout:
 	kfree(iw_buf);
 	dev_put(dev);
@@ -698,10 +712,10 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change)
 	/* failure implies BUG in if_nlmsg_size() */
 	BUG_ON(err < 0);
 
-	err = rtnl_notify(skb, 0, RTNLGRP_LINK, NULL, GFP_KERNEL);
+	err = rtnl_notify(skb, init_net(), 0, RTNLGRP_LINK, NULL, GFP_KERNEL);
 errout:
 	if (err < 0)
-		rtnl_set_sk_err(RTNLGRP_LINK, err);
+		rtnl_set_sk_err(init_net(), RTNLGRP_LINK, err);
 }
 
 /* Protected by RTNL sempahore.  */
@@ -713,6 +727,7 @@ static int rtattr_max;
 static __inline__ int
 rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
 {
+	net_t net = skb->sk->sk_net;
 	struct rtnetlink_link *link;
 	struct rtnetlink_link *link_tab;
 	int sz_idx, kind;
@@ -767,7 +782,7 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp)
 		if (link->dumpit == NULL)
 			goto err_inval;
 
-		if ((*errp = netlink_dump_start(rtnl, skb, nlh,
+		if ((*errp = netlink_dump_start(per_net(rtnl, net), skb, nlh,
 						link->dumpit, NULL)) != 0) {
 			return -1;
 		}
@@ -875,6 +890,36 @@ static struct notifier_block rtnetlink_dev_notifier = {
 	.notifier_call	= rtnetlink_event,
 };
 
+
+static int rtnetlink_net_init(net_t net)
+{
+	struct sock *sk;
+	sk = netlink_kernel_create(net, NETLINK_ROUTE, RTNLGRP_MAX,
+				   rtnetlink_rcv, THIS_MODULE);
+	if (!sk)
+		return -ENOMEM;
+
+	/* Don't hold an extra reference on the namespace */
+	put_net(sk->sk_net);
+	per_net(rtnl, net) = sk;
+	return 0;
+}
+
+static void rtnetlink_net_exit(net_t net)
+{
+	/* At the last minute lie and say this is a socket for the
+	 * initial network namespace.  So the socket will be safe to
+	 * free.
+	 */
+	per_net(rtnl, net)->sk_net = get_net(init_net());
+	sock_put(per_net(rtnl, net));
+}
+
+static struct pernet_operations rtnetlink_net_ops = {
+	.init = rtnetlink_net_init,
+	.exit = rtnetlink_net_exit,
+};
+
 void __init rtnetlink_init(void)
 {
 	int i;
@@ -887,10 +932,9 @@ void __init rtnetlink_init(void)
 	if (!rta_buf)
 		panic("rtnetlink_init: cannot allocate rta_buf\n");
 
-	rtnl = netlink_kernel_create(init_net(), NETLINK_ROUTE, RTNLGRP_MAX,
-				      rtnetlink_rcv, THIS_MODULE);
-	if (rtnl == NULL)
-		panic("rtnetlink_init: cannot initialize rtnetlink\n");
+	if (register_pernet_subsys(&rtnetlink_net_ops))
+  		panic("rtnetlink_init: cannot initialize rtnetlink\n");
+
 	netlink_set_nonroot(NETLINK_ROUTE, NL_NONROOT_RECV);
 	register_netdevice_notifier(&rtnetlink_dev_notifier);
 	rtnetlink_links[PF_UNSPEC] = link_rtnetlink_table;
diff --git a/net/core/wireless.c b/net/core/wireless.c
index d1418bf..9036359 100644
--- a/net/core/wireless.c
+++ b/net/core/wireless.c
@@ -1935,7 +1935,7 @@ static void wireless_nlevent_process(unsigned long data)
 	struct sk_buff *skb;
 
 	while ((skb = skb_dequeue(&wireless_nlevent_queue)))
-		rtnl_notify(skb, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
+		rtnl_notify(skb, init_net(), 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
 }
 
 static DECLARE_TASKLET(wireless_nlevent_tasklet, wireless_nlevent_process, 0);
@@ -1992,6 +1992,9 @@ static inline void rtmsg_iwinfo(struct net_device *	dev,
 	struct sk_buff *skb;
 	int size = NLMSG_GOODSIZE;
 
+	if (!net_eq(dev->nd_net, init_net()))
+		return;
+
 	skb = alloc_skb(size, GFP_ATOMIC);
 	if (!skb)
 		return;
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index a09275b..bad972d 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -788,10 +788,10 @@ static void dn_ifaddr_notify(int event, struct dn_ifaddr *ifa)
 	/* failure implies BUG in dn_ifaddr_nlmsg_size() */
 	BUG_ON(err < 0);
 
-	err = rtnl_notify(skb, 0, RTNLGRP_DECnet_IFADDR, NULL, GFP_KERNEL);
+	err = rt

...

[ Show the rest of the message ]

Report message to a moderator

[Message index]

		[RFC PATCH 0/31] An introduction and A path for merging network namespace work By: ebiederm on Thu, 25 January 2007 18:55
		[PATCH RFC 1/31] net: Add net_namespace_type.h to allow for per network namespace variables. By: ebiederm on Thu, 25 January 2007 19:00
		Re: [PATCH RFC 1/31] net: Add net_namespace_type.h to allow for per network namespace variables. By: Stephen Hemminger on Thu, 25 January 2007 20:30
		Re: [PATCH RFC 1/31] net: Add net_namespace_type.h to allow for per network namespace variables. By: ebiederm on Thu, 25 January 2007 20:53
		[PATCH RFC 2/31] net: Implement a place holder network namespace By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 3/31] net: Add a network namespace parameter to tasks By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 4/31] net: Add a network namespace tag to struct net_device By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 5/31] net: Add a network namespace parameter to struct sock By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 6/31] net: Add a helper to get a reference to the initial network namespace. By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 7/31] net: Make /proc/net per network namespace By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 8/31] net: Make /sys/class/net handle multiple network namespaces By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 9/31] net: Implement the per network namespace sysctl infrastructure By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 10/31] net: Make socket creation namespace safe. By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 11/31] net: Initialize the network namespace of network devices. By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 12/31] net: Make packet reception network namespace safe By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 13/31] net: Make device event notification network namespace safe By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 14/31] net: Support multiple network namespaces with netlink By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 15/31] net: Make the loopback device per network namespace By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 16/31] net: Make the device list and device lookups per namespace. By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 17/31] net: Factor out __dev_alloc_name from dev_alloc_name By: ebiederm on Thu, 25 January 2007 19:00
		Re: [PATCH RFC 17/31] net: Factor out __dev_alloc_name from dev_alloc_name By: Benjamin Thery on Mon, 05 March 2007 15:29
		[PATCH RFC 18/31] net: Implment network device movement between namespaces By: ebiederm on Thu, 25 January 2007 19:00
		Re: [PATCH RFC 18/31] net: Implment network device movement between namespaces By: ebiederm on Wed, 28 February 2007 15:12
		Re: [PATCH RFC 18/31] net: Implment network device movement between namespaces By: Daniel Lezcano on Wed, 28 February 2007 14:35
		[PATCH RFC 19/31] net: sysfs interface support for moving devices between network namespaces. By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 20/31] net: Implement CONFIG_NET_NS By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 21/31] net: Implement the guts of the network namespace infrastructure By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 22/31] net: Add network namespace clone support. By: ebiederm on Thu, 25 January 2007 19:00
		Re: [PATCH RFC 22/31] net: Add network namespace clone support. By: ebiederm on Wed, 28 February 2007 15:05
		Re: [PATCH RFC 22/31] net: Add network namespace clone support. By: Daniel Lezcano on Wed, 28 February 2007 14:42
		[PATCH RFC 23/31] net: Modify all rtnetlink methods to only work in the initial namespace By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 24/31] net: Make rtnetlink network namespace aware By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 25/31] net: Make wireless netlink event generation handle multiple network namespaces By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 26/31] net: Make the netlink methods in rtnetlink handle multiple network namespaces By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 27/31] net: Make the xfrm sysctls per network namespace. By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 28/31] net: Make the SOMAXCONN sysctl per network namespace By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 29/31] net: Make AF_PACKET handle multiple network namespaces By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 30/31] net: Make AF_UNIX per network namespace safe. By: ebiederm on Thu, 25 January 2007 19:00
		[PATCH RFC 31/31] net: Add etun driver By: ebiederm on Thu, 25 January 2007 19:00
		Re: [RFC PATCH 0/31] An introduction and A path for merging network namespace work By: ebiederm on Wed, 28 February 2007 19:45
		Re: [RFC PATCH 0/31] An introduction and A path for merging network namespace work By: Daniel Lezcano on Thu, 01 March 2007 13:53
		Re: [RFC PATCH 0/31] An introduction and A path for merging network namespace work By: Daniel Lezcano on Thu, 01 March 2007 14:22
		Re: [RFC PATCH 0/31] An introduction and A path for merging network namespace work By: ebiederm on Wed, 07 March 2007 04:53
		Re: [RFC PATCH 0/31] An introduction and A path for merging network namespace work By: Daniel Lezcano on Wed, 28 February 2007 16:38

Previous Topic:	Re: [ckrm-tech] [PATCH 0/2] resource control file system - aka containers on top of nsproxy!
Next Topic:	[RFC] Containers infrastructure problems

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Sat Sep 20 15:52:20 GMT 2025

Total time taken to generate the page: 0.05554 seconds