From: Tejun Heo <tj@kernel.org>
To: roland@redhat.com, oleg@redhat.com, linux-kernel@vger.kernel.org,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
"rjw@sisk.plpavel"@ucw.cz
Cc: Tejun Heo <tj@kernel.org>, "Rafael J. Wysocki" <rjw@sisk.pl>
Subject: [PATCH 02/14] freezer: fix a race during freezing of TASK_STOPPED tasks
Date: Fri, 26 Nov 2010 11:49:17 +0100 [thread overview]
Message-ID: <1290768569-16224-3-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1290768569-16224-1-git-send-email-tj@kernel.org>
After calling freeze_task(), try_to_freeze_tasks() see whether the
task is stopped or traced and if so, considers it to be frozen;
however, nothing guarantees that either the task being frozen sees
TIF_FREEZE or the freezer sees TASK_STOPPED -> TASK_RUNNING
transition. The task being frozen may wake up and not see TIF_FREEZE
while the freezer fails to notice the transition and believes the task
is still stopped.
This patch fixes the race by making freeze_task() always go through
fake_signal_wake_up() for applicable tasks. The function goes through
the target task's scheduler lock and thus guarantees that either the
target sees TIF_FREEZE or try_to_freeze_task() sees TASK_RUNNING.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
---
kernel/freezer.c | 9 +++++++--
kernel/power/process.c | 6 ++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/kernel/freezer.c b/kernel/freezer.c
index bd1d42b..66ecd2e 100644
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -104,8 +104,13 @@ bool freeze_task(struct task_struct *p, bool sig_only)
}
if (should_send_signal(p)) {
- if (!signal_pending(p))
- fake_signal_wake_up(p);
+ fake_signal_wake_up(p);
+ /*
+ * fake_signal_wake_up() goes through p's scheduler
+ * lock and guarantees that TASK_STOPPED/TRACED ->
+ * TASK_RUNNING transition can't race with task state
+ * testing in try_to_freeze_tasks().
+ */
} else if (sig_only) {
return false;
} else {
diff --git a/kernel/power/process.c b/kernel/power/process.c
index e50b4c1..eb2c88a 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -64,6 +64,12 @@ static int try_to_freeze_tasks(bool sig_only)
* perturb a task in TASK_STOPPED or TASK_TRACED.
* It is "frozen enough". If the task does wake
* up, it will immediately call try_to_freeze.
+ *
+ * Because freeze_task() goes through p's
+ * scheduler lock after setting TIF_FREEZE, it's
+ * guaranteed that either we see TASK_RUNNING or
+ * try_to_stop() after schedule() in ptrace/signal
+ * stop sees TIF_FREEZE.
*/
if (!task_is_stopped_or_traced(p) &&
!freezer_should_skip(p))
--
1.7.1
next prev parent reply other threads:[~2010-11-26 10:50 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-26 10:49 [PATCHSET RFC] ptrace,signal: sane interaction between ptrace and job control signals Tejun Heo
2010-11-26 10:49 ` [PATCH 01/14] signal: fix SIGCONT notification code Tejun Heo
2010-11-26 13:49 ` Oleg Nesterov
2010-12-01 1:43 ` Roland McGrath
2010-11-26 10:49 ` Tejun Heo [this message]
2010-11-26 19:40 ` [PATCH 02/14] freezer: fix a race during freezing of TASK_STOPPED tasks Rafael J. Wysocki
2010-11-26 19:59 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 03/14] freezer: remove superflous try_to_freeze() loop in do_signal_stop() Tejun Heo
2010-11-26 19:42 ` Rafael J. Wysocki
2010-11-26 10:49 ` [PATCH 04/14] signal: don't notify parent if not stopping after tracehook_notify_jctl() " Tejun Heo
2010-11-26 14:46 ` Oleg Nesterov
2010-11-26 15:04 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 05/14] signal: fix premature completion of group stop when interfered by ptrace Tejun Heo
2010-11-26 15:40 ` Oleg Nesterov
2010-11-26 16:03 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 06/14] signal: use GROUP_STOP_PENDING to avoid stopping multiple times for a single group stop Tejun Heo
2010-11-26 17:59 ` Oleg Nesterov
2010-11-26 18:39 ` Tejun Heo
2010-11-27 11:40 ` [PATCH UPDATED " Tejun Heo
2010-11-28 19:07 ` Oleg Nesterov
2010-11-29 13:38 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 07/14] ptrace: add @why to ptrace_stop() Tejun Heo
2010-11-26 10:49 ` [PATCH 08/14] ptrace: make do_signal_stop() use ptrace_stop() if the task is being ptraced Tejun Heo
2010-11-28 19:54 ` Oleg Nesterov
2010-11-28 20:22 ` Jan Kratochvil
2010-11-28 20:53 ` Oleg Nesterov
2010-11-26 10:49 ` [PATCH 09/14] ptrace: clean transitions between TASK_STOPPED and TRACED Tejun Heo
2010-11-28 20:25 ` Oleg Nesterov
2010-11-28 20:51 ` Jan Kratochvil
2010-11-29 13:48 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 10/14] ptrace: don't consume group count from ptrace_stop() Tejun Heo
2010-11-26 10:49 ` [PATCH 11/14] ptrace: make group stop notification reliable against ptrace Tejun Heo
2010-11-28 20:30 ` Oleg Nesterov
2010-11-29 13:52 ` Tejun Heo
2010-11-26 10:49 ` [PATCH 12/14] ptrace: reorganize __ptrace_unlink() and ptrace_untrace() Tejun Heo
2010-11-26 10:49 ` [PATCH 13/14] ptrace: make SIGCONT notification reliable against ptrace Tejun Heo
2010-11-26 10:49 ` [PATCH 14/14] ptrace: remove the extra wake_up_process() from ptrace_detach() Tejun Heo
2010-11-28 20:44 ` Oleg Nesterov
2010-11-29 13:55 ` Tejun Heo
2010-11-26 10:55 ` [PATCHSET RFC] ptrace,signal: sane interaction between ptrace and job control signals Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290768569-16224-3-git-send-email-tj@kernel.org \
--to=tj@kernel.org \
--cc="rjw@sisk.plpavel"@ucw.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=rjw@sisk.pl \
--cc=roland@redhat.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome