X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fjbd2.h;h=9b77ab92b9cf197145a8b3dbc4a9a8bc8d7079a3;hb=4fd2615b87b3cac0fd5bdc5fc82db05f6fcfdecf;hp=8ead71ae30ead38ccd4d2d829af9f07aaa0e6be7;hpb=5f4c791e2ad2c814101ccdb500e65543f2792c41;p=lttng-modules.git diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h index 8ead71ae..9b77ab92 100644 --- a/include/instrumentation/events/jbd2.h +++ b/include/instrumentation/events/jbd2.h @@ -27,6 +27,24 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, ) ) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(jbd2_commit, + + TP_PROTO(journal_t *journal, transaction_t *commit_transaction), + + TP_ARGS(journal, commit_transaction), + + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) + ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit) + ctf_integer(tid_t, transaction, commit_transaction->t_tid) + ) +) +#else LTTNG_TRACEPOINT_EVENT_CLASS(jbd2_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), @@ -39,6 +57,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(jbd2_commit, ctf_integer(int, transaction, commit_transaction->t_tid) ) ) +#endif LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_start_commit, @@ -77,6 +96,24 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction, ) #endif +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +LTTNG_TRACEPOINT_EVENT(jbd2_end_commit, + TP_PROTO(journal_t *journal, transaction_t *commit_transaction), + + TP_ARGS(journal, commit_transaction), + + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) + ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit) + ctf_integer(tid_t, transaction, commit_transaction->t_tid) + ctf_integer(tid_t, head, journal->j_tail_sequence) + ) +) +#else LTTNG_TRACEPOINT_EVENT(jbd2_end_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), @@ -89,6 +126,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_end_commit, ctf_integer(int, head, journal->j_tail_sequence) ) ) +#endif LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, TP_PROTO(struct inode *inode), @@ -101,6 +139,47 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, ) ) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, + TP_PROTO(dev_t dev, tid_t tid, + struct transaction_run_stats_s *stats), + + TP_ARGS(dev, tid, stats), + + TP_FIELDS( + ctf_integer(dev_t, dev, dev) + ctf_integer(tid_t, tid, tid) + ctf_integer(unsigned long, wait, stats->rs_wait) + ctf_integer(unsigned long, running, stats->rs_running) + ctf_integer(unsigned long, locked, stats->rs_locked) + ctf_integer(unsigned long, flushing, stats->rs_flushing) + ctf_integer(unsigned long, logging, stats->rs_logging) + ctf_integer(__u32, handle_count, stats->rs_handle_count) + ctf_integer(__u32, blocks, stats->rs_blocks) + ctf_integer(__u32, blocks_logged, stats->rs_blocks_logged) + ) +) + +LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats, + TP_PROTO(dev_t dev, tid_t tid, + struct transaction_chp_stats_s *stats), + + TP_ARGS(dev, tid, stats), + + TP_FIELDS( + ctf_integer(dev_t, dev, dev) + ctf_integer(tid_t, tid, tid) + ctf_integer(unsigned long, chp_time, stats->cs_chp_time) + ctf_integer(__u32, forced_to_close, stats->cs_forced_to_close) + ctf_integer(__u32, written, stats->cs_written) + ctf_integer(__u32, dropped, stats->cs_dropped) + ) +) +#else LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, TP_PROTO(dev_t dev, unsigned long tid, struct transaction_run_stats_s *stats), @@ -136,13 +215,9 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats, ctf_integer(__u32, dropped, stats->cs_dropped) ) ) - -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) -LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail, -#else -LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail, #endif +LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail, TP_PROTO(journal_t *journal, tid_t first_tid, unsigned long block_nr, unsigned long freed), @@ -157,7 +232,46 @@ LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail, ) ) -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0)) + +#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM +LTTNG_TRACEPOINT_ENUM(req_op, + TP_ENUM_VALUES( + ctf_enum_value("REQ_OP_READ", REQ_OP_READ) + ctf_enum_value("REQ_OP_WRITE", REQ_OP_WRITE) + ctf_enum_value("REQ_OP_FLUSH", REQ_OP_FLUSH) + ctf_enum_value("REQ_OP_DISCARD", REQ_OP_DISCARD) + ctf_enum_value("REQ_OP_SECURE_ERASE", REQ_OP_SECURE_ERASE) + ctf_enum_value("REQ_OP_WRITE_ZEROES", REQ_OP_WRITE_ZEROES) + ctf_enum_value("REQ_OP_ZONE_OPEN", REQ_OP_ZONE_OPEN) + ctf_enum_value("REQ_OP_ZONE_CLOSE", REQ_OP_ZONE_CLOSE) + ctf_enum_value("REQ_OP_ZONE_FINISH", REQ_OP_ZONE_FINISH) + ctf_enum_value("REQ_OP_ZONE_APPEND", REQ_OP_ZONE_APPEND) + ctf_enum_value("REQ_OP_ZONE_RESET", REQ_OP_ZONE_RESET) + ctf_enum_value("REQ_OP_ZONE_RESET_ALL", REQ_OP_ZONE_RESET_ALL) + ctf_enum_value("REQ_OP_DRV_IN", REQ_OP_DRV_IN) + ctf_enum_value("REQ_OP_DRV_OUT", REQ_OP_DRV_OUT) + ctf_enum_value("REQ_OP_LAST", REQ_OP_LAST) + ) +) +#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ + +LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock, + + TP_PROTO(journal_t *journal, blk_opf_t write_flags), + + TP_ARGS(journal, write_flags), + + TP_FIELDS( + ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) +#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM + ctf_enum(req_op, blk_opf_t, write_flags, write_flags) +#else + ctf_integer_hex(blk_opf_t, write_flags, write_flags) +#endif + ) +) +#else LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock, TP_PROTO(journal_t *journal, int write_op),