nvme: handle the persistent internal error AER

In the NVM Express Revision 1.4 spec, Figure 145 describes possible
values for an AER with event type "Error" (value 000b). For a
Persistent Internal Error (value 03h), the host should perform a
controller reset.

Add support for this error using code that already exists for
doing a controller reset. As part of this support, introduce
two utility functions for parsing the AER type and subtype.

This new support was tested in a lab environment where we can
generate the persistent internal error on demand, and observe
both the Linux side and NVMe controller side to see that the
controller reset has been done.

Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-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 2533b88e66d532aec0495913a5607d9577a59a50..92d90dc82a9b300ec8b4c12540fd1142aefacb67 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4525,9 +4525,19 @@ static void nvme_fw_act_work(struct work_struct *work)
        nvme_get_fw_slot_info(ctrl);
 }
 
+static u32 nvme_aer_type(u32 result)
+{
+       return result & 0x7;
+}
+
+static u32 nvme_aer_subtype(u32 result)
+{
+       return (result & 0xff00) >> 8;
+}
+
 static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result)
 {
-       u32 aer_notice_type = (result & 0xff00) >> 8;
+       u32 aer_notice_type = nvme_aer_subtype(result);
 
        trace_nvme_async_event(ctrl, aer_notice_type);
 
@@ -4560,11 +4570,19 @@ static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result)
        }
 }
 
+static void nvme_handle_aer_persistent_error(struct nvme_ctrl *ctrl)
+{
+       trace_nvme_async_event(ctrl, NVME_AER_ERROR);
+       dev_warn(ctrl->device, "resetting controller due to AER\n");
+       nvme_reset_ctrl(ctrl);
+}
+
 void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
                volatile union nvme_result *res)
 {
        u32 result = le32_to_cpu(res->u32);
-       u32 aer_type = result & 0x07;
+       u32 aer_type = nvme_aer_type(result);
+       u32 aer_subtype = nvme_aer_subtype(result);
 
        if (le16_to_cpu(status) >> 1 != NVME_SC_SUCCESS)
                return;
@@ -4574,6 +4592,15 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
                nvme_handle_aen_notice(ctrl, result);
                break;
        case NVME_AER_ERROR:
+               /*
+                * For a persistent internal error, don't run async_event_work
+                * to submit a new AER. The controller reset will do it.
+                */
+               if (aer_subtype == NVME_AER_ERROR_PERSIST_INT_ERR) {
+                       nvme_handle_aer_persistent_error(ctrl);
+                       return;
+               }
+               fallthrough;
        case NVME_AER_SMART:
        case NVME_AER_CSS:
        case NVME_AER_VS:

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 07cfc922f8e48b8298fc9da04108962e06d2197b..3b8fc6c6952913436718147e238774b916920642 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -711,6 +711,10 @@ enum {
        NVME_AER_VS                     = 7,
 };
 
+enum {
+       NVME_AER_ERROR_PERSIST_INT_ERR  = 0x03,
+};
+
 enum {
        NVME_AER_NOTICE_NS_CHANGED      = 0x00,
        NVME_AER_NOTICE_FW_ACT_STARTING = 0x01,