Skip to content

Commit

Permalink
cgroup: explicitly track whether a cgroup_subsys_state is visible to …
Browse files Browse the repository at this point in the history
…userland

Currently, whether a css (cgroup_subsys_state) has its interface files
created is not tracked and assumed to change together with the owning
cgroup's lifecycle.  cgroup directory and interface creation is being
separated out from internal object creation to help refactoring and
eventually allow cgroups which are not visible through cgroupfs.

This patch adds CSS_VISIBLE to track whether a css has its interface
files created and perform management operations only when necessary
which helps decoupling interface file handling from internal object
lifecycle.  After this patch, all css interface file management
functions can be called regardless of the current state and will
achieve the expected result.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Zefan Li <lizefan@huawei.com>
  • Loading branch information
htejun committed Mar 3, 2016
1 parent 6cd0f5b commit 88cb04b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions include/linux/cgroup-defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ enum {
CSS_NO_REF = (1 << 0), /* no reference counting for this css */
CSS_ONLINE = (1 << 1), /* between ->css_online() and ->css_offline() */
CSS_RELEASED = (1 << 2), /* refcnt reached zero, released */
CSS_VISIBLE = (1 << 3), /* css is visible to userland */
};

/* bits in struct cgroup flags field */
Expand Down
13 changes: 12 additions & 1 deletion kernel/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1421,6 +1421,11 @@ static void css_clear_dir(struct cgroup_subsys_state *css,
struct cgroup *cgrp = cgrp_override ?: css->cgroup;
struct cftype *cfts;

if (!(css->flags & CSS_VISIBLE))
return;

css->flags &= ~CSS_VISIBLE;

list_for_each_entry(cfts, &css->ss->cfts, node)
cgroup_addrm_files(css, cgrp, cfts, false);
}
Expand All @@ -1439,6 +1444,9 @@ static int css_populate_dir(struct cgroup_subsys_state *css,
struct cftype *cfts, *failed_cfts;
int ret;

if (css->flags & CSS_VISIBLE)
return 0;

if (!css->ss) {
if (cgroup_on_dfl(cgrp))
cfts = cgroup_dfl_base_files;
Expand All @@ -1455,6 +1463,9 @@ static int css_populate_dir(struct cgroup_subsys_state *css,
goto err;
}
}

css->flags |= CSS_VISIBLE;

return 0;
err:
list_for_each_entry(cfts, &css->ss->cfts, node) {
Expand Down Expand Up @@ -3403,7 +3414,7 @@ static int cgroup_apply_cftypes(struct cftype *cfts, bool is_add)
css_for_each_descendant_pre(css, cgroup_css(root, ss)) {
struct cgroup *cgrp = css->cgroup;

if (cgroup_is_dead(cgrp))
if (!(css->flags & CSS_VISIBLE))
continue;

ret = cgroup_addrm_files(css, cgrp, cfts, is_add);
Expand Down

0 comments on commit 88cb04b

Please sign in to comment.