Skip to content

Commit

Permalink
cgroup: allow cgroup creation and suppress automatic css creation in …
Browse files Browse the repository at this point in the history
…the unified hierarchy

Now that effective css handling has been added and iterators updated
accordingly, it's safe to allow cgroup creation in the default
hierarchy.  Unblock cgroup creation in the default hierarchy.

As the default hierarchy will implement explicit enabling and
disabling of controllers on each cgroup, suppress automatic css
enabling on cgroup creation.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
  • Loading branch information
Tejun Heo committed Apr 23, 2014
1 parent e329780 commit bd53d61
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions kernel/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1115,8 +1115,10 @@ static int rebind_subsystems(struct cgroup_root *dst_root,
src_root->subsys_mask &= ~(1 << ssid);
src_root->cgrp.child_subsys_mask &= ~(1 << ssid);

/* default hierarchy doesn't enable controllers by default */
dst_root->subsys_mask |= 1 << ssid;
dst_root->cgrp.child_subsys_mask |= 1 << ssid;
if (dst_root != &cgrp_dfl_root)
dst_root->cgrp.child_subsys_mask |= 1 << ssid;

if (ss->bind)
ss->bind(css);
Expand Down Expand Up @@ -3786,13 +3788,6 @@ static long cgroup_create(struct cgroup *parent, const char *name,
struct cgroup_subsys *ss;
struct kernfs_node *kn;

/*
* XXX: The default hierarchy isn't fully implemented yet. Block
* !root cgroup creation on it for now.
*/
if (root == &cgrp_dfl_root)
return -EINVAL;

/* allocate the cgroup and its ID, 0 is reserved for the root */
cgrp = kzalloc(sizeof(*cgrp), GFP_KERNEL);
if (!cgrp)
Expand Down Expand Up @@ -3878,7 +3873,12 @@ static long cgroup_create(struct cgroup *parent, const char *name,
}
}

cgrp->child_subsys_mask = parent->child_subsys_mask;
/*
* On the default hierarchy, a child doesn't automatically inherit
* child_subsys_mask from the parent. Each is configured manually.
*/
if (!cgroup_on_dfl(cgrp))
cgrp->child_subsys_mask = parent->child_subsys_mask;

kernfs_activate(kn);

Expand Down

0 comments on commit bd53d61

Please sign in to comment.