Commit 3df494a3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds

[PATCH] PM: Fix freezing of stopped tasks

Currently, if a task is stopped (ie.  it's in the TASK_STOPPED state), it
is considered by the freezer as unfreezeable.  However, there may be a race
between the freezer and the delivery of the continuation signal to the task
resulting in the task running after we have finished freezing the other
tasks.  This, in turn, may lead to undesirable effects up to and including
data corruption.

To prevent this from happening we first need to make the freezer consider
stopped tasks as freezeable.  For this purpose we need to make freezeable()
stop returning 0 for these tasks and we need to force them to enter the
refrigerator.  However, if there's no continuation signal in the meantime,
the stopped tasks should remain stopped after all processes have been
thawed, so we need to send an additional SIGSTOP to each of them before
waking it up.

Also, a stopped task that has just been woken up should first check if
there's a freezing request for it and go to the refrigerator if that's the
case.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6a2d7a95
...@@ -28,8 +28,7 @@ static inline int freezeable(struct task_struct * p) ...@@ -28,8 +28,7 @@ static inline int freezeable(struct task_struct * p)
if ((p == current) || if ((p == current) ||
(p->flags & PF_NOFREEZE) || (p->flags & PF_NOFREEZE) ||
(p->exit_state == EXIT_ZOMBIE) || (p->exit_state == EXIT_ZOMBIE) ||
(p->exit_state == EXIT_DEAD) || (p->exit_state == EXIT_DEAD))
(p->state == TASK_STOPPED))
return 0; return 0;
return 1; return 1;
} }
...@@ -61,9 +60,12 @@ static inline void freeze_process(struct task_struct *p) ...@@ -61,9 +60,12 @@ static inline void freeze_process(struct task_struct *p)
unsigned long flags; unsigned long flags;
if (!freezing(p)) { if (!freezing(p)) {
if (p->state == TASK_STOPPED)
force_sig_specific(SIGSTOP, p);
freeze(p); freeze(p);
spin_lock_irqsave(&p->sighand->siglock, flags); spin_lock_irqsave(&p->sighand->siglock, flags);
signal_wake_up(p, 0); signal_wake_up(p, p->state == TASK_STOPPED);
spin_unlock_irqrestore(&p->sighand->siglock, flags); spin_unlock_irqrestore(&p->sighand->siglock, flags);
} }
} }
...@@ -103,9 +105,7 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space) ...@@ -103,9 +105,7 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space)
if (frozen(p)) if (frozen(p))
continue; continue;
if (p->state == TASK_TRACED && if (p->state == TASK_TRACED && frozen(p->parent)) {
(frozen(p->parent) ||
p->parent->state == TASK_STOPPED)) {
cancel_freezing(p); cancel_freezing(p);
continue; continue;
} }
......
...@@ -1705,7 +1705,9 @@ finish_stop(int stop_count) ...@@ -1705,7 +1705,9 @@ finish_stop(int stop_count)
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
} }
schedule(); do {
schedule();
} while (try_to_freeze());
/* /*
* Now we don't run again until continued. * Now we don't run again until continued.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment