nvme: send uevent for some asynchronous events

This will give udev a chance to observe and handle asynchronous event
notifications and clear the log to unmask future events of the same type.
The driver will create a change uevent of the asyncronuos event result
before submitting the next AEN request to the device if a completed AEN
event is of type error, smart, command set or vendor specific,

Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Guan Junxiong <guanjunxiong@huawei.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 c135d0aeebd787f7c10026391fb743e54222a416..683d890d73fa3d27035bed062131edd624c44ef2 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2665,11 +2665,28 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl)
 }
 EXPORT_SYMBOL_GPL(nvme_remove_namespaces);
 
+static void nvme_aen_uevent(struct nvme_ctrl *ctrl)
+{
+       char *envp[2] = { NULL, NULL };
+       u32 aen_result = ctrl->aen_result;
+
+       ctrl->aen_result = 0;
+       if (!aen_result)
+               return;
+
+       envp[0] = kasprintf(GFP_KERNEL, "NVME_AEN=%#08x", aen_result);
+       if (!envp[0])
+               return;
+       kobject_uevent_env(&ctrl->device->kobj, KOBJ_CHANGE, envp);
+       kfree(envp[0]);
+}
+
 static void nvme_async_event_work(struct work_struct *work)
 {
        struct nvme_ctrl *ctrl =
                container_of(work, struct nvme_ctrl, async_event_work);
 
+       nvme_aen_uevent(ctrl);
        ctrl->ops->submit_async_event(ctrl);
 }
 
@@ -2741,6 +2758,17 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
        if (le16_to_cpu(status) >> 1 != NVME_SC_SUCCESS)
                return;
 
+       switch (result & 0x7) {
+       case NVME_AER_ERROR:
+       case NVME_AER_SMART:
+       case NVME_AER_CSS:
+       case NVME_AER_VS:
+               ctrl->aen_result = result;
+               break;
+       default:
+               break;
+       }
+
        switch (result & 0xff07) {
        case NVME_AER_NOTICE_NS_CHANGED:
                dev_info(ctrl->device, "rescanning\n");

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 151062573ece12c90638910ca4a7fff55f7d6012..7b9cc7d616b75a695e890840d86a37edf58e78ea 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -168,6 +168,7 @@ struct nvme_ctrl {
        u16 kas;
        u8 npss;
        u8 apsta;
+       u32 aen_result;
        unsigned int shutdown_timeout;
        unsigned int kato;
        bool subsystem;

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 89ffa7eed2fd9dc119d036eec57d66bfa6675830..aea87f0d917b3d18b08308d1c5ae163ca2eac9e9 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -428,6 +428,10 @@ enum {
 };
 
 enum {
+       NVME_AER_ERROR                  = 0,
+       NVME_AER_SMART                  = 1,
+       NVME_AER_CSS                    = 6,
+       NVME_AER_VS                     = 7,
        NVME_AER_NOTICE_NS_CHANGED      = 0x0002,
        NVME_AER_NOTICE_FW_ACT_STARTING = 0x0102,
 };