aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-11-21 15:32:24 -0500
committerTejun Heo <tj@kernel.org>2011-11-21 15:32:24 -0500
commit6907483b4e803a20f0b48cc9afa3817420ce61c5 (patch)
tree9f4b7cbe59eae0c6f59d704e4f465d537c172479 /kernel/power
parent0c9af09262864a2744091ee94c98c4a8fd60c98b (diff)
freezer: make freezing indicate freeze condition in effect
Currently freezing (TIF_FREEZE) and frozen (PF_FROZEN) states are interlocked - freezing is set to request freeze and when the task actually freezes, it clears freezing and sets frozen. This interlocking makes things more complex than necessary - freezing doesn't mean there's freezing condition in effect and frozen doesn't match the task actually entering and leaving frozen state (it's cleared by the thawing task). This patch makes freezing indicate that freeze condition is in effect. A task enters and stays frozen if freezing. This makes PF_FROZEN manipulation done only by the task itself and prevents wakeup from __thaw_task() leaking outside of refrigerator. The only place which needs to tell freezing && !frozen is try_to_freeze_task() to whine about tasks which don't enter frozen. It's updated to test the condition explicitly. With the change, frozen() state my linger after __thaw_task() until the task wakes up and exits fridge. This can trigger BUG_ON() in update_if_frozen(). Work it around by testing freezing() && frozen() instead of frozen(). -v2: Oleg pointed out missing re-check of freezing() when trying to clear FROZEN and possible spurious BUG_ON() trigger in update_if_frozen(). Both fixed. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Paul Menage <paul@paulmenage.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/process.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index bd420ca4826..e6e2739190b 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -118,7 +118,8 @@ static int try_to_freeze_tasks(bool sig_only)
118 118
119 read_lock(&tasklist_lock); 119 read_lock(&tasklist_lock);
120 do_each_thread(g, p) { 120 do_each_thread(g, p) {
121 if (!wakeup && freezing(p) && !freezer_should_skip(p)) 121 if (!wakeup && !freezer_should_skip(p) &&
122 freezing(p) && !frozen(p))
122 sched_show_task(p); 123 sched_show_task(p);
123 cancel_freezing(p); 124 cancel_freezing(p);
124 } while_each_thread(g, p); 125 } while_each_thread(g, p);