[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110504014749.GA28337@drongo>
Date: Wed, 4 May 2011 11:47:49 +1000
From: Paul Mackerras <paulus@...ba.org>
To: linux-kernel@...r.kernel.org, Tejun Heo <tj@...nel.org>
Subject: [PATCH] workqueue: Don't spin forever in worker_maybe_bind_and_lock
On a 48-thread POWER7 box, I often see the system hang when offlining
processors. What happens is that we get a rescuer thread trying to
move to some processor at the same time that a cpu offline operation
is happening for that processor, and we end up with one cpu spinning in
worker_maybe_bind_and_lock() and all of the rest of the online cpus
spinning inside the stop_machine code. The rescuer thread is
continually calling set_cpus_allowed_ptr() which is continually
failing because the cpu it is trying to move to is no longer in the
cpu_active_mask. The result is a deadlock.
This fixes worker_maybe_bind_and_lock so that it stops trying to move
to a cpu if that cpu is no longer in the cpu_active_mask, and instead
returns to its caller. With this I no longer see the deadlocks when
offlining cpus.
Signed-off-by: Paul Mackerras <paulus@...ba.org>
---
kernel/workqueue.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 8859a41..12faf78 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1289,6 +1289,8 @@ __acquires(&gcwq->lock)
cpumask_equal(¤t->cpus_allowed,
get_cpu_mask(gcwq->cpu)))
return true;
+ if (!cpumask_test_cpu(gcwq->cpu, cpu_active_mask))
+ return false;
spin_unlock_irq(&gcwq->lock);
/* CPU has come up in between, retry migration */
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists