forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cgroup: update cgroup_transfer_tasks() to either succeed or fail

Browse source 
cgroup_transfer_tasks() can currently fail in the middle due to memory
allocation failure.  When that happens, the function just aborts and
returns error code and there's no way to tell how many actually got
migrated at the point of failure and or to revert the partial
migration.

Update it to use cgroup_migrate{_add_src|prepare_dst|migrate|finish}()
so that the function either succeeds or fails as a whole as long as
->can_attach() doesn't fail.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
This commit is contained in:
Tejun Heo 2014-02-25 10:04:03 -05:00
commit 952aaa1254
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
kernel/cgroup.c
View file

@ -2810,10 +2810,28 @@ void css_task_iter_end(struct css_task_iter *it)
*/ */
int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from) int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from)
{ {
LIST_HEAD(preloaded_csets);
struct cgrp_cset_link *link;
struct css_task_iter it; struct css_task_iter it;
struct task_struct *task; struct task_struct *task;
int ret = 0; int ret;
mutex_lock(&cgroup_mutex);
/* all tasks in @from are being moved, all csets are source */
down_read(&css_set_rwsem);
list_for_each_entry(link, &from->cset_links, cset_link)
cgroup_migrate_add_src(link->cset, to, &preloaded_csets);
up_read(&css_set_rwsem);
ret = cgroup_migrate_prepare_dst(to, &preloaded_csets);
if (ret)
goto out_err;
/*
* Migrate tasks one-by-one until @form is empty. This fails iff
* ->can_attach() fails.
*/
do { do {
css_task_iter_start(&from->dummy_css, &it); css_task_iter_start(&from->dummy_css, &it);
task = css_task_iter_next(&it); task = css_task_iter_next(&it);
@ -2822,13 +2840,13 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from)
css_task_iter_end(&it); css_task_iter_end(&it);
if (task) { if (task) {
mutex_lock(&cgroup_mutex); ret = cgroup_migrate(to, task, false);
ret = cgroup_attach_task(to, task, false);
mutex_unlock(&cgroup_mutex);
put_task_struct(task); put_task_struct(task);
} }
} while (task && !ret); } while (task && !ret);
out_err:
cgroup_migrate_finish(&preloaded_csets);
mutex_unlock(&cgroup_mutex);
return ret; return ret;
} }