aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-03-18 15:22:34 -0400
committerIngo Molnar <mingo@kernel.org>2013-03-21 06:48:20 -0400
commit383efcd00053ec40023010ce5034bd702e7ab373 (patch)
tree16658e8a8f4d0f6ee4832da0a1b5368e983c0d59
parent7f6575f1fb963d5231afbceecd3feadb6ab58cd3 (diff)
sched: Convert BUG_ON()s in try_to_wake_up_local() to WARN_ON_ONCE()s
try_to_wake_up_local() should only be invoked to wake up another task in the same runqueue and BUG_ON()s are used to enforce the rule. Missing try_to_wake_up_local() can stall workqueue execution but such stalls are likely to be finite either by another work item being queued or the one blocked getting unblocked. There's no reason to trigger BUG while holding rq lock crashing the whole system. Convert BUG_ON()s in try_to_wake_up_local() to WARN_ON_ONCE()s. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Steven Rostedt <rostedt@goodmis.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20130318192234.GD3042@htj.dyndns.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--kernel/sched/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b7b03cd2d4cd..306943f531a3 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1488,8 +1488,10 @@ static void try_to_wake_up_local(struct task_struct *p)
1488{ 1488{
1489 struct rq *rq = task_rq(p); 1489 struct rq *rq = task_rq(p);
1490 1490
1491 BUG_ON(rq != this_rq()); 1491 if (WARN_ON_ONCE(rq != this_rq()) ||
1492 BUG_ON(p == current); 1492 WARN_ON_ONCE(p == current))
1493 return;
1494
1493 lockdep_assert_held(&rq->lock); 1495 lockdep_assert_held(&rq->lock);
1494 1496
1495 if (!raw_spin_trylock(&p->pi_lock)) { 1497 if (!raw_spin_trylock(&p->pi_lock)) {