Skip to content

Commit

Permalink
cgroup: init_tasks shouldn't be linked to the root cgroup
Browse files Browse the repository at this point in the history
5153faa ("cgroup: remove cgroup_enable_task_cg_lists()
optimization") removed lazy initialization of css_sets so that new
tasks are always lniked to its css_set. In the process, it incorrectly
ended up adding init_tasks to root css_set. They show up as PID 0's in
root's cgroup.procs triggering warnings in systemd and generally
confusing people.

Fix it by skip css_set linking for init_tasks.

Signed-off-by: Tejun Heo <[email protected]>
Reported-by: https://github.com/joanbm
Link: systemd/systemd#14682
Fixes: 5153faa ("cgroup: remove cgroup_enable_task_cg_lists() optimization")
Cc: [email protected] # v5.5+
  • Loading branch information
htejun committed Jan 30, 2020
1 parent 39bed42 commit 0cd9d33
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions kernel/cgroup/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -5932,11 +5932,14 @@ void cgroup_post_fork(struct task_struct *child)

spin_lock_irq(&css_set_lock);

WARN_ON_ONCE(!list_empty(&child->cg_list));
cset = task_css_set(current); /* current is @child's parent */
get_css_set(cset);
cset->nr_tasks++;
css_set_move_task(child, NULL, cset, false);
/* init tasks are special, only link regular threads */
if (likely(child->pid)) {
WARN_ON_ONCE(!list_empty(&child->cg_list));
cset = task_css_set(current); /* current is @child's parent */
get_css_set(cset);
cset->nr_tasks++;
css_set_move_task(child, NULL, cset, false);
}

/*
* If the cgroup has to be frozen, the new task has too. Let's set
Expand Down

0 comments on commit 0cd9d33

Please sign in to comment.