mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 02:17:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

cgroup: Defer kill_css_finish() in cgroup_apply_control_disable()

Browse Source 
Same race shape as the rmdir path that 93618edf75 ("cgroup: Defer css
percpu_ref kill on rmdir until cgroup is depopulated") fixed: a task past
exit_signals() whose cset subsys[ssid] still pins the disabled controller's
css can be touching subsys state while ->css_offline() runs. The earlier
patches in this series built up the per-subsys-css deferral machinery and
routed cgroup_destroy_locked() through it. Apply the same shape to
cgroup_apply_control_disable():

	kill_css_sync(css);
	if (!css_is_populated(css))
		kill_css_finish(css);

When the dying css is still populated, kill_css_finish() is deferred. The
walker in css_update_populated() fires kill_finish_work once the css's
hierarchical populated count drops to zero.

cgroup_lock_and_drain_offline()'s wait predicate switches from
percpu_ref_is_dying() to css_is_dying(). CSS_DYING is set by kill_css_sync()
and is a strict superset of percpu_ref_is_dying. Without this change, a +cpu
re-enable after a deferred -cpu disable would skip the drain (percpu_ref
isn't killed yet) and observe the still-CSS_DYING css through cgroup_css(),
treating it as live.

Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Tejun Heo
2026-05-04 14:51:21 -10:00
parent cfc1da7e11
commit 1dffd95575
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/cgroup/cgroup.c
View File

@@ -3237,7 +3237,7 @@ void cgroup_lock_and_drain_offline(struct cgroup *cgrp)
struct cgroup_subsys_state *css = cgroup_css(dsct, ss); struct cgroup_subsys_state *css = cgroup_css(dsct, ss);
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
if (!css || !percpu_ref_is_dying(&css->refcnt)) if (!css || !css_is_dying(css))
continue; continue;
cgroup_get_live(dsct); cgroup_get_live(dsct);
@@ -3405,7 +3405,8 @@ static void cgroup_apply_control_disable(struct cgroup *cgrp)
if (css->parent && if (css->parent &&
!(cgroup_ss_mask(dsct) & (1 << ss->id))) { !(cgroup_ss_mask(dsct) & (1 << ss->id))) {
kill_css_sync(css); kill_css_sync(css);
kill_css_finish(css); if (!css_is_populated(css))
kill_css_finish(css);
} else if (!css_visible(css)) { } else if (!css_visible(css)) {
css_clear_dir(css); css_clear_dir(css);
if (ss->css_reset) if (ss->css_reset)