aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time/timekeeping.c
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2011-11-22 07:44:47 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 08:52:27 -0800
commit953d0c888eda75de7d248017f6dd2e5e254ad0cc (patch)
tree58017d4edf59b04ec606eafd12e6c6a7f967abd7 /kernel/time/timekeeping.c
parent1c8ca629b774d8dd5fb85baf985f260cfcd68fc8 (diff)
downloadkernel_samsung_smdk4412-953d0c888eda75de7d248017f6dd2e5e254ad0cc.zip
kernel_samsung_smdk4412-953d0c888eda75de7d248017f6dd2e5e254ad0cc.tar.gz
kernel_samsung_smdk4412-953d0c888eda75de7d248017f6dd2e5e254ad0cc.tar.bz2
cgroup_freezer: fix freezing groups with stopped tasks
commit 884a45d964dd395eda945842afff5e16bcaedf56 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/time/timekeeping.c')
0 files changed, 0 insertions, 0 deletions