File fix-jbd2-use-the-correct-print-format.patch of Package lttng-modules
151
1
From: Michael Jeanson <mjeanson@efficios.com>2
Date: Thu Jan 12 13:52:22 2023 -05003
Subject: fix: jbd2: use the correct print format4
Git-commit: 82b8d59fea083ed5652a6d52606862ae44c0bedd5
Signed-off-by: Tony Jones <tonyj@suse.de>6
7
See upstream commit :8
9
commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a810
Author: Bixuan Cui <cuibixuan@linux.alibaba.com>11
Date: Tue Oct 11 19:33:44 2022 +080012
13
jbd2: use the correct print format14
15
The print format error was found when using ftrace event:16
<...>-1406 [000] .... 23599442.895823: jbd2_end_commit: dev 252,8 transaction -1866216965 sync 0 head -186621736817
<...>-1406 [000] .... 23599442.896299: jbd2_start_commit: dev 252,8 transaction -1866216964 sync 018
19
Use the correct print format for transaction, head and tid.20
21
Change-Id: Ic053f0e0c1e24ebc75bae51d07696aaa5e1c009422
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>23
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>24
25
diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h26
index a356a80c..f621d72c 10064427
--- a/include/instrumentation/events/jbd2.h28
+++ b/include/instrumentation/events/jbd2.h29
30
)31
)32
33
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \34
+ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \35
+ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \36
+ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0) \37
+ || defined(CONFIG_SUSE_KERNEL))38
+LTTNG_TRACEPOINT_EVENT_CLASS(jbd2_commit,39
+40
+ TP_PROTO(journal_t *journal, transaction_t *commit_transaction),41
+42
+ TP_ARGS(journal, commit_transaction),43
+44
+ TP_FIELDS(45
+ ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)46
+ ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)47
+ ctf_integer(tid_t, transaction, commit_transaction->t_tid)48
+ )49
+)50
+#else51
LTTNG_TRACEPOINT_EVENT_CLASS(jbd2_commit,52
53
TP_PROTO(journal_t *journal, transaction_t *commit_transaction),54
55
ctf_integer(int, transaction, commit_transaction->t_tid)56
)57
)58
+#endif59
60
LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_start_commit,61
62
63
)64
#endif65
66
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \67
+ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \68
+ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \69
+ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0) \70
+ || defined(CONFIG_SUSE_KERNEL))71
+LTTNG_TRACEPOINT_EVENT(jbd2_end_commit,72
+ TP_PROTO(journal_t *journal, transaction_t *commit_transaction),73
+74
+ TP_ARGS(journal, commit_transaction),75
+76
+ TP_FIELDS(77
+ ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)78
+ ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)79
+ ctf_integer(tid_t, transaction, commit_transaction->t_tid)80
+ ctf_integer(tid_t, head, journal->j_tail_sequence)81
+ )82
+)83
+#else84
LTTNG_TRACEPOINT_EVENT(jbd2_end_commit,85
TP_PROTO(journal_t *journal, transaction_t *commit_transaction),86
87
88
ctf_integer(int, head, journal->j_tail_sequence)89
)90
)91
+#endif92
93
LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data,94
TP_PROTO(struct inode *inode),95
96
)97
)98
99
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \100
+ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \101
+ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \102
+ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0) \103
+ || defined(CONFIG_SUSE_KERNEL))104
+LTTNG_TRACEPOINT_EVENT(jbd2_run_stats,105
+ TP_PROTO(dev_t dev, tid_t tid,106
+ struct transaction_run_stats_s *stats),107
+108
+ TP_ARGS(dev, tid, stats),109
+110
+ TP_FIELDS(111
+ ctf_integer(dev_t, dev, dev)112
+ ctf_integer(tid_t, tid, tid)113
+ ctf_integer(unsigned long, wait, stats->rs_wait)114
+ ctf_integer(unsigned long, running, stats->rs_running)115
+ ctf_integer(unsigned long, locked, stats->rs_locked)116
+ ctf_integer(unsigned long, flushing, stats->rs_flushing)117
+ ctf_integer(unsigned long, logging, stats->rs_logging)118
+ ctf_integer(__u32, handle_count, stats->rs_handle_count)119
+ ctf_integer(__u32, blocks, stats->rs_blocks)120
+ ctf_integer(__u32, blocks_logged, stats->rs_blocks_logged)121
+ )122
+)123
+124
+LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats,125
+ TP_PROTO(dev_t dev, tid_t tid,126
+ struct transaction_chp_stats_s *stats),127
+128
+ TP_ARGS(dev, tid, stats),129
+130
+ TP_FIELDS(131
+ ctf_integer(dev_t, dev, dev)132
+ ctf_integer(tid_t, tid, tid)133
+ ctf_integer(unsigned long, chp_time, stats->cs_chp_time)134
+ ctf_integer(__u32, forced_to_close, stats->cs_forced_to_close)135
+ ctf_integer(__u32, written, stats->cs_written)136
+ ctf_integer(__u32, dropped, stats->cs_dropped)137
+ )138
+)139
+#else140
LTTNG_TRACEPOINT_EVENT(jbd2_run_stats,141
TP_PROTO(dev_t dev, unsigned long tid,142
struct transaction_run_stats_s *stats),143
144
ctf_integer(__u32, dropped, stats->cs_dropped)145
)146
)147
+#endif148
149
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))150
LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail,151