All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Josef Bacik" <jbacik@fb.com>,
	"James Smart" <james.smart@broadcom.com>,
	"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
	"Roger Pau Monné" <roger.pau@citrix.com>,
	linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org,
	linux-block@vger.kernel.org, dm-devel@redhat.com
Subject: [PATCH 05/23] nvme: make nvme_error_status private
Date: Thu, 20 Apr 2017 16:02:58 +0200	[thread overview]
Message-ID: <20170420140316.6546-6-hch@lst.de> (raw)
In-Reply-To: <20170420140316.6546-1-hch@lst.de>

Currently it's used by the lighnvm passthrough ioctl, but we'd like to make
it private in preparation of block layer specific error code.  Lighnvm already
returns the real NVMe status anyway, so I think we can just limit it to
returning -EIO for any status set.

This will need a careful audit from the lightnvm folks, though.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/nvme/host/core.c     | 3 +--
 drivers/nvme/host/lightnvm.c | 6 +++---
 drivers/nvme/host/nvme.h     | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c6f256d74b6b..805f250315ec 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -66,7 +66,7 @@ static DEFINE_SPINLOCK(dev_list_lock);
 
 static struct class *nvme_class;
 
-int nvme_error_status(struct request *req)
+static int nvme_error_status(struct request *req)
 {
 	switch (nvme_req(req)->status & 0x7ff) {
 	case NVME_SC_SUCCESS:
@@ -77,7 +77,6 @@ int nvme_error_status(struct request *req)
 		return -EIO;
 	}
 }
-EXPORT_SYMBOL_GPL(nvme_error_status);
 
 static inline bool nvme_req_needs_retry(struct request *req)
 {
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index cb599b3fc12c..de61a4a03d78 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -595,7 +595,7 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q,
 	__le64 *metadata = NULL;
 	dma_addr_t metadata_dma;
 	DECLARE_COMPLETION_ONSTACK(wait);
-	int ret;
+	int ret = 0;
 
 	rq = nvme_alloc_request(q, (struct nvme_command *)vcmd, 0,
 			NVME_QID_ANY);
@@ -667,8 +667,8 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q,
 
 	if (nvme_req(rq)->flags & NVME_REQ_CANCELLED)
 		ret = -EINTR;
-	else
-		ret = nvme_error_status(rq);
+	else if (nvme_req(rq)->status & 0x7ff)
+		ret = -EIO;
 	if (result)
 		*result = nvme_req(rq)->status & 0x7ff;
 	if (status)
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index d7330f75632d..550037f5efea 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -254,7 +254,6 @@ static inline void nvme_end_request(struct request *req, __le16 status,
 	blk_mq_complete_request(req, 0);
 }
 
-int nvme_error_status(struct request *req);
 void nvme_complete_rq(struct request *req);
 void nvme_cancel_request(struct request *req, void *data, bool reserved);
 bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
-- 
2.11.0

WARNING: multiple messages have this Message-ID (diff)
From: hch@lst.de (Christoph Hellwig)
Subject: [PATCH 05/23] nvme: make nvme_error_status private
Date: Thu, 20 Apr 2017 16:02:58 +0200	[thread overview]
Message-ID: <20170420140316.6546-6-hch@lst.de> (raw)
In-Reply-To: <20170420140316.6546-1-hch@lst.de>

Currently it's used by the lighnvm passthrough ioctl, but we'd like to make
it private in preparation of block layer specific error code.  Lighnvm already
returns the real NVMe status anyway, so I think we can just limit it to
returning -EIO for any status set.

This will need a careful audit from the lightnvm folks, though.

Signed-off-by: Christoph Hellwig <hch at lst.de>
---
 drivers/nvme/host/core.c     | 3 +--
 drivers/nvme/host/lightnvm.c | 6 +++---
 drivers/nvme/host/nvme.h     | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c6f256d74b6b..805f250315ec 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -66,7 +66,7 @@ static DEFINE_SPINLOCK(dev_list_lock);
 
 static struct class *nvme_class;
 
-int nvme_error_status(struct request *req)
+static int nvme_error_status(struct request *req)
 {
 	switch (nvme_req(req)->status & 0x7ff) {
 	case NVME_SC_SUCCESS:
@@ -77,7 +77,6 @@ int nvme_error_status(struct request *req)
 		return -EIO;
 	}
 }
-EXPORT_SYMBOL_GPL(nvme_error_status);
 
 static inline bool nvme_req_needs_retry(struct request *req)
 {
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index cb599b3fc12c..de61a4a03d78 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -595,7 +595,7 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q,
 	__le64 *metadata = NULL;
 	dma_addr_t metadata_dma;
 	DECLARE_COMPLETION_ONSTACK(wait);
-	int ret;
+	int ret = 0;
 
 	rq = nvme_alloc_request(q, (struct nvme_command *)vcmd, 0,
 			NVME_QID_ANY);
@@ -667,8 +667,8 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q,
 
 	if (nvme_req(rq)->flags & NVME_REQ_CANCELLED)
 		ret = -EINTR;
-	else
-		ret = nvme_error_status(rq);
+	else if (nvme_req(rq)->status & 0x7ff)
+		ret = -EIO;
 	if (result)
 		*result = nvme_req(rq)->status & 0x7ff;
 	if (status)
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index d7330f75632d..550037f5efea 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -254,7 +254,6 @@ static inline void nvme_end_request(struct request *req, __le16 status,
 	blk_mq_complete_request(req, 0);
 }
 
-int nvme_error_status(struct request *req);
 void nvme_complete_rq(struct request *req);
 void nvme_cancel_request(struct request *req, void *data, bool reserved);
 bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
-- 
2.11.0

  parent reply	other threads:[~2017-04-20 14:02 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-20 14:02 kill req->errors V4 Christoph Hellwig
2017-04-20 14:02 ` Christoph Hellwig
2017-04-20 14:02 ` [PATCH 01/23] pd: don't check blk_execute_rq return value Christoph Hellwig
2017-04-20 14:02   ` Christoph Hellwig
2017-04-20 14:59   ` Johannes Thumshirn
2017-04-20 14:59     ` Johannes Thumshirn
2017-04-20 14:59     ` Johannes Thumshirn
2017-04-20 14:02 ` [PATCH 02/23] block: remove the " Christoph Hellwig
2017-04-20 14:02   ` Christoph Hellwig
2017-04-20 15:19   ` Bart Van Assche
2017-04-20 15:19     ` Bart Van Assche
2017-04-20 15:19     ` Bart Van Assche
2017-04-20 14:02 ` [PATCH 03/23] nvme-fc: fix status code handling in nvme_fc_fcpio_done Christoph Hellwig
2017-04-20 14:02   ` Christoph Hellwig
2017-04-20 14:02 ` [PATCH 04/23] nvme: split nvme status from block req->errors Christoph Hellwig
2017-04-20 14:02   ` Christoph Hellwig
2017-04-20 14:02 ` Christoph Hellwig [this message]
2017-04-20 14:02   ` [PATCH 05/23] nvme: make nvme_error_status private Christoph Hellwig
2017-04-20 14:02 ` [PATCH 06/23] virtio: fix spelling of virtblk_scsi_request_done Christoph Hellwig
2017-04-20 14:02   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 07/23] virtio_blk: don't use req->errors Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 08/23] scsi: introduce a result field in struct scsi_request Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:25   ` Bart Van Assche
2017-04-20 15:25     ` Bart Van Assche
2017-04-20 15:25     ` Bart Van Assche
2017-04-20 14:03 ` [PATCH 09/23] loop: zero-fill bio on the submitting cpu Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 10/23] null_blk: don't pass always-0 req->errors to blk_mq_complete_request Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:02   ` Johannes Thumshirn
2017-04-20 15:02     ` Johannes Thumshirn
2017-04-20 15:02     ` Johannes Thumshirn
2017-04-20 14:03 ` [PATCH 11/23] dm rq: don't pass irrelevant error code " Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:04   ` Johannes Thumshirn
2017-04-20 15:04     ` Johannes Thumshirn
2017-04-20 15:04     ` Johannes Thumshirn
2017-04-20 15:25   ` Bart Van Assche
2017-04-20 15:25     ` Bart Van Assche
2017-04-20 15:25     ` Bart Van Assche
2017-04-20 14:03 ` [PATCH 12/23] dm mpath: don't check for req->errors Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:04   ` Johannes Thumshirn
2017-04-20 15:04     ` Johannes Thumshirn
2017-04-20 15:04     ` Johannes Thumshirn
2017-04-20 15:25   ` Bart Van Assche
2017-04-20 15:25     ` Bart Van Assche
2017-04-20 15:25     ` Bart Van Assche
2017-04-20 14:03 ` [PATCH 13/23] nbd: don't use req->errors Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 14/23] mtip32xx: add a status field to struct mtip_cmd Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:13   ` Johannes Thumshirn
2017-04-20 15:13     ` Johannes Thumshirn
2017-04-20 15:13     ` Johannes Thumshirn
2017-04-20 14:03 ` [PATCH 15/23] xen-blkfront: don't use req->errors Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 16/23] blk-mq: remove the error argument to blk_mq_complete_request Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:14   ` Johannes Thumshirn
2017-04-20 15:14     ` Johannes Thumshirn
2017-04-20 15:14     ` Johannes Thumshirn
2017-04-20 15:28   ` Bart Van Assche
2017-04-20 15:28     ` Bart Van Assche
2017-04-20 15:28     ` Bart Van Assche
2017-04-20 14:03 ` [PATCH 17/23] blk-mq: simplify __blk_mq_complete_request Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 18/23] block: add a error_count field to struct request Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 19/23] floppy: switch from req->errors to req->error_count Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 20/23] ataflop: " Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 14:03 ` [PATCH 21/23] swim3: remove (commented out) printing of req->errors Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:19   ` Johannes Thumshirn
2017-04-20 15:19     ` Johannes Thumshirn
2017-04-20 15:19     ` Johannes Thumshirn
2017-04-20 14:03 ` [PATCH 22/23] blktrace: remove the unused block_rq_abort tracepoint Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:20   ` Johannes Thumshirn
2017-04-20 15:20     ` Johannes Thumshirn
2017-04-20 15:20     ` Johannes Thumshirn
2017-04-20 15:25     ` Christoph Hellwig
2017-04-20 15:25       ` Christoph Hellwig
2017-04-20 15:38       ` Johannes Thumshirn
2017-04-20 15:38         ` Johannes Thumshirn
2017-04-20 15:38         ` Johannes Thumshirn
2017-04-20 18:13     ` Jens Axboe
2017-04-20 18:13       ` Jens Axboe
2017-04-20 14:03 ` [PATCH 23/23] block: remove the errors field from struct request Christoph Hellwig
2017-04-20 14:03   ` Christoph Hellwig
2017-04-20 15:21   ` Johannes Thumshirn
2017-04-20 15:21     ` Johannes Thumshirn
2017-04-20 15:21     ` Johannes Thumshirn
2017-04-20 18:16 ` kill req->errors V4 Jens Axboe
2017-04-20 18:16   ` Jens Axboe
  -- strict thread matches above, loose matches on Subject: below --
2017-04-19 19:26 kill req->errors V3 Christoph Hellwig
2017-04-19 19:26 ` [PATCH 05/23] nvme: make nvme_error_status private Christoph Hellwig
2017-04-19 19:26   ` 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=20170420140316.6546-6-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=dm-devel@redhat.com \
    --cc=james.smart@broadcom.com \
    --cc=jbacik@fb.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=roger.pau@citrix.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.