* [PATCHv2 2/2] nvme: cancel requests for real
2020-05-28 15:19 [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request Keith Busch
@ 2020-05-28 15:19 ` Keith Busch
2020-05-28 15:23 ` Johannes Thumshirn
2020-05-28 15:22 ` [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request Johannes Thumshirn
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Keith Busch @ 2020-05-28 15:19 UTC (permalink / raw)
To: linux-nvme, hch, sagi, linux-block, axboe; +Cc: Keith Busch
Once the driver decides to cancel requests, the concept of those
requests timing out ceases to exist. Use __blk_mq_complete_request() to
bypass fake timeout error injection so that request reclaim may
proceed.
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
v1->v2: Use new export rather than loop for success
drivers/nvme/host/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index ba860efd250d..f65a0b6cd988 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -310,7 +310,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
return true;
nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
- blk_mq_complete_request(req);
+ __blk_mq_complete_request(req);
return true;
}
EXPORT_SYMBOL_GPL(nvme_cancel_request);
--
2.24.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request
2020-05-28 15:19 [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request Keith Busch
2020-05-28 15:19 ` [PATCHv2 2/2] nvme: cancel requests for real Keith Busch
@ 2020-05-28 15:22 ` Johannes Thumshirn
2020-05-28 15:29 ` Jens Axboe
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Johannes Thumshirn @ 2020-05-28 15:22 UTC (permalink / raw)
To: Keith Busch, linux-nvme@lists.infradead.org, hch@lst.de,
sagi@grimberg.me, linux-block@vger.kernel.org, axboe@kernel.dk
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request
2020-05-28 15:19 [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request Keith Busch
2020-05-28 15:19 ` [PATCHv2 2/2] nvme: cancel requests for real Keith Busch
2020-05-28 15:22 ` [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request Johannes Thumshirn
@ 2020-05-28 15:29 ` Jens Axboe
2020-05-28 16:42 ` Christoph Hellwig
2020-05-29 3:44 ` Ming Lei
4 siblings, 0 replies; 9+ messages in thread
From: Jens Axboe @ 2020-05-28 15:29 UTC (permalink / raw)
To: Keith Busch, linux-nvme, hch, sagi, linux-block
On 5/28/20 9:19 AM, Keith Busch wrote:
> For when drivers have a need to bypass error injection.
>
> Signed-off-by: Keith Busch <kbusch@kernel.org>
> ---
> block/blk-mq.c | 3 ++-
> include/linux/blk-mq.h | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index cac11945f602..3c61faf63e15 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -556,7 +556,7 @@ static void __blk_mq_complete_request_remote(void *data)
> q->mq_ops->complete(rq);
> }
>
> -static void __blk_mq_complete_request(struct request *rq)
> +void __blk_mq_complete_request(struct request *rq)
> {
> struct blk_mq_ctx *ctx = rq->mq_ctx;
> struct request_queue *q = rq->q;
> @@ -602,6 +602,7 @@ static void __blk_mq_complete_request(struct request *rq)
> }
> put_cpu();
> }
> +EXPORT_SYMBOL(__blk_mq_complete_request);
Let's please make that _GPL
--
Jens Axboe
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request
2020-05-28 15:19 [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request Keith Busch
` (2 preceding siblings ...)
2020-05-28 15:29 ` Jens Axboe
@ 2020-05-28 16:42 ` Christoph Hellwig
2020-05-28 18:18 ` Keith Busch
2020-05-29 3:44 ` Ming Lei
4 siblings, 1 reply; 9+ messages in thread
From: Christoph Hellwig @ 2020-05-28 16:42 UTC (permalink / raw)
To: Keith Busch; +Cc: linux-nvme, hch, sagi, linux-block, axboe
On Thu, May 28, 2020 at 08:19:30AM -0700, Keith Busch wrote:
> For when drivers have a need to bypass error injection.
EXPORT_SYMBOL_GPL, and as hinted I think this needs a better name.
It also absolutely needs a kerneldoc comment describing the use case.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request
2020-05-28 16:42 ` Christoph Hellwig
@ 2020-05-28 18:18 ` Keith Busch
2020-05-29 12:26 ` Christoph Hellwig
0 siblings, 1 reply; 9+ messages in thread
From: Keith Busch @ 2020-05-28 18:18 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-nvme, sagi, linux-block, axboe
On Thu, May 28, 2020 at 06:42:56PM +0200, Christoph Hellwig wrote:
> I think this needs a better name.
blk_mq_do_complete_req()?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request
2020-05-28 18:18 ` Keith Busch
@ 2020-05-29 12:26 ` Christoph Hellwig
0 siblings, 0 replies; 9+ messages in thread
From: Christoph Hellwig @ 2020-05-29 12:26 UTC (permalink / raw)
To: Keith Busch; +Cc: Christoph Hellwig, linux-nvme, sagi, linux-block, axboe
On Thu, May 28, 2020 at 11:18:07AM -0700, Keith Busch wrote:
> On Thu, May 28, 2020 at 06:42:56PM +0200, Christoph Hellwig wrote:
> > I think this needs a better name.
>
> blk_mq_do_complete_req()?
do isn't exactly descriptive, is it?
blk_mq_force_complete_request maybe?
And yes, I think for 5.9 we need to lift the error injection into the
callers, this is a mess..
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request
2020-05-28 15:19 [PATCHv2 1/2] blk-mq: export __blk_mq_complete_request Keith Busch
` (3 preceding siblings ...)
2020-05-28 16:42 ` Christoph Hellwig
@ 2020-05-29 3:44 ` Ming Lei
4 siblings, 0 replies; 9+ messages in thread
From: Ming Lei @ 2020-05-29 3:44 UTC (permalink / raw)
To: Keith Busch
Cc: linux-nvme, Christoph Hellwig, Sagi Grimberg, linux-block,
Jens Axboe
On Thu, May 28, 2020 at 11:19 PM Keith Busch <kbusch@kernel.org> wrote:
>
> For when drivers have a need to bypass error injection.
>
> Signed-off-by: Keith Busch <kbusch@kernel.org>
> ---
> block/blk-mq.c | 3 ++-
> include/linux/blk-mq.h | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index cac11945f602..3c61faf63e15 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -556,7 +556,7 @@ static void __blk_mq_complete_request_remote(void *data)
> q->mq_ops->complete(rq);
> }
>
> -static void __blk_mq_complete_request(struct request *rq)
> +void __blk_mq_complete_request(struct request *rq)
> {
> struct blk_mq_ctx *ctx = rq->mq_ctx;
> struct request_queue *q = rq->q;
> @@ -602,6 +602,7 @@ static void __blk_mq_complete_request(struct request *rq)
> }
> put_cpu();
> }
> +EXPORT_SYMBOL(__blk_mq_complete_request);
>
> static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx)
> __releases(hctx->srcu)
> diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
> index d7307795439a..cfe7eac3764e 100644
> --- a/include/linux/blk-mq.h
> +++ b/include/linux/blk-mq.h
> @@ -494,6 +494,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(struct request *rq);
> bool blk_mq_bio_list_merge(struct request_queue *q, struct list_head *list,
> struct bio *bio, unsigned int nr_segs);
> bool blk_mq_queue_stopped(struct request_queue *q);
> --
Looks fine:
Reviewed-by: Ming Lei <ming.lei@redhat.com>
--
Ming Lei
^ permalink raw reply [flat|nested] 9+ messages in thread