Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ee0d883 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: qgroup: Update trace events for metadata reservation 



Now trace_qgroup_meta_reserve() will have extra type parameter.

And introduce two new trace events:

1) trace_qgroup_meta_free_all_pertrans()
   For btrfs_qgroup_free_meta_all_pertrans()

2) trace_qgroup_meta_convert()
   For btrfs_qgroup_convert_reserved_meta()

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8287475a

fs/btrfs/qgroup.c

+4 −3
Original line number Diff line number Diff line
@@ -3138,7 +3138,7 @@ int __btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes, 
		return 0;



	BUG_ON(num_bytes != round_down(num_bytes, fs_info->nodesize));

	trace_qgroup_meta_reserve(root, (s64)num_bytes);

	trace_qgroup_meta_reserve(root, type, (s64)num_bytes);

	ret = qgroup_reserve(root, num_bytes, enforce, type);

	if (ret < 0)

		return ret;
@@ -3163,7 +3163,7 @@ void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root) 
		return;



	/* TODO: Update trace point to handle such free */

	trace_qgroup_meta_reserve(root, 0);

	trace_qgroup_meta_free_all_pertrans(root);

	/* Special value -1 means to free all reserved space */

	btrfs_qgroup_free_refroot(fs_info, root->objectid, (u64)-1,

				  BTRFS_QGROUP_RSV_META_PERTRANS);
@@ -3185,7 +3185,7 @@ void __btrfs_qgroup_free_meta(struct btrfs_root *root, int num_bytes, 
	 */

	num_bytes = sub_root_meta_rsv(root, num_bytes, type);

	BUG_ON(num_bytes != round_down(num_bytes, fs_info->nodesize));

	trace_qgroup_meta_reserve(root, -(s64)num_bytes);

	trace_qgroup_meta_reserve(root, type, -(s64)num_bytes);

	btrfs_qgroup_free_refroot(fs_info, root->objectid, num_bytes, type);

}
@@ -3245,6 +3245,7 @@ void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes) 
	/* Same as btrfs_qgroup_free_meta_prealloc() */

	num_bytes = sub_root_meta_rsv(root, num_bytes,

				      BTRFS_QGROUP_RSV_META_PREALLOC);

	trace_qgroup_meta_convert(root, num_bytes);

	qgroup_convert_meta(fs_info, root->objectid, num_bytes);

}

include/trace/events/btrfs.h

+53 −2
Original line number Diff line number Diff line
@@ -1663,6 +1663,28 @@ TRACE_EVENT(qgroup_update_reserve, 


TRACE_EVENT(qgroup_meta_reserve,



	TP_PROTO(struct btrfs_root *root, s64 diff, int type),



	TP_ARGS(root, diff, type),



	TP_STRUCT__entry_btrfs(

		__field(	u64,	refroot			)

		__field(	s64,	diff			)

		__field(	int,	type			)

	),



	TP_fast_assign_btrfs(root->fs_info,

		__entry->refroot	= root->objectid;

		__entry->diff		= diff;

	),



	TP_printk_btrfs("refroot=%llu(%s) type=%s diff=%lld",

		show_root_type(__entry->refroot),

		show_qgroup_rsv_type(__entry->type), __entry->diff)

);



TRACE_EVENT(qgroup_meta_convert,



	TP_PROTO(struct btrfs_root *root, s64 diff),



	TP_ARGS(root, diff),
@@ -1670,6 +1692,7 @@ TRACE_EVENT(qgroup_meta_reserve, 
	TP_STRUCT__entry_btrfs(

		__field(	u64,	refroot			)

		__field(	s64,	diff			)

		__field(	int,	type			)

	),



	TP_fast_assign_btrfs(root->fs_info,
@@ -1677,8 +1700,36 @@ TRACE_EVENT(qgroup_meta_reserve, 
		__entry->diff		= diff;

	),



	TP_printk_btrfs("refroot=%llu(%s) diff=%lld",

		show_root_type(__entry->refroot), __entry->diff)

	TP_printk_btrfs("refroot=%llu(%s) type=%s->%s diff=%lld",

		show_root_type(__entry->refroot),

		show_qgroup_rsv_type(BTRFS_QGROUP_RSV_META_PREALLOC),

		show_qgroup_rsv_type(BTRFS_QGROUP_RSV_META_PERTRANS),

		__entry->diff)

);



TRACE_EVENT(qgroup_meta_free_all_pertrans,



	TP_PROTO(struct btrfs_root *root),



	TP_ARGS(root),



	TP_STRUCT__entry_btrfs(

		__field(	u64,	refroot			)

		__field(	s64,	diff			)

		__field(	int,	type			)

	),



	TP_fast_assign_btrfs(root->fs_info,

		__entry->refroot	= root->objectid;

		spin_lock(&root->qgroup_meta_rsv_lock);

		__entry->diff		= -(s64)root->qgroup_meta_rsv_pertrans;

		spin_unlock(&root->qgroup_meta_rsv_lock);

		__entry->type		= BTRFS_QGROUP_RSV_META_PERTRANS;

	),



	TP_printk_btrfs("refroot=%llu(%s) type=%s diff=%lld",

		show_root_type(__entry->refroot),

		show_qgroup_rsv_type(__entry->type), __entry->diff)

);



DECLARE_EVENT_CLASS(btrfs__prelim_ref,