nvme/multipath: Consult blk_status_t for failover

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>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d8956d94cbd84234a8351889cf27737dbe58680c..2fe15351ac4eb14c370fadb2960acd913a4648c1 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -197,8 +197,10 @@ static inline bool nvme_req_needs_retry(struct request *req)
 
 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 *req)
                        return;
                }
        }
-
-       blk_mq_end_request(req, nvme_error_status(req));
+       blk_mq_end_request(req, status);
 }
 EXPORT_SYMBOL_GPL(nvme_complete_rq);
 

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 1218a9fca8466b874e45f97d47b9c70234916ec7..ae9abb600c0f3265a259eb793cee51877cc78891 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -33,46 +33,18 @@ void nvme_failover_req(struct request *req)
        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;
        }
 

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index eecf71ce6e7505266880501468b3a89eff1bc1da..4112fb6ce80d756aa4b5aa26e11a948dbd1be712 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -402,7 +402,7 @@ extern const struct block_device_operations nvme_ns_head_ops;
 
 #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);
@@ -422,7 +422,8 @@ struct nvme_ns *nvme_find_path(struct nvme_ns_head *head);
 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;
 }