lkml.org 
[lkml]   [2011]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
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@samba.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(&current->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


\
 
 \ /
  Last update: 2011-05-04 03:51    [W:0.991 / U:0.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site