From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public•gmane.org>
To: netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
tgraf-G/eBtMaohhA@public•gmane.org,
"Eric W. Biederman"
<ebiederm-aS9lmoZGLiVWk0Htik3J/w@public•gmane.org>
Subject: [PATCH 4/4] net: move and export get_net_ns_by_pid
Date: Fri, 10 Jul 2009 21:51:35 +0200 [thread overview]
Message-ID: <20090710195536.664865508@sipsolutions.net> (raw)
In-Reply-To: 20090710195131.504091075@sipsolutions.net
[-- Attachment #1: 030-netns-export-get-by-pid.patch --]
[-- Type: text/plain, Size: 2903 bytes --]
The function get_net_ns_by_pid(), to get a network
namespace from a pid_t, will be required in cfg80211
as well. Therefore, let's move it to net_namespace.c
and export it. We can't make it a static inline in
the !NETNS case because it needs to verify that the
given pid even exists (and return -ESRCH).
Signed-off-by: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public•gmane.org>
---
include/net/net_namespace.h | 2 ++
net/core/net_namespace.c | 21 +++++++++++++++++++++
net/core/rtnetlink.c | 21 +--------------------
3 files changed, 24 insertions(+), 20 deletions(-)
--- wireless-testing.orig/include/net/net_namespace.h 2009-07-07 12:18:30.000000000 +0200
+++ wireless-testing/include/net/net_namespace.h 2009-07-07 12:25:42.000000000 +0200
@@ -111,6 +111,8 @@ static inline struct net *copy_net_ns(un
extern struct list_head net_namespace_list;
+extern struct net *get_net_ns_by_pid(pid_t pid);
+
#ifdef CONFIG_NET_NS
extern void __put_net(struct net *net);
--- wireless-testing.orig/net/core/net_namespace.c 2009-07-07 12:18:19.000000000 +0200
+++ wireless-testing/net/core/net_namespace.c 2009-07-07 12:25:42.000000000 +0200
@@ -7,6 +7,7 @@
#include <linux/sched.h>
#include <linux/idr.h>
#include <linux/rculist.h>
+#include <linux/nsproxy.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
@@ -201,6 +202,26 @@ struct net *copy_net_ns(unsigned long fl
}
#endif
+struct net *get_net_ns_by_pid(pid_t pid)
+{
+ struct task_struct *tsk;
+ struct net *net;
+
+ /* Lookup the network namespace */
+ net = ERR_PTR(-ESRCH);
+ rcu_read_lock();
+ tsk = find_task_by_vpid(pid);
+ if (tsk) {
+ struct nsproxy *nsproxy;
+ nsproxy = task_nsproxy(tsk);
+ if (nsproxy)
+ net = get_net(nsproxy->net_ns);
+ }
+ rcu_read_unlock();
+ return net;
+}
+EXPORT_SYMBOL_GPL(get_net_ns_by_pid);
+
static int __init net_ns_init(void)
{
struct net_generic *ng;
--- wireless-testing.orig/net/core/rtnetlink.c 2009-07-07 12:15:29.000000000 +0200
+++ wireless-testing/net/core/rtnetlink.c 2009-07-07 12:25:42.000000000 +0200
@@ -35,7 +35,6 @@
#include <linux/security.h>
#include <linux/mutex.h>
#include <linux/if_addr.h>
-#include <linux/nsproxy.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@ -52,6 +51,7 @@
#include <net/pkt_sched.h>
#include <net/fib_rules.h>
#include <net/rtnetlink.h>
+#include <net/net_namespace.h>
struct rtnl_link
{
@@ -725,25 +725,6 @@ static const struct nla_policy ifla_info
[IFLA_INFO_DATA] = { .type = NLA_NESTED },
};
-static struct net *get_net_ns_by_pid(pid_t pid)
-{
- struct task_struct *tsk;
- struct net *net;
-
- /* Lookup the network namespace */
- net = ERR_PTR(-ESRCH);
- rcu_read_lock();
- tsk = find_task_by_vpid(pid);
- if (tsk) {
- struct nsproxy *nsproxy;
- nsproxy = task_nsproxy(tsk);
- if (nsproxy)
- net = get_net(nsproxy->net_ns);
- }
- rcu_read_unlock();
- return net;
-}
next prev parent reply other threads:[~2009-07-10 19:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-10 19:51 [PATCH 0/4] generic netlink namespace awareness Johannes Berg
2009-07-10 19:51 ` [PATCH 1/4] netlink: use call_rcu for netlink_change_ngroups Johannes Berg
2009-07-10 19:51 ` [PATCH 2/4] net: make namespace iteration possible under RCU Johannes Berg
2009-07-10 19:51 ` [PATCH 3/4] genetlink: make netns aware Johannes Berg
2009-07-10 19:51 ` Johannes Berg [this message]
[not found] ` <20090710195131.504091075-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
2009-07-12 21:17 ` [PATCH 0/4] generic netlink namespace awareness David Miller
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=20090710195536.664865508@sipsolutions.net \
--to=johannes-cdvu00un1vgdhxzaddlk8q@public$(echo .)gmane.org \
--cc=ebiederm-aS9lmoZGLiVWk0Htik3J/w@public$(echo .)gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=tgraf-G/eBtMaohhA@public$(echo .)gmane.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