From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: Keith Busch <keith.busch@wdc.com>,
Sagi Grimberg <sagi@grimberg.me>, Daniel Wagner <dwagner@suse.de>,
linux-nvme@lists.infradead.org, Hannes Reinecke <hare@suse.de>,
Chao Leng <lengchao@huawei.com>, Keith Busch <kbusch@kernel.org>
Subject: [PATCH 2/4] nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
Date: Fri, 26 Feb 2021 08:17:26 +0100 [thread overview]
Message-ID: <20210226071728.106923-3-hare@suse.de> (raw)
In-Reply-To: <20210226071728.106923-1-hare@suse.de>
NVME_REQ_CANCELLED is translated into -EINTR in nvme_submit_sync_cmd(),
so we should be setting this flags during nvme_cancel_request() to
ensure that the callers to nvme_submit_sync_cmd() will get the correct
error code when the controller is reset.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Chao Leng <lengchao@huawei.com>
---
drivers/nvme/host/core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index bde1b22ca7f2..bf32460c180a 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -380,6 +380,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
return true;
nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
+ nvme_req(req)->flags |= NVME_REQ_CANCELLED;
blk_mq_complete_request(req);
return true;
}
--
2.29.2
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-02-26 8:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 7:17 [PATCHv4 0/4] Fixup return value for nvme_submit_sync_cmd() Hannes Reinecke
2021-02-26 7:17 ` [PATCH 1/4] nvme: simplify error logic in nvme_validate_ns() Hannes Reinecke
2021-02-26 9:10 ` Daniel Wagner
2021-02-26 9:24 ` Hannes Reinecke
2021-02-26 9:55 ` Daniel Wagner
2021-03-05 21:59 ` Sagi Grimberg
2021-02-26 7:17 ` Hannes Reinecke [this message]
2021-03-05 21:59 ` [PATCH 2/4] nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request() Sagi Grimberg
2021-02-26 7:17 ` [PATCH 3/4] nvme-fc: set NVME_REQ_CANCELLED in nvme_fc_terminate_exchange() Hannes Reinecke
2021-03-05 21:59 ` Sagi Grimberg
2021-03-06 19:16 ` James Smart
2021-02-26 7:17 ` [PATCH 4/4] nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted Hannes Reinecke
2021-03-01 19:07 ` James Smart
2021-03-02 7:09 ` Hannes Reinecke
2021-03-05 22:00 ` Sagi Grimberg
2021-03-06 19:17 ` James Smart
2021-02-26 9:21 ` [PATCHv4 0/4] Fixup return value for nvme_submit_sync_cmd() Chao Leng
2021-03-09 10:05 ` Christoph Hellwig
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=20210226071728.106923-3-hare@suse.de \
--to=hare@suse.de \
--cc=dwagner@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=keith.busch@wdc.com \
--cc=lengchao@huawei.com \
--cc=linux-nvme@lists.infradead.org \
--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: link
Be 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.