提交 b1f70efd 编写于 作者: M Michal Koutný 提交者: Yang Yingliang

cgroup: Iterate tasks that did not finish do_exit()

commit 9c974c77246460fa6a92c18554c3311c8c83c160 upstream.

PF_EXITING is set earlier than actual removal from css_set when a task
is exitting. This can confuse cgroup.procs readers who see no PF_EXITING
tasks, however, rmdir is checking against css_set membership so it can
transitionally fail with EBUSY.

Fix this by listing tasks that weren't unlinked from css_set active
lists.
It may happen that other users of the task iterator (without
CSS_TASK_ITER_PROCS) spot a PF_EXITING task before cgroup_exit(). This
is equal to the state before commit c03cd7738a83 ("cgroup: Include dying
leaders with live threads in PROCS iterations") but it may be reviewed
later.
Reported-by: NSuren Baghdasaryan <surenb@google.com>
Fixes: c03cd7738a83 ("cgroup: Include dying leaders with live threads in PROCS iterations")
Signed-off-by: NMichal Koutný <mkoutny@suse.com>
Signed-off-by: NTejun Heo <tj@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 da9ccfad
...@@ -62,6 +62,7 @@ struct css_task_iter { ...@@ -62,6 +62,7 @@ struct css_task_iter {
struct list_head *mg_tasks_head; struct list_head *mg_tasks_head;
struct list_head *dying_tasks_head; struct list_head *dying_tasks_head;
struct list_head *cur_tasks_head;
struct css_set *cur_cset; struct css_set *cur_cset;
struct css_set *cur_dcset; struct css_set *cur_dcset;
struct task_struct *cur_task; struct task_struct *cur_task;
......
...@@ -4155,12 +4155,16 @@ static void css_task_iter_advance_css_set(struct css_task_iter *it) ...@@ -4155,12 +4155,16 @@ static void css_task_iter_advance_css_set(struct css_task_iter *it)
} }
} while (!css_set_populated(cset) && list_empty(&cset->dying_tasks)); } while (!css_set_populated(cset) && list_empty(&cset->dying_tasks));
if (!list_empty(&cset->tasks)) if (!list_empty(&cset->tasks)) {
it->task_pos = cset->tasks.next; it->task_pos = cset->tasks.next;
else if (!list_empty(&cset->mg_tasks)) it->cur_tasks_head = &cset->tasks;
} else if (!list_empty(&cset->mg_tasks)) {
it->task_pos = cset->mg_tasks.next; it->task_pos = cset->mg_tasks.next;
else it->cur_tasks_head = &cset->mg_tasks;
} else {
it->task_pos = cset->dying_tasks.next; it->task_pos = cset->dying_tasks.next;
it->cur_tasks_head = &cset->dying_tasks;
}
it->tasks_head = &cset->tasks; it->tasks_head = &cset->tasks;
it->mg_tasks_head = &cset->mg_tasks; it->mg_tasks_head = &cset->mg_tasks;
...@@ -4218,10 +4222,14 @@ static void css_task_iter_advance(struct css_task_iter *it) ...@@ -4218,10 +4222,14 @@ static void css_task_iter_advance(struct css_task_iter *it)
else else
it->task_pos = it->task_pos->next; it->task_pos = it->task_pos->next;
if (it->task_pos == it->tasks_head) if (it->task_pos == it->tasks_head) {
it->task_pos = it->mg_tasks_head->next; it->task_pos = it->mg_tasks_head->next;
if (it->task_pos == it->mg_tasks_head) it->cur_tasks_head = it->mg_tasks_head;
}
if (it->task_pos == it->mg_tasks_head) {
it->task_pos = it->dying_tasks_head->next; it->task_pos = it->dying_tasks_head->next;
it->cur_tasks_head = it->dying_tasks_head;
}
if (it->task_pos == it->dying_tasks_head) if (it->task_pos == it->dying_tasks_head)
css_task_iter_advance_css_set(it); css_task_iter_advance_css_set(it);
} else { } else {
...@@ -4240,11 +4248,12 @@ static void css_task_iter_advance(struct css_task_iter *it) ...@@ -4240,11 +4248,12 @@ static void css_task_iter_advance(struct css_task_iter *it)
goto repeat; goto repeat;
/* and dying leaders w/o live member threads */ /* and dying leaders w/o live member threads */
if (!atomic_read(&task->signal->live)) if (it->cur_tasks_head == it->dying_tasks_head &&
!atomic_read(&task->signal->live))
goto repeat; goto repeat;
} else { } else {
/* skip all dying ones */ /* skip all dying ones */
if (task->flags & PF_EXITING) if (it->cur_tasks_head == it->dying_tasks_head)
goto repeat; goto repeat;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册