blk-mq: don't call io sched's .requeue_request when requeueing rq to ->dispatch
commitpull/10/head105976f517
upstream. __blk_mq_requeue_request() covers two cases: - one is that the requeued request is added to hctx->dispatch, such as blk_mq_dispatch_rq_list() - another case is that the request is requeued to io scheduler, such as blk_mq_requeue_request(). We should call io sched's .requeue_request callback only for the 2nd case. Cc: Paolo Valente <paolo.valente@linaro.org> Cc: Omar Sandoval <osandov@fb.com> Fixes:bd166ef183
("blk-mq-sched: add framework for MQ capable IO schedulers") Cc: stable@vger.kernel.org Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com> Acked-by: Paolo Valente <paolo.valente@linaro.org> Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
c5f32462f0
commit
ccddee811e
|
@ -638,7 +638,6 @@ static void __blk_mq_requeue_request(struct request *rq)
|
||||||
|
|
||||||
trace_block_rq_requeue(q, rq);
|
trace_block_rq_requeue(q, rq);
|
||||||
wbt_requeue(q->rq_wb, &rq->issue_stat);
|
wbt_requeue(q->rq_wb, &rq->issue_stat);
|
||||||
blk_mq_sched_requeue_request(rq);
|
|
||||||
|
|
||||||
if (test_and_clear_bit(REQ_ATOM_STARTED, &rq->atomic_flags)) {
|
if (test_and_clear_bit(REQ_ATOM_STARTED, &rq->atomic_flags)) {
|
||||||
if (q->dma_drain_size && blk_rq_bytes(rq))
|
if (q->dma_drain_size && blk_rq_bytes(rq))
|
||||||
|
@ -650,6 +649,9 @@ void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list)
|
||||||
{
|
{
|
||||||
__blk_mq_requeue_request(rq);
|
__blk_mq_requeue_request(rq);
|
||||||
|
|
||||||
|
/* this request will be re-inserted to io scheduler queue */
|
||||||
|
blk_mq_sched_requeue_request(rq);
|
||||||
|
|
||||||
BUG_ON(blk_queued_rq(rq));
|
BUG_ON(blk_queued_rq(rq));
|
||||||
blk_mq_add_to_requeue_list(rq, true, kick_requeue_list);
|
blk_mq_add_to_requeue_list(rq, true, kick_requeue_list);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue