Skip to content

L
linux
Commit a269029d authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files
Options

ext4,jbd2: convert tracepoints to use major/minor numbers 

Unfortunately perf can't deal with anything other than direct structure
accesses in the TP_printk() section.  It will drop dead when it sees
jbd2_dev_to_name() in the "print fmt" section of the tracepoint.

Addresses-Google-Bug: 3138508
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 3d287de3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 251 additions and 156 deletions
include/trace/events/ext4.h
View file @ a269029d
This diff is collapsed.
include/trace/events/jbd2.h
View file @ a269029d
...@@ -17,17 +17,19 @@ TRACE_EVENT(jbd2_checkpoint, ...@@ -17,17 +17,19 @@ TRACE_EVENT(jbd2_checkpoint,
TP_ARGS(journal, result), TP_ARGS(journal, result),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( int, dev_major )
__field( int, dev_minor )
__field( int, result ) __field( int, result )
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = journal->j_fs_dev->bd_dev; __entry->dev_major = MAJOR(journal->j_fs_dev->bd_dev);
__entry->dev_minor = MINOR(journal->j_fs_dev->bd_dev);
__entry->result = result; __entry->result = result;
), ),
TP_printk("dev %s result %d", TP_printk("dev %d,%d result %d",
jbd2_dev_to_name(__entry->dev), __entry->result) __entry->dev_major, __entry->dev_minor, __entry->result)
); );
DECLARE_EVENT_CLASS(jbd2_commit, DECLARE_EVENT_CLASS(jbd2_commit,
...@@ -37,20 +39,22 @@ DECLARE_EVENT_CLASS(jbd2_commit, ...@@ -37,20 +39,22 @@ DECLARE_EVENT_CLASS(jbd2_commit,
TP_ARGS(journal, commit_transaction), TP_ARGS(journal, commit_transaction),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( int, dev_major )
__field( int, dev_minor )
__field( char, sync_commit ) __field( char, sync_commit )
__field( int, transaction ) __field( int, transaction )
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = journal->j_fs_dev->bd_dev; __entry->dev_major = MAJOR(journal->j_fs_dev->bd_dev);
__entry->dev_minor = MINOR(journal->j_fs_dev->bd_dev);
__entry->sync_commit = commit_transaction->t_synchronous_commit; __entry->sync_commit = commit_transaction->t_synchronous_commit;
__entry->transaction = commit_transaction->t_tid; __entry->transaction = commit_transaction->t_tid;
), ),
TP_printk("dev %s transaction %d sync %d", TP_printk("dev %d,%d transaction %d sync %d",
jbd2_dev_to_name(__entry->dev), __entry->transaction, __entry->dev_major, __entry->dev_minor,
__entry->sync_commit) __entry->transaction, __entry->sync_commit)
); );
DEFINE_EVENT(jbd2_commit, jbd2_start_commit, DEFINE_EVENT(jbd2_commit, jbd2_start_commit,
...@@ -87,22 +91,24 @@ TRACE_EVENT(jbd2_end_commit, ...@@ -87,22 +91,24 @@ TRACE_EVENT(jbd2_end_commit,
TP_ARGS(journal, commit_transaction), TP_ARGS(journal, commit_transaction),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( int, dev_major )
__field( int, dev_minor )
__field( char, sync_commit ) __field( char, sync_commit )
__field( int, transaction ) __field( int, transaction )
__field( int, head ) __field( int, head )
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = journal->j_fs_dev->bd_dev; __entry->dev_major = MAJOR(journal->j_fs_dev->bd_dev);
__entry->dev_minor = MINOR(journal->j_fs_dev->bd_dev);
__entry->sync_commit = commit_transaction->t_synchronous_commit; __entry->sync_commit = commit_transaction->t_synchronous_commit;
__entry->transaction = commit_transaction->t_tid; __entry->transaction = commit_transaction->t_tid;
__entry->head = journal->j_tail_sequence; __entry->head = journal->j_tail_sequence;
), ),
TP_printk("dev %s transaction %d sync %d head %d", TP_printk("dev %d,%d transaction %d sync %d head %d",
jbd2_dev_to_name(__entry->dev), __entry->transaction, __entry->dev_major, __entry->dev_minor,
__entry->sync_commit, __entry->head) __entry->transaction, __entry->sync_commit, __entry->head)
); );
TRACE_EVENT(jbd2_submit_inode_data, TRACE_EVENT(jbd2_submit_inode_data,
...@@ -111,17 +117,20 @@ TRACE_EVENT(jbd2_submit_inode_data, ...@@ -111,17 +117,20 @@ TRACE_EVENT(jbd2_submit_inode_data,
TP_ARGS(inode), TP_ARGS(inode),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( int, dev_major )
__field( int, dev_minor )
__field( ino_t, ino ) __field( ino_t, ino )
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = inode->i_sb->s_dev; __entry->dev_major = MAJOR(inode->i_sb->s_dev);
__entry->dev_minor = MINOR(inode->i_sb->s_dev);
__entry->ino = inode->i_ino; __entry->ino = inode->i_ino;
), ),
TP_printk("dev %s ino %lu", TP_printk("dev %d,%d ino %lu",
jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino) __entry->dev_major, __entry->dev_minor,
(unsigned long) __entry->ino)
); );
TRACE_EVENT(jbd2_run_stats, TRACE_EVENT(jbd2_run_stats,
...@@ -131,7 +140,8 @@ TRACE_EVENT(jbd2_run_stats, ...@@ -131,7 +140,8 @@ TRACE_EVENT(jbd2_run_stats,
TP_ARGS(dev, tid, stats), TP_ARGS(dev, tid, stats),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( int, dev_major )
__field( int, dev_minor )
__field( unsigned long, tid ) __field( unsigned long, tid )
__field( unsigned long, wait ) __field( unsigned long, wait )
__field( unsigned long, running ) __field( unsigned long, running )
...@@ -144,7 +154,8 @@ TRACE_EVENT(jbd2_run_stats, ...@@ -144,7 +154,8 @@ TRACE_EVENT(jbd2_run_stats,
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = dev; __entry->dev_major = MAJOR(dev);
__entry->dev_minor = MINOR(dev);
__entry->tid = tid; __entry->tid = tid;
__entry->wait = stats->rs_wait; __entry->wait = stats->rs_wait;
__entry->running = stats->rs_running; __entry->running = stats->rs_running;
...@@ -156,9 +167,9 @@ TRACE_EVENT(jbd2_run_stats, ...@@ -156,9 +167,9 @@ TRACE_EVENT(jbd2_run_stats,
__entry->blocks_logged = stats->rs_blocks_logged; __entry->blocks_logged = stats->rs_blocks_logged;
), ),
TP_printk("dev %s tid %lu wait %u running %u locked %u flushing %u " TP_printk("dev %d,%d tid %lu wait %u running %u locked %u flushing %u "
"logging %u handle_count %u blocks %u blocks_logged %u", "logging %u handle_count %u blocks %u blocks_logged %u",
jbd2_dev_to_name(__entry->dev), __entry->tid, __entry->dev_major, __entry->dev_minor, __entry->tid,
jiffies_to_msecs(__entry->wait), jiffies_to_msecs(__entry->wait),
jiffies_to_msecs(__entry->running), jiffies_to_msecs(__entry->running),
jiffies_to_msecs(__entry->locked), jiffies_to_msecs(__entry->locked),
...@@ -175,7 +186,8 @@ TRACE_EVENT(jbd2_checkpoint_stats, ...@@ -175,7 +186,8 @@ TRACE_EVENT(jbd2_checkpoint_stats,
TP_ARGS(dev, tid, stats), TP_ARGS(dev, tid, stats),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( int, dev_major )
__field( int, dev_minor )
__field( unsigned long, tid ) __field( unsigned long, tid )
__field( unsigned long, chp_time ) __field( unsigned long, chp_time )
__field( __u32, forced_to_close ) __field( __u32, forced_to_close )
...@@ -184,7 +196,8 @@ TRACE_EVENT(jbd2_checkpoint_stats, ...@@ -184,7 +196,8 @@ TRACE_EVENT(jbd2_checkpoint_stats,
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = dev; __entry->dev_major = MAJOR(dev);
__entry->dev_minor = MINOR(dev);
__entry->tid = tid; __entry->tid = tid;
__entry->chp_time = stats->cs_chp_time; __entry->chp_time = stats->cs_chp_time;
__entry->forced_to_close= stats->cs_forced_to_close; __entry->forced_to_close= stats->cs_forced_to_close;
...@@ -192,9 +205,9 @@ TRACE_EVENT(jbd2_checkpoint_stats, ...@@ -192,9 +205,9 @@ TRACE_EVENT(jbd2_checkpoint_stats,
__entry->dropped = stats->cs_dropped; __entry->dropped = stats->cs_dropped;
), ),
TP_printk("dev %s tid %lu chp_time %u forced_to_close %u " TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u "
"written %u dropped %u", "written %u dropped %u",
jbd2_dev_to_name(__entry->dev), __entry->tid, __entry->dev_major, __entry->dev_minor, __entry->tid,
jiffies_to_msecs(__entry->chp_time), jiffies_to_msecs(__entry->chp_time),
__entry->forced_to_close, __entry->written, __entry->dropped) __entry->forced_to_close, __entry->written, __entry->dropped)
); );
...@@ -207,7 +220,8 @@ TRACE_EVENT(jbd2_cleanup_journal_tail, ...@@ -207,7 +220,8 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
TP_ARGS(journal, first_tid, block_nr, freed), TP_ARGS(journal, first_tid, block_nr, freed),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( int, dev_major )
__field( int, dev_minor )
__field( tid_t, tail_sequence ) __field( tid_t, tail_sequence )
__field( tid_t, first_tid ) __field( tid_t, first_tid )
__field(unsigned long, block_nr ) __field(unsigned long, block_nr )
...@@ -215,16 +229,18 @@ TRACE_EVENT(jbd2_cleanup_journal_tail, ...@@ -215,16 +229,18 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = journal->j_fs_dev->bd_dev; __entry->dev_major = MAJOR(journal->j_fs_dev->bd_dev);
__entry->dev_minor = MINOR(journal->j_fs_dev->bd_dev);
__entry->tail_sequence = journal->j_tail_sequence; __entry->tail_sequence = journal->j_tail_sequence;
__entry->first_tid = first_tid; __entry->first_tid = first_tid;
__entry->block_nr = block_nr; __entry->block_nr = block_nr;
__entry->freed = freed; __entry->freed = freed;
), ),
TP_printk("dev %s from %u to %u offset %lu freed %lu", TP_printk("dev %d,%d from %u to %u offset %lu freed %lu",
jbd2_dev_to_name(__entry->dev), __entry->tail_sequence, __entry->dev_major, __entry->dev_minor,
__entry->first_tid, __entry->block_nr, __entry->freed) __entry->tail_sequence, __entry->first_tid,
__entry->block_nr, __entry->freed)
); );
#endif /* _TRACE_JBD2_H */ #endif /* _TRACE_JBD2_H */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7