Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae943d20 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

blk-mq: Avoid that blk_mq_delay_run_hw_queue() introduces unintended delays 



Make sure that calling blk_mq_run_hw_queue() or
blk_mq_kick_requeue_list() triggers a queue run without delay even
if blk_mq_delay_run_hw_queue() has been called recently and if its
delay has not yet expired.

Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c77ff7fd

block/blk-mq.c

+3 −4
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ EXPORT_SYMBOL(blk_mq_add_to_requeue_list); 


void blk_mq_kick_requeue_list(struct request_queue *q)

{

	kblockd_schedule_delayed_work(&q->requeue_work, 0);

	kblockd_mod_delayed_work_on(WORK_CPU_UNBOUND, &q->requeue_work, 0);

}

EXPORT_SYMBOL(blk_mq_kick_requeue_list);
@@ -1401,8 +1401,7 @@ static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async, 
		put_cpu();

	}



	kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),

					 &hctx->run_work,

	kblockd_mod_delayed_work_on(blk_mq_hctx_next_cpu(hctx), &hctx->run_work,

				    msecs_to_jiffies(msecs));

}