From 20e546d0894624fd82af092414d9a4927c7d6ea5 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 24 Aug 2020 15:37:50 -0400 Subject: [PATCH] =?utf8?q?fix:=20ext4:=20indicate=20via=20a=20block=20bitm?= =?utf8?q?ap=20read=20is=20prefetched=E2=80=A6=20(v5.9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- include/instrumentation/events/ext4.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h index 654a39b1..88ab394c 100644 --- a/include/instrumentation/events/ext4.h +++ b/include/instrumentation/events/ext4.h @@ -893,12 +893,26 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_buddy_bitmap_load, TP_ARGS(sb, group) ) +#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, -- 2.34.1