[RFC PATCH] cgroup: Remove task_lock() from cgroup_post_fork()
From: Frederic Weisbecker <hidden>
Date: 2011-12-22 01:18:40
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
cgroup_post_fork() is protected between threadgroup_change_begin() and threadgroup_change_end() against concurrent changes of the child's css_set in cgroup_task_migrate(). Also the child can't exit and call cgroup_exit() at this stage, this means it's css_set can't be changed with init_css_set concurrently. For these reasons, we don't need to hold task_lock() on the child because it's css_set can only remain stable in this place. Let's remove the lock there. NOTE: We could do something else: move threadgroup_change_end() before cgroup_post_fork() and keep the task_lock() which, combined with the css_set_lock, would be enough to synchronize against cgroup_task_migrate()'s change on child->cgroup and its cglist. Because outside that, the threadgroup lock doesn't appear to be needed on cgroup_post_fork(). Let's debate! Signed-off-by: Frederic Weisbecker <redacted> Cc: Li Zefan <redacted> Cc: Tejun Heo <redacted> Cc: Containers <redacted> Cc: Cgroups <redacted> Cc: KAMEZAWA Hiroyuki <redacted> Cc: Oleg Nesterov <redacted> Cc: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> Cc: Paul Menage <redacted> Cc: Mandeep Singh Baines <redacted> --- kernel/cgroup.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 4936d88..d0dbf72 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c@@ -4622,10 +4622,15 @@ void cgroup_post_fork(struct task_struct *child) { if (use_task_css_set_links) { write_lock(&css_set_lock); - task_lock(child); - if (list_empty(&child->cg_list)) + if (list_empty(&child->cg_list)) { + /* + * It's safe to use child->cgroups without task_lock() + * here because we are protected through + * threadgroup_change_begin() against concurrent + * css_set change in cgroup_task_migrate() + */ list_add(&child->cg_list, &child->cgroups->tasks); - task_unlock(child); + } write_unlock(&css_set_lock); } }
--
1.7.5.4