aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-02-10 10:52:37 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-11 05:04:16 -0500
commitcf2592f59c0e8ed4308adbdb2e0a88655379d579 (patch)
tree383b30bc13af8ce83e15825b041d8bb791ea4cea
parent17406b82d621930cca8ccc1272cdac9a7dae8e40 (diff)
softlockup: ensure the task has been switched out once
When we check if a task has been switched out since the last scan, we might have a race condition on the following scenario: - the task is freshly created and scheduled - it puts its state to TASK_UNINTERRUPTIBLE and is not yet switched out - check_hung_task() scans this task and will report a false positive because t->nvcsw + t->nivcsw == t->last_switch_count == 0 Add a check for such cases. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Acked-by: Mandeep Singh Baines <msb@google.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/hung_task.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/hung_task.c b/kernel/hung_task.c
index 0c924de58cb2..022a4927b785 100644
--- a/kernel/hung_task.c
+++ b/kernel/hung_task.c
@@ -72,7 +72,13 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
72{ 72{
73 unsigned long switch_count = t->nvcsw + t->nivcsw; 73 unsigned long switch_count = t->nvcsw + t->nivcsw;
74 74
75 if (t->flags & PF_FROZEN) 75 /*
76 * Ensure the task is not frozen.
77 * Also, when a freshly created task is scheduled once, changes
78 * its state to TASK_UNINTERRUPTIBLE without having ever been
79 * switched out once, it musn't be checked.
80 */
81 if (unlikely(t->flags & PF_FROZEN || !switch_count))
76 return; 82 return;
77 83
78 if (switch_count != t->last_switch_count) { 84 if (switch_count != t->last_switch_count) {