]> git.karo-electronics.de Git - karo-tx-linux.git/commit
cgroup_freezer: fix freezing groups with stopped tasks
authorMichal Hocko <mhocko@suse.cz>
Tue, 22 Nov 2011 15:44:47 +0000 (07:44 -0800)
committerTejun Heo <tj@kernel.org>
Tue, 22 Nov 2011 15:46:09 +0000 (07:46 -0800)
commit41dfa07cedcc469ccfe53b5d3ad4fc14d0d7a11f
tree47a28f7231d65cff01f797ad1ad74e4a82a86839
parent860ca0e6f72d21ded33ce14be9a53eb103f88441
cgroup_freezer: fix freezing groups with stopped tasks

2d3cbf8b (cgroup_freezer: update_freezer_state() does incorrect state
transitions) removed is_task_frozen_enough and replaced it with a simple
frozen call. This, however, breaks freezing for a group with stopped tasks
because those cannot be frozen and so the group remains in CGROUP_FREEZING
state (update_if_frozen doesn't count stopped tasks) and never reaches
CGROUP_FROZEN.

Let's add is_task_frozen_enough back and use it at the original locations
(update_if_frozen and try_to_freeze_cgroup). Semantically we consider
stopped tasks as frozen enough so we should consider both cases when
testing frozen tasks.

Testcase:
mkdir /dev/freezer
mount -t cgroup -o freezer none /dev/freezer
mkdir /dev/freezer/foo
sleep 1h &
pid=$!
kill -STOP $pid
echo $pid > /dev/freezer/foo/tasks
echo FROZEN > /dev/freezer/foo/freezer.state
while true
do
cat /dev/freezer/foo/freezer.state
[ "`cat /dev/freezer/foo/freezer.state`" = "FROZEN" ] && break
sleep 1
done
echo OK

Signed-off-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Tomasz Buchert <tomasz.buchert@inria.fr>
Cc: Paul Menage <paul@paulmenage.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tejun Heo <htejun@gmail.com>
kernel/cgroup_freezer.c