btrfs: qgroup: Bug fixes for trace events
Subsystems (2)
v2 cover btrfs: qgroup: Bug fixes for trace events
Several stupid bugs exposed for qgroup related trace events. Fix them.
Changelog:
v2:
- Split patches
Qu Wenruo (2):
btrfs: qgroup: Fix wrong parameter order for trace events
btrfs: qgroup: Fix bad entry members of qgroup trace events
fs/btrfs/qgroup.c | 4 ++-- include/trace/events/btrfs.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
Signature · 1 line
2.23.0
PATCH v2 1/2 btrfs: qgroup: Fix wrong parameter order for trace events
[BUG]
For btrfs:qgroup_meta_reserve event, the trace event can output garbage:qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=DATA diff=2
The diff should always be alinged to sector size (4k), so there is definitely something wrong.
[CAUSE]
For the wrong @diff, it's caused by wrong parameter order. The correct parameters are:
struct btrfs_root, s64 diff, int type.
However the parameters used are:
struct btrfs_root, int type, s64 diff.
[FIX]
Fix the super stupid bug.
--- fs/btrfs/qgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/qgroup.c +2 -2
@@ -3629,7 +3629,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, type, (s64 )num_bytes); +trace_qgroup_meta_reserve (root, (s64 )num_bytes, type); ret =qgroup_reserve (root, num_bytes, enforce, type);if (ret <0 )return ret;
@@ -3676,7 +3676,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, type, -(s64 )num_bytes); +trace_qgroup_meta_reserve (root, -(s64 )num_bytes, type);btrfs_qgroup_free_refroot (fs_info, root->root_key.objectid, num_bytes, type); }
Signature · 1 line
2.23.0
Re: [PATCH v2 1/2] btrfs: qgroup: Fix wrong parameter order for trace events
Quoted 12 lines · Qu Wenruo
[BUG]
For btrfs:qgroup_meta_reserve event, the trace event can output garbage:qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=DATA diff=2The diff should always be alinged to sector size (4k), so there is definitely something wrong.
[CAUSE]
For the wrong @diff, it's caused by wrong parameter order. The correct parameters are:
structbtrfs_root, s64 diff, int type.
Quoted 8 lines
However the parameters used are:
structbtrfs_root, int type, s64 diff.[FIX]
Fix the super stupid bug.Fixes 4ee0d8832c2e ("btrfs: qgroup: Update trace events for metadata reservation")Signed-off-by Qu Wenruo <[email protected]>
Quoted 27 lines
--- fs/btrfs/qgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/btrfs/qgroup.c +2
-2@@ -3629,7 +3629,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, type, (s64 )num_bytes); +trace_qgroup_meta_reserve (root, (s64 )num_bytes, type); ret =qgroup_reserve (root, num_bytes, enforce, type);if (ret <0 )return ret;@@ -3676,7 +3676,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, type, -(s64 )num_bytes); +trace_qgroup_meta_reserve (root, -(s64 )num_bytes, type);btrfs_qgroup_free_refroot (fs_info, root->root_key.objectid, num_bytes, type); }
PATCH v2 2/2 btrfs: qgroup: Fix bad entry members of qgroup trace events
In reply to Qu Wenruo[BUG]
For btrfs:qgroup_meta_reserve event, the trace event can output garbage:qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=DATA diff=2qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=0x258792 diff=2
The @type can be completely garbage, as DATA type is not possible for trace_qgroup_meta_reserve() trace event.
[CAUSE]
Ther are several problems related to qgroup trace events:
- Unassigned entry member
Member entry::type of trace_qgroup_update_reserve() and trace_qgourp_meta_reserve() is not assigned
- Redundant entry member
Member entry::type is completely useless in
trace_qgroup_meta_convert()
[FIX]
Fix these stupid bugs.
--- include/trace/events/btrfs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/trace/events/btrfs.h +2 -1
@@ -1688,6 +1688,7 @@ TRACE_EVENT(qgroup_update_reserve, __entry->qgid = qgroup->qgroupid; __entry->cur_reserved = qgroup->rsv.values[type]; __entry->diff = diff; + __entry->type = type; ), TP_printk_btrfs("qgid=%llu type=%s cur_reserved=%llu diff=%lld",
@@ -1710,6 +1711,7 @@ TRACE_EVENT(qgroup_meta_reserve,TP_fast_assign_btrfs (root->fs_info, __entry->refroot = root->root_key.objectid; __entry->diff = diff; + __entry->type = type; ), TP_printk_btrfs("refroot=%llu(%s) type=%s diff=%lld",
@@ -1726,7 +1728,6 @@ TRACE_EVENT(qgroup_meta_convert,TP_STRUCT__entry_btrfs (__field (u64 ,refroot )__field ( s64, diff ) -__field ( int, type ) ), TP_fast_assign_btrfs(root->fs_info,
Signature · 1 line
2.23.0
Re: [PATCH v2 2/2] btrfs: qgroup: Fix bad entry members of qgroup trace events
Quoted 18 lines · Qu Wenruo
[BUG]
For btrfs:qgroup_meta_reserve event, the trace event can output garbage:qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=DATA diff=2qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=0x258792 diff=2The @type can be completely garbage, as DATA type is not possible for
trace_qgroup_meta_reserve()trace event.[CAUSE]
Ther are several problems related to qgroup trace events:
- Unassigned entry member
Memberentry::typeoftrace_qgroup_update_reserve()andtrace_qgourp_meta_reserve()is not assigned- Redundant entry member
Memberentry::typeis completely useless in
trace_qgroup_meta_convert()
Quoted 5 lines
[FIX]
Fix these stupid bugs.Fixes 4ee0d8832c2e ("btrfs: qgroup: Update trace events for metadata reservation")Signed-off-by Qu Wenruo <[email protected]>
David Sterba
AppliedQuoted 2 lines · Qu Wenruo
Several stupid bugs exposed for qgroup related trace events. Fix them.
Queued for 5.4-rc, thanks.