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

Commit b1e6b3fd authored by Keith Busch's avatar Keith Busch Committed by Greg Kroah-Hartman
Browse files

nvme: fix async event trace event 



[ Upstream commit 6622b76fe922b94189499a90ccdb714a4a8d0773 ]

Mixing AER Event Type and Event Info has masking clashes. Just print the
event type, but also include the event info of the AER result in the
trace.

Fixes: 09bd1ff4 ("nvme-core: add async event trace helper")
Reported-by: default avatarNate Thornton <nate.thornton@samsung.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarMinwoo Im <minwoo.im@samsung.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent eaaa0c6b

drivers/nvme/host/core.c

+1 −4
Original line number Diff line number Diff line
@@ -3990,8 +3990,6 @@ static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) 
{

	u32 aer_notice_type = nvme_aer_subtype(result);



	trace_nvme_async_event(ctrl, aer_notice_type);



	switch (aer_notice_type) {

	case NVME_AER_NOTICE_NS_CHANGED:

		set_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events);
@@ -4023,7 +4021,6 @@ 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);

}
@@ -4038,6 +4035,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status, 
	if (le16_to_cpu(status) >> 1 != NVME_SC_SUCCESS)

		return;



	trace_nvme_async_event(ctrl, result);

	switch (aer_type) {

	case NVME_AER_NOTICE:

		nvme_handle_aen_notice(ctrl, result);
@@ -4055,7 +4053,6 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status, 
	case NVME_AER_SMART:

	case NVME_AER_CSS:

	case NVME_AER_VS:

		trace_nvme_async_event(ctrl, aer_type);

		ctrl->aen_result = result;

		break;

	default:

drivers/nvme/host/trace.h

+6 −9
Original line number Diff line number Diff line
@@ -127,13 +127,10 @@ TRACE_EVENT(nvme_async_event, 
	),

	TP_printk("nvme%d: NVME_AEN=%#08x [%s]",

		__entry->ctrl_id, __entry->result,

		__print_symbolic(__entry->result,

		aer_name(NVME_AER_NOTICE_NS_CHANGED),

		aer_name(NVME_AER_NOTICE_ANA),

		aer_name(NVME_AER_NOTICE_FW_ACT_STARTING),

		aer_name(NVME_AER_NOTICE_DISC_CHANGED),

		__print_symbolic(__entry->result & 0x7,

			aer_name(NVME_AER_ERROR),

			aer_name(NVME_AER_SMART),

			aer_name(NVME_AER_NOTICE),

			aer_name(NVME_AER_CSS),

			aer_name(NVME_AER_VS))

	)