diff options
author | Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> | 2012-10-04 03:37:16 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-10-16 20:09:36 -0400 |
commit | 1f5320d5972aa50d3e8d2b227b636b370e608359 (patch) | |
tree | a36f1ef6a2f2f72d81e5aef43c0089bb62056bf5 /kernel | |
parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) |
cgroup: notify_on_release may not be triggered in some cases
notify_on_release must be triggered when the last process in a cgroup is
move to another. But if the first(and only) process in a cgroup is moved to
another, notify_on_release is not triggered.
# mkdir /cgroup/cpu/SRC
# mkdir /cgroup/cpu/DST
#
# echo 1 >/cgroup/cpu/SRC/notify_on_release
# echo 1 >/cgroup/cpu/DST/notify_on_release
#
# sleep 300 &
[1] 8629
#
# echo 8629 >/cgroup/cpu/SRC/tasks
# echo 8629 >/cgroup/cpu/DST/tasks
-> notify_on_release for /SRC must be triggered at this point,
but it isn't.
This is because put_css_set() is called before setting CGRP_RELEASABLE
in cgroup_task_migrate(), and is a regression introduce by the
commit:74a1166d(cgroups: make procs file writable), which was merged
into v3.0.
Cc: Ben Blum <bblum@andrew.cmu.edu>
Cc: <stable@vger.kernel.org> # v3.0.x and later
Acked-by: Li Zefan <lizefan@huawei.com>
Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cgroup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 13774b3b39aa..d1739fc7eb94 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -1962,9 +1962,8 @@ static void cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp, | |||
1962 | * trading it for newcg is protected by cgroup_mutex, we're safe to drop | 1962 | * trading it for newcg is protected by cgroup_mutex, we're safe to drop |
1963 | * it here; it will be freed under RCU. | 1963 | * it here; it will be freed under RCU. |
1964 | */ | 1964 | */ |
1965 | put_css_set(oldcg); | ||
1966 | |||
1967 | set_bit(CGRP_RELEASABLE, &oldcgrp->flags); | 1965 | set_bit(CGRP_RELEASABLE, &oldcgrp->flags); |
1966 | put_css_set(oldcg); | ||
1968 | } | 1967 | } |
1969 | 1968 | ||
1970 | /** | 1969 | /** |