From: keith.busch@intel.com (Keith Busch)
Subject: [PATCHv2 5/5] nvme: Send uevent for unhandled AEN completions
Date: Fri, 20 Oct 2017 16:19:24 -0600 [thread overview]
Message-ID: <20171020221924.30659-6-keith.busch@intel.com> (raw)
In-Reply-To: <20171020221924.30659-1-keith.busch@intel.com>
This will give udev a chance to handle asynchronous event notification
and clear the log to unmask future events of the same type. Since the
core driver allows only one AEN request at a time, we can only have one
possible oustanding uevent to send. This implementation saves the last
AEN result from the IRQ handler, and sends the uevent change notification
when the AEN work is rescheduled.
AEN events that the kernel handles directly will not create a uevent. Such
events will stop being sent to the user as new handlers are added to
the kernel.
Signed-off-by: Keith Busch <keith.busch at intel.com>
---
drivers/nvme/host/core.c | 21 +++++++++++++++++++++
drivers/nvme/host/nvme.h | 1 +
2 files changed, 22 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 74724329f430..d05dcd172ad5 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2574,11 +2574,27 @@ 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 = ctrl->aen;
+
+ ctrl->aen = 0;
+ if (!aen)
+ return;
+
+ 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);
}
@@ -2655,6 +2671,10 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
if (le16_to_cpu(status) >> 1 != NVME_SC_SUCCESS)
return;
+ /*
+ * Set result for udev only for AEN types that the kernel does not
+ * directly handle.
+ */
switch (result & 0xff07) {
case NVME_AER_NOTICE_NS_CHANGED:
dev_info(ctrl->device, "rescanning\n");
@@ -2664,6 +2684,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
queue_work(nvme_wq, &ctrl->fw_act_work);
break;
default:
+ ctrl->aen = result;
dev_warn(ctrl->device, "async event result %08x\n", result);
}
queue_work(nvme_wq, &ctrl->async_event_work);
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 4cd4e8f4db19..69366293ce57 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -166,6 +166,7 @@ struct nvme_ctrl {
u16 kas;
u8 npss;
u8 apsta;
+ u32 aen;
unsigned int shutdown_timeout;
unsigned int kato;
bool subsystem;
--
2.13.6
next prev parent reply other threads:[~2017-10-20 22:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-20 22:19 [PATCHv2 0/5] AEN and userspace updates Keith Busch
2017-10-20 22:19 ` [PATCHv2 1/5] nvme: Centralize AEN defines Keith Busch
2017-10-21 8:06 ` Christoph Hellwig
2017-10-20 22:19 ` [PATCHv2 2/5] nvme/fc: remove unused "queue_size" field Keith Busch
2017-10-20 23:06 ` James Smart
2017-10-20 22:19 ` [PATCHv2 3/5] nvme: Single AEN request Keith Busch
2017-10-21 8:06 ` Christoph Hellwig
2017-10-20 22:19 ` [PATCHv2 4/5] nvme: Unexport starting async event work Keith Busch
2017-10-21 8:07 ` Christoph Hellwig
2017-10-20 22:19 ` Keith Busch [this message]
2017-10-20 22:29 ` [PATCHv2 5/5] nvme: Send uevent for unhandled AEN completions Keith Busch
-- strict thread matches above, loose matches on Subject: below --
2017-10-20 22:37 Keith Busch
2017-10-21 8:09 ` Christoph Hellwig
2017-10-23 15:01 ` Keith Busch
2017-10-30 10:14 ` Guan Junxiong
2017-10-30 15:18 ` Keith Busch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171020221924.30659-6-keith.busch@intel.com \
--to=keith.busch@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.