]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
sched: Convert BUG_ON()s in try_to_wake_up_local() to WARN_ON_ONCE()s
authorTejun Heo <tj@kernel.org>
Mon, 18 Mar 2013 19:22:34 +0000 (12:22 -0700)
committerIngo Molnar <mingo@kernel.org>
Thu, 21 Mar 2013 10:48:20 +0000 (11:48 +0100)
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>
kernel/sched/core.c

index b7b03cd2d4cdfad88839eded1df96a92764c3508..306943f531a3e175ecf9595b50e1a76ff225fe44 100644 (file)
@@ -1488,8 +1488,10 @@ static void try_to_wake_up_local(struct task_struct *p)
 {
        struct rq *rq = task_rq(p);
 
-       BUG_ON(rq != this_rq());
-       BUG_ON(p == current);
+       if (WARN_ON_ONCE(rq != this_rq()) ||
+           WARN_ON_ONCE(p == current))
+               return;
+
        lockdep_assert_held(&rq->lock);
 
        if (!raw_spin_trylock(&p->pi_lock)) {