From: ebiederm@xmission.com (Eric W. Biederman) To: linux-kernel@vger.kernel.org Cc: Linux Containers <containers@lists.osdl.org>, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, jamal <hadi@cyberus.ca>, Daniel Lezcano <daniel.lezcano@free.fr>, Linus Torvalds <torvalds@linux-foundation.org>, Michael Kerrisk <mtk.manpages@gmail.com>, Ulrich Drepper <drepper@gmail.com>, Al Viro <viro@ZenIV.linux.org.uk>, David Miller <davem@davemloft.net>, "Serge E. Hallyn" <serge@hallyn.com>, Pavel Emelyanov <xemul@openvz.org>, Pavel Emelyanov <xemul@parallels.com>, Ben Greear <greearb@candelatech.com>, Matt Helsley <matthltc@us.ibm.com>, Jonathan Corbet <corbet@lwn.net>, Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>, Jan Engelhardt <jengelh@medozas.de>, Patrick McHardy <kaber@trash.net> Subject: [PATCH 3/8] ns proc: Add support for the network namespace. Date: Thu, 23 Sep 2010 01:47:42 -0700 [thread overview] Message-ID: <m17hicrglt.fsf@fess.ebiederm.org> (raw) In-Reply-To: <m1ocborgq7.fsf@fess.ebiederm.org> (Eric W. Biederman's message of "Thu, 23 Sep 2010 01:45:04 -0700") Implementing file descriptors for the network namespace is simple and straight forward. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- fs/proc/namespaces.c | 3 +++ include/linux/proc_fs.h | 1 + net/core/net_namespace.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c index f33537f..31e32f3 100644 --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c @@ -16,6 +16,9 @@ static const struct proc_ns_operations *ns_entries[] = { +#ifdef CONFIG_NET_NS + &netns_operations, +#endif }; static const struct file_operations ns_file_operations = { diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index a6c26f0..9cd3fae 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -262,6 +262,7 @@ struct proc_ns_operations { int (*install)(struct nsproxy *nsproxy, void *ns); }; #define PROC_NSNAME(NAME) { .name = (NAME), .len = (sizeof(NAME) - 1), } +extern const struct proc_ns_operations netns_operations; extern struct file *proc_ns_fget(int fd); union proc_op { diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index c988e68..581a088 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -571,3 +571,33 @@ void unregister_pernet_device(struct pernet_operations *ops) mutex_unlock(&net_mutex); } EXPORT_SYMBOL_GPL(unregister_pernet_device); + +#ifdef CONFIG_NET_NS +static void *netns_get(struct task_struct *task) +{ + struct net *net; + rcu_read_lock(); + net = get_net(task->nsproxy->net_ns); + rcu_read_unlock(); + return net; +} + +static void netns_put(void *ns) +{ + put_net(ns); +} + +static int netns_install(struct nsproxy *nsproxy, void *ns) +{ + put_net(nsproxy->net_ns); + nsproxy->net_ns = get_net(ns); + return 0; +} + +const struct proc_ns_operations netns_operations = { + .name = PROC_NSNAME("net"), + .get = netns_get, + .put = netns_put, + .install = netns_install, +}; +#endif -- 1.6.5.2.143.g8cc62
WARNING: multiple messages have this Message-ID (diff)
From: ebiederm@xmission.com (Eric W. Biederman) To: <linux-kernel@vger.kernel.org> Cc: Linux Containers <containers@lists.osdl.org>, <netdev@vger.kernel.org>, netfilter-devel@vger.kernel.org, <linux-fsdevel@vger.kernel.org>, jamal <hadi@cyberus.ca>, Daniel Lezcano <daniel.lezcano@free.fr>, Linus Torvalds <torvalds@linux-foundation.org>, Michael Kerrisk <mtk.manpages@gmail.com>, Ulrich Drepper <drepper@gmail.com>, Al Viro <viro@ZenIV.linux.org.uk>, David Miller <davem@davemloft.net>, "Serge E. Hallyn" <serge@hallyn.com>, Pavel Emelyanov <xemul@openvz.org>, Pavel Emelyanov <xemul@parallels.com>, Ben Greear <greearb@candelatech.com>, Matt Helsley <matthltc@us.ibm.com>, Jonathan Corbet <corbet@lwn.net>, Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>, Jan Engelhardt <jengelh@medozas.de>, Patrick McHardy <kaber@trash.net> Subject: [PATCH 3/8] ns proc: Add support for the network namespace. Date: Thu, 23 Sep 2010 01:47:42 -0700 [thread overview] Message-ID: <m17hicrglt.fsf@fess.ebiederm.org> (raw) In-Reply-To: <m1ocborgq7.fsf@fess.ebiederm.org> (Eric W. Biederman's message of "Thu, 23 Sep 2010 01:45:04 -0700") Implementing file descriptors for the network namespace is simple and straight forward. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- fs/proc/namespaces.c | 3 +++ include/linux/proc_fs.h | 1 + net/core/net_namespace.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c index f33537f..31e32f3 100644 --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c @@ -16,6 +16,9 @@ static const struct proc_ns_operations *ns_entries[] = { +#ifdef CONFIG_NET_NS + &netns_operations, +#endif }; static const struct file_operations ns_file_operations = { diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index a6c26f0..9cd3fae 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -262,6 +262,7 @@ struct proc_ns_operations { int (*install)(struct nsproxy *nsproxy, void *ns); }; #define PROC_NSNAME(NAME) { .name = (NAME), .len = (sizeof(NAME) - 1), } +extern const struct proc_ns_operations netns_operations; extern struct file *proc_ns_fget(int fd); union proc_op { diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index c988e68..581a088 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -571,3 +571,33 @@ void unregister_pernet_device(struct pernet_operations *ops) mutex_unlock(&net_mutex); } EXPORT_SYMBOL_GPL(unregister_pernet_device); + +#ifdef CONFIG_NET_NS +static void *netns_get(struct task_struct *task) +{ + struct net *net; + rcu_read_lock(); + net = get_net(task->nsproxy->net_ns); + rcu_read_unlock(); + return net; +} + +static void netns_put(void *ns) +{ + put_net(ns); +} + +static int netns_install(struct nsproxy *nsproxy, void *ns) +{ + put_net(nsproxy->net_ns); + nsproxy->net_ns = get_net(ns); + return 0; +} + +const struct proc_ns_operations netns_operations = { + .name = PROC_NSNAME("net"), + .get = netns_get, + .put = netns_put, + .install = netns_install, +}; +#endif -- 1.6.5.2.143.g8cc62
next prev parent reply other threads:[~2010-09-23 8:47 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-09-23 8:45 [ABI REVIEW][PATCH 0/8] Namespace file descriptors Eric W. Biederman 2010-09-23 8:45 ` Eric W. Biederman 2010-09-23 8:46 ` [PATCH 1/8] ns: proc files for namespace naming policy Eric W. Biederman 2010-09-23 8:46 ` Eric W. Biederman 2010-09-23 8:46 ` [PATCH 2/8] ns: Introduce the setns syscall Eric W. Biederman 2010-09-23 8:46 ` Eric W. Biederman 2010-09-23 8:47 ` Eric W. Biederman [this message] 2010-09-23 8:47 ` [PATCH 3/8] ns proc: Add support for the network namespace Eric W. Biederman 2010-09-23 11:27 ` Louis Rilling 2010-09-23 16:00 ` Eric W. Biederman 2010-09-23 8:48 ` [PATCH 4/8] ns proc: Add support for the uts namespace Eric W. Biederman 2010-09-23 8:48 ` Eric W. Biederman 2010-09-23 8:49 ` [PATCH 5/8] ns proc: Add support for the ipc namespace Eric W. Biederman 2010-09-23 8:49 ` Eric W. Biederman 2010-09-23 8:50 ` [PATCH 6/8] ns proc: Add support for the mount namespace Eric W. Biederman 2010-09-23 8:50 ` Eric W. Biederman [not found] ` <m1ocborgq7.fsf-+imSwln9KH6u2/kzUuoCbdi2O/JbrIOy@public.gmane.org> 2010-09-23 8:51 ` [PATCH 7/8] net: Allow setting the network namespace by fd Eric W. Biederman 2010-09-23 8:51 ` Eric W. Biederman 2010-09-23 8:51 ` Eric W. Biederman 2010-09-23 9:41 ` Eric Dumazet 2010-09-23 9:41 ` Eric Dumazet 2010-09-23 16:03 ` Eric W. Biederman 2010-09-23 16:03 ` Eric W. Biederman 2010-09-23 11:22 ` jamal 2010-09-23 14:58 ` David Lamparter 2010-09-24 11:51 ` jamal 2010-09-24 12:57 ` David Lamparter 2010-09-24 13:32 ` jamal 2010-09-24 14:09 ` David Lamparter 2010-09-24 14:16 ` jamal 2010-09-23 15:14 ` Eric W. Biederman 2010-09-23 14:22 ` Brian Haley 2010-09-23 16:16 ` Eric W. Biederman [not found] ` <m1hbhgq1v1.fsf-+imSwln9KH6u2/kzUuoCbdi2O/JbrIOy@public.gmane.org> 2010-09-24 13:46 ` Daniel Lezcano 2010-09-24 13:46 ` Daniel Lezcano 2010-09-23 8:51 ` [PATCH 8/8] net: Implement socketat Eric W. Biederman 2010-09-23 8:51 ` Eric W. Biederman 2010-09-23 8:51 ` Eric W. Biederman 2010-09-23 8:56 ` Pavel Emelyanov 2010-09-23 11:19 ` jamal 2010-09-23 11:33 ` Pavel Emelyanov [not found] ` <4C9B3B06.900-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org> 2010-09-23 11:40 ` jamal 2010-09-23 11:40 ` jamal 2010-09-23 11:53 ` Pavel Emelyanov 2010-09-23 12:11 ` jamal 2010-09-23 12:34 ` Pavel Emelyanov 2010-09-23 12:34 ` Pavel Emelyanov 2010-09-23 14:54 ` David Lamparter 2010-09-23 15:00 ` Eric W. Biederman 2010-10-02 21:13 ` Daniel Lezcano 2010-10-03 13:44 ` jamal 2010-10-04 10:13 ` Daniel Lezcano 2010-10-04 19:07 ` Eric W. Biederman 2010-10-15 12:30 ` netns patches WAS( " jamal 2010-10-26 20:52 ` jamal 2010-10-27 0:27 ` Eric W. Biederman 2010-09-23 15:18 ` [ABI REVIEW][PATCH 0/8] Namespace file descriptors David Lamparter 2010-09-23 16:32 ` Eric W. Biederman 2010-09-23 16:49 ` David Lamparter 2010-09-24 13:02 ` Andrew Lutomirski 2010-09-24 13:49 ` Daniel Lezcano 2010-09-24 17:06 ` Eric W. Biederman 2010-09-29 3:09 ` Rémi Denis-Courmont
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=m17hicrglt.fsf@fess.ebiederm.org \ --to=ebiederm@xmission.com \ --cc=containers@lists.osdl.org \ --cc=corbet@lwn.net \ --cc=daniel.lezcano@free.fr \ --cc=davem@davemloft.net \ --cc=drepper@gmail.com \ --cc=greearb@candelatech.com \ --cc=hadi@cyberus.ca \ --cc=jengelh@medozas.de \ --cc=kaber@trash.net \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=matthltc@us.ibm.com \ --cc=mtk.manpages@gmail.com \ --cc=netdev@vger.kernel.org \ --cc=netfilter-devel@vger.kernel.org \ --cc=serge@hallyn.com \ --cc=sukadev@linux.vnet.ibm.com \ --cc=torvalds@linux-foundation.org \ --cc=viro@ZenIV.linux.org.uk \ --cc=xemul@openvz.org \ --cc=xemul@parallels.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.