nvme: Enhanced Command Retry

* Show CRDT fields of Identify Controller data structure
* Show Host Behavior Supported state for Get Feature 16h
* Add support for error status NVME_SC_CMD_INTERRUPTED

Reviewed-by: Edmund Nadolski <edmund.nadolski@intel.com>
Signed-off-by: Kenneth Heitke <kenneth.heitke@intel.com>

diff --git a/linux/nvme.h b/linux/nvme.h
index 40bc8d7a76b6c5c121d601c5bec41b64b2abdbfc..55062ee69cd8bdb50081306c65688d4345ceeec0 100644 (file)
--- a/linux/nvme.h
+++ b/linux/nvme.h
@@ -221,7 +221,11 @@ struct nvme_id_ctrl {
        __le32                  oaes;
        __le32                  ctratt;
        __le16                  rrls;
-       __u8                    rsvd102[154];
+       __u8                    rsvd102[26];
+       __le16                  crdt1;
+       __le16                  crdt2;
+       __le16                  crdt3;
+       __u8                    rsvd134[122];
        __le16                  oacs;
        __u8                    acl;
        __u8                    aerl;
@@ -933,6 +937,7 @@ enum {
        NVME_FEAT_RRL           = 0x12,
        NVME_FEAT_PLM_CONFIG    = 0x13,
        NVME_FEAT_PLM_WINDOW    = 0x14,
+       NVME_FEAT_HOST_BEHAVIOR = 0x16,
        NVME_FEAT_SW_PROGRESS   = 0x80,
        NVME_FEAT_HOST_ID       = 0x81,
        NVME_FEAT_RESV_MASK     = 0x82,
@@ -1362,6 +1367,7 @@ enum {
        NVME_SC_SANITIZE_IN_PROGRESS    = 0x1D,
 
        NVME_SC_NS_WRITE_PROTECTED      = 0x20,
+       NVME_SC_CMD_INTERRUPTED         = 0x21,
 
        NVME_SC_LBA_RANGE               = 0x80,
        NVME_SC_CAP_EXCEEDED            = 0x81,
@@ -1440,6 +1446,7 @@ enum {
        NVME_SC_ANA_INACCESSIBLE        = 0x302,
        NVME_SC_ANA_TRANSITION          = 0x303,
 
+       NVME_SC_CRD                     = 0x1800,
        NVME_SC_DNR                     = 0x4000,
 };
 

diff --git a/nvme-print.c b/nvme-print.c
index 2b6bc389015bc1eec35d0043314d25373bd0b6b7..71abf5227be48253cb496f3916647870501c80e6 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -1004,6 +1004,11 @@ void __show_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*ve
        if (human)
                show_nvme_id_ctrl_ctratt(ctrl->ctratt);
        printf("rrls      : %#x\n", le16_to_cpu(ctrl->rrls));
+
+       printf("crdt1     : %u\n", le16_to_cpu(ctrl->crdt1));
+       printf("crdt2     : %u\n", le16_to_cpu(ctrl->crdt2));
+       printf("crdt3     : %u\n", le16_to_cpu(ctrl->crdt3));
+
        printf("oacs      : %#x\n", le16_to_cpu(ctrl->oacs));
        if (human)
                show_nvme_id_ctrl_oacs(ctrl->oacs);
@@ -1745,6 +1750,7 @@ const char *nvme_feature_to_string(int feature)
        case NVME_FEAT_TIMESTAMP:       return "Timestamp";
        case NVME_FEAT_WRITE_PROTECT:   return "Namespce Write Protect";
        case NVME_FEAT_HCTM:            return "Host Controlled Thermal Management";
+       case NVME_FEAT_HOST_BEHAVIOR:   return "Host Behavior";
        default:                        return "Unknown";
        }
 }
@@ -1853,6 +1859,7 @@ const char *nvme_status_to_string(__u32 status)
        case NVME_SC_ANA_PERSISTENT_LOSS:       return "ASYMMETRIC_NAMESPACE_ACCESS_PERSISTENT_LOSS: The requested function (e.g., command) is not able to be performed as a result of the relationship between the controller and the namespace being in the ANA Persistent Loss state";
        case NVME_SC_ANA_INACCESSIBLE:          return "ASYMMETRIC_NAMESPACE_ACCESS_INACCESSIBLE: The requested function (e.g., command) is not able to be performed as a result of the relationship between the controller and the namespace being in the ANA Inaccessible state";
        case NVME_SC_ANA_TRANSITION:            return "ASYMMETRIC_NAMESPACE_ACCESS_TRANSITION: The requested function (e.g., command) is not able to be performed as a result of the relationship between the controller and the namespace transitioning between Asymmetric Namespace Access states";
+       case NVME_SC_CMD_INTERRUPTED:           return "CMD_INTERRUPTED: Command processing was interrupted and the controller is unable to successfully complete the command. The host should retry the command.";
        default:                                return "Unknown";
        }
 }
@@ -2149,6 +2156,9 @@ void nvme_feature_show_fields(__u32 fid, unsigned int result, unsigned char *buf
        case NVME_FEAT_NOPSC:
                printf("\tNon-Operational Power State Permissive Mode Enable (NOPPME): %s\n", (result & 1) ? "True" : "False");
                break;
+       case NVME_FEAT_HOST_BEHAVIOR:
+               printf("\tHost Behavior Support: %s\n", (buf[0] & 0x1) ? "True" : "False");
+               break;
        }
 }
 
@@ -2386,6 +2396,9 @@ void json_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*vs)(
        json_object_add_value_uint(root, "oaes", le32_to_cpu(ctrl->oaes));
        json_object_add_value_int(root, "ctratt", le32_to_cpu(ctrl->ctratt));
        json_object_add_value_int(root, "rrls", le16_to_cpu(ctrl->rrls));
+       json_object_add_value_int(root, "crdt1", le16_to_cpu(ctrl->crdt1));
+       json_object_add_value_int(root, "crdt2", le16_to_cpu(ctrl->crdt2));
+       json_object_add_value_int(root, "crdt3", le16_to_cpu(ctrl->crdt3));
        json_object_add_value_int(root, "oacs", le16_to_cpu(ctrl->oacs));
        json_object_add_value_int(root, "acl", ctrl->acl);
        json_object_add_value_int(root, "aerl", ctrl->aerl);

diff --git a/nvme.c b/nvme.c
index 19385a088c04db55a8301b811c4d15f90b6401f7..cfe38441fb0f155ccd3f71fd128524ba5eb953dc 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -2606,6 +2606,9 @@ static int get_feature(int argc, char **argv, struct command *cmd, struct plugin
        case NVME_FEAT_TIMESTAMP:
                cfg.data_len = 8;
                break;
+       case NVME_FEAT_HOST_BEHAVIOR:
+               cfg.data_len = 512;
+               break;
        }
 
        if (cfg.sel == 3)