commit 0850f361d627e6725d676000db31402e1e9e4841
author Theodore Ts'o <tytso@mit.edu> Fri Jul 31 15:08:04 2020 -0400
committer Harshad Shirwadkar <harshads@google.com> Mon Aug 24 15:55:53 2020 +0000
tree b4d427c8e2b4254d0b9fa64c14f7775dbb1ed85f
parent 3866f34d3063f832fe3e9989516eb44a085af610

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: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Artem Blagodarenko <artem.blagodarenko@gmail.com>
Change-Id: Iff76ca005e3f7a8e4039ac7c96e862273389ea5b
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/3302
Reviewed-by: Theodore Tso <tytso@google.com>
(cherry picked from commit 0ded813a64e089eea904fb7567bde09889f84072)
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/4400
Reviewed-by: Roy Yang <royyang@google.com>

fs/ext4/balloc.c

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 63a395a..f0e00af 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -493,7 +493,7 @@
 	 * submit the buffer_head for reading
 	 */
 	set_buffer_new(bh);
-	trace_ext4_read_block_bitmap_load(sb, block_group);
+	trace_ext4_read_block_bitmap_load(sb, block_group, ignore_locked);
 	bh->b_end_io = ext4_end_bitmap_read;
 	get_bh(bh);
 	submit_bh(REQ_OP_READ, REQ_META | REQ_PRIO |

include/trace/events/ext4.h

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index d68e9e5..a2dd7b0 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -1292,18 +1292,34 @@
 	TP_ARGS(sb, group)
 );
 
-DEFINE_EVENT(ext4__bitmap_load, ext4_read_block_bitmap_load,
+DEFINE_EVENT(ext4__bitmap_load, ext4_load_inode_bitmap,
 
 	TP_PROTO(struct super_block *sb, unsigned long group),
 
 	TP_ARGS(sb, group)
 );
 
-DEFINE_EVENT(ext4__bitmap_load, ext4_load_inode_bitmap,
+TRACE_EVENT(ext4_read_block_bitmap_load,
+	TP_PROTO(struct super_block *sb, unsigned long group, bool prefetch),
 
-	TP_PROTO(struct super_block *sb, unsigned long group),
+	TP_ARGS(sb, group, prefetch),
 
-	TP_ARGS(sb, group)
+	TP_STRUCT__entry(
+		__field(	dev_t,	dev			)
+		__field(	__u32,	group			)
+		__field(	bool,	prefetch		)
+
+	),
+
+	TP_fast_assign(
+		__entry->dev	= sb->s_dev;
+		__entry->group	= group;
+		__entry->prefetch = prefetch;
+	),
+
+	TP_printk("dev %d,%d group %u prefetch %d",
+		  MAJOR(__entry->dev), MINOR(__entry->dev),
+		  __entry->group, __entry->prefetch)
 );
 
 TRACE_EVENT(ext4_direct_IO_enter,