Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd53d617 authored by Tejun Heo's avatar Tejun Heo
Browse files

cgroup: allow cgroup creation and suppress automatic css creation in 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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
parent e3297803

kernel/cgroup.c

+9 −9
Original line number Diff line number Diff line
@@ -1115,7 +1115,9 @@ 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;

		if (dst_root != &cgrp_dfl_root)

			dst_root->cgrp.child_subsys_mask |= 1 << ssid;



		if (ss->bind)
@@ -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)
@@ -3878,6 +3873,11 @@ static long cgroup_create(struct cgroup *parent, const char *name, 
		}

	}



	/*

	 * 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);