From: Michael Jeanson Date: Mon, 24 Aug 2020 19:37:50 +0000 (-0400) Subject: fix: ext4: indicate via a block bitmap read is prefetched… (v5.9) X-Git-Tag: v2.11.6~14 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6065d1e566bbd5c6908ef3d7c84e31a949a1b44a;p=lttng-modules.git fix: ext4: indicate via a block bitmap read is prefetched… (v5.9) See upstream commit: commit ab74c7b23f3770935016e3eb3ecdf1e42b73efaa Author: Theodore Ts'o Date: Wed Jul 15 11:48:55 2020 -0400 ext4: indicate via a block bitmap read is prefetched via a tracepoint Modify the ext4_read_block_bitmap_load tracepoint so that it tells us whether a block bitmap is being prefetched. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: I0e5e2c5b8004223d0928235c092449ee16a940e1 --- diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h index 13a32865..064419e9 100644 --- a/instrumentation/events/lttng-module/ext4.h +++ b/instrumentation/events/lttng-module/ext4.h @@ -1041,12 +1041,27 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_buddy_bitmap_load, #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) +LTTNG_TRACEPOINT_EVENT(ext4_read_block_bitmap_load, + TP_PROTO(struct super_block *sb, unsigned long group, bool prefetch), + + TP_ARGS(sb, group, prefetch), + + TP_FIELDS( + ctf_integer(dev_t, dev, sb->s_dev) + ctf_integer(__u32, group, group) + ctf_integer(bool, prefetch, prefetch) + ) +) +#else LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_read_block_bitmap_load, TP_PROTO(struct super_block *sb, unsigned long group), TP_ARGS(sb, group) ) +#endif LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_load_inode_bitmap,