Commit d78298e7 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io-wq: don't resched if there is no work

This little tweak restores the behaviour that was before the recent
io_worker_handle_work() optimisation patches. It makes the function do
cond_resched() and flush_signals() only if there is an actual work to
execute.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2293b419
...@@ -458,10 +458,12 @@ static void io_impersonate_work(struct io_worker *worker, ...@@ -458,10 +458,12 @@ static void io_impersonate_work(struct io_worker *worker,
static void io_assign_current_work(struct io_worker *worker, static void io_assign_current_work(struct io_worker *worker,
struct io_wq_work *work) struct io_wq_work *work)
{ {
if (work) {
/* flush pending signals before assigning new work */ /* flush pending signals before assigning new work */
if (signal_pending(current)) if (signal_pending(current))
flush_signals(current); flush_signals(current);
cond_resched(); cond_resched();
}
spin_lock_irq(&worker->lock); spin_lock_irq(&worker->lock);
worker->cur_work = work; worker->cur_work = work;
......
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