Skip to content

Commit 3872bf3

Browse files
adam900710gregkh
authored andcommitted
btrfs: tracepoints: output proper root owner for trace_find_free_extent()
commit 437490f upstream. The current trace event always output result like this: find_free_extent: root=2(EXTENT_TREE) len=16384 empty_size=0 flags=4(METADATA) find_free_extent: root=2(EXTENT_TREE) len=16384 empty_size=0 flags=4(METADATA) find_free_extent: root=2(EXTENT_TREE) len=8192 empty_size=0 flags=1(DATA) find_free_extent: root=2(EXTENT_TREE) len=8192 empty_size=0 flags=1(DATA) find_free_extent: root=2(EXTENT_TREE) len=4096 empty_size=0 flags=1(DATA) find_free_extent: root=2(EXTENT_TREE) len=4096 empty_size=0 flags=1(DATA) T's saying we're allocating data extent for EXTENT tree, which is not even possible. It's because we always use EXTENT tree as the owner for trace_find_free_extent() without using the @root from btrfs_reserve_extent(). This patch will change the parameter to use proper @root for trace_find_free_extent(): Now it looks much better: find_free_extent: root=5(FS_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) find_free_extent: root=5(FS_TREE) len=8192 empty_size=0 flags=1(DATA) find_free_extent: root=5(FS_TREE) len=16384 empty_size=0 flags=1(DATA) find_free_extent: root=5(FS_TREE) len=4096 empty_size=0 flags=1(DATA) find_free_extent: root=5(FS_TREE) len=8192 empty_size=0 flags=1(DATA) find_free_extent: root=5(FS_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) find_free_extent: root=7(CSUM_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) find_free_extent: root=2(EXTENT_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) find_free_extent: root=1(ROOT_TREE) len=16384 empty_size=0 flags=36(METADATA|DUP) Reported-by: Hans van Kranenburg <hans@knorrie.org> CC: stable@vger.kernel.org # 5.4+ Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 304f3c0 commit 3872bf3

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

fs/btrfs/extent-tree.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3918,11 +3918,12 @@ static int prepare_allocation(struct btrfs_fs_info *fs_info,
39183918
* |- Push harder to find free extents
39193919
* |- If not found, re-iterate all block groups
39203920
*/
3921-
static noinline int find_free_extent(struct btrfs_fs_info *fs_info,
3921+
static noinline int find_free_extent(struct btrfs_root *root,
39223922
u64 ram_bytes, u64 num_bytes, u64 empty_size,
39233923
u64 hint_byte_orig, struct btrfs_key *ins,
39243924
u64 flags, int delalloc)
39253925
{
3926+
struct btrfs_fs_info *fs_info = root->fs_info;
39263927
int ret = 0;
39273928
int cache_block_group_error = 0;
39283929
struct btrfs_block_group *block_group = NULL;
@@ -3954,7 +3955,7 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info,
39543955
ins->objectid = 0;
39553956
ins->offset = 0;
39563957

3957-
trace_find_free_extent(fs_info, num_bytes, empty_size, flags);
3958+
trace_find_free_extent(root, num_bytes, empty_size, flags);
39583959

39593960
space_info = btrfs_find_space_info(fs_info, flags);
39603961
if (!space_info) {
@@ -4203,7 +4204,7 @@ int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes,
42034204
flags = get_alloc_profile_by_root(root, is_data);
42044205
again:
42054206
WARN_ON(num_bytes < fs_info->sectorsize);
4206-
ret = find_free_extent(fs_info, ram_bytes, num_bytes, empty_size,
4207+
ret = find_free_extent(root, ram_bytes, num_bytes, empty_size,
42074208
hint_byte, ins, flags, delalloc);
42084209
if (!ret && !is_data) {
42094210
btrfs_dec_block_group_reservations(fs_info, ins->objectid);

include/trace/events/btrfs.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,25 +1176,27 @@ DEFINE_EVENT(btrfs__reserved_extent, btrfs_reserved_extent_free,
11761176

11771177
TRACE_EVENT(find_free_extent,
11781178

1179-
TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes,
1179+
TP_PROTO(const struct btrfs_root *root, u64 num_bytes,
11801180
u64 empty_size, u64 data),
11811181

1182-
TP_ARGS(fs_info, num_bytes, empty_size, data),
1182+
TP_ARGS(root, num_bytes, empty_size, data),
11831183

11841184
TP_STRUCT__entry_btrfs(
1185+
__field( u64, root_objectid )
11851186
__field( u64, num_bytes )
11861187
__field( u64, empty_size )
11871188
__field( u64, data )
11881189
),
11891190

1190-
TP_fast_assign_btrfs(fs_info,
1191+
TP_fast_assign_btrfs(root->fs_info,
1192+
__entry->root_objectid = root->root_key.objectid;
11911193
__entry->num_bytes = num_bytes;
11921194
__entry->empty_size = empty_size;
11931195
__entry->data = data;
11941196
),
11951197

11961198
TP_printk_btrfs("root=%llu(%s) len=%llu empty_size=%llu flags=%llu(%s)",
1197-
show_root_type(BTRFS_EXTENT_TREE_OBJECTID),
1199+
show_root_type(__entry->root_objectid),
11981200
__entry->num_bytes, __entry->empty_size, __entry->data,
11991201
__print_flags((unsigned long)__entry->data, "|",
12001202
BTRFS_GROUP_FLAGS))

0 commit comments

Comments
 (0)