Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72655d84 authored by Michal Koutný's avatar Michal Koutný Committed by Greg Kroah-Hartman
Browse files

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 c03cd773 ("cgroup: Include dying
leaders with live threads in PROCS iterations") but it may be reviewed
later.

Reported-by: default avatarSuren Baghdasaryan <surenb@google.com>
Fixes: c03cd773 ("cgroup: Include dying leaders with live threads in PROCS iterations")
Signed-off-by: default avatarMichal Koutný <mkoutny@suse.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb81ee94

include/linux/cgroup.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ struct css_task_iter { 
	struct list_head		*mg_tasks_head;

	struct list_head		*dying_tasks_head;



	struct list_head		*cur_tasks_head;

	struct css_set			*cur_cset;

	struct css_set			*cur_dcset;

	struct task_struct		*cur_task;

kernel/cgroup/cgroup.c

+16 −7
Original line number Diff line number Diff line
@@ -4461,12 +4461,16 @@ static void css_task_iter_advance_css_set(struct css_task_iter *it) 
		}

	} 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;

	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;

	else

		it->cur_tasks_head = &cset->mg_tasks;

	} else {

		it->task_pos = cset->dying_tasks.next;

		it->cur_tasks_head = &cset->dying_tasks;

	}



	it->tasks_head = &cset->tasks;

	it->mg_tasks_head = &cset->mg_tasks;
@@ -4524,10 +4528,14 @@ static void css_task_iter_advance(struct css_task_iter *it) 
		else

			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;

		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->cur_tasks_head = it->dying_tasks_head;

		}

		if (it->task_pos == it->dying_tasks_head)

			css_task_iter_advance_css_set(it);

	} else {
@@ -4546,11 +4554,12 @@ static void css_task_iter_advance(struct css_task_iter *it) 
			goto repeat;



		/* 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;

	} else {

		/* skip all dying ones */

		if (task->flags & PF_EXITING)

		if (it->cur_tasks_head == it->dying_tasks_head)

			goto repeat;

	}

}