cgroup: fix cgroupfs_root early destruction path

cgroupfs_root used to have ->actual_subsys_mask in addition to
->subsys_mask.  a8a648c4ac ("cgroup: remove
cgroup->actual_subsys_mask") removed it noting that the subsys_mask is
essentially temporary and doesn't belong in cgroupfs_root; however,
the patch made it impossible to tell whether a cgroupfs_root actually
has the subsystems bound or just have the bits set leading to the
following BUG when trying to mount with subsystems which are already
mounted elsewhere.

 kernel BUG at kernel/cgroup.c:1038!
 invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
 ...
 CPU: 1 PID: 7973 Comm: mount Tainted: G        W    3.10.0-rc7-next-20130625-sasha-00011-g1c1dc0e #1105
 task: ffff880fc0ae8000 ti: ffff880fc0b9a000 task.ti: ffff880fc0b9a000
 RIP: 0010:[<ffffffff81249b29>]  [<ffffffff81249b29>] rebind_subsystems+0x409/0x5f0
 ...
 Call Trace:
  [<ffffffff8124bd4f>] cgroup_kill_sb+0xff/0x210
  [<ffffffff813d21af>] deactivate_locked_super+0x4f/0x90
  [<ffffffff8124f3b3>] cgroup_mount+0x673/0x6e0
  [<ffffffff81257169>] cpuset_mount+0xd9/0x110
  [<ffffffff813d2580>] mount_fs+0xb0/0x2d0
  [<ffffffff81404afd>] vfs_kern_mount+0xbd/0x180
  [<ffffffff814070b5>] do_new_mount+0x145/0x2c0
  [<ffffffff814085d6>] do_mount+0x356/0x3c0
  [<ffffffff8140873d>] SyS_mount+0xfd/0x140
  [<ffffffff854eb600>] tracesys+0xdd/0xe2

We still want rebind_subsystems() to take added/removed masks, so
let's fix it by marking whether a cgroupfs_root has finished binding
or not.  Also, document what's going on around ->subsys_mask
initialization so that similar mistakes aren't repeated.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Acked-by: Li Zefan <lizefan@huawei.com>

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 4c1eceb8c439e536843ab28ce2385f1e755fc343..8e4fd5e67384345c32e4af7c9b9511a9a4e9158c 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -276,6 +276,7 @@ enum {
 
        CGRP_ROOT_NOPREFIX      = (1 << 1), /* mounted subsystems have no named prefix */
        CGRP_ROOT_XATTR         = (1 << 2), /* supports extended attributes */
+       CGRP_ROOT_SUBSYS_BOUND  = (1 << 3), /* subsystems finished binding */
 };
 
 /*

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index f9c99abc38ab21417f0fe4f1bc691a1f8643d49e..e801ecfa36ef7fc64b2402ce72c3beb385b8558b 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1086,6 +1086,12 @@ static int rebind_subsystems(struct cgroupfs_root *root,
                }
        }
 
+       /*
+        * Mark @root has finished binding subsystems.  @root->subsys_mask
+        * now matches the bound subsystems.
+        */
+       root->flags |= CGRP_ROOT_SUBSYS_BOUND;
+
        return 0;
 }
 
@@ -1485,6 +1491,14 @@ static struct cgroupfs_root *cgroup_root_from_opts(struct cgroup_sb_opts *opts)
 
        init_cgroup_root(root);
 
+       /*
+        * We need to set @root->subsys_mask now so that @root can be
+        * matched by cgroup_test_super() before it finishes
+        * initialization; otherwise, competing mounts with the same
+        * options may try to bind the same subsystems instead of waiting
+        * for the first one leading to unexpected mount errors.
+        * SUBSYS_BOUND will be set once actual binding is complete.
+        */
        root->subsys_mask = opts->subsys_mask;
        root->flags = opts->flags;
        ida_init(&root->cgroup_ida);
@@ -1734,9 +1748,11 @@ static void cgroup_kill_sb(struct super_block *sb) {
        mutex_lock(&cgroup_root_mutex);
 
        /* Rebind all subsystems back to the default hierarchy */
-       ret = rebind_subsystems(root, 0, root->subsys_mask);
-       /* Shouldn't be able to fail ... */
-       BUG_ON(ret);
+       if (root->flags & CGRP_ROOT_SUBSYS_BOUND) {
+               ret = rebind_subsystems(root, 0, root->subsys_mask);
+               /* Shouldn't be able to fail ... */
+               BUG_ON(ret);
+       }
 
        /*
         * Release all the links from cset_links to this hierarchy's