From: Keith Busch <kbusch@kernel.org> To: linux-nvme@lists.infradead.org, hch@lst.de, sagi@grimberg.me, linux-block@vger.kernel.org, axboe@kernel.dk Cc: alan.adamson@oracle.com, Keith Busch <kbusch@kernel.org>, Johannes Thumshirn <johannes.thumshirn@wdc.com>, Ming Lei <ming.lei@redhat.com> Subject: [PATCHv4 2/2] nvme: force complete cancelled requests Date: Fri, 29 May 2020 07:52:00 -0700 [thread overview] Message-ID: <20200529145200.3545747-2-kbusch@kernel.org> (raw) In-Reply-To: <20200529145200.3545747-1-kbusch@kernel.org> Use blk_mq_foce_complete_rq() to bypass fake timeout error injection so that request reclaim may proceed. Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Keith Busch <kbusch@kernel.org> --- 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..891e9461bfae 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_force_complete_rq(req); return true; } EXPORT_SYMBOL_GPL(nvme_cancel_request); -- 2.24.1
WARNING: multiple messages have this Message-ID (diff)
From: Keith Busch <kbusch@kernel.org> To: linux-nvme@lists.infradead.org, hch@lst.de, sagi@grimberg.me, linux-block@vger.kernel.org, axboe@kernel.dk Cc: Keith Busch <kbusch@kernel.org>, Johannes Thumshirn <johannes.thumshirn@wdc.com>, alan.adamson@oracle.com, Ming Lei <ming.lei@redhat.com> Subject: [PATCHv4 2/2] nvme: force complete cancelled requests Date: Fri, 29 May 2020 07:52:00 -0700 [thread overview] Message-ID: <20200529145200.3545747-2-kbusch@kernel.org> (raw) In-Reply-To: <20200529145200.3545747-1-kbusch@kernel.org> Use blk_mq_foce_complete_rq() to bypass fake timeout error injection so that request reclaim may proceed. Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Keith Busch <kbusch@kernel.org> --- 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..891e9461bfae 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_force_complete_rq(req); return true; } EXPORT_SYMBOL_GPL(nvme_cancel_request); -- 2.24.1 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-05-29 14:52 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-29 14:51 [PATCHv4 1/2] blk-mq: blk-mq: provide forced completion method Keith Busch 2020-05-29 14:51 ` Keith Busch 2020-05-29 14:52 ` Keith Busch [this message] 2020-05-29 14:52 ` [PATCHv4 2/2] nvme: force complete cancelled requests Keith Busch 2020-05-29 15:42 ` Daniel Wagner 2020-05-29 15:42 ` Daniel Wagner 2020-05-29 15:42 ` [PATCHv4 1/2] blk-mq: blk-mq: provide forced completion method Daniel Wagner 2020-05-29 15:42 ` Daniel Wagner 2020-05-29 16:22 ` Jens Axboe 2020-05-29 16:22 ` Jens Axboe 2020-05-29 18:02 ` Alan Adamson 2020-05-29 18:02 ` Alan Adamson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200529145200.3545747-2-kbusch@kernel.org \ --to=kbusch@kernel.org \ --cc=alan.adamson@oracle.com \ --cc=axboe@kernel.dk \ --cc=hch@lst.de \ --cc=johannes.thumshirn@wdc.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=ming.lei@redhat.com \ --cc=sagi@grimberg.me \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.