From: Tejun Heo Date: Thu, 30 Jan 2020 16:37:33 +0000 (-0500) Subject: cgroup: init_tasks shouldn't be linked to the root cgroup X-Git-Tag: v5.5.5~53 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dcf6b17b8a036bb53f65d1a4f0e1636a5df96868;p=users%2Fdwmw2%2Flinux.git cgroup: init_tasks shouldn't be linked to the root cgroup commit 0cd9d33ace336bc424fc30944aa3defd6786e4fe upstream. 5153faac18d2 ("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 Reported-by: https://github.com/joanbm Link: https://github.com/systemd/systemd/issues/14682 Fixes: 5153faac18d2 ("cgroup: remove cgroup_enable_task_cg_lists() optimization") Cc: stable@vger.kernel.org # v5.5+ Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 1e12e6928bca5..30892c4759b49 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -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