Fix: btrfs_delayed_ref_head was unwired since v3.12
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mathieu Desnoyers
Appliedmerged into master, 2.10, 2.9, thanks!
Mathieu
Quoted 170 lines · ----- On Jan 9, 2018, at 5:40 PM, Michael Jeanson [email protected] wrote:
See upstream commit:
commit
599c75ec3f7f3b606e8a0a684c00f12190712de8
Author: Liu Bo <[email protected]>
Date: Tue Jul 16 19:03:36 2013 +0800Btrfs/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.
Signed-off-by Michael Jeanson <[email protected]>---
instrumentation/events/lttng-module/btrfs.h| 132 +++++++++++++++++++++++++++-1 file changed, 130 insertions(+), 2 deletions(-)instrumentation/events/lttng-module/btrfs.h +130
-3@@ -680,8 +680,81 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref, ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,8 ,0 )) -LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head, +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,15 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs_delayed_ref_head, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (fs_info, head_ref, action), + +TP_FIELDS ( + ctf_integer(u64, bytenr, head_ref->bytenr) + ctf_integer(u64, num_bytes, head_ref->num_bytes) + ctf_integer(int, action, action) +ctf_integer (int, is_data, head_ref->is_data) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_ref_head, add_delayed_ref_head, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (fs_info, head_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_ref_head, run_delayed_ref_head, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (fs_info, head_ref, action) +) + +#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,14 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs_delayed_ref_head, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_node *ref, + const struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (fs_info, ref, head_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 (int, is_data, head_ref->is_data) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_ref_head, add_delayed_ref_head, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_node *ref, + const struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (fs_info, ref, head_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_ref_head, run_delayed_ref_head, + + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_delayed_ref_node *ref, + const struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (fs_info, ref, head_ref, action) +) + +#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,8 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head, TP_PROTO(struct btrfs_fs_info *fs_info, struct btrfs_delayed_ref_node *ref,@@ -698,6 +771,61 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head, ) ) +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_ref_head, add_delayed_ref_head, + + TP_PROTO(struct btrfs_fs_info *fs_info, + struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (fs_info, ref, head_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_ref_head, run_delayed_ref_head, + + TP_PROTO(struct btrfs_fs_info *fs_info, + struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (fs_info, ref, head_ref, action) +) + +#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,12 ,0 )) +LTTNG_TRACEPOINT_EVENT_CLASS (btrfs_delayed_ref_head, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (ref, head_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 (int, is_data, head_ref->is_data) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_ref_head, add_delayed_ref_head, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (ref, head_ref, action) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE (btrfs_delayed_ref_head, run_delayed_ref_head, + + TP_PROTO(struct btrfs_delayed_ref_node *ref, + struct btrfs_delayed_ref_head *head_ref, + int action), + +TP_ARGS (ref, head_ref, action) +) +#else LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head, --2.7.4
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