Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55fdd6b6 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvmet: mask pending AENs 



Per section 5.2 of the NVMe 1.3 spec:

  "When the controller posts a completion queue entry for an outstanding
  Asynchronous Event Request command and thus reports an asynchronous
  event, subsequent events of that event type are automatically masked by
  the controller until the host clears that event. An event is cleared by
  reading the log page associated with that event using the Get Log Page
  command (see section 5.14)."

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent c86b8f7b

drivers/nvme/target/admin-cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ static void nvmet_execute_get_log_changed_ns(struct nvmet_req *req) 
	if (!status)

		status = nvmet_zero_sgl(req, len, req->data_len - len);

	ctrl->nr_changed_ns = 0;

	clear_bit(NVME_AEN_CFG_NS_ATTR, &ctrl->aen_masked);

	mutex_unlock(&ctrl->lock);

out:

	nvmet_req_complete(req, status);

drivers/nvme/target/core.c

+8 −1
Original line number Diff line number Diff line
@@ -144,6 +144,13 @@ static void nvmet_add_async_event(struct nvmet_ctrl *ctrl, u8 event_type, 
	schedule_work(&ctrl->async_event_work);

}



static bool nvmet_aen_disabled(struct nvmet_ctrl *ctrl, u32 aen)

{

	if (!(READ_ONCE(ctrl->aen_enabled) & aen))

		return true;

	return test_and_set_bit(aen, &ctrl->aen_masked);

}



static void nvmet_add_to_changed_ns_log(struct nvmet_ctrl *ctrl, __le32 nsid)

{

	u32 i;
@@ -174,7 +181,7 @@ static void nvmet_ns_changed(struct nvmet_subsys *subsys, u32 nsid) 


	list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry) {

		nvmet_add_to_changed_ns_log(ctrl, cpu_to_le32(nsid));

		if (!(READ_ONCE(ctrl->aen_enabled) & NVME_AEN_CFG_NS_ATTR))

		if (nvmet_aen_disabled(ctrl, NVME_AEN_CFG_NS_ATTR))

			continue;

		nvmet_add_async_event(ctrl, NVME_AER_TYPE_NOTICE,

				NVME_AER_NOTICE_NS_CHANGED,

drivers/nvme/target/nvmet.h

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ struct nvmet_ctrl { 
	u32			kato;



	u32			aen_enabled;

	unsigned long		aen_masked;

	struct nvmet_req	*async_event_cmds[NVMET_ASYNC_EVENTS];

	unsigned int		nr_async_event_cmds;

	struct list_head	async_events;