diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2010-03-07 16:41:34 -0800 | 
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2011-05-10 14:31:44 -0700 | 
| commit | 6b4e306aa3dc94a0545eb9279475b1ab6209a31f (patch) | |
| tree | ca8c6dec0805076f0b5ba7c547e3cb2004e3aea2 /fs/proc/base.c | |
| parent | 0ee5623f9a6e52df90a78bd21179f8ab370e102e (diff) | |
| download | olio-linux-3.10-6b4e306aa3dc94a0545eb9279475b1ab6209a31f.tar.xz olio-linux-3.10-6b4e306aa3dc94a0545eb9279475b1ab6209a31f.zip  | |
ns: proc files for namespace naming policy.
Create files under /proc/<pid>/ns/ to allow controlling the
namespaces of a process.
This addresses three specific problems that can make namespaces hard to
work with.
- Namespaces require a dedicated process to pin them in memory.
- It is not possible to use a namespace unless you are the child
  of the original creator.
- Namespaces don't have names that userspace can use to talk about
  them.
The namespace files under /proc/<pid>/ns/ can be opened and the
file descriptor can be used to talk about a specific namespace, and
to keep the specified namespace alive.
A namespace can be kept alive by either holding the file descriptor
open or bind mounting the file someplace else.  aka:
mount --bind /proc/self/ns/net /some/filesystem/path
mount --bind /proc/self/fd/<N> /some/filesystem/path
This allows namespaces to be named with userspace policy.
It requires additional support to make use of these filedescriptors
and that will be comming in the following patches.
Acked-by: Daniel Lezcano <daniel.lezcano@free.fr>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 20 | 
1 files changed, 9 insertions, 11 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index dfa532730e5..dc8bca72b00 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -600,7 +600,7 @@ static int proc_fd_access_allowed(struct inode *inode)  	return allowed;  } -static int proc_setattr(struct dentry *dentry, struct iattr *attr) +int proc_setattr(struct dentry *dentry, struct iattr *attr)  {  	int error;  	struct inode *inode = dentry->d_inode; @@ -1736,8 +1736,7 @@ static int task_dumpable(struct task_struct *task)  	return 0;  } - -static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task) +struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task)  {  	struct inode * inode;  	struct proc_inode *ei; @@ -1779,7 +1778,7 @@ out_unlock:  	return NULL;  } -static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) +int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)  {  	struct inode *inode = dentry->d_inode;  	struct task_struct *task; @@ -1820,7 +1819,7 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat   * made this apply to all per process world readable and executable   * directories.   */ -static int pid_revalidate(struct dentry *dentry, struct nameidata *nd) +int pid_revalidate(struct dentry *dentry, struct nameidata *nd)  {  	struct inode *inode;  	struct task_struct *task; @@ -1862,7 +1861,7 @@ static int pid_delete_dentry(const struct dentry * dentry)  	return !proc_pid(dentry->d_inode)->tasks[PIDTYPE_PID].first;  } -static const struct dentry_operations pid_dentry_operations = +const struct dentry_operations pid_dentry_operations =  {  	.d_revalidate	= pid_revalidate,  	.d_delete	= pid_delete_dentry, @@ -1870,9 +1869,6 @@ static const struct dentry_operations pid_dentry_operations =  /* Lookups */ -typedef struct dentry *instantiate_t(struct inode *, struct dentry *, -				struct task_struct *, const void *); -  /*   * Fill a directory entry.   * @@ -1885,8 +1881,8 @@ typedef struct dentry *instantiate_t(struct inode *, struct dentry *,   * reported by readdir in sync with the inode numbers reported   * by stat.   */ -static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, -	char *name, int len, +int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, +	const char *name, int len,  	instantiate_t instantiate, struct task_struct *task, const void *ptr)  {  	struct dentry *child, *dir = filp->f_path.dentry; @@ -2820,6 +2816,7 @@ static const struct pid_entry tgid_base_stuff[] = {  	DIR("task",       S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),  	DIR("fd",         S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),  	DIR("fdinfo",     S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fdinfo_operations), +	DIR("ns",	  S_IRUSR|S_IXUGO, proc_ns_dir_inode_operations, proc_ns_dir_operations),  #ifdef CONFIG_NET  	DIR("net",        S_IRUGO|S_IXUGO, proc_net_inode_operations, proc_net_operations),  #endif @@ -3168,6 +3165,7 @@ out_no_task:  static const struct pid_entry tid_base_stuff[] = {  	DIR("fd",        S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),  	DIR("fdinfo",    S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fdinfo_operations), +	DIR("ns",	 S_IRUSR|S_IXUGO, proc_ns_dir_inode_operations, proc_ns_dir_operations),  	REG("environ",   S_IRUSR, proc_environ_operations),  	INF("auxv",      S_IRUSR, proc_pid_auxv),  	ONE("status",    S_IRUGO, proc_pid_status),  |