diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2013-03-18 15:12:49 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2014-02-26 21:21:28 -0500 |
| commit | f1a610a5992c4a5155f3620734d8719493c7dac9 (patch) | |
| tree | d3a880f58e5c4255d27ddff08e98fc66fdbef3b5 | |
| parent | d32faf4841c4c904be85c08581f25c1b95085faa (diff) | |
sched/workqueue: Only wake up idle workers if not blocked on sleeping spin lock
In -rt, most spin_locks() turn into mutexes. One of these spin_lock
conversions is performed on the workqueue gcwq->lock. When the idle
worker is worken, the first thing it will do is grab that same lock and
it too will block, possibly jumping into the same code, but because
nr_running would already be decremented it prevents an infinite loop.
But this is still a waste of CPU cycles, and it doesn't follow the method
of mainline, as new workers should only be woken when a worker thread is
truly going to sleep, and not just blocked on a spin_lock().
Check the saved_state too before waking up new workers.
Cc: stable-rt@vger.kernel.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
| -rw-r--r-- | kernel/sched/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 9f9dae3e6c23..0bce7e16777d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3586,8 +3586,10 @@ static inline void sched_submit_work(struct task_struct *tsk) /* * If a worker went to sleep, notify and ask workqueue whether * it wants to wake up a task to maintain concurrency. + * Only call wake up if prev isn't blocked on a sleeping + * spin lock. */ - if (tsk->flags & PF_WQ_WORKER) + if (tsk->flags & PF_WQ_WORKER && !tsk->saved_state) wq_worker_sleeping(tsk); /* |