fix: ext4 instrumentation for CentOS >= 4.18.0-147

[lttng-modules.git] / instrumentation / events / lttng-module / ext4.h

diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h
index b2ca8a7c3ece814596b28a6e2b9a18228587c6fd..4f117c93521b60341f3be186cb3c5dc21859a963 100644 (file)
--- a/instrumentation/events/lttng-module/ext4.h
+++ b/instrumentation/events/lttng-module/ext4.h
@@ -106,7 +106,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_mark_inode_dirty,
        TP_FIELDS(
                ctf_integer(dev_t, dev, inode->i_sb->s_dev)
                ctf_integer(ino_t, ino, inode->i_ino)
-               ctf_integer(unsigned long, ip, IP)
+               ctf_integer_hex(unsigned long, ip, IP)
        )
 )
 
@@ -1255,7 +1255,36 @@ LTTNG_TRACEPOINT_EVENT(ext4_load_inode,
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
+       TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks,
+                int revoke_creds, unsigned long IP),
+
+       TP_ARGS(sb, blocks, rsv_blocks, revoke_creds, IP),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer_hex(unsigned long, ip, IP)
+               ctf_integer(int, blocks, blocks)
+               ctf_integer(int, rsv_blocks, rsv_blocks)
+               ctf_integer(int, revoke_creds, revoke_creds)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved,
+       TP_PROTO(struct super_block *sb, int blocks, unsigned long IP),
+
+       TP_ARGS(sb, blocks, IP),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer_hex(unsigned long, ip, IP)
+               ctf_integer(int, blocks, blocks)
+       )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
 
 LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
        TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks,
@@ -1265,7 +1294,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
 
        TP_FIELDS(
                ctf_integer(dev_t, dev, sb->s_dev)
-               ctf_integer(unsigned long, ip, IP)
+               ctf_integer_hex(unsigned long, ip, IP)
                ctf_integer(int, blocks, blocks)
                ctf_integer(int, rsv_blocks, rsv_blocks)
        )
@@ -1278,7 +1307,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved,
 
        TP_FIELDS(
                ctf_integer(dev_t, dev, sb->s_dev)
-               ctf_integer(unsigned long, ip, IP)
+               ctf_integer_hex(unsigned long, ip, IP)
                ctf_integer(int, blocks, blocks)
        )
 )
@@ -1292,7 +1321,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
 
        TP_FIELDS(
                ctf_integer(dev_t, dev, sb->s_dev)
-               ctf_integer(unsigned long, ip, IP)
+               ctf_integer_hex(unsigned long, ip, IP)
                ctf_integer(int, nblocks, nblocks)
        )
 )
@@ -1454,7 +1483,8 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_show_extent,
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
 
 LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
        TP_PROTO(struct inode *inode, struct ext4_extent *ex,
@@ -1521,7 +1551,8 @@ LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
 
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
 
 LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
        TP_PROTO(struct inode *inode, ext4_lblk_t start,
@@ -1630,7 +1661,8 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space,
 
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
 
 LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
        TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,