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 /include | |
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 'include')
-rw-r--r-- | include/linux/ipc_namespace.h | 2 | ||||
-rw-r--r-- | include/linux/pid_namespace.h | 1 | ||||
-rw-r--r-- | include/linux/proc_fs.h | 7 | ||||
-rw-r--r-- | include/linux/user_namespace.h | 1 | ||||
-rw-r--r-- | include/linux/utsname.h | 1 | ||||
-rw-r--r-- | include/net/net_namespace.h | 2 |
6 files changed, 13 insertions, 1 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index f03af702a39d..fe771978e877 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
@@ -67,6 +67,8 @@ struct ipc_namespace { | |||
67 | 67 | ||
68 | /* user_ns which owns the ipc ns */ | 68 | /* user_ns which owns the ipc ns */ |
69 | struct user_namespace *user_ns; | 69 | struct user_namespace *user_ns; |
70 | |||
71 | unsigned int proc_inum; | ||
70 | }; | 72 | }; |
71 | 73 | ||
72 | extern struct ipc_namespace init_ipc_ns; | 74 | extern struct ipc_namespace init_ipc_ns; |
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index 4c96acdb2489..bf285999273a 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h | |||
@@ -37,6 +37,7 @@ struct pid_namespace { | |||
37 | kgid_t pid_gid; | 37 | kgid_t pid_gid; |
38 | int hide_pid; | 38 | int hide_pid; |
39 | int reboot; /* group exit code if this pidns was rebooted */ | 39 | int reboot; /* group exit code if this pidns was rebooted */ |
40 | unsigned int proc_inum; | ||
40 | }; | 41 | }; |
41 | 42 | ||
42 | extern struct pid_namespace init_pid_ns; | 43 | extern struct pid_namespace init_pid_ns; |
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index bf1d000fbba6..2e24018b7cec 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
@@ -28,7 +28,11 @@ struct mm_struct; | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | enum { | 30 | enum { |
31 | PROC_ROOT_INO = 1, | 31 | PROC_ROOT_INO = 1, |
32 | PROC_IPC_INIT_INO = 0xEFFFFFFFU, | ||
33 | PROC_UTS_INIT_INO = 0xEFFFFFFEU, | ||
34 | PROC_USER_INIT_INO = 0xEFFFFFFDU, | ||
35 | PROC_PID_INIT_INO = 0xEFFFFFFCU, | ||
32 | }; | 36 | }; |
33 | 37 | ||
34 | /* | 38 | /* |
@@ -263,6 +267,7 @@ struct proc_ns_operations { | |||
263 | void *(*get)(struct task_struct *task); | 267 | void *(*get)(struct task_struct *task); |
264 | void (*put)(void *ns); | 268 | void (*put)(void *ns); |
265 | int (*install)(struct nsproxy *nsproxy, void *ns); | 269 | int (*install)(struct nsproxy *nsproxy, void *ns); |
270 | unsigned int (*inum)(void *ns); | ||
266 | }; | 271 | }; |
267 | extern const struct proc_ns_operations netns_operations; | 272 | extern const struct proc_ns_operations netns_operations; |
268 | extern const struct proc_ns_operations utsns_operations; | 273 | extern const struct proc_ns_operations utsns_operations; |
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 17651f08d67f..b9bd2e6c73cc 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h | |||
@@ -25,6 +25,7 @@ struct user_namespace { | |||
25 | struct user_namespace *parent; | 25 | struct user_namespace *parent; |
26 | kuid_t owner; | 26 | kuid_t owner; |
27 | kgid_t group; | 27 | kgid_t group; |
28 | unsigned int proc_inum; | ||
28 | }; | 29 | }; |
29 | 30 | ||
30 | extern struct user_namespace init_user_ns; | 31 | extern struct user_namespace init_user_ns; |
diff --git a/include/linux/utsname.h b/include/linux/utsname.h index 221f4a0a7502..239e27733d6c 100644 --- a/include/linux/utsname.h +++ b/include/linux/utsname.h | |||
@@ -23,6 +23,7 @@ struct uts_namespace { | |||
23 | struct kref kref; | 23 | struct kref kref; |
24 | struct new_utsname name; | 24 | struct new_utsname name; |
25 | struct user_namespace *user_ns; | 25 | struct user_namespace *user_ns; |
26 | unsigned int proc_inum; | ||
26 | }; | 27 | }; |
27 | extern struct uts_namespace init_uts_ns; | 28 | extern struct uts_namespace init_uts_ns; |
28 | 29 | ||
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index c5a43f56b796..de644bcd8613 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -56,6 +56,8 @@ struct net { | |||
56 | 56 | ||
57 | struct user_namespace *user_ns; /* Owning user namespace */ | 57 | struct user_namespace *user_ns; /* Owning user namespace */ |
58 | 58 | ||
59 | unsigned int proc_inum; | ||
60 | |||
59 | struct proc_dir_entry *proc_net; | 61 | struct proc_dir_entry *proc_net; |
60 | struct proc_dir_entry *proc_net_stat; | 62 | struct proc_dir_entry *proc_net_stat; |
61 | 63 | ||