Skip to content

Commit

Permalink
cgroup: call cgroup_subsys->bind on cgroup subsys initialization
Browse files Browse the repository at this point in the history
Currently, we call cgroup_subsys->bind only on unmount, remount, and
when creating a new root on mount. Since the default hierarchy root is
created in cgroup_init, we will not call cgroup_subsys->bind if the
default hierarchy is freshly mounted. As a result, some controllers will
behave incorrectly (most notably, the "memory" controller will not
enable hierarchy support). Fix this by calling cgroup_subsys->bind right
after initializing a cgroup subsystem.

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
Vladimir Davydov authored and Tejun Heo committed Mar 2, 2015
1 parent 283cb41 commit 295458e
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions kernel/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -5040,6 +5040,9 @@ int __init cgroup_init(void)
WARN_ON(cgroup_add_dfl_cftypes(ss, ss->dfl_cftypes));
WARN_ON(cgroup_add_legacy_cftypes(ss, ss->legacy_cftypes));
}

if (ss->bind)
ss->bind(init_css_set.subsys[ssid]);
}

cgroup_kobj = kobject_create_and_add("cgroup", fs_kobj);
Expand Down

0 comments on commit 295458e

Please sign in to comment.