blk-mq/nvme: cancel request synchronously
Subsystems (2)
v4 cover blk-mq/nvme: cancel request synchronously
Hi,
This patchset introduces blk_mq_complete_request_sync() for canceling request synchronously in error handler context, then one race between completing request remotely and destroying contoller/queues can be fixed.
V4:
- drop return value
- don't handle fake timeout
V3:
- avoid extra cost to blk_mq_complete_request
V2:
- export via EXPORT_SYMBOL_GPL
- minor commit log change
Ming Lei (2):
blk-mq: introduce blk_mq_complete_request_sync()
nvme: cancel request synchronously
block/blk-mq.c | 7 +++++++ drivers/nvme/host/core.c | 2 +- include/linux/blk-mq.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-)
Signature · 1 line
2.9.5
PATCH v4 1/2 blk-mq: introduce blk_mq_complete_request_sync()
In NVMe's error handler, follows the typical steps of tearing down hardware for recovering controller:
1) stop blk_mq hw queues
2) stop the real hw queues
3) cancel in-flight requests via blk_mq_tagset_busy_iter(tags, cancel_request, ...)cancel_request():
mark the request as abort blk_mq_complete_request(req);
4) destroy real hw queues
However, there may be race between #3 and #4, because blk_mq_complete_request() may run q->mq_ops->complete(rq) remotelly and asynchronously, and ->complete(rq) may be run after #4.
This patch introduces blk_mq_complete_request_sync() for fixing the above race.
--- block/blk-mq.c | 7 +++++++ include/linux/blk-mq.h | 1 + 2 files changed, 8 insertions(+)
block/blk-mq.c +7 -0
@@ -654,6 +654,13 @@ bool blk_mq_complete_request(struct request *rq) }EXPORT_SYMBOL (blk_mq_complete_request); +void blk_mq_complete_request_sync (struct request *rq) +{ +WRITE_ONCE (rq->state,MQ_RQ_COMPLETE ); + rq->q->mq_ops->complete (rq); +} +EXPORT_SYMBOL_GPL (blk_mq_complete_request_sync); +int blk_mq_request_started (struct request *rq) {return blk_mq_rq_state (rq) !=MQ_RQ_IDLE ;
include/linux/blk-mq.h +1 -0
@@ -302,6 +302,7 @@ void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list);void blk_mq_kick_requeue_list (struct request_queue *q);void blk_mq_delay_kick_requeue_list (struct request_queue *q,unsigned long msecs);bool blk_mq_complete_request (struct request *rq); +void blk_mq_complete_request_sync (struct request *rq);bool blk_mq_bio_list_merge (struct request_queue *q,struct list_head *list,struct bio *bio);bool blk_mq_queue_stopped (struct request_queue *q);
Signature · 1 line
2.9.5
Re: [PATCH V4 1/2] blk-mq: introduce blk_mq_complete_request_sync()
Looks good,
PATCH v4 2/2 nvme: cancel request synchronously
In reply to Ming Leinvme_cancel_request() is used in error handler, and it is always reliable to cancel request synchronously, and avoids possible race in which request may be completed after real hw queue is destroyed.
One issue is reported by our customer on NVMe RDMA, in which freed ib queue pair may be used in nvme_rdma_complete_rq().
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -288,7 +288,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved) "Cancelling I/O %d", req->tag);nvme_req (req)->status =NVME_SC_ABORT_REQ ; -blk_mq_complete_request (req); +blk_mq_complete_request_sync (req);return true; }EXPORT_SYMBOL_GPL (nvme_cancel_request);
Signature · 1 line
2.9.5
Quoted 27 lines · Ming Lei
Hi,
This patchset introduces
blk_mq_complete_request_sync()for canceling request synchronously in error handler context, then one race between completing request remotely and destroying contoller/queues can be fixed.V4:
- drop return value
- don't handle fake timeoutV3:
- avoid extra cost toblk_mq_complete_requestV2:
- export viaEXPORT_SYMBOL_GPL
- minor commit log changeMing Lei (2):
blk-mq: introduceblk_mq_complete_request_sync()
nvme: cancel request synchronouslyblock/blk-mq.c | 7 +++++++ drivers/nvme/host/core.c | 2 +- include/linux/blk-mq.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-)
Quoted 7 lines
Cc Keith Busch <kbusch at kernel.org>Cc Sagi Grimberg <sagi at grimberg.me>Cc Bart Van Assche <bvanassche at acm.org>Cc James Smart <james.smart at broadcom.com>Cc Christoph Hellwig <hch at lst.de>Cc linux-nvme at lists.infradead.org
Hi Jens,
These two patches have been posted for a while, any chance to make them in v5.1?
Thanks,
Ming
Quoted 36 lines · Ming Lei
Quoted 27 lines · Ming Lei
Hi,
This patchset introduces
blk_mq_complete_request_sync()for canceling request synchronously in error handler context, then one race between completing request remotely and destroying contoller/queues can be fixed.V4:
- drop return value
- don't handle fake timeoutV3:
- avoid extra cost toblk_mq_complete_requestV2:
- export viaEXPORT_SYMBOL_GPL
- minor commit log changeMing Lei (2):
blk-mq: introduceblk_mq_complete_request_sync()
nvme: cancel request synchronouslyblock/blk-mq.c | 7 +++++++ drivers/nvme/host/core.c | 2 +- include/linux/blk-mq.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-)Quoted 7 lines
Cc Keith Busch <[email protected]>Cc Sagi Grimberg <[email protected]>Cc Bart Van Assche <[email protected]>Cc James Smart <[email protected]>Cc Christoph Hellwig <[email protected]>
Quoted 4 lines
Hi Jens,
These two patches have been posted for a while, any chance to make them in v5.1?
FWIW, series looks good to me too.
Jens Axboe
maintainerQuoted 5 lines · Ming Lei
Hi,
This patchset introduces
blk_mq_complete_request_sync()for canceling request synchronously in error handler context, then one race between completing request remotely and destroying contoller/queues can be fixed.
Applied for 5.1, thanks.
Signature · 1 line
Jens Axboe