ufs: core: add hba parameter to trace events
Subsystems (4)
PATCH v2 1/1 ufs: core: add hba parameter to trace events
From: Peter Wang <[email protected]>
Included the ufs_hba structure as a parameter in various trace events to provide more context and improve debugging capabilities. Also remove dev_name and replace it with dev_name(hba->dev).
--- drivers/ufs/core/ufs_trace.h | 119 ++++++++++++++++++++--------------- drivers/ufs/core/ufshcd.c | 68 ++++++++++---------- 2 files changed, 103 insertions(+), 84 deletions(-)
drivers/ufs/core/ufs_trace.h +69 -50
@@ -83,16 +83,18 @@ UFS_CMD_TRACE_TSF_TYPES TRACE_EVENT(ufshcd_clk_gating, - TP_PROTO(const char *dev_name, int state), + TP_PROTO(struct ufs_hba *hba, int state), - TP_ARGS(dev_name, state), + TP_ARGS(hba, state), TP_STRUCT__entry( - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev)) __field(int, state) ), TP_fast_assign( + __entry->hba = hba; __assign_str(dev_name); __entry->state = state; ),
@@ -104,13 +106,14 @@ TRACE_EVENT(ufshcd_clk_gating, TRACE_EVENT(ufshcd_clk_scaling, - TP_PROTO(const char *dev_name, const char *state, const char *clk, + TP_PROTO(struct ufs_hba *hba, const char *state, const char *clk, u32 prev_state, u32 curr_state), - TP_ARGS(dev_name, state, clk, prev_state, curr_state), + TP_ARGS(hba, state, clk, prev_state, curr_state), TP_STRUCT__entry( - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev)) __string(state, state) __string(clk, clk) __field(u32, prev_state)
@@ -118,6 +121,7 @@ TRACE_EVENT(ufshcd_clk_scaling, ), TP_fast_assign( + __entry->hba = hba;__assign_str (dev_name);__assign_str (state);__assign_str (clk);
@@ -132,16 +136,18 @@ TRACE_EVENT(ufshcd_clk_scaling, TRACE_EVENT(ufshcd_auto_bkops_state, - TP_PROTO(const char *dev_name, const char *state), + TP_PROTO(struct ufs_hba *hba, const char *state), - TP_ARGS(dev_name, state), + TP_ARGS(hba, state), TP_STRUCT__entry( - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev)) __string(state, state) ), TP_fast_assign( + __entry->hba = hba; __assign_str(dev_name); __assign_str(state); ),
@@ -151,19 +157,21 @@ TRACE_EVENT(ufshcd_auto_bkops_state, ); DECLARE_EVENT_CLASS(ufshcd_profiling_template, - TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us, + TP_PROTO(struct ufs_hba *hba, const char *profile_info, s64 time_us, int err), - TP_ARGS(dev_name, profile_info, time_us, err), + TP_ARGS(hba, profile_info, time_us, err), TP_STRUCT__entry( - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev)) __string(profile_info, profile_info) __field(s64, time_us) __field(int, err) ), TP_fast_assign( + __entry->hba = hba; __assign_str(dev_name); __assign_str(profile_info); __entry->time_us = time_us;
@@ -176,30 +184,31 @@ DECLARE_EVENT_CLASS(ufshcd_profiling_template, );DEFINE_EVENT (ufshcd_profiling_template, ufshcd_profile_hibern8, - TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us, + TP_PROTO(struct ufs_hba *hba, const char *profile_info, s64 time_us, int err), -TP_ARGS (dev_name, profile_info, time_us, err)); +TP_ARGS (hba, profile_info, time_us, err));DEFINE_EVENT (ufshcd_profiling_template, ufshcd_profile_clk_gating, - TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us, + TP_PROTO(struct ufs_hba *hba, const char *profile_info, s64 time_us, int err), -TP_ARGS (dev_name, profile_info, time_us, err)); +TP_ARGS (hba, profile_info, time_us, err));DEFINE_EVENT (ufshcd_profiling_template, ufshcd_profile_clk_scaling, - TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us, + TP_PROTO(struct ufs_hba *hba, const char *profile_info, s64 time_us, int err), -TP_ARGS (dev_name, profile_info, time_us, err)); +TP_ARGS (hba, profile_info, time_us, err)); DECLARE_EVENT_CLASS(ufshcd_template, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), - TP_ARGS(dev_name, err, usecs, dev_state, link_state), + TP_ARGS(hba, err, usecs, dev_state, link_state), TP_STRUCT__entry( __field(s64, usecs) __field(int, err) - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev)) __field(int, dev_state) __field(int, link_state) ),
@@ -207,6 +216,7 @@ DECLARE_EVENT_CLASS(ufshcd_template,TP_fast_assign ( __entry->usecs = usecs; __entry->err = err; + __entry->hba = hba;__assign_str (dev_name); __entry->dev_state = dev_state; __entry->link_state = link_state;
@@ -223,60 +233,62 @@ DECLARE_EVENT_CLASS(ufshcd_template, );DEFINE_EVENT (ufshcd_template, ufshcd_system_suspend, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state));DEFINE_EVENT (ufshcd_template, ufshcd_system_resume, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state));DEFINE_EVENT (ufshcd_template, ufshcd_runtime_suspend, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state));DEFINE_EVENT (ufshcd_template, ufshcd_runtime_resume, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state));DEFINE_EVENT (ufshcd_template, ufshcd_init, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state));DEFINE_EVENT (ufshcd_template, ufshcd_wl_suspend, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state));DEFINE_EVENT (ufshcd_template, ufshcd_wl_resume, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state));DEFINE_EVENT (ufshcd_template, ufshcd_wl_runtime_suspend, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state));DEFINE_EVENT (ufshcd_template, ufshcd_wl_runtime_resume, - TP_PROTO(const char *dev_name, int err, s64 usecs, + TP_PROTO(struct ufs_hba *hba, int err, s64 usecs, int dev_state, int link_state), -TP_ARGS (dev_name, err, usecs, dev_state, link_state)); +TP_ARGS (hba, err, usecs, dev_state, link_state)); TRACE_EVENT(ufshcd_command, - TP_PROTO(struct scsi_device *sdev, enum ufs_trace_str_t str_t, + TP_PROTO(struct scsi_device *sdev, struct ufs_hba *hba, + enum ufs_trace_str_t str_t, unsigned int tag, u32 doorbell, u32 hwq_id, int transfer_len, u32 intr, u64 lba, u8 opcode, u8 group_id), - TP_ARGS(sdev, str_t, tag, doorbell, hwq_id, transfer_len, intr, lba, + TP_ARGS(sdev, hba, str_t, tag, doorbell, hwq_id, transfer_len, intr, lba, opcode, group_id), TP_STRUCT__entry( __field(struct scsi_device *, sdev) + __field(struct ufs_hba *, hba) __field(enum ufs_trace_str_t, str_t) __field(unsigned int, tag) __field(u32, doorbell)
@@ -290,6 +302,7 @@ TRACE_EVENT(ufshcd_command,TP_fast_assign ( __entry->sdev = sdev; + __entry->hba = hba; __entry->str_t = str_t; __entry->tag = tag; __entry->doorbell = doorbell;
@@ -312,13 +325,14 @@ TRACE_EVENT(ufshcd_command, ); TRACE_EVENT(ufshcd_uic_command, - TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t, u32 cmd, + TP_PROTO(struct ufs_hba *hba, enum ufs_trace_str_t str_t, u32 cmd, u32 arg1, u32 arg2, u32 arg3), - TP_ARGS(dev_name, str_t, cmd, arg1, arg2, arg3), + TP_ARGS(hba, str_t, cmd, arg1, arg2, arg3), TP_STRUCT__entry( - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev)) __field(enum ufs_trace_str_t, str_t) __field(u32, cmd) __field(u32, arg1)
@@ -327,6 +341,7 @@ TRACE_EVENT(ufshcd_uic_command, ), TP_fast_assign( + __entry->hba = hba;__assign_str (dev_name); __entry->str_t = str_t; __entry->cmd = cmd;
@@ -343,13 +358,14 @@ TRACE_EVENT(ufshcd_uic_command, ); TRACE_EVENT(ufshcd_upiu, - TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t, void *hdr, + TP_PROTO(struct ufs_hba *hba, enum ufs_trace_str_t str_t, void *hdr, void *tsf, enum ufs_trace_tsf_t tsf_t), - TP_ARGS(dev_name, str_t, hdr, tsf, tsf_t), + TP_ARGS(hba, str_t, hdr, tsf, tsf_t), TP_STRUCT__entry( - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev)) __field(enum ufs_trace_str_t, str_t) __array(unsigned char, hdr, 12) __array(unsigned char, tsf, 16)
@@ -357,6 +373,7 @@ TRACE_EVENT(ufshcd_upiu, ), TP_fast_assign( + __entry->hba = hba;__assign_str (dev_name); __entry->str_t = str_t;memcpy (__entry->hdr, hdr,sizeof (__entry->hdr));
@@ -375,16 +392,18 @@ TRACE_EVENT(ufshcd_upiu, TRACE_EVENT(ufshcd_exception_event, - TP_PROTO(const char *dev_name, u16 status), + TP_PROTO(struct ufs_hba *hba, u16 status), - TP_ARGS(dev_name, status), + TP_ARGS(hba, status), TP_STRUCT__entry( - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev)) __field(u16, status) ), TP_fast_assign( + __entry->hba = hba; __assign_str(dev_name); __entry->status = status; ),
drivers/ufs/core/ufshcd.c +34 -34
268 lines not on this page · raw message
Signature · 1 line
2.45.2
Bart Van Assche
reviewerQuoted 10 lines · On 2/13/25 3:35 AM, [email protected] wrote:
drivers/ufs/core/ufs_trace.h +1
-1@@ -83,16 +83,18 @@ UFS_CMD_TRACE_TSF_TYPES TRACE_EVENT(ufshcd_clk_gating, - TP_PROTO(const char *dev_name, int state), + TP_PROTO(struct ufs_hba *hba, int state),
drivers/ufs/core/ufs_trace.h UFS_CMD_TRACE_TSF_TYPES · line 94
Quoted 10 lines
drivers/ufs/core/ufs_trace.h +3
-2-TP_ARGS (dev_name, state), +TP_ARGS (hba, state),TP_STRUCT__entry ( - __string(dev_name, dev_name) + __field(struct ufs_hba *, hba) + __string(dev_name, dev_name(hba->dev))__field (int, state) ),
Please reduce the size of the tracing entries by removing dev_name from TP_STRUCT__entry() and by replacing 'dev_name' with 'dev_name(hba->dev)' in the TP_printk() calls.
Thanks,
Bart.
Quoted 9 lines · Bart Van Assche
Please reduce the size of the tracing entries by removing
dev_namefromTP_STRUCT__entry()and by replacing 'dev_name' with 'dev_name(hba-Quoted 1 line
dev)'
in the
TP_printk()calls.Thanks,
Bart.
Hi Bart,
Thank you for your suggestion.
The dev_name entry will be removed in the next version.
Thanks.
Peter
Steven Rostedt
maintainerQuoted 15 lines · On Thu, 13 Feb 2025 09:19:42 -0800 Bart Van Assche <[email protected]> wrote:
Quoted 14 lines · On 2/13/25 3:35 AM, [email protected] wrote:
drivers/ufs/core/ufs_trace.h +2
-2@@ -83,16 +83,18 @@ UFS_CMD_TRACE_TSF_TYPES TRACE_EVENT(ufshcd_clk_gating, - TP_PROTO(const char *dev_name, int state), + TP_PROTO(struct ufs_hba *hba, int state), - TP_ARGS(dev_name, state), + TP_ARGS(hba, state),
Quoted 10 lines
drivers/ufs/core/ufs_trace.h UFS_CMD_TRACE_TSF_TYPES · line 94
Quoted 6 lines
drivers/ufs/core/ufs_trace.h +2
-1TP_STRUCT__entry ( -__string (dev_name ,dev_name ) +__field (struct ufs_hba *,hba ) + __string(dev_name, dev_name(hba->dev))__field (int, state) ),Please reduce the size of the tracing entries by removing
dev_namefromTP_STRUCT__entry()and by replacing 'dev_name' with 'dev_name(hba->dev)' in theTP_printk()calls.
For future references, please do not recommend moving dereferences into the TP_printk() callers. Those happen when the event is read by the user and the hba pointer may no longer exist.
-- Steve