aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs/mount.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2010-03-30 14:31:26 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-21 12:37:31 -0400
commit3ff195b011d7decf501a4d55aeed312731094796 (patch)
tree8cfdc330abbf82893955f2d7d6e96efee81bfd7c /fs/sysfs/mount.c
parentbc451f2058238013e1cdf4acd443c01734d332f0 (diff)
sysfs: Implement sysfs tagged directory support.
The problem. When implementing a network namespace I need to be able to have multiple network devices with the same name. Currently this is a problem for /sys/class/net/*, /sys/devices/virtual/net/*, and potentially a few other directories of the form /sys/ ... /net/*. What this patch does is to add an additional tag field to the sysfs dirent structure. For directories that should show different contents depending on the context such as /sys/class/net/, and /sys/devices/virtual/net/ this tag field is used to specify the context in which those directories should be visible. Effectively this is the same as creating multiple distinct directories with the same name but internally to sysfs the result is nicer. I am calling the concept of a single directory that looks like multiple directories all at the same path in the filesystem tagged directories. For the networking namespace the set of directories whose contents I need to filter with tags can depend on the presence or absence of hotplug hardware or which modules are currently loaded. Which means I need a simple race free way to setup those directories as tagged. To achieve a reace free design all tagged directories are created and managed by sysfs itself. Users of this interface: - define a type in the sysfs_tag_type enumeration. - call sysfs_register_ns_types with the type and it's operations - sysfs_exit_ns when an individual tag is no longer valid - Implement mount_ns() which returns the ns of the calling process so we can attach it to a sysfs superblock. - Implement ktype.namespace() which returns the ns of a syfs kobject. Everything else is left up to sysfs and the driver layer. For the network namespace mount_ns and namespace() are essentially one line functions, and look to remain that. Tags are currently represented a const void * pointers as that is both generic, prevides enough information for equality comparisons, and is trivial to create for current users, as it is just the existing namespace pointer. The work needed in sysfs is more extensive. At each directory or symlink creating I need to check if the directory it is being created in is a tagged directory and if so generate the appropriate tag to place on the sysfs_dirent. Likewise at each symlink or directory removal I need to check if the sysfs directory it is being removed from is a tagged directory and if so figure out which tag goes along with the name I am deleting. Currently only directories which hold kobjects, and symlinks are supported. There is not enough information in the current file attribute interfaces to give us anything to discriminate on which makes it useless, and there are no potential users which makes it an uninteresting problem to solve. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Benjamin Thery <benjamin.thery@bull.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/sysfs/mount.c')
-rw-r--r--fs/sysfs/mount.c33
1 files changed, 32 insertions, 1 deletions
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 50e4fb6a7403..1afa32ba242c 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -35,7 +35,7 @@ static const struct super_operations sysfs_ops = {
35struct sysfs_dirent sysfs_root = { 35struct sysfs_dirent sysfs_root = {
36 .s_name = "", 36 .s_name = "",
37 .s_count = ATOMIC_INIT(1), 37 .s_count = ATOMIC_INIT(1),
38 .s_flags = SYSFS_DIR, 38 .s_flags = SYSFS_DIR | (KOBJ_NS_TYPE_NONE << SYSFS_NS_TYPE_SHIFT),
39 .s_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO, 39 .s_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
40 .s_ino = 1, 40 .s_ino = 1,
41}; 41};
@@ -76,7 +76,13 @@ static int sysfs_test_super(struct super_block *sb, void *data)
76{ 76{
77 struct sysfs_super_info *sb_info = sysfs_info(sb); 77 struct sysfs_super_info *sb_info = sysfs_info(sb);
78 struct sysfs_super_info *info = data; 78 struct sysfs_super_info *info = data;
79 enum kobj_ns_type type;
79 int found = 1; 80 int found = 1;
81
82 for (type = KOBJ_NS_TYPE_NONE; type < KOBJ_NS_TYPES; type++) {
83 if (sb_info->ns[type] != info->ns[type])
84 found = 0;
85 }
80 return found; 86 return found;
81} 87}
82 88
@@ -93,6 +99,7 @@ static int sysfs_get_sb(struct file_system_type *fs_type,
93 int flags, const char *dev_name, void *data, struct vfsmount *mnt) 99 int flags, const char *dev_name, void *data, struct vfsmount *mnt)
94{ 100{
95 struct sysfs_super_info *info; 101 struct sysfs_super_info *info;
102 enum kobj_ns_type type;
96 struct super_block *sb; 103 struct super_block *sb;
97 int error; 104 int error;
98 105
@@ -100,6 +107,10 @@ static int sysfs_get_sb(struct file_system_type *fs_type,
100 info = kzalloc(sizeof(*info), GFP_KERNEL); 107 info = kzalloc(sizeof(*info), GFP_KERNEL);
101 if (!info) 108 if (!info)
102 goto out; 109 goto out;
110
111 for (type = KOBJ_NS_TYPE_NONE; type < KOBJ_NS_TYPES; type++)
112 info->ns[type] = kobj_ns_current(type);
113
103 sb = sget(fs_type, sysfs_test_super, sysfs_set_super, info); 114 sb = sget(fs_type, sysfs_test_super, sysfs_set_super, info);
104 if (IS_ERR(sb) || sb->s_fs_info != info) 115 if (IS_ERR(sb) || sb->s_fs_info != info)
105 kfree(info); 116 kfree(info);
@@ -137,6 +148,26 @@ static struct file_system_type sysfs_fs_type = {
137 .kill_sb = sysfs_kill_sb, 148 .kill_sb = sysfs_kill_sb,
138}; 149};
139 150
151void sysfs_exit_ns(enum kobj_ns_type type, const void *ns)
152{
153 struct super_block *sb;
154
155 mutex_lock(&sysfs_mutex);
156 spin_lock(&sb_lock);
157 list_for_each_entry(sb, &sysfs_fs_type.fs_supers, s_instances) {
158 struct sysfs_super_info *info = sysfs_info(sb);
159 /* Ignore superblocks that are in the process of unmounting */
160 if (sb->s_count <= S_BIAS)
161 continue;
162 /* Ignore superblocks with the wrong ns */
163 if (info->ns[type] != ns)
164 continue;
165 info->ns[type] = NULL;
166 }
167 spin_unlock(&sb_lock);
168 mutex_unlock(&sysfs_mutex);
169}
170
140int __init sysfs_init(void) 171int __init sysfs_init(void)
141{ 172{
142 int err = -ENOMEM; 173 int err = -ENOMEM;