| Message ID | 9a8c359270a6330ed384ea0a75441e367ecde924.1645558375.git.riteshh@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ext4: Improve FC trace events and discuss one FC failure | expand |
On Wed, 23 Feb 2022 02:04:10 +0530 Ritesh Harjani <riteshh@linux.ibm.com> wrote: > ftrace's __print_symbolic() requires that any enum values used in the > symbol to string translation table be wrapped in a TRACE_DEFINE_ENUM > so that the enum value can be encoded in the ftrace ring buffer. Actually, you mean "decoded from the ftrace ring buffer by user space tooling". > > This patch also fixes few other problems found in this trace point. > e.g. dereferencing structures in TP_printk which should not be done > at any cost. > > Also to avoid checkpatch warnings, this patch removes those > whitespaces/tab stops issues. > > Fixes: commit aa75f4d3daae ("ext4: main fast-commit commit path") Should add: Cc: stable@kernel.org as the commit landed in 5.10. > Reported-by: Steven Rostedt <rostedt@goodmis.org> > Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> Looks good with one small nit below. > --- > include/trace/events/ext4.h | 76 +++++++++++++++++++++++-------------- > 1 file changed, 47 insertions(+), 29 deletions(-) > > diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h > index 19e957b7f941..17fb9c506e8a 100644 > --- a/include/trace/events/ext4.h > +++ b/include/trace/events/ext4.h > @@ -95,6 +95,16 @@ TRACE_DEFINE_ENUM(ES_REFERENCED_B); > { FALLOC_FL_COLLAPSE_RANGE, "COLLAPSE_RANGE"}, \ > { FALLOC_FL_ZERO_RANGE, "ZERO_RANGE"}) > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_XATTR); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_CROSS_RENAME); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_NOMEM); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_SWAP_BOOT); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_RESIZE); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_RENAME_DIR); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_FALLOC_RANGE); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_INODE_JOURNAL_DATA); > + > #define show_fc_reason(reason) \ > __print_symbolic(reason, \ > { EXT4_FC_REASON_XATTR, "XATTR"}, \ > @@ -2723,41 +2733,49 @@ TRACE_EVENT(ext4_fc_commit_stop, > > #define FC_REASON_NAME_STAT(reason) \ > show_fc_reason(reason), \ > - __entry->sbi->s_fc_stats.fc_ineligible_reason_count[reason] > + __entry->fc_ineligible_rc[reason] > > TRACE_EVENT(ext4_fc_stats, > - TP_PROTO(struct super_block *sb), > - > - TP_ARGS(sb), > + TP_PROTO(struct super_block *sb), > > - TP_STRUCT__entry( > - __field(dev_t, dev) > - __field(struct ext4_sb_info *, sbi) > - __field(int, count) > - ), > + TP_ARGS(sb), > > - TP_fast_assign( > - __entry->dev = sb->s_dev; > - __entry->sbi = EXT4_SB(sb); > - ), > + TP_STRUCT__entry( > + __field(dev_t, dev) > + __array(unsigned int, fc_ineligible_rc, EXT4_FC_REASON_MAX) > + __field(unsigned long, fc_commits) > + __field(unsigned long, fc_ineligible_commits) > + __field(unsigned long, fc_numblks) > + ), > > - TP_printk("dev %d:%d fc ineligible reasons:\n" > - "%s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d; " > - "num_commits:%ld, ineligible: %ld, numblks: %ld", > - MAJOR(__entry->dev), MINOR(__entry->dev), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_CROSS_RENAME), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_NOMEM), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_SWAP_BOOT), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA), > - __entry->sbi->s_fc_stats.fc_num_commits, > - __entry->sbi->s_fc_stats.fc_ineligible_commits, > - __entry->sbi->s_fc_stats.fc_numblks) > + TP_fast_assign( > + int i; > > + __entry->dev = sb->s_dev; > + for (i = 0; i < EXT4_FC_REASON_MAX; i++) > + __entry->fc_ineligible_rc[i] = > + EXT4_SB(sb)->s_fc_stats.fc_ineligible_reason_count[i]; As the above line is a continuation of the previous line, it should be indented as such. And since you added a line break, it is recommend to have any blocks use brackets. That is: for (i = 0; i < EXT4_FC_REASON_MAX; i++) { __entry->fc_ineligible_rc[i] = EXT4_SB(sb)->s_fc_stats.fc_ineligible_reason_count[i]; } Other than that: Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> -- Steve > + __entry->fc_commits = EXT4_SB(sb)->s_fc_stats.fc_num_commits; > + __entry->fc_ineligible_commits = > + EXT4_SB(sb)->s_fc_stats.fc_ineligible_commits; > + __entry->fc_numblks = EXT4_SB(sb)->s_fc_stats.fc_numblks; > + ), > + > + TP_printk("dev %d,%d fc ineligible reasons:\n" > + "%s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u " > + "num_commits:%lu, ineligible: %lu, numblks: %lu", > + MAJOR(__entry->dev), MINOR(__entry->dev), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_CROSS_RENAME), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_NOMEM), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_SWAP_BOOT), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA), > + __entry->fc_commits, __entry->fc_ineligible_commits, > + __entry->fc_numblks) > ); > > #define DEFINE_TRACE_DENTRY_EVENT(__type) \
On Wed 23-02-22 02:04:10, Ritesh Harjani wrote: > ftrace's __print_symbolic() requires that any enum values used in the > symbol to string translation table be wrapped in a TRACE_DEFINE_ENUM > so that the enum value can be encoded in the ftrace ring buffer. > > This patch also fixes few other problems found in this trace point. > e.g. dereferencing structures in TP_printk which should not be done > at any cost. > > Also to avoid checkpatch warnings, this patch removes those > whitespaces/tab stops issues. > > Fixes: commit aa75f4d3daae ("ext4: main fast-commit commit path") > Reported-by: Steven Rostedt <rostedt@goodmis.org> > Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> Looks good (modulo Steven's nit). Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > include/trace/events/ext4.h | 76 +++++++++++++++++++++++-------------- > 1 file changed, 47 insertions(+), 29 deletions(-) > > diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h > index 19e957b7f941..17fb9c506e8a 100644 > --- a/include/trace/events/ext4.h > +++ b/include/trace/events/ext4.h > @@ -95,6 +95,16 @@ TRACE_DEFINE_ENUM(ES_REFERENCED_B); > { FALLOC_FL_COLLAPSE_RANGE, "COLLAPSE_RANGE"}, \ > { FALLOC_FL_ZERO_RANGE, "ZERO_RANGE"}) > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_XATTR); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_CROSS_RENAME); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_NOMEM); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_SWAP_BOOT); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_RESIZE); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_RENAME_DIR); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_FALLOC_RANGE); > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_INODE_JOURNAL_DATA); > + > #define show_fc_reason(reason) \ > __print_symbolic(reason, \ > { EXT4_FC_REASON_XATTR, "XATTR"}, \ > @@ -2723,41 +2733,49 @@ TRACE_EVENT(ext4_fc_commit_stop, > > #define FC_REASON_NAME_STAT(reason) \ > show_fc_reason(reason), \ > - __entry->sbi->s_fc_stats.fc_ineligible_reason_count[reason] > + __entry->fc_ineligible_rc[reason] > > TRACE_EVENT(ext4_fc_stats, > - TP_PROTO(struct super_block *sb), > - > - TP_ARGS(sb), > + TP_PROTO(struct super_block *sb), > > - TP_STRUCT__entry( > - __field(dev_t, dev) > - __field(struct ext4_sb_info *, sbi) > - __field(int, count) > - ), > + TP_ARGS(sb), > > - TP_fast_assign( > - __entry->dev = sb->s_dev; > - __entry->sbi = EXT4_SB(sb); > - ), > + TP_STRUCT__entry( > + __field(dev_t, dev) > + __array(unsigned int, fc_ineligible_rc, EXT4_FC_REASON_MAX) > + __field(unsigned long, fc_commits) > + __field(unsigned long, fc_ineligible_commits) > + __field(unsigned long, fc_numblks) > + ), > > - TP_printk("dev %d:%d fc ineligible reasons:\n" > - "%s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d; " > - "num_commits:%ld, ineligible: %ld, numblks: %ld", > - MAJOR(__entry->dev), MINOR(__entry->dev), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_CROSS_RENAME), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_NOMEM), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_SWAP_BOOT), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE), > - FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA), > - __entry->sbi->s_fc_stats.fc_num_commits, > - __entry->sbi->s_fc_stats.fc_ineligible_commits, > - __entry->sbi->s_fc_stats.fc_numblks) > + TP_fast_assign( > + int i; > > + __entry->dev = sb->s_dev; > + for (i = 0; i < EXT4_FC_REASON_MAX; i++) > + __entry->fc_ineligible_rc[i] = > + EXT4_SB(sb)->s_fc_stats.fc_ineligible_reason_count[i]; > + __entry->fc_commits = EXT4_SB(sb)->s_fc_stats.fc_num_commits; > + __entry->fc_ineligible_commits = > + EXT4_SB(sb)->s_fc_stats.fc_ineligible_commits; > + __entry->fc_numblks = EXT4_SB(sb)->s_fc_stats.fc_numblks; > + ), > + > + TP_printk("dev %d,%d fc ineligible reasons:\n" > + "%s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u " > + "num_commits:%lu, ineligible: %lu, numblks: %lu", > + MAJOR(__entry->dev), MINOR(__entry->dev), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_CROSS_RENAME), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_NOMEM), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_SWAP_BOOT), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE), > + FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA), > + __entry->fc_commits, __entry->fc_ineligible_commits, > + __entry->fc_numblks) > ); > > #define DEFINE_TRACE_DENTRY_EVENT(__type) \ > -- > 2.31.1 >
Thanks for reporting this Steven and thanks Ritesh for fixing this. Looks good. Reviewed-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com> - Harshad On Wed, 23 Feb 2022 at 01:54, Jan Kara <jack@suse.cz> wrote: > > On Wed 23-02-22 02:04:10, Ritesh Harjani wrote: > > ftrace's __print_symbolic() requires that any enum values used in the > > symbol to string translation table be wrapped in a TRACE_DEFINE_ENUM > > so that the enum value can be encoded in the ftrace ring buffer. > > > > This patch also fixes few other problems found in this trace point. > > e.g. dereferencing structures in TP_printk which should not be done > > at any cost. > > > > Also to avoid checkpatch warnings, this patch removes those > > whitespaces/tab stops issues. > > > > Fixes: commit aa75f4d3daae ("ext4: main fast-commit commit path") > > Reported-by: Steven Rostedt <rostedt@goodmis.org> > > Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> > > Looks good (modulo Steven's nit). Feel free to add: > > Reviewed-by: Jan Kara <jack@suse.cz> > > Honza > > > > --- > > include/trace/events/ext4.h | 76 +++++++++++++++++++++++-------------- > > 1 file changed, 47 insertions(+), 29 deletions(-) > > > > diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h > > index 19e957b7f941..17fb9c506e8a 100644 > > --- a/include/trace/events/ext4.h > > +++ b/include/trace/events/ext4.h > > @@ -95,6 +95,16 @@ TRACE_DEFINE_ENUM(ES_REFERENCED_B); > > { FALLOC_FL_COLLAPSE_RANGE, "COLLAPSE_RANGE"}, \ > > { FALLOC_FL_ZERO_RANGE, "ZERO_RANGE"}) > > > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_XATTR); > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_CROSS_RENAME); > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE); > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_NOMEM); > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_SWAP_BOOT); > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_RESIZE); > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_RENAME_DIR); > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_FALLOC_RANGE); > > +TRACE_DEFINE_ENUM(EXT4_FC_REASON_INODE_JOURNAL_DATA); > > + > > #define show_fc_reason(reason) \ > > __print_symbolic(reason, \ > > { EXT4_FC_REASON_XATTR, "XATTR"}, \ > > @@ -2723,41 +2733,49 @@ TRACE_EVENT(ext4_fc_commit_stop, > > > > #define FC_REASON_NAME_STAT(reason) \ > > show_fc_reason(reason), \ > > - __entry->sbi->s_fc_stats.fc_ineligible_reason_count[reason] > > + __entry->fc_ineligible_rc[reason] > > > > TRACE_EVENT(ext4_fc_stats, > > - TP_PROTO(struct super_block *sb), > > - > > - TP_ARGS(sb), > > + TP_PROTO(struct super_block *sb), > > > > - TP_STRUCT__entry( > > - __field(dev_t, dev) > > - __field(struct ext4_sb_info *, sbi) > > - __field(int, count) > > - ), > > + TP_ARGS(sb), > > > > - TP_fast_assign( > > - __entry->dev = sb->s_dev; > > - __entry->sbi = EXT4_SB(sb); > > - ), > > + TP_STRUCT__entry( > > + __field(dev_t, dev) > > + __array(unsigned int, fc_ineligible_rc, EXT4_FC_REASON_MAX) > > + __field(unsigned long, fc_commits) > > + __field(unsigned long, fc_ineligible_commits) > > + __field(unsigned long, fc_numblks) > > + ), > > > > - TP_printk("dev %d:%d fc ineligible reasons:\n" > > - "%s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d; " > > - "num_commits:%ld, ineligible: %ld, numblks: %ld", > > - MAJOR(__entry->dev), MINOR(__entry->dev), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_CROSS_RENAME), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_NOMEM), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_SWAP_BOOT), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE), > > - FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA), > > - __entry->sbi->s_fc_stats.fc_num_commits, > > - __entry->sbi->s_fc_stats.fc_ineligible_commits, > > - __entry->sbi->s_fc_stats.fc_numblks) > > + TP_fast_assign( > > + int i; > > > > + __entry->dev = sb->s_dev; > > + for (i = 0; i < EXT4_FC_REASON_MAX; i++) > > + __entry->fc_ineligible_rc[i] = > > + EXT4_SB(sb)->s_fc_stats.fc_ineligible_reason_count[i]; > > + __entry->fc_commits = EXT4_SB(sb)->s_fc_stats.fc_num_commits; > > + __entry->fc_ineligible_commits = > > + EXT4_SB(sb)->s_fc_stats.fc_ineligible_commits; > > + __entry->fc_numblks = EXT4_SB(sb)->s_fc_stats.fc_numblks; > > + ), > > + > > + TP_printk("dev %d,%d fc ineligible reasons:\n" > > + "%s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u " > > + "num_commits:%lu, ineligible: %lu, numblks: %lu", > > + MAJOR(__entry->dev), MINOR(__entry->dev), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_CROSS_RENAME), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_NOMEM), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_SWAP_BOOT), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE), > > + FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA), > > + __entry->fc_commits, __entry->fc_ineligible_commits, > > + __entry->fc_numblks) > > ); > > > > #define DEFINE_TRACE_DENTRY_EVENT(__type) \ > > -- > > 2.31.1 > > > -- > Jan Kara <jack@suse.com> > SUSE Labs, CR
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 19e957b7f941..17fb9c506e8a 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h @@ -95,6 +95,16 @@ TRACE_DEFINE_ENUM(ES_REFERENCED_B); { FALLOC_FL_COLLAPSE_RANGE, "COLLAPSE_RANGE"}, \ { FALLOC_FL_ZERO_RANGE, "ZERO_RANGE"}) +TRACE_DEFINE_ENUM(EXT4_FC_REASON_XATTR); +TRACE_DEFINE_ENUM(EXT4_FC_REASON_CROSS_RENAME); +TRACE_DEFINE_ENUM(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE); +TRACE_DEFINE_ENUM(EXT4_FC_REASON_NOMEM); +TRACE_DEFINE_ENUM(EXT4_FC_REASON_SWAP_BOOT); +TRACE_DEFINE_ENUM(EXT4_FC_REASON_RESIZE); +TRACE_DEFINE_ENUM(EXT4_FC_REASON_RENAME_DIR); +TRACE_DEFINE_ENUM(EXT4_FC_REASON_FALLOC_RANGE); +TRACE_DEFINE_ENUM(EXT4_FC_REASON_INODE_JOURNAL_DATA); + #define show_fc_reason(reason) \ __print_symbolic(reason, \ { EXT4_FC_REASON_XATTR, "XATTR"}, \ @@ -2723,41 +2733,49 @@ TRACE_EVENT(ext4_fc_commit_stop, #define FC_REASON_NAME_STAT(reason) \ show_fc_reason(reason), \ - __entry->sbi->s_fc_stats.fc_ineligible_reason_count[reason] + __entry->fc_ineligible_rc[reason] TRACE_EVENT(ext4_fc_stats, - TP_PROTO(struct super_block *sb), - - TP_ARGS(sb), + TP_PROTO(struct super_block *sb), - TP_STRUCT__entry( - __field(dev_t, dev) - __field(struct ext4_sb_info *, sbi) - __field(int, count) - ), + TP_ARGS(sb), - TP_fast_assign( - __entry->dev = sb->s_dev; - __entry->sbi = EXT4_SB(sb); - ), + TP_STRUCT__entry( + __field(dev_t, dev) + __array(unsigned int, fc_ineligible_rc, EXT4_FC_REASON_MAX) + __field(unsigned long, fc_commits) + __field(unsigned long, fc_ineligible_commits) + __field(unsigned long, fc_numblks) + ), - TP_printk("dev %d:%d fc ineligible reasons:\n" - "%s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d, %s:%d; " - "num_commits:%ld, ineligible: %ld, numblks: %ld", - MAJOR(__entry->dev), MINOR(__entry->dev), - FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR), - FC_REASON_NAME_STAT(EXT4_FC_REASON_CROSS_RENAME), - FC_REASON_NAME_STAT(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE), - FC_REASON_NAME_STAT(EXT4_FC_REASON_NOMEM), - FC_REASON_NAME_STAT(EXT4_FC_REASON_SWAP_BOOT), - FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE), - FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR), - FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE), - FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA), - __entry->sbi->s_fc_stats.fc_num_commits, - __entry->sbi->s_fc_stats.fc_ineligible_commits, - __entry->sbi->s_fc_stats.fc_numblks) + TP_fast_assign( + int i; + __entry->dev = sb->s_dev; + for (i = 0; i < EXT4_FC_REASON_MAX; i++) + __entry->fc_ineligible_rc[i] = + EXT4_SB(sb)->s_fc_stats.fc_ineligible_reason_count[i]; + __entry->fc_commits = EXT4_SB(sb)->s_fc_stats.fc_num_commits; + __entry->fc_ineligible_commits = + EXT4_SB(sb)->s_fc_stats.fc_ineligible_commits; + __entry->fc_numblks = EXT4_SB(sb)->s_fc_stats.fc_numblks; + ), + + TP_printk("dev %d,%d fc ineligible reasons:\n" + "%s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u, %s:%u " + "num_commits:%lu, ineligible: %lu, numblks: %lu", + MAJOR(__entry->dev), MINOR(__entry->dev), + FC_REASON_NAME_STAT(EXT4_FC_REASON_XATTR), + FC_REASON_NAME_STAT(EXT4_FC_REASON_CROSS_RENAME), + FC_REASON_NAME_STAT(EXT4_FC_REASON_JOURNAL_FLAG_CHANGE), + FC_REASON_NAME_STAT(EXT4_FC_REASON_NOMEM), + FC_REASON_NAME_STAT(EXT4_FC_REASON_SWAP_BOOT), + FC_REASON_NAME_STAT(EXT4_FC_REASON_RESIZE), + FC_REASON_NAME_STAT(EXT4_FC_REASON_RENAME_DIR), + FC_REASON_NAME_STAT(EXT4_FC_REASON_FALLOC_RANGE), + FC_REASON_NAME_STAT(EXT4_FC_REASON_INODE_JOURNAL_DATA), + __entry->fc_commits, __entry->fc_ineligible_commits, + __entry->fc_numblks) ); #define DEFINE_TRACE_DENTRY_EVENT(__type) \
ftrace's __print_symbolic() requires that any enum values used in the symbol to string translation table be wrapped in a TRACE_DEFINE_ENUM so that the enum value can be encoded in the ftrace ring buffer. This patch also fixes few other problems found in this trace point. e.g. dereferencing structures in TP_printk which should not be done at any cost. Also to avoid checkpatch warnings, this patch removes those whitespaces/tab stops issues. Fixes: commit aa75f4d3daae ("ext4: main fast-commit commit path") Reported-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> --- include/trace/events/ext4.h | 76 +++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 29 deletions(-)