From: Sagi Grimberg <sagi@grimberg.me>
To: linux-nvme@lists.infradead.org
Cc: Keith Busch <keith.busch@intel.com>, Christoph Hellwig <hch@lst.de>
Subject: [PATCH] nvme: set NVME_REQ_CANCELLED flag when cancelling a request
Date: Fri, 20 Sep 2019 11:19:13 -0700 [thread overview]
Message-ID: <20190920181913.14723-1-sagi@grimberg.me> (raw)
This will prevent userspace to wrongly get the completion result
when we cancelled the command. Also, make sure to clear it from
the request flags in nvme_setup_cmd.
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
---
drivers/nvme/host/core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f85e7b09d1d4..fc3ed75ef80b 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -298,6 +298,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
if (blk_mq_request_completed(req))
return true;
+ nvme_req(req)->flags |= NVME_REQ_CANCELLED;
nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
blk_mq_complete_request(req);
return true;
@@ -434,6 +435,7 @@ static inline void nvme_clear_nvme_request(struct request *req)
nvme_req(req)->flags = 0;
req->rq_flags |= RQF_DONTPREP;
}
+ nvme_req(req)->flags &= ~NVME_REQ_CANCELLED;
}
struct request *nvme_alloc_request(struct request_queue *q,
--
2.17.1
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next reply other threads:[~2019-09-20 18:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 18:19 Sagi Grimberg [this message]
2019-09-22 4:26 ` [PATCH] nvme: set NVME_REQ_CANCELLED flag when cancelling a request Chaitanya Kulkarni
2019-09-23 17:04 ` Sagi Grimberg
2019-09-27 21:32 ` Christoph Hellwig
2019-09-27 22:15 ` Chaitanya Kulkarni
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=20190920181913.14723-1-sagi@grimberg.me \
--to=sagi@grimberg.me \
--cc=hch@lst.de \
--cc=keith.busch@intel.com \
--cc=linux-nvme@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).