jbd: Add fixed tracepoints
This commit adds fixed tracepoint for jbd. It has been based on fixed tracepoints for jbd2, however there are missing those for collecting statistics, since I think that it will require more intrusive patch so I should have its own commit, if someone decide that it is needed. Also there are new tracepoints in __journal_drop_transaction() and journal_update_superblock(). The list of jbd tracepoints: jbd_checkpoint jbd_start_commit jbd_commit_locking jbd_commit_flushing jbd_commit_logging jbd_drop_transaction jbd_end_commit jbd_do_submit_data jbd_cleanup_journal_tail jbd_update_superblock_end Signed-off-by: Lukas Czerner <lczerner@redhat.com> Cc: Jan Kara <jack@suse.cz> Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
#include <linux/jbd.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/slab.h>
|
||||
#include <trace/events/jbd.h>
|
||||
|
||||
/*
|
||||
* Unlink a buffer from a transaction checkpoint list.
|
||||
@@ -358,6 +359,7 @@ int log_do_checkpoint(journal_t *journal)
|
||||
* journal straight away.
|
||||
*/
|
||||
result = cleanup_journal_tail(journal);
|
||||
trace_jbd_checkpoint(journal, result);
|
||||
jbd_debug(1, "cleanup_journal_tail returned %d\n", result);
|
||||
if (result <= 0)
|
||||
return result;
|
||||
@@ -503,6 +505,7 @@ int cleanup_journal_tail(journal_t *journal)
|
||||
if (blocknr < journal->j_tail)
|
||||
freed = freed + journal->j_last - journal->j_first;
|
||||
|
||||
trace_jbd_cleanup_journal_tail(journal, first_tid, blocknr, freed);
|
||||
jbd_debug(1,
|
||||
"Cleaning journal tail from %d to %d (offset %u), "
|
||||
"freeing %u\n",
|
||||
@@ -752,6 +755,7 @@ void __journal_drop_transaction(journal_t *journal, transaction_t *transaction)
|
||||
J_ASSERT(journal->j_committing_transaction != transaction);
|
||||
J_ASSERT(journal->j_running_transaction != transaction);
|
||||
|
||||
trace_jbd_drop_transaction(journal, transaction);
|
||||
jbd_debug(1, "Dropping transaction %d, all done\n", transaction->t_tid);
|
||||
kfree(transaction);
|
||||
}
|
||||
|
@@ -21,6 +21,7 @@
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/bio.h>
|
||||
#include <linux/blkdev.h>
|
||||
#include <trace/events/jbd.h>
|
||||
|
||||
/*
|
||||
* Default IO end handler for temporary BJ_IO buffer_heads.
|
||||
@@ -204,6 +205,8 @@ write_out_data:
|
||||
if (!trylock_buffer(bh)) {
|
||||
BUFFER_TRACE(bh, "needs blocking lock");
|
||||
spin_unlock(&journal->j_list_lock);
|
||||
trace_jbd_do_submit_data(journal,
|
||||
commit_transaction);
|
||||
/* Write out all data to prevent deadlocks */
|
||||
journal_do_submit_data(wbuf, bufs, write_op);
|
||||
bufs = 0;
|
||||
@@ -236,6 +239,8 @@ write_out_data:
|
||||
jbd_unlock_bh_state(bh);
|
||||
if (bufs == journal->j_wbufsize) {
|
||||
spin_unlock(&journal->j_list_lock);
|
||||
trace_jbd_do_submit_data(journal,
|
||||
commit_transaction);
|
||||
journal_do_submit_data(wbuf, bufs, write_op);
|
||||
bufs = 0;
|
||||
goto write_out_data;
|
||||
@@ -266,6 +271,7 @@ write_out_data:
|
||||
}
|
||||
}
|
||||
spin_unlock(&journal->j_list_lock);
|
||||
trace_jbd_do_submit_data(journal, commit_transaction);
|
||||
journal_do_submit_data(wbuf, bufs, write_op);
|
||||
|
||||
return err;
|
||||
@@ -316,12 +322,14 @@ void journal_commit_transaction(journal_t *journal)
|
||||
commit_transaction = journal->j_running_transaction;
|
||||
J_ASSERT(commit_transaction->t_state == T_RUNNING);
|
||||
|
||||
trace_jbd_start_commit(journal, commit_transaction);
|
||||
jbd_debug(1, "JBD: starting commit of transaction %d\n",
|
||||
commit_transaction->t_tid);
|
||||
|
||||
spin_lock(&journal->j_state_lock);
|
||||
commit_transaction->t_state = T_LOCKED;
|
||||
|
||||
trace_jbd_commit_locking(journal, commit_transaction);
|
||||
spin_lock(&commit_transaction->t_handle_lock);
|
||||
while (commit_transaction->t_updates) {
|
||||
DEFINE_WAIT(wait);
|
||||
@@ -392,6 +400,7 @@ void journal_commit_transaction(journal_t *journal)
|
||||
*/
|
||||
journal_switch_revoke_table(journal);
|
||||
|
||||
trace_jbd_commit_flushing(journal, commit_transaction);
|
||||
commit_transaction->t_state = T_FLUSH;
|
||||
journal->j_committing_transaction = commit_transaction;
|
||||
journal->j_running_transaction = NULL;
|
||||
@@ -493,6 +502,7 @@ void journal_commit_transaction(journal_t *journal)
|
||||
commit_transaction->t_state = T_COMMIT;
|
||||
spin_unlock(&journal->j_state_lock);
|
||||
|
||||
trace_jbd_commit_logging(journal, commit_transaction);
|
||||
J_ASSERT(commit_transaction->t_nr_buffers <=
|
||||
commit_transaction->t_outstanding_credits);
|
||||
|
||||
@@ -946,6 +956,7 @@ restart_loop:
|
||||
}
|
||||
spin_unlock(&journal->j_list_lock);
|
||||
|
||||
trace_jbd_end_commit(journal, commit_transaction);
|
||||
jbd_debug(1, "JBD: commit %d complete, head %d\n",
|
||||
journal->j_commit_sequence, journal->j_tail_sequence);
|
||||
|
||||
|
@@ -38,6 +38,9 @@
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/ratelimit.h>
|
||||
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include <trace/events/jbd.h>
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
@@ -1065,6 +1068,7 @@ void journal_update_superblock(journal_t *journal, int wait)
|
||||
} else
|
||||
write_dirty_buffer(bh, WRITE);
|
||||
|
||||
trace_jbd_update_superblock_end(journal, wait);
|
||||
out:
|
||||
/* If we have just flushed the log (by marking s_start==0), then
|
||||
* any future commit will have to be careful to update the
|
||||
|
Reference in New Issue
Block a user