diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2011-06-15 13:21:48 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-20 07:19:49 -0500 |
commit | 98f842e675f96ffac96e6c50315790912b2812be (patch) | |
tree | ed4dee9a6e54e3443e9f3f1614c8a2fcf9b31e0a /ipc | |
parent | bf056bfa80596a5d14b26b17276a56a0dcb080e5 (diff) |
proc: Usable inode numbers for the namespace file descriptors.
Assign a unique proc inode to each namespace, and use that
inode number to ensure we only allocate at most one proc
inode for every namespace in proc.
A single proc inode per namespace allows userspace to test
to see if two processes are in the same namespace.
This has been a long requested feature and only blocked because
a naive implementation would put the id in a global space and
would ultimately require having a namespace for the names of
namespaces, making migration and certain virtualization tricks
impossible.
We still don't have per superblock inode numbers for proc, which
appears necessary for application unaware checkpoint/restart and
migrations (if the application is using namespace file descriptors)
but that is now allowd by the design if it becomes important.
I have preallocated the ipc and uts initial proc inode numbers so
their structures can be statically initialized.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/msgutil.c | 2 | ||||
-rw-r--r-- | ipc/namespace.c | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/ipc/msgutil.c b/ipc/msgutil.c index 26143d377c95..6471f1bdae96 100644 --- a/ipc/msgutil.c +++ b/ipc/msgutil.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/msg.h> | 16 | #include <linux/msg.h> |
17 | #include <linux/ipc_namespace.h> | 17 | #include <linux/ipc_namespace.h> |
18 | #include <linux/utsname.h> | 18 | #include <linux/utsname.h> |
19 | #include <linux/proc_fs.h> | ||
19 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
20 | 21 | ||
21 | #include "util.h" | 22 | #include "util.h" |
@@ -30,6 +31,7 @@ DEFINE_SPINLOCK(mq_lock); | |||
30 | struct ipc_namespace init_ipc_ns = { | 31 | struct ipc_namespace init_ipc_ns = { |
31 | .count = ATOMIC_INIT(1), | 32 | .count = ATOMIC_INIT(1), |
32 | .user_ns = &init_user_ns, | 33 | .user_ns = &init_user_ns, |
34 | .proc_inum = PROC_IPC_INIT_INO, | ||
33 | }; | 35 | }; |
34 | 36 | ||
35 | atomic_t nr_ipc_ns = ATOMIC_INIT(1); | 37 | atomic_t nr_ipc_ns = ATOMIC_INIT(1); |
diff --git a/ipc/namespace.c b/ipc/namespace.c index 72c868277793..cf3386a51de2 100644 --- a/ipc/namespace.c +++ b/ipc/namespace.c | |||
@@ -26,9 +26,16 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns, | |||
26 | if (ns == NULL) | 26 | if (ns == NULL) |
27 | return ERR_PTR(-ENOMEM); | 27 | return ERR_PTR(-ENOMEM); |
28 | 28 | ||
29 | err = proc_alloc_inum(&ns->proc_inum); | ||
30 | if (err) { | ||
31 | kfree(ns); | ||
32 | return ERR_PTR(err); | ||
33 | } | ||
34 | |||
29 | atomic_set(&ns->count, 1); | 35 | atomic_set(&ns->count, 1); |
30 | err = mq_init_ns(ns); | 36 | err = mq_init_ns(ns); |
31 | if (err) { | 37 | if (err) { |
38 | proc_free_inum(ns->proc_inum); | ||
32 | kfree(ns); | 39 | kfree(ns); |
33 | return ERR_PTR(err); | 40 | return ERR_PTR(err); |
34 | } | 41 | } |
@@ -111,6 +118,7 @@ static void free_ipc_ns(struct ipc_namespace *ns) | |||
111 | */ | 118 | */ |
112 | ipcns_notify(IPCNS_REMOVED); | 119 | ipcns_notify(IPCNS_REMOVED); |
113 | put_user_ns(ns->user_ns); | 120 | put_user_ns(ns->user_ns); |
121 | proc_free_inum(ns->proc_inum); | ||
114 | kfree(ns); | 122 | kfree(ns); |
115 | } | 123 | } |
116 | 124 | ||
@@ -172,10 +180,18 @@ static int ipcns_install(struct nsproxy *nsproxy, void *new) | |||
172 | return 0; | 180 | return 0; |
173 | } | 181 | } |
174 | 182 | ||
183 | static unsigned int ipcns_inum(void *vp) | ||
184 | { | ||
185 | struct ipc_namespace *ns = vp; | ||
186 | |||
187 | return ns->proc_inum; | ||
188 | } | ||
189 | |||
175 | const struct proc_ns_operations ipcns_operations = { | 190 | const struct proc_ns_operations ipcns_operations = { |
176 | .name = "ipc", | 191 | .name = "ipc", |
177 | .type = CLONE_NEWIPC, | 192 | .type = CLONE_NEWIPC, |
178 | .get = ipcns_get, | 193 | .get = ipcns_get, |
179 | .put = ipcns_put, | 194 | .put = ipcns_put, |
180 | .install = ipcns_install, | 195 | .install = ipcns_install, |
196 | .inum = ipcns_inum, | ||
181 | }; | 197 | }; |