Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-01-12 15:46:58 +0100
committerJohannes Thumshirn <jthumshirn@suse.de>2018-01-12 15:47:01 +0100
commit248952d541cc8d9ebaaf69e2df26e50c929b5682 (patch)
tree280ebb62417c0d0fa12ce1708c46bcbcc3ea0d22
parent53cddd77e537301ed24f0d8a13e346d0dc8f39ab (diff)
nvme/multipath: Consult blk_status_t for failover (FATE#323952,
-rw-r--r--patches.drivers/nvme-multipath-Consult-blk_status_t-for-failover.patch128
-rw-r--r--series.conf1
2 files changed, 129 insertions, 0 deletions
diff --git a/patches.drivers/nvme-multipath-Consult-blk_status_t-for-failover.patch b/patches.drivers/nvme-multipath-Consult-blk_status_t-for-failover.patch
new file mode 100644
index 0000000000..19e461bb34
--- /dev/null
+++ b/patches.drivers/nvme-multipath-Consult-blk_status_t-for-failover.patch
@@ -0,0 +1,128 @@
+From: Keith Busch <keith.busch@intel.com>
+Date: Tue, 9 Jan 2018 12:04:15 -0700
+Subject: nvme/multipath: Consult blk_status_t for failover
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.dk/linux-block
+Git-commit: 908e45643d6450551bfbdbad3f088d4bd1f1c1fb
+References: FATE#323952, FATE#322506
+
+This removes nvme multipath's specific status decoding to see if failover
+is needed, using the generic blk_status_t that was decoded earlier. This
+abstraction from the raw NVMe status means all status decoding exists
+in one place.
+
+Acked-by: Mike Snitzer <snitzer@redhat.com>
+Reviewed-by: Hannes Reinecke <hare@suse.com>
+Signed-off-by: Keith Busch <keith.busch@intel.com>
+Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ drivers/nvme/host/core.c | 9 ++++----
+ drivers/nvme/host/multipath.c | 44 +++++++-----------------------------------
+ drivers/nvme/host/nvme.h | 5 ++--
+ 3 files changed, 16 insertions(+), 42 deletions(-)
+
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -197,8 +197,10 @@ static inline bool nvme_req_needs_retry(
+
+ void nvme_complete_rq(struct request *req)
+ {
+- if (unlikely(nvme_req(req)->status && nvme_req_needs_retry(req))) {
+- if (nvme_req_needs_failover(req)) {
++ blk_status_t status = nvme_error_status(req);
++
++ if (unlikely(status != BLK_STS_OK && nvme_req_needs_retry(req))) {
++ if (nvme_req_needs_failover(req, status)) {
+ nvme_failover_req(req);
+ return;
+ }
+@@ -209,8 +211,7 @@ void nvme_complete_rq(struct request *re
+ return;
+ }
+ }
+-
+- blk_mq_end_request(req, nvme_error_status(req));
++ blk_mq_end_request(req, status);
+ }
+ EXPORT_SYMBOL_GPL(nvme_complete_rq);
+
+--- a/drivers/nvme/host/multipath.c
++++ b/drivers/nvme/host/multipath.c
+@@ -33,46 +33,18 @@ void nvme_failover_req(struct request *r
+ kblockd_schedule_work(&ns->head->requeue_work);
+ }
+
+-bool nvme_req_needs_failover(struct request *req)
++bool nvme_req_needs_failover(struct request *req, blk_status_t error)
+ {
+ if (!(req->cmd_flags & REQ_NVME_MPATH))
+ return false;
+
+- switch (nvme_req(req)->status & 0x7ff) {
+- /*
+- * Generic command status:
+- */
+- case NVME_SC_INVALID_OPCODE:
+- case NVME_SC_INVALID_FIELD:
+- case NVME_SC_INVALID_NS:
+- case NVME_SC_LBA_RANGE:
+- case NVME_SC_CAP_EXCEEDED:
+- case NVME_SC_RESERVATION_CONFLICT:
+- return false;
+-
+- /*
+- * I/O command set specific error. Unfortunately these values are
+- * reused for fabrics commands, but those should never get here.
+- */
+- case NVME_SC_BAD_ATTRIBUTES:
+- case NVME_SC_INVALID_PI:
+- case NVME_SC_READ_ONLY:
+- case NVME_SC_ONCS_NOT_SUPPORTED:
+- WARN_ON_ONCE(nvme_req(req)->cmd->common.opcode ==
+- nvme_fabrics_command);
+- return false;
+-
+- /*
+- * Media and Data Integrity Errors:
+- */
+- case NVME_SC_WRITE_FAULT:
+- case NVME_SC_READ_ERROR:
+- case NVME_SC_GUARD_CHECK:
+- case NVME_SC_APPTAG_CHECK:
+- case NVME_SC_REFTAG_CHECK:
+- case NVME_SC_COMPARE_FAILED:
+- case NVME_SC_ACCESS_DENIED:
+- case NVME_SC_UNWRITTEN_BLOCK:
++ switch (error) {
++ case BLK_STS_NOTSUPP:
++ case BLK_STS_NOSPC:
++ case BLK_STS_TARGET:
++ case BLK_STS_NEXUS:
++ case BLK_STS_MEDIUM:
++ case BLK_STS_PROTECTION:
+ return false;
+ }
+
+--- a/drivers/nvme/host/nvme.h
++++ b/drivers/nvme/host/nvme.h
+@@ -400,7 +400,7 @@ extern const struct block_device_operati
+
+ #ifdef CONFIG_NVME_MULTIPATH
+ void nvme_failover_req(struct request *req);
+-bool nvme_req_needs_failover(struct request *req);
++bool nvme_req_needs_failover(struct request *req, blk_status_t error);
+ void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
+ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
+ void nvme_mpath_add_disk(struct nvme_ns_head *head);
+@@ -429,7 +429,8 @@ static inline void nvme_mpath_check_last
+ static inline void nvme_failover_req(struct request *req)
+ {
+ }
+-static inline bool nvme_req_needs_failover(struct request *req)
++static inline bool nvme_req_needs_failover(struct request *req,
++ blk_status_t error)
+ {
+ return false;
+ }
diff --git a/series.conf b/series.conf
index 7a38756834..d91ddc0bd8 100644
--- a/series.conf
+++ b/series.conf
@@ -6502,6 +6502,7 @@
# git://git.kernel.dk/linux-block.git for-next
patches.drivers/nvme-Add-more-command-status-translation.patch
+ patches.drivers/nvme-multipath-Consult-blk_status_t-for-failover.patch
# out-of-tree patches
patches.drivers/s390-sles15-00-04-04-kmsg-add-VNIC-Characteristics-msg-documentation.patch