All of lore.kernel.org
 help / color / mirror / Atom feed
From: Keith Busch <kbusch@kernel.org>
To: linux-nvme@lists.infradead.org, sagi@grimberg.me, hch@lst.de,
	axboe@kernel.dk, linux-block@vger.kernel.org
Cc: Keith Busch <kbusch@kernel.org>, Yuanyuan Zhong <yzhong@purestorage.com>
Subject: [PATCH 2/2] nvme: use return value from blk_execute_rq()
Date: Fri, 16 Apr 2021 09:53:53 -0700	[thread overview]
Message-ID: <20210416165353.3088547-2-kbusch@kernel.org> (raw)
In-Reply-To: <20210416165353.3088547-1-kbusch@kernel.org>

We don't have an nvme status to report if the driver's .queue_rq()
returns an error without dispatching the requested nvme command. Use the
return value from blk_execute_rq() so the caller may know their command
was not successful.

Reported-by: Yuanyuan Zhong <yzhong@purestorage.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
 drivers/nvme/host/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 85538c38aae9..b57157106cac 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1000,12 +1000,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
 	if (poll)
 		nvme_execute_rq_polled(req->q, NULL, req, at_head);
 	else
-		blk_execute_rq(NULL, req, at_head);
+		ret = blk_execute_rq(NULL, req, at_head);
 	if (result)
 		*result = nvme_req(req)->result;
 	if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
 		ret = -EINTR;
-	else
+	else if (nvme_req(req)->status)
 		ret = nvme_req(req)->status;
  out:
 	blk_mq_free_request(req);
-- 
2.25.4


WARNING: multiple messages have this Message-ID (diff)
From: Keith Busch <kbusch@kernel.org>
To: linux-nvme@lists.infradead.org, sagi@grimberg.me, hch@lst.de,
	axboe@kernel.dk, linux-block@vger.kernel.org
Cc: Keith Busch <kbusch@kernel.org>, Yuanyuan Zhong <yzhong@purestorage.com>
Subject: [PATCH 2/2] nvme: use return value from blk_execute_rq()
Date: Fri, 16 Apr 2021 09:53:53 -0700	[thread overview]
Message-ID: <20210416165353.3088547-2-kbusch@kernel.org> (raw)
In-Reply-To: <20210416165353.3088547-1-kbusch@kernel.org>

We don't have an nvme status to report if the driver's .queue_rq()
returns an error without dispatching the requested nvme command. Use the
return value from blk_execute_rq() so the caller may know their command
was not successful.

Reported-by: Yuanyuan Zhong <yzhong@purestorage.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
 drivers/nvme/host/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 85538c38aae9..b57157106cac 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1000,12 +1000,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
 	if (poll)
 		nvme_execute_rq_polled(req->q, NULL, req, at_head);
 	else
-		blk_execute_rq(NULL, req, at_head);
+		ret = blk_execute_rq(NULL, req, at_head);
 	if (result)
 		*result = nvme_req(req)->result;
 	if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
 		ret = -EINTR;
-	else
+	else if (nvme_req(req)->status)
 		ret = nvme_req(req)->status;
  out:
 	blk_mq_free_request(req);
-- 
2.25.4


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

  reply	other threads:[~2021-04-16 16:54 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-16 16:53 [PATCH 1/2] block: return errors from blk_execute_rq() Keith Busch
2021-04-16 16:53 ` Keith Busch
2021-04-16 16:53 ` Keith Busch [this message]
2021-04-16 16:53   ` [PATCH 2/2] nvme: use return value " Keith Busch
2021-04-16 17:12   ` Yuanyuan Zhong
2021-04-16 17:12     ` Yuanyuan Zhong
2021-04-16 17:17     ` Keith Busch
2021-04-16 17:17       ` Keith Busch
2021-04-19  7:16       ` Christoph Hellwig
2021-04-19  7:16         ` Christoph Hellwig
2021-04-19 15:14         ` Keith Busch
2021-04-19 15:14           ` Keith Busch
2021-04-19 17:27           ` Yuanyuan Zhong
2021-04-19 17:27             ` Yuanyuan Zhong
2021-04-19 17:48             ` Keith Busch
2021-04-19 17:48               ` Keith Busch
2021-04-19 18:20               ` Yuanyuan Zhong
2021-04-19 18:20                 ` Yuanyuan Zhong
2021-04-18  4:17   ` Chaitanya Kulkarni
2021-04-18  4:17     ` Chaitanya Kulkarni
2021-04-18  4:13 ` [PATCH 1/2] block: return errors " Chaitanya Kulkarni
2021-04-18  4:13   ` Chaitanya Kulkarni
2021-04-17  2:04 [PATCH 2/2] nvme: use return value " Casey Chen
2021-04-17  2:39 ` Keith Busch
2021-04-17  2:39   ` Keith Busch
2021-04-23 21:57 [PATCH 1/2] block: return errors " Keith Busch
2021-04-23 21:58 ` [PATCH 2/2] nvme: use return value " Keith Busch
2021-04-23 21:58   ` Keith Busch

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=20210416165353.3088547-2-kbusch@kernel.org \
    --to=kbusch@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=hch@lst.de \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    --cc=yzhong@purestorage.com \
    /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.