Add btrfs file item tracepoints
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/3 Add btrfs file item tracepoints
See upstream commit:
commit 09ed2f165cb3449237dec842b3564044e12d22cb
Author: Liu Bo <[email protected]>
Date: Fri Mar 10 11:09:48 2017 -0800
Btrfs: add file item tracepoints
While debugging truncate problems, I found that these tracepoints could help us quickly know what went wrong.
Two sets of tracepoints are created to track regular/prealloc file item and inline file item respectively, I put inline as a separate one since what inline file items cares about are way less than the regular one.
This adds four tracepoints:
- btrfs_get_extent_show_fi_regular
- btrfs_get_extent_show_fi_inline
- btrfs_truncate_show_fi_regular
- btrfs_truncate_show_fi_inline
--- instrumentation/events/lttng-module/btrfs.h | 83 +++++++++++++++++++++ 1 file changed, 83 insertions(+)
instrumentation/events/lttng-module/btrfs.h +83 -0
@@ -291,6 +291,89 @@ LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist, )#endif +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,12 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs__file_extent_item_regular, + + TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, + struct btrfs_file_extent_item *fi, u64 start), + +TP_ARGS (bi, l, fi, start), + +TP_FIELDS ( + ctf_array(u8, fsid, bi->root->fs_info, BTRFS_FSID_SIZE) + ctf_integer(u64, root_obj, bi->root->objectid) + ctf_integer(u64, ino, btrfs_ino(bi)) + ctf_integer(loff_t, isize, bi->vfs_inode.i_size) + ctf_integer(u64, disk_isize, bi->disk_i_size) + ctf_integer(u64, num_bytes, btrfs_file_extent_num_bytes(l, fi)) + ctf_integer(u64, ram_bytes, btrfs_file_extent_ram_bytes(l, fi)) + ctf_integer(u64, disk_bytenr, btrfs_file_extent_disk_bytenr(l, fi)) + ctf_integer(u64, disk_num_bytes, btrfs_file_extent_disk_num_bytes(l, fi)) + ctf_integer(u64, extent_offset, btrfs_file_extent_offset(l, fi)) + ctf_integer(u8, extent_type, btrfs_file_extent_type(l, fi)) + ctf_integer(u8, compression, btrfs_file_extent_compression(l, fi)) + ctf_integer(u64, extent_start, start) +ctf_integer (u64, extent_end, (start +btrfs_file_extent_num_bytes (l, fi))) + ) +) + +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs__file_extent_item_inline, + + TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, + struct btrfs_file_extent_item *fi, int slot, u64 start), + +TP_ARGS (bi, l, fi, slot, start), + +TP_FIELDS ( + ctf_array(u8, fsid, bi->root->fs_info, BTRFS_FSID_SIZE) + ctf_integer(u64, root_obj, bi->root->objectid) + ctf_integer(u64, ino, btrfs_ino(bi)) + ctf_integer(loff_t, isize, bi->vfs_inode.i_size) + ctf_integer(u64, disk_isize, bi->disk_i_size) + ctf_integer(u8, extent_type, btrfs_file_extent_type(l, fi)) + ctf_integer(u8, compression, btrfs_file_extent_compression(l, fi)) + ctf_integer(u64, extent_start, start) +ctf_integer (u64, extent_end, (start +btrfs_file_extent_inline_len (l, slot, fi))) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE ( + btrfs__file_extent_item_regular, btrfs_get_extent_show_fi_regular, + + TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, + struct btrfs_file_extent_item *fi, u64 start), + +TP_ARGS (bi, l, fi, start) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE ( + btrfs__file_extent_item_regular, btrfs_truncate_show_fi_regular, + + TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, + struct btrfs_file_extent_item *fi, u64 start), + +TP_ARGS (bi, l, fi, start) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE ( + btrfs__file_extent_item_inline, btrfs_get_extent_show_fi_inline, + + TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, + struct btrfs_file_extent_item *fi, int slot, u64 start), + +TP_ARGS (bi, l, fi, slot, start) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE ( + btrfs__file_extent_item_inline, btrfs_truncate_show_fi_inline, + + TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, + struct btrfs_file_extent_item *fi, int slot, u64 start), + +TP_ARGS (bi, l, fi, slot, start) +) +#endif +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,14 ,0 )) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
Signature · 6 lines
2.17.1 _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
PATCH 3/3 Update delayed ref tracepoints for v3.12
In reply to a message not in the archiveIn v3.12 'btrfs_delayed_tree_ref' was split in 2 tracepoints and the name was kept as an event class which did not trigger a build failure.
See upstream commit:
commit 599c75ec3f7f3b606e8a0a684c00f12190712de8
Author: Liu Bo <[email protected]>
Date: Tue Jul 16 19:03:36 2013 +0800
Btrfs/tracepoint: update delayed ref tracepoints
This shows exactly how btrfs processes the delayed refs onto disks, which is very helpful on understanding delayed ref mechanism and debugging related bugs.
--- instrumentation/events/lttng-module/btrfs.h | 256 +++++++++++++++++++- 1 file changed, 249 insertions(+), 7 deletions(-)
instrumentation/events/lttng-module/btrfs.h +249 -7
@@ -739,7 +739,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,#endif #if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,14 ,0 )) -LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref, +LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref, TP_PROTO(const struct btrfs_fs_info *fs_info, const struct btrfs_delayed_ref_node *ref,
@@ -749,6 +749,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,TP_ARGS (fs_info, ref, full_ref, action),TP_FIELDS ( + ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE) ctf_integer(u64, bytenr, ref->bytenr) ctf_integer(u64, num_bytes, ref->num_bytes) ctf_integer(int, action, action)
@@ -759,8 +760,28 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref, ctf_integer(u64, seq, ref->seq) ) ) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_tree_ref, add_delayed_tree_ref, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_node *ref, + const struct btrfs_delayed_tree_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_tree_ref, run_delayed_tree_ref, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_node *ref, + const struct btrfs_delayed_tree_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +)#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,8 ,0 )) -LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref, +LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref, TP_PROTO(struct btrfs_fs_info *fs_info, struct btrfs_delayed_ref_node *ref,
@@ -770,6 +791,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,TP_ARGS (fs_info, ref, full_ref, action),TP_FIELDS ( + ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE) ctf_integer(u64, bytenr, ref->bytenr) ctf_integer(u64, num_bytes, ref->num_bytes) ctf_integer(int, action, action)
@@ -780,7 +802,65 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref, ctf_integer(u64, seq, ref->seq) ) ) -#else + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_tree_ref, add_delayed_tree_ref, + + TP_PROTO(struct btrfs_fs_info *fs_info, + struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_tree_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_tree_ref, run_delayed_tree_ref, + + TP_PROTO(struct btrfs_fs_info *fs_info, + struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_tree_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) +#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,12 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs_delayed_tree_ref, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_tree_ref *full_ref, + int action), + +TP_ARGS (ref, full_ref, action), + +TP_FIELDS ( + ctf_integer(u64, bytenr, ref->bytenr) + ctf_integer(u64, num_bytes, ref->num_bytes) + ctf_integer(int, action, action) + ctf_integer(u64, parent, full_ref->parent) + ctf_integer(u64, ref_root, full_ref->root) + ctf_integer(int, level, full_ref->level) + ctf_integer(int, type, ref->type) +ctf_integer (u64, seq, ref->seq) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_tree_ref, add_delayed_tree_ref, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_tree_ref *full_ref, + int action), + +TP_ARGS (ref, full_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_tree_ref, run_delayed_tree_ref, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_tree_ref *full_ref, + int action), + +TP_ARGS (ref, full_ref, action) +) +#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,7 ,0 )) LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref, TP_PROTO(struct btrfs_delayed_ref_node *ref,
@@ -797,13 +877,156 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref, ctf_integer(u64, ref_root, full_ref->root) ctf_integer(int, level, full_ref->level) ctf_integer(int, type, ref->type) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,7 ,0 )) ctf_integer(u64, seq, ref->seq) -#endif + ) +) +#else +LTTNG_TRACEPOINT_EVENT (btrfs_delayed_tree_ref, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_tree_ref *full_ref, + int action), + +TP_ARGS (ref, full_ref, action), + +TP_FIELDS ( + ctf_integer(u64, bytenr, ref->bytenr) + ctf_integer(u64, num_bytes, ref->num_bytes) + ctf_integer(int, action, action) + ctf_integer(u64, parent, full_ref->parent) + ctf_integer(u64, ref_root, full_ref->root) + ctf_integer(int, level, full_ref->level) +ctf_integer (int, type, ref->type) ) )#endif +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,14 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs_delayed_data_ref, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_node *ref, + const struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action), + +TP_FIELDS ( + ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE) + ctf_integer(u64, bytenr, ref->bytenr) + ctf_integer(u64, num_bytes, ref->num_bytes) + ctf_integer(int, action, action) + ctf_integer(u64, parent, full_ref->parent) + ctf_integer(u64, ref_root, full_ref->root) + ctf_integer(u64, owner, full_ref->objectid) + ctf_integer(u64, offset, full_ref->offset) + ctf_integer(int, type, ref->type) +ctf_integer (u64, seq, ref->seq) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_data_ref, add_delayed_data_ref, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_node *ref, + const struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_data_ref, run_delayed_data_ref, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_node *ref, + const struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) +#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,8 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs_delayed_data_ref, + + TP_PROTO(struct btrfs_fs_info *fs_info, + struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action), + +TP_FIELDS ( + ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE) + ctf_integer(u64, bytenr, ref->bytenr) + ctf_integer(u64, num_bytes, ref->num_bytes) + ctf_integer(int, action, action) + ctf_integer(u64, parent, full_ref->parent) + ctf_integer(u64, ref_root, full_ref->root) + ctf_integer(u64, owner, full_ref->objectid) + ctf_integer(u64, offset, full_ref->offset) + ctf_integer(int, type, ref->type) +ctf_integer (u64, seq, ref->seq) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_data_ref, add_delayed_data_ref, + + TP_PROTO(struct btrfs_fs_info *fs_info, + struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_data_ref, run_delayed_data_ref, + + TP_PROTO(struct btrfs_fs_info *fs_info, + struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) +#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,12 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs_delayed_data_ref, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (ref, full_ref, action), + +TP_FIELDS ( + ctf_integer(u64, bytenr, ref->bytenr) + ctf_integer(u64, num_bytes, ref->num_bytes) + ctf_integer(int, action, action) + ctf_integer(u64, parent, full_ref->parent) + ctf_integer(u64, ref_root, full_ref->root) + ctf_integer(u64, owner, full_ref->objectid) + ctf_integer(u64, offset, full_ref->offset) + ctf_integer(int, type, ref->type) +ctf_integer (u64, seq, ref->seq) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_data_ref, add_delayed_data_ref, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_data_ref, run_delayed_data_ref, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (fs_info, ref, full_ref, action) +) +#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,7 ,0 )) LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref, TP_PROTO(struct btrfs_delayed_ref_node *ref,
@@ -821,11 +1044,30 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref, ctf_integer(u64, owner, full_ref->objectid) ctf_integer(u64, offset, full_ref->offset) ctf_integer(int, type, ref->type) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,7 ,0 )) ctf_integer(u64, seq, ref->seq) -#endif ) ) +#else +LTTNG_TRACEPOINT_EVENT (btrfs_delayed_data_ref, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_data_ref *full_ref, + int action), + +TP_ARGS (ref, full_ref, action), + +TP_FIELDS ( + ctf_integer(u64, bytenr, ref->bytenr) + ctf_integer(u64, num_bytes, ref->num_bytes) + ctf_integer(int, action, action) + ctf_integer(u64, parent, full_ref->parent) + ctf_integer(u64, ref_root, full_ref->root) + ctf_integer(u64, owner, full_ref->objectid) + ctf_integer(u64, offset, full_ref->offset) +ctf_integer (int, type, ref->type) + ) +) +#endif #if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,15 ,0 )) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head,
Signature · 6 lines
2.17.1 _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Re: [PATCH lttng-modules 1/3] Add btrfs tracepoint for em's EEXIST case
In reply to a message not in the archiveAll 3 merged into master, thanks!
Mathieu
Quoted 49 lines · ----- On Jun 7, 2018, at 3:48 PM, Michael Jeanson [email protected] wrote:
See upstream commits:
commit
393da91819e35af538ef97c7c6a04899e2fbfe0e
Author: Liu Bo <[email protected]>
Date: Fri Jan 5 12:51:16 2018 -0700Btrfs: add tracepoint for em's EEXIST case
This is adding a tracepoint '
btrfs_handle_em_exist' to help debug the subtle bugs aroundmerge_extent_mapping.Signed-off-by Michael Jeanson <[email protected]>---
instrumentation/events/lttng-module/btrfs.h| 18 ++++++++++++++++++1 file changed, 18 insertions(+)instrumentation/events/lttng-module/btrfs.h +18
-1@@ -273,6 +273,24 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,17 ,0 )) +LTTNG_TRACEPOINT_EVENT (btrfs_handle_em_exist, + + TP_PROTO(const struct extent_map *existing, const struct extent_map *map, u64 start, u64 len), + +TP_ARGS (existing, map, start, len), + +TP_FIELDS ( + ctf_integer(u64, e_start, existing->start) + ctf_integer(u64, e_len, existing->len) + ctf_integer(u64, map_start, map->start) + ctf_integer(u64, map_len, map->len) + ctf_integer(u64, start, start) +ctf_integer (u64, len, len) + ) +) +#endif +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,14 ,0 )) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, --2.17.1
Signature · 7 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev