blk-mq: always allow reserved allocation in hctx_may_queue
Subsystems (2)
PATCH v2 1/1 blk-mq: always allow reserved allocation in hctx_may_queue
NVMe shares tagset between fabric queue and admin queue or between connect_q and NS queue, so hctx_may_queue() can be called to allocate request for these queues.
Tags can be reserved in these tagset. Before error recovery, there is often lots of in-flight requests which can't be completed, and new reserved request may be needed in error recovery path. However, hctx_may_queue() can always return false because there is too many in-flight requests which can't be completed during error handling. Finally, everything can't move on.
Fix this issue by always allowing reserved tag allocation in hctx_may_queue(). This ways is reasonable because reserved tag suppose to be ready any time.
---
V2:
- remove 'reserved' local variable, as suggested by Christoph
block/blk-mq-tag.c | 3 ++- block/blk-mq.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-)
block/blk-mq-tag.c +2 -1
@@ -76,7 +76,8 @@ void __blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx)static int __blk_mq_get_tag (struct blk_mq_alloc_data *data,struct sbitmap_queue *bt) { -if (!data->q->elevator && !hctx_may_queue (data->hctx, bt)) +if (!data->q->elevator && !(data->flags &BLK_MQ_REQ_RESERVED ) && + !hctx_may_queue (data->hctx, bt))return BLK_MQ_NO_TAG ;if (data->shallow_depth)
block/blk-mq.c +3 -2
@@ -1153,10 +1153,11 @@ static bool __blk_mq_get_driver_tag(struct request *rq)if (blk_mq_tag_is_reserved (rq->mq_hctx->sched_tags, rq->internal_tag)) { bt = rq->mq_hctx->tags->breserved_tags; tag_offset =0 ; + }else { +if (!hctx_may_queue (rq->mq_hctx, bt)) +return false; } -if (!hctx_may_queue (rq->mq_hctx, bt)) -return false; tag =__sbitmap_queue_get (bt);if (tag ==BLK_MQ_NO_TAG )return false;
Signature · 1 line
2.25.2
Quoted 11 lines · Ming Lei
NVMe shares tagset between fabric queue and admin queue or between
connect_qand NS queue, sohctx_may_queue()can be called to allocate request for these queues.Tags can be reserved in these tagset. Before error recovery, there is often lots of in-flight requests which can't be completed, and new reserved request may be needed in error recovery path. However,
hctx_may_queue()can always return false because there is too many in-flight requests which can't be completed during error handling. Finally, everything can't move on.
Quoted 3 lines
Fix this issue by always allowing reserved tag allocation in
hctx_may_queue(). This ways is reasonable because reserved tag suppose to be ready any time.
Applied, thanks.
Signature · 7 lines
Jens Axboe _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme