Commit 4b402210 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Ingo Molnar

mutex: Don't spin when the owner CPU is offline or other weird cases

Due to recent load-balancer changes that delay the task migration to
the next wakeup, the adaptive mutex spinning ends up in a live lock
when the owner's CPU gets offlined because the cpu_online() check
lives before the owner running check.

This patch changes mutex_spin_on_owner() to return 0 (don't spin) in
any case where we aren't sure about the owner struct validity or CPU
number, and if the said CPU is offline. There is no point going back &
re-evaluate spinning in corner cases like that, let's just go to
sleep.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1271212509.13059.135.camel@pasglop>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d5a30458
...@@ -3780,7 +3780,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner) ...@@ -3780,7 +3780,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
* the mutex owner just released it and exited. * the mutex owner just released it and exited.
*/ */
if (probe_kernel_address(&owner->cpu, cpu)) if (probe_kernel_address(&owner->cpu, cpu))
goto out; return 0;
#else #else
cpu = owner->cpu; cpu = owner->cpu;
#endif #endif
...@@ -3790,14 +3790,14 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner) ...@@ -3790,14 +3790,14 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
* the cpu field may no longer be valid. * the cpu field may no longer be valid.
*/ */
if (cpu >= nr_cpumask_bits) if (cpu >= nr_cpumask_bits)
goto out; return 0;
/* /*
* We need to validate that we can do a * We need to validate that we can do a
* get_cpu() and that we have the percpu area. * get_cpu() and that we have the percpu area.
*/ */
if (!cpu_online(cpu)) if (!cpu_online(cpu))
goto out; return 0;
rq = cpu_rq(cpu); rq = cpu_rq(cpu);
...@@ -3816,7 +3816,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner) ...@@ -3816,7 +3816,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
cpu_relax(); cpu_relax();
} }
out:
return 1; return 1;
} }
#endif #endif
......
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