[08/19] btrfs: simplify delayed ref tracepoints

Message ID	ecd41b71527519744c006919ded25a3d70d6b51d.1713052088.git.josef@toxicpanda.com (mailing list archive)
State	New
Headers	show Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 504D259B69 for <linux-btrfs@vger.kernel.org>; Sat, 13 Apr 2024 23:53:43 +0000 (UTC) From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 08/19] btrfs: simplify delayed ref tracepoints Date: Sat, 13 Apr 2024 19:53:18 -0400 Message-ID: <ecd41b71527519744c006919ded25a3d70d6b51d.1713052088.git.josef@toxicpanda.com> In-Reply-To: <cover.1713052088.git.josef@toxicpanda.com> References: <cover.1713052088.git.josef@toxicpanda.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	btrfs: delayed refs cleanups \| expand [00/19] btrfs: delayed refs cleanups [01/19] btrfs: add a helper to get the delayed ref node from the data/tree ref [02/19] btrfs: embed data_ref and tree_ref in btrfs_delayed_ref_node [03/19] btrfs: do not use a function to initialize btrfs_ref [04/19] btrfs: move ref_root into btrfs_ref [05/19] btrfs: pass btrfs_ref to init_delayed_ref_common [06/19] btrfs: initialize btrfs_delayed_ref_head with btrfs_ref [07/19] btrfs: move ref specific initialization into init_delayed_ref_common [08/19] btrfs: simplify delayed ref tracepoints [09/19] btrfs: unify the btrfs_add_delayed__ref helpers into one helper [10/19] btrfs: rename ->len to ->num_bytes in btrfs_ref [11/19] btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node [12/19] btrfs: rename btrfs_data_ref->ino to ->objectid [13/19] btrfs: make __btrfs_inc_extent_ref take a btrfs_delayed_ref_node [14/19] btrfs: drop unnecessary arguments from __btrfs_free_extent [15/19] btrfs: make the insert backref helpers take a btrfs_delayed_ref_node [16/19] btrfs: stop referencing btrfs_delayed_data_ref directly [17/19] btrfs: stop referencing btrfs_delayed_tree_ref directly [18/19] btrfs: remove the btrfs_delayed_ref_node container helpers [19/19] btrfs: replace btrfs_delayed__ref with btrfs_*_ref

Message ID

ecd41b71527519744c006919ded25a3d70d6b51d.1713052088.git.josef@toxicpanda.com (mailing list archive)

State

New

Headers

From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org,
	kernel-team@fb.com
Subject: [PATCH 08/19] btrfs: simplify delayed ref tracepoints
Date: Sat, 13 Apr 2024 19:53:18 -0400
Message-ID: 
 <ecd41b71527519744c006919ded25a3d70d6b51d.1713052088.git.josef@toxicpanda.com>
In-Reply-To: <cover.1713052088.git.josef@toxicpanda.com>
References: <cover.1713052088.git.josef@toxicpanda.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

btrfs: delayed refs cleanups | expand

Commit Message

Josef Bacik April 13, 2024, 11:53 p.m. UTC

Now that all of the delayed ref information is in the delayed ref node,
drastically simplify the delayed ref tracepoints by simply passing in
the btrfs_delayed_ref_node and populating the tracepoints with the
values from the structure itself.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
 fs/btrfs/delayed-ref.c       | 14 ++--------
 fs/btrfs/extent-tree.c       |  4 +--
 include/trace/events/btrfs.h | 54 ++++++++++++++----------------------
 3 files changed, 25 insertions(+), 47 deletions(-)

Comments

Filipe Manana April 15, 2024, 12:45 p.m. UTC | #1

On Sun, Apr 14, 2024 at 12:54 AM Josef Bacik <josef@toxicpanda.com> wrote:
>
> Now that all of the delayed ref information is in the delayed ref node,
> drastically simplify the delayed ref tracepoints by simply passing in
> the btrfs_delayed_ref_node and populating the tracepoints with the
> values from the structure itself.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>

Reviewed-by: Filipe Manana <fdmanana@suse.com>

Looks good, thanks.

> ---
>  fs/btrfs/delayed-ref.c       | 14 ++--------
>  fs/btrfs/extent-tree.c       |  4 +--
>  include/trace/events/btrfs.h | 54 ++++++++++++++----------------------
>  3 files changed, 25 insertions(+), 47 deletions(-)
>
> diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
> index 743cc52c30af..cc1510d7eee8 100644
> --- a/fs/btrfs/delayed-ref.c
> +++ b/fs/btrfs/delayed-ref.c
> @@ -1064,7 +1064,6 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
>                                struct btrfs_delayed_extent_op *extent_op)
>  {
>         struct btrfs_fs_info *fs_info = trans->fs_info;
> -       struct btrfs_delayed_tree_ref *ref;
>         struct btrfs_delayed_ref_node *node;
>         struct btrfs_delayed_ref_head *head_ref;
>         struct btrfs_delayed_ref_root *delayed_refs;
> @@ -1093,8 +1092,6 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
>                 }
>         }
>
> -       ref = btrfs_delayed_node_to_tree_ref(node);
> -
>         init_delayed_ref_common(fs_info, node, generic_ref);
>
>         init_delayed_ref_head(head_ref, generic_ref, record, 0);
> @@ -1119,9 +1116,7 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
>          */
>         btrfs_update_delayed_refs_rsv(trans);
>
> -       trace_add_delayed_tree_ref(fs_info, node, ref,
> -                                  action == BTRFS_ADD_DELAYED_EXTENT ?
> -                                  BTRFS_ADD_DELAYED_REF : action);
> +       trace_add_delayed_tree_ref(fs_info, node);
>         if (merged)
>                 kmem_cache_free(btrfs_delayed_ref_node_cachep, node);
>
> @@ -1139,7 +1134,6 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
>                                u64 reserved)
>  {
>         struct btrfs_fs_info *fs_info = trans->fs_info;
> -       struct btrfs_delayed_data_ref *ref;
>         struct btrfs_delayed_ref_node *node;
>         struct btrfs_delayed_ref_head *head_ref;
>         struct btrfs_delayed_ref_root *delayed_refs;
> @@ -1153,8 +1147,6 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
>         if (!node)
>                 return -ENOMEM;
>
> -       ref = btrfs_delayed_node_to_data_ref(node);
> -
>         init_delayed_ref_common(fs_info, node, generic_ref);
>
>         head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);
> @@ -1195,9 +1187,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
>          */
>         btrfs_update_delayed_refs_rsv(trans);
>
> -       trace_add_delayed_data_ref(trans->fs_info, node, ref,
> -                                  action == BTRFS_ADD_DELAYED_EXTENT ?
> -                                  BTRFS_ADD_DELAYED_REF : action);
> +       trace_add_delayed_data_ref(trans->fs_info, node);
>         if (merged)
>                 kmem_cache_free(btrfs_delayed_ref_node_cachep, node);
>
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index 275e3141dc1e..805e3e904368 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -1574,7 +1574,7 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans,
>         u64 flags = 0;
>
>         ref = btrfs_delayed_node_to_data_ref(node);
> -       trace_run_delayed_data_ref(trans->fs_info, node, ref, node->action);
> +       trace_run_delayed_data_ref(trans->fs_info, node);
>
>         if (node->type == BTRFS_SHARED_DATA_REF_KEY)
>                 parent = ref->parent;
> @@ -1737,7 +1737,7 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,
>         u64 ref_root = 0;
>
>         ref = btrfs_delayed_node_to_tree_ref(node);
> -       trace_run_delayed_tree_ref(trans->fs_info, node, ref, node->action);
> +       trace_run_delayed_tree_ref(trans->fs_info, node);
>
>         if (node->type == BTRFS_SHARED_BLOCK_REF_KEY)
>                 parent = ref->parent;
> diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
> index 766cfd48386c..dae29f6d6b4c 100644
> --- a/include/trace/events/btrfs.h
> +++ b/include/trace/events/btrfs.h
> @@ -868,11 +868,9 @@ TRACE_EVENT(btrfs_add_block_group,
>  DECLARE_EVENT_CLASS(btrfs_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),
> +                const struct btrfs_delayed_ref_node *ref),
>
> -       TP_ARGS(fs_info, ref, full_ref, action),
> +       TP_ARGS(fs_info, ref),
>
>         TP_STRUCT__entry_btrfs(
>                 __field(        u64,  bytenr            )
> @@ -888,10 +886,10 @@ DECLARE_EVENT_CLASS(btrfs_delayed_tree_ref,
>         TP_fast_assign_btrfs(fs_info,
>                 __entry->bytenr         = ref->bytenr;
>                 __entry->num_bytes      = ref->num_bytes;
> -               __entry->action         = action;
> -               __entry->parent         = full_ref->parent;
> -               __entry->ref_root       = full_ref->root;
> -               __entry->level          = full_ref->level;
> +               __entry->action         = ref->action;
> +               __entry->parent         = ref->tree_ref.parent;
> +               __entry->ref_root       = ref->tree_ref.root;
> +               __entry->level          = ref->tree_ref.level;
>                 __entry->type           = ref->type;
>                 __entry->seq            = ref->seq;
>         ),
> @@ -911,31 +909,25 @@ DECLARE_EVENT_CLASS(btrfs_delayed_tree_ref,
>  DEFINE_EVENT(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),
> +                const struct btrfs_delayed_ref_node *ref),
>
> -       TP_ARGS(fs_info, ref, full_ref, action)
> +       TP_ARGS(fs_info, ref)
>  );
>
>  DEFINE_EVENT(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),
> +                const struct btrfs_delayed_ref_node *ref),
>
> -       TP_ARGS(fs_info, ref, full_ref, action)
> +       TP_ARGS(fs_info, ref)
>  );
>
>  DECLARE_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),
> +                const struct btrfs_delayed_ref_node *ref),
>
> -       TP_ARGS(fs_info, ref, full_ref, action),
> +       TP_ARGS(fs_info, ref),
>
>         TP_STRUCT__entry_btrfs(
>                 __field(        u64,  bytenr            )
> @@ -952,11 +944,11 @@ DECLARE_EVENT_CLASS(btrfs_delayed_data_ref,
>         TP_fast_assign_btrfs(fs_info,
>                 __entry->bytenr         = ref->bytenr;
>                 __entry->num_bytes      = ref->num_bytes;
> -               __entry->action         = action;
> -               __entry->parent         = full_ref->parent;
> -               __entry->ref_root       = full_ref->root;
> -               __entry->owner          = full_ref->objectid;
> -               __entry->offset         = full_ref->offset;
> +               __entry->action         = ref->action;
> +               __entry->parent         = ref->data_ref.parent;
> +               __entry->ref_root       = ref->data_ref.root;
> +               __entry->owner          = ref->data_ref.objectid;
> +               __entry->offset         = ref->data_ref.offset;
>                 __entry->type           = ref->type;
>                 __entry->seq            = ref->seq;
>         ),
> @@ -978,21 +970,17 @@ DECLARE_EVENT_CLASS(btrfs_delayed_data_ref,
>  DEFINE_EVENT(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),
> +                const struct btrfs_delayed_ref_node *ref),
>
> -       TP_ARGS(fs_info, ref, full_ref, action)
> +       TP_ARGS(fs_info, ref)
>  );
>
>  DEFINE_EVENT(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),
> +                const struct btrfs_delayed_ref_node *ref),
>
> -       TP_ARGS(fs_info, ref, full_ref, action)
> +       TP_ARGS(fs_info, ref)
>  );
>
>  DECLARE_EVENT_CLASS(btrfs_delayed_ref_head,
> --
> 2.43.0
>
>

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 743cc52c30af..cc1510d7eee8 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -1064,7 +1064,6 @@  int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
 			       struct btrfs_delayed_extent_op *extent_op)
 {
 	struct btrfs_fs_info *fs_info = trans->fs_info;
-	struct btrfs_delayed_tree_ref *ref;
 	struct btrfs_delayed_ref_node *node;
 	struct btrfs_delayed_ref_head *head_ref;
 	struct btrfs_delayed_ref_root *delayed_refs;
@@ -1093,8 +1092,6 @@  int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
 		}
 	}
 
-	ref = btrfs_delayed_node_to_tree_ref(node);
-
 	init_delayed_ref_common(fs_info, node, generic_ref);
 
 	init_delayed_ref_head(head_ref, generic_ref, record, 0);
@@ -1119,9 +1116,7 @@  int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
 	 */
 	btrfs_update_delayed_refs_rsv(trans);
 
-	trace_add_delayed_tree_ref(fs_info, node, ref,
-				   action == BTRFS_ADD_DELAYED_EXTENT ?
-				   BTRFS_ADD_DELAYED_REF : action);
+	trace_add_delayed_tree_ref(fs_info, node);
 	if (merged)
 		kmem_cache_free(btrfs_delayed_ref_node_cachep, node);
 
@@ -1139,7 +1134,6 @@  int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
 			       u64 reserved)
 {
 	struct btrfs_fs_info *fs_info = trans->fs_info;
-	struct btrfs_delayed_data_ref *ref;
 	struct btrfs_delayed_ref_node *node;
 	struct btrfs_delayed_ref_head *head_ref;
 	struct btrfs_delayed_ref_root *delayed_refs;
@@ -1153,8 +1147,6 @@  int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
 	if (!node)
 		return -ENOMEM;
 
-	ref = btrfs_delayed_node_to_data_ref(node);
-
 	init_delayed_ref_common(fs_info, node, generic_ref);
 
 	head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);
@@ -1195,9 +1187,7 @@  int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
 	 */
 	btrfs_update_delayed_refs_rsv(trans);
 
-	trace_add_delayed_data_ref(trans->fs_info, node, ref,
-				   action == BTRFS_ADD_DELAYED_EXTENT ?
-				   BTRFS_ADD_DELAYED_REF : action);
+	trace_add_delayed_data_ref(trans->fs_info, node);
 	if (merged)
 		kmem_cache_free(btrfs_delayed_ref_node_cachep, node);
 
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 275e3141dc1e..805e3e904368 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1574,7 +1574,7 @@  static int run_delayed_data_ref(struct btrfs_trans_handle *trans,
 	u64 flags = 0;
 
 	ref = btrfs_delayed_node_to_data_ref(node);
-	trace_run_delayed_data_ref(trans->fs_info, node, ref, node->action);
+	trace_run_delayed_data_ref(trans->fs_info, node);
 
 	if (node->type == BTRFS_SHARED_DATA_REF_KEY)
 		parent = ref->parent;
@@ -1737,7 +1737,7 @@  static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,
 	u64 ref_root = 0;
 
 	ref = btrfs_delayed_node_to_tree_ref(node);
-	trace_run_delayed_tree_ref(trans->fs_info, node, ref, node->action);
+	trace_run_delayed_tree_ref(trans->fs_info, node);
 
 	if (node->type == BTRFS_SHARED_BLOCK_REF_KEY)
 		parent = ref->parent;
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 766cfd48386c..dae29f6d6b4c 100644
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -868,11 +868,9 @@  TRACE_EVENT(btrfs_add_block_group,
 DECLARE_EVENT_CLASS(btrfs_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),
+		 const struct btrfs_delayed_ref_node *ref),
 
-	TP_ARGS(fs_info, ref, full_ref, action),
+	TP_ARGS(fs_info, ref),
 
 	TP_STRUCT__entry_btrfs(
 		__field(	u64,  bytenr		)
@@ -888,10 +886,10 @@  DECLARE_EVENT_CLASS(btrfs_delayed_tree_ref,
 	TP_fast_assign_btrfs(fs_info,
 		__entry->bytenr		= ref->bytenr;
 		__entry->num_bytes	= ref->num_bytes;
-		__entry->action		= action;
-		__entry->parent		= full_ref->parent;
-		__entry->ref_root	= full_ref->root;
-		__entry->level		= full_ref->level;
+		__entry->action		= ref->action;
+		__entry->parent		= ref->tree_ref.parent;
+		__entry->ref_root	= ref->tree_ref.root;
+		__entry->level		= ref->tree_ref.level;
 		__entry->type		= ref->type;
 		__entry->seq		= ref->seq;
 	),
@@ -911,31 +909,25 @@  DECLARE_EVENT_CLASS(btrfs_delayed_tree_ref,
 DEFINE_EVENT(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),
+		 const struct btrfs_delayed_ref_node *ref),
 
-	TP_ARGS(fs_info, ref, full_ref, action)
+	TP_ARGS(fs_info, ref)
 );
 
 DEFINE_EVENT(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),
+		 const struct btrfs_delayed_ref_node *ref),
 
-	TP_ARGS(fs_info, ref, full_ref, action)
+	TP_ARGS(fs_info, ref)
 );
 
 DECLARE_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),
+		 const struct btrfs_delayed_ref_node *ref),
 
-	TP_ARGS(fs_info, ref, full_ref, action),
+	TP_ARGS(fs_info, ref),
 
 	TP_STRUCT__entry_btrfs(
 		__field(	u64,  bytenr		)
@@ -952,11 +944,11 @@  DECLARE_EVENT_CLASS(btrfs_delayed_data_ref,
 	TP_fast_assign_btrfs(fs_info,
 		__entry->bytenr		= ref->bytenr;
 		__entry->num_bytes	= ref->num_bytes;
-		__entry->action		= action;
-		__entry->parent		= full_ref->parent;
-		__entry->ref_root	= full_ref->root;
-		__entry->owner		= full_ref->objectid;
-		__entry->offset		= full_ref->offset;
+		__entry->action		= ref->action;
+		__entry->parent		= ref->data_ref.parent;
+		__entry->ref_root	= ref->data_ref.root;
+		__entry->owner		= ref->data_ref.objectid;
+		__entry->offset		= ref->data_ref.offset;
 		__entry->type		= ref->type;
 		__entry->seq		= ref->seq;
 	),
@@ -978,21 +970,17 @@  DECLARE_EVENT_CLASS(btrfs_delayed_data_ref,
 DEFINE_EVENT(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),
+		 const struct btrfs_delayed_ref_node *ref),
 
-	TP_ARGS(fs_info, ref, full_ref, action)
+	TP_ARGS(fs_info, ref)
 );
 
 DEFINE_EVENT(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),
+		 const struct btrfs_delayed_ref_node *ref),
 
-	TP_ARGS(fs_info, ref, full_ref, action)
+	TP_ARGS(fs_info, ref)
 );
 
 DECLARE_EVENT_CLASS(btrfs_delayed_ref_head,

[08/19] btrfs: simplify delayed ref tracepoints

Commit Message

Comments

Patch