Skip to content

Commit

Permalink
btrfs: qgroup: Update trace events to use new separate rsv types
Browse files Browse the repository at this point in the history 
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Qu Wenruo authored and David Sterba committed Mar 30, 2018
1 parent 429d627 commit 64ee4e7
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 20 deletions.
36 changes: 21 additions & 15 deletions fs/btrfs/qgroup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,19 @@ static const char *qgroup_rsv_type_str(enum btrfs_qgroup_rsv_type type)
}
#endif

static void qgroup_rsv_add(struct btrfs_qgroup *qgroup, u64 num_bytes,
static void qgroup_rsv_add(struct btrfs_fs_info *fs_info,
struct btrfs_qgroup *qgroup, u64 num_bytes,
enum btrfs_qgroup_rsv_type type)
{
trace_qgroup_update_reserve(fs_info, qgroup, num_bytes, type);
qgroup->rsv.values[type] += num_bytes;
}

static void qgroup_rsv_release(struct btrfs_qgroup *qgroup, u64 num_bytes,
static void qgroup_rsv_release(struct btrfs_fs_info *fs_info,
struct btrfs_qgroup *qgroup, u64 num_bytes,
enum btrfs_qgroup_rsv_type type)
{
trace_qgroup_update_reserve(fs_info, qgroup, -(s64)num_bytes, type);
if (qgroup->rsv.values[type] >= num_bytes) {
qgroup->rsv.values[type] -= num_bytes;
return;
Expand All @@ -97,22 +101,24 @@ static void qgroup_rsv_release(struct btrfs_qgroup *qgroup, u64 num_bytes,
qgroup->rsv.values[type] = 0;
}

static void qgroup_rsv_add_by_qgroup(struct btrfs_qgroup *dest,
struct btrfs_qgroup *src)
static void qgroup_rsv_add_by_qgroup(struct btrfs_fs_info *fs_info,
struct btrfs_qgroup *dest,
struct btrfs_qgroup *src)
{
int i;

for (i = 0; i < BTRFS_QGROUP_RSV_LAST; i++)
qgroup_rsv_add(dest, src->rsv.values[i], i);
qgroup_rsv_add(fs_info, dest, src->rsv.values[i], i);
}

static void qgroup_rsv_release_by_qgroup(struct btrfs_qgroup *dest,
static void qgroup_rsv_release_by_qgroup(struct btrfs_fs_info *fs_info,
struct btrfs_qgroup *dest,
struct btrfs_qgroup *src)
{
int i;

for (i = 0; i < BTRFS_QGROUP_RSV_LAST; i++)
qgroup_rsv_release(dest, src->rsv.values[i], i);
qgroup_rsv_release(fs_info, dest, src->rsv.values[i], i);
}

static void btrfs_qgroup_update_old_refcnt(struct btrfs_qgroup *qg, u64 seq,
Expand Down Expand Up @@ -1114,9 +1120,9 @@ static int __qgroup_excl_accounting(struct btrfs_fs_info *fs_info,
qgroup->excl_cmpr += sign * num_bytes;

if (sign > 0)
qgroup_rsv_add_by_qgroup(qgroup, src);
qgroup_rsv_add_by_qgroup(fs_info, qgroup, src);
else
qgroup_rsv_release_by_qgroup(qgroup, src);
qgroup_rsv_release_by_qgroup(fs_info, qgroup, src);

qgroup_dirty(fs_info, qgroup);

Expand All @@ -1137,9 +1143,9 @@ static int __qgroup_excl_accounting(struct btrfs_fs_info *fs_info,
WARN_ON(sign < 0 && qgroup->excl < num_bytes);
qgroup->excl += sign * num_bytes;
if (sign > 0)
qgroup_rsv_add_by_qgroup(qgroup, src);
qgroup_rsv_add_by_qgroup(fs_info, qgroup, src);
else
qgroup_rsv_release_by_qgroup(qgroup, src);
qgroup_rsv_release_by_qgroup(fs_info, qgroup, src);
qgroup->excl_cmpr += sign * num_bytes;
qgroup_dirty(fs_info, qgroup);

Expand Down Expand Up @@ -2495,8 +2501,8 @@ static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce,

qg = unode_aux_to_qgroup(unode);

trace_qgroup_update_reserve(fs_info, qg, num_bytes);
qgroup_rsv_add(qg, num_bytes, type);
trace_qgroup_update_reserve(fs_info, qg, num_bytes, type);
qgroup_rsv_add(fs_info, qg, num_bytes, type);
}

out:
Expand Down Expand Up @@ -2542,8 +2548,8 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,

qg = unode_aux_to_qgroup(unode);

trace_qgroup_update_reserve(fs_info, qg, -(s64)num_bytes);
qgroup_rsv_release(qg, num_bytes, type);
trace_qgroup_update_reserve(fs_info, qg, -(s64)num_bytes, type);
qgroup_rsv_release(fs_info, qg, num_bytes, type);

list_for_each_entry(glist, &qg->groups, next_group) {
ret = ulist_add(fs_info->qgroup_ulist,
Expand Down
17 changes: 12 additions & 5 deletions include/trace/events/btrfs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ TRACE_DEFINE_ENUM(COMMIT_TRANS);
{ BTRFS_FILE_EXTENT_REG, "REG" }, \
{ BTRFS_FILE_EXTENT_PREALLOC, "PREALLOC"})

#define show_qgroup_rsv_type(type) \
__print_symbolic(type, \
{ BTRFS_QGROUP_RSV_DATA, "DATA" }, \
{ BTRFS_QGROUP_RSV_META, "META" })

#define BTRFS_GROUP_FLAGS \
{ BTRFS_BLOCK_GROUP_DATA, "DATA"}, \
{ BTRFS_BLOCK_GROUP_SYSTEM, "SYSTEM"}, \
Expand Down Expand Up @@ -1633,24 +1638,26 @@ TRACE_EVENT(qgroup_update_counters,
TRACE_EVENT(qgroup_update_reserve,

TP_PROTO(struct btrfs_fs_info *fs_info, struct btrfs_qgroup *qgroup,
s64 diff),
s64 diff, int type),

TP_ARGS(fs_info, qgroup, diff),
TP_ARGS(fs_info, qgroup, diff, type),

TP_STRUCT__entry_btrfs(
__field( u64, qgid )
__field( u64, cur_reserved )
__field( s64, diff )
__field( int, type )
),

TP_fast_assign_btrfs(fs_info,
__entry->qgid = qgroup->qgroupid;
__entry->cur_reserved = qgroup->reserved;
__entry->cur_reserved = qgroup->rsv.values[type];
__entry->diff = diff;
),

TP_printk_btrfs("qgid=%llu cur_reserved=%llu diff=%lld",
__entry->qgid, __entry->cur_reserved, __entry->diff)
TP_printk_btrfs("qgid=%llu type=%s cur_reserved=%llu diff=%lld",
__entry->qgid, show_qgroup_rsv_type(__entry->type),
__entry->cur_reserved, __entry->diff)
);

TRACE_EVENT(qgroup_meta_reserve,
Expand Down

0 comments on commit 64ee4e7

Please sign in to comment.