Commit 1b9aba49 authored by Tejun Heo's avatar Tejun Heo
Browse files

cgroup: fix cgroup_taskset walking order 



cgroup_taskset is used to track and iterate target tasks while
migrating a task or process and should guarantee that the first task
iterated is the task group leader if a process is being migrated.

b3dc094e ("cgroup: use css_set->mg_tasks to track target tasks
during migration") replaced flex array cgroup_taskset->tc_array with
css_set->mg_tasks list to remove process size limit and dynamic
allocation during migration; unfortunately, it incorrectly used list
operations which don't preserve order breaking the guarantee that
cgroup_taskset_first() returns the leader for a process target.

Fix it by using order preserving list operations.  Note that as
multiple src_csets may map to a single dst_cset, the iteration order
may change across cgroup_task_migrate(); however, the leader is still
guaranteed to be the first entry.

The switch to list_splice_tail_init() at the end of cgroup_migrate()
isn't strictly necessary.  Let's still do it for consistency.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 8cbbf2c9

kernel/cgroup.c

+19 −5
Original line number Diff line number Diff line
@@ -1761,7 +1761,14 @@ static void cgroup_task_migrate(struct cgroup *old_cgrp, 


	get_css_set(new_cset);

	rcu_assign_pointer(tsk->cgroups, new_cset);

	list_move(&tsk->cg_list, &new_cset->mg_tasks);



	/*

	 * Use move_tail so that cgroup_taskset_first() still returns the

	 * leader after migration.  This works because cgroup_migrate()

	 * ensures that the dst_cset of the leader is the first on the

	 * tset's dst_csets list.

	 */

	list_move_tail(&tsk->cg_list, &new_cset->mg_tasks);



	/*

	 * We just gained a reference on old_cset by taking it from the
@@ -1936,9 +1943,16 @@ static int cgroup_migrate(struct cgroup *cgrp, struct task_struct *leader, 
		if (!cset->mg_src_cgrp)

			goto next;



		list_move(&task->cg_list, &cset->mg_tasks);

		list_move(&cset->mg_node, &tset.src_csets);

		list_move(&cset->mg_dst_cset->mg_node, &tset.dst_csets);

		/*

		 * cgroup_taskset_first() must always return the leader.

		 * Take care to avoid disturbing the ordering.

		 */

		list_move_tail(&task->cg_list, &cset->mg_tasks);

		if (list_empty(&cset->mg_node))

			list_add_tail(&cset->mg_node, &tset.src_csets);

		if (list_empty(&cset->mg_dst_cset->mg_node))

			list_move_tail(&cset->mg_dst_cset->mg_node,

				       &tset.dst_csets);

	next:

		if (!threadgroup)

			break;
@@ -1999,7 +2013,7 @@ out_release_tset: 
	down_write(&css_set_rwsem);

	list_splice_init(&tset.dst_csets, &tset.src_csets);

	list_for_each_entry_safe(cset, tmp_cset, &tset.src_csets, mg_node) {

		list_splice_init(&cset->mg_tasks, &cset->tasks);

		list_splice_tail_init(&cset->mg_tasks, &cset->tasks);

		list_del_init(&cset->mg_node);

	}

	up_write(&css_set_rwsem);

CRA Git | Maintained and supported by SUSTech CRA and CCSE