nvme-core: add async event trace helper
PATCH v2 1/1 nvme-core: add async event trace helper
This patch adds a new event for nvme async event notification. We print the async event in the decoded format when we recognize the event otherwise we just dump the result.
---
Changes since V1:-
1. __stringify() all the known NVME_AER* status codes.
--- drivers/nvme/host/core.c | 24 ++++++++++++++++++++++++ drivers/nvme/host/trace.h | 22 ++++++++++++++++++++++ 2 files changed, 46 insertions(+)
drivers/nvme/host/core.c +24 -0
@@ -3411,16 +3411,24 @@ static void nvme_fw_act_work(struct work_struct *work)static void nvme_handle_aen_notice (struct nvme_ctrl *ctrl,u32 result) { +const char *str; +switch ((result &0xff00 ) >>8 ) {case NVME_AER_NOTICE_NS_CHANGED : + str =__stringify (NVME_AER_NOTICE_NS_CHANGED ); +trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 , str);set_bit (NVME_AER_NOTICE_NS_CHANGED , &ctrl->events);nvme_queue_scan (ctrl);break ;case NVME_AER_NOTICE_FW_ACT_STARTING : + str =__stringify (NVME_AER_NOTICE_FW_ACT_STARTING ); +trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 , str);queue_work (nvme_wq, &ctrl->fw_act_work);break ;#ifdef CONFIG_NVME_MULTIPATH case NVME_AER_NOTICE_ANA : + str = __stringify(NVME_AER_NOTICE_ANA) +trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 , str);if (!ctrl->ana_log_buf)break ;queue_work (nvme_wq, &ctrl->ana_work);
@@ -3434,6 +3442,7 @@ static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result)void nvme_complete_async_event (struct nvme_ctrl *ctrl,__le16 status,volatile union nvme_result *res) { +const char *str;u32 result =le32_to_cpu (res->u32);if (le16_to_cpu (status) >>1 !=NVME_SC_SUCCESS )
@@ -3444,12 +3453,27 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,nvme_handle_aen_notice (ctrl, result);break ;case NVME_AER_ERROR : + str =__stringify (NVME_AER_ERROR ); +trace_nvme_async_event (ctrl, result &0x7 , str); + ctrl->aen_result = result; +break ;case NVME_AER_SMART : + str =__stringify (NVME_AER_SMART ); +trace_nvme_async_event (ctrl, result &0x7 , str); + ctrl->aen_result = result; +break ;case NVME_AER_CSS : + str =__stringify (NVME_AER_CSS ); +trace_nvme_async_event (ctrl, result &0x7 , str); + ctrl->aen_result = result; +break ;case NVME_AER_VS : + str =__stringify (NVME_AER_VS ); +trace_nvme_async_event (ctrl, result &0x7 , str); ctrl->aen_result = result;break ;default : +trace_nvme_async_event (ctrl, result,"unknown" );break ; }queue_work (nvme_wq, &ctrl->async_event_work);
drivers/nvme/host/trace.h +22 -0
@@ -156,6 +156,28 @@ TRACE_EVENT(nvme_complete_rq, ); +TRACE_EVENT (nvme_async_event, + TP_PROTO(struct nvme_ctrl *ctrl, + u32 result, + const char *result_str), +TP_ARGS (ctrl, + result, + result_str), +TP_STRUCT__entry ( + __field(int, ctrl_id) + __field(u32, result) + __field(const char *, result_str) + ), +TP_fast_assign ( + __entry->ctrl_id = ctrl->instance; + __entry->result = result; + __entry->result_str = result_str; + ), +TP_printk ("nvme%d: NVME_AEN=%#08x [%s]" , + __entry->ctrl_id, __entry->result, __entry->result_str) + + ); +#endif /* _TRACE_NVME_H */ #undef TRACE_INCLUDE_PATH
Signature · 1 line
2.17.0
PATCH v2 1/1 nvme-core: add async event trace helper
Quoted 3 lines · Chaitanya Kulkarni
This patch adds a new event for nvme async event notification. We print the async event in the decoded format when we recognize the event otherwise we just dump the result.
I don't like the reason_str handling. The normal way to do this would be to but the binary reason (i.e. what we switch on) into the trace buffer, and then use __print_symbolic in the TP_printk statement.
PATCH v2 1/1 nvme-core: add async event trace helper
What do you think of the following implementation?
drivers/nvme/host/core.c +4 -0
@@ -3413,14 +3413,17 @@ static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) {switch ((result &0xff00 ) >>8 ) {case NVME_AER_NOTICE_NS_CHANGED : +trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 );set_bit (NVME_AER_NOTICE_NS_CHANGED , &ctrl->events);nvme_queue_scan (ctrl);break ;case NVME_AER_NOTICE_FW_ACT_STARTING : +trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 );queue_work (nvme_wq, &ctrl->fw_act_work);break ;#ifdef CONFIG_NVME_MULTIPATH case NVME_AER_NOTICE_ANA : +trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 );if (!ctrl->ana_log_buf)break ;queue_work (nvme_wq, &ctrl->ana_work);
@@ -3447,6 +3450,7 @@ 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, result &0x7 ); ctrl->aen_result = result;break ;default :
drivers/nvme/host/trace.h +30 -0
@@ -156,6 +156,36 @@ TRACE_EVENT(nvme_complete_rq, ); +#define aer_name (aer) { aer, #aer } + +TRACE_EVENT (nvme_async_event, + TP_PROTO(struct nvme_ctrl *ctrl, + u32 result), +TP_ARGS (ctrl, + result), +TP_STRUCT__entry ( + __field(int, ctrl_id) +__field (u32, result) + ), +TP_fast_assign ( + __entry->ctrl_id = ctrl->instance; + __entry->result = result; + ), +TP_printk ("nvme%d: NVME_AEN=%#08x [%s]" , + __entry->ctrl_id, __entry->result, +__print_symbolic (__entry->result, +aer_name (NVME_AER_NOTICE_NS_CHANGED ), +#ifdef CONFIG_NVME_MULTIPATH + aer_name(NVME_AER_NOTICE_ANA) +#endif +aer_name (NVME_AER_NOTICE_FW_ACT_STARTING ), +aer_name (NVME_AER_ERROR ), +aer_name (NVME_AER_SMART ), +aer_name (NVME_AER_CSS ), +aer_name (NVME_AER_VS )) +) + ); +#endif /* _TRACE_NVME_H */ #undef TRACE_INCLUDE_PATH
Regards,
Chaitanya
From: Christoph Hellwig <[email protected]>
Sent: Tuesday, September 11, 2018 12:19 AM
To: Chaitanya Kulkarni
Cc: linux-nvme at lists.infradead.org
Subject: Re: [PATCH V2] nvme-core: add async event trace helper ?
Quoted 3 lines · Chaitanya Kulkarni
This patch adds a new event for nvme async event notification. We print the async event in the decoded format when we recognize the event otherwise we just dump the result.
I don't like the reason_str handling.? The normal way to do this would be to but the binary reason (i.e. what we switch on) into the trace buffer, and then use __print_symbolic in the TP_printk statement.
PATCH v2 1/1 nvme-core: add async event trace helper
drivers/nvme/host/core.c static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) · line 3426
Quoted 13 lines · Chaitanya Kulkarni
switch ((result & 0xff00) >> 8) { case NVME_AER_NOTICE_NS_CHANGED:drivers/nvme/host/core.c +3
-0+trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 );set_bit (NVME_AER_NOTICE_NS_CHANGED , &ctrl->events);nvme_queue_scan (ctrl);break ;case NVME_AER_NOTICE_FW_ACT_STARTING : +trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 );queue_work (nvme_wq, &ctrl->fw_act_work);break ;#ifdef CONFIG_NVME_MULTIPATH case NVME_AER_NOTICE_ANA : +trace_nvme_async_event (ctrl, (result &0xff00 ) >>8 );
I think we want a local variable so that we only do the mask and shift once.
drivers/nvme/host/trace.h TRACE_EVENT(nvme_complete_rq, · line 180
Quoted 3 lines
drivers/nvme/host/trace.h +3
-0+#ifdef CONFIG_NVME_MULTIPATH + aer_name(NVME_AER_NOTICE_ANA) +#endif
I don't think we need the ifdef as the symbol is always defined.
Otherwise this looks good to me.