btrfs: pass find_free_extent_ctl to allocator tracepoints
The allocator tracepoints currently have a pile of values from ffe_ctl. In modifying the allocator and adding more tracepoints, I found myself adding to the already long argument list of the tracepoints. It makes it a lot simpler to just send in the ffe_ctl itself. Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: Boris Burkov <boris@bur.io> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Boris Burkov
David Sterba
parent
36d4556745
commit
cfc2de0fce
@ -16,7 +16,8 @@
|
||||
#include <linux/percpu_counter.h>
|
||||
#include <linux/lockdep.h>
|
||||
#include <linux/crc32c.h>
|
||||
#include "misc.h"
|
||||
#include "ctree.h"
|
||||
#include "extent-tree.h"
|
||||
#include "tree-log.h"
|
||||
#include "disk-io.h"
|
||||
#include "print-tree.h"
|
||||
@ -31,7 +32,6 @@
|
||||
#include "space-info.h"
|
||||
#include "block-rsv.h"
|
||||
#include "delalloc-space.h"
|
||||
#include "block-group.h"
|
||||
#include "discard.h"
|
||||
#include "rcu-string.h"
|
||||
#include "zoned.h"
|
||||
@ -3453,81 +3453,6 @@ btrfs_release_block_group(struct btrfs_block_group *cache,
|
||||
btrfs_put_block_group(cache);
|
||||
}
|
||||
|
||||
enum btrfs_extent_allocation_policy {
|
||||
BTRFS_EXTENT_ALLOC_CLUSTERED,
|
||||
BTRFS_EXTENT_ALLOC_ZONED,
|
||||
};
|
||||
|
||||
/*
|
||||
* Structure used internally for find_free_extent() function. Wraps needed
|
||||
* parameters.
|
||||
*/
|
||||
struct find_free_extent_ctl {
|
||||
/* Basic allocation info */
|
||||
u64 ram_bytes;
|
||||
u64 num_bytes;
|
||||
u64 min_alloc_size;
|
||||
u64 empty_size;
|
||||
u64 flags;
|
||||
int delalloc;
|
||||
|
||||
/* Where to start the search inside the bg */
|
||||
u64 search_start;
|
||||
|
||||
/* For clustered allocation */
|
||||
u64 empty_cluster;
|
||||
struct btrfs_free_cluster *last_ptr;
|
||||
bool use_cluster;
|
||||
|
||||
bool have_caching_bg;
|
||||
bool orig_have_caching_bg;
|
||||
|
||||
/* Allocation is called for tree-log */
|
||||
bool for_treelog;
|
||||
|
||||
/* Allocation is called for data relocation */
|
||||
bool for_data_reloc;
|
||||
|
||||
/* RAID index, converted from flags */
|
||||
int index;
|
||||
|
||||
/*
|
||||
* Current loop number, check find_free_extent_update_loop() for details
|
||||
*/
|
||||
int loop;
|
||||
|
||||
/*
|
||||
* Whether we're refilling a cluster, if true we need to re-search
|
||||
* current block group but don't try to refill the cluster again.
|
||||
*/
|
||||
bool retry_clustered;
|
||||
|
||||
/*
|
||||
* Whether we're updating free space cache, if true we need to re-search
|
||||
* current block group but don't try updating free space cache again.
|
||||
*/
|
||||
bool retry_unclustered;
|
||||
|
||||
/* If current block group is cached */
|
||||
int cached;
|
||||
|
||||
/* Max contiguous hole found */
|
||||
u64 max_extent_size;
|
||||
|
||||
/* Total free space from free space cache, not always contiguous */
|
||||
u64 total_free_space;
|
||||
|
||||
/* Found result */
|
||||
u64 found_offset;
|
||||
|
||||
/* Hint where to start looking for an empty space */
|
||||
u64 hint_byte;
|
||||
|
||||
/* Allocation policy */
|
||||
enum btrfs_extent_allocation_policy policy;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Helper function for find_free_extent().
|
||||
*
|
||||
@ -3559,8 +3484,7 @@ static int find_free_extent_clustered(struct btrfs_block_group *bg,
|
||||
if (offset) {
|
||||
/* We have a block, we're done */
|
||||
spin_unlock(&last_ptr->refill_lock);
|
||||
trace_btrfs_reserve_extent_cluster(cluster_bg,
|
||||
ffe_ctl->search_start, ffe_ctl->num_bytes);
|
||||
trace_btrfs_reserve_extent_cluster(cluster_bg, ffe_ctl);
|
||||
*cluster_bg_ret = cluster_bg;
|
||||
ffe_ctl->found_offset = offset;
|
||||
return 0;
|
||||
@ -3610,10 +3534,8 @@ refill_cluster:
|
||||
if (offset) {
|
||||
/* We found one, proceed */
|
||||
spin_unlock(&last_ptr->refill_lock);
|
||||
trace_btrfs_reserve_extent_cluster(bg,
|
||||
ffe_ctl->search_start,
|
||||
ffe_ctl->num_bytes);
|
||||
ffe_ctl->found_offset = offset;
|
||||
trace_btrfs_reserve_extent_cluster(bg, ffe_ctl);
|
||||
return 0;
|
||||
}
|
||||
} else if (!ffe_ctl->cached && ffe_ctl->loop > LOOP_CACHING_NOWAIT &&
|
||||
@ -4296,8 +4218,7 @@ static noinline int find_free_extent(struct btrfs_root *root,
|
||||
ins->objectid = 0;
|
||||
ins->offset = 0;
|
||||
|
||||
trace_find_free_extent(root, ffe_ctl->num_bytes, ffe_ctl->empty_size,
|
||||
ffe_ctl->flags);
|
||||
trace_find_free_extent(root, ffe_ctl);
|
||||
|
||||
space_info = btrfs_find_space_info(fs_info, ffe_ctl->flags);
|
||||
if (!space_info) {
|
||||
@ -4468,8 +4389,7 @@ have_block_group:
|
||||
ins->objectid = ffe_ctl->search_start;
|
||||
ins->offset = ffe_ctl->num_bytes;
|
||||
|
||||
trace_btrfs_reserve_extent(block_group, ffe_ctl->search_start,
|
||||
ffe_ctl->num_bytes);
|
||||
trace_btrfs_reserve_extent(block_group, ffe_ctl);
|
||||
btrfs_release_block_group(block_group, ffe_ctl->delalloc);
|
||||
break;
|
||||
loop:
|
||||
|
||||
@ -3,6 +3,81 @@
|
||||
#ifndef BTRFS_EXTENT_TREE_H
|
||||
#define BTRFS_EXTENT_TREE_H
|
||||
|
||||
#include "misc.h"
|
||||
#include "block-group.h"
|
||||
|
||||
struct btrfs_free_cluster;
|
||||
|
||||
enum btrfs_extent_allocation_policy {
|
||||
BTRFS_EXTENT_ALLOC_CLUSTERED,
|
||||
BTRFS_EXTENT_ALLOC_ZONED,
|
||||
};
|
||||
|
||||
struct find_free_extent_ctl {
|
||||
/* Basic allocation info */
|
||||
u64 ram_bytes;
|
||||
u64 num_bytes;
|
||||
u64 min_alloc_size;
|
||||
u64 empty_size;
|
||||
u64 flags;
|
||||
int delalloc;
|
||||
|
||||
/* Where to start the search inside the bg */
|
||||
u64 search_start;
|
||||
|
||||
/* For clustered allocation */
|
||||
u64 empty_cluster;
|
||||
struct btrfs_free_cluster *last_ptr;
|
||||
bool use_cluster;
|
||||
|
||||
bool have_caching_bg;
|
||||
bool orig_have_caching_bg;
|
||||
|
||||
/* Allocation is called for tree-log */
|
||||
bool for_treelog;
|
||||
|
||||
/* Allocation is called for data relocation */
|
||||
bool for_data_reloc;
|
||||
|
||||
/* RAID index, converted from flags */
|
||||
int index;
|
||||
|
||||
/*
|
||||
* Current loop number, check find_free_extent_update_loop() for details
|
||||
*/
|
||||
int loop;
|
||||
|
||||
/*
|
||||
* Whether we're refilling a cluster, if true we need to re-search
|
||||
* current block group but don't try to refill the cluster again.
|
||||
*/
|
||||
bool retry_clustered;
|
||||
|
||||
/*
|
||||
* Whether we're updating free space cache, if true we need to re-search
|
||||
* current block group but don't try updating free space cache again.
|
||||
*/
|
||||
bool retry_unclustered;
|
||||
|
||||
/* If current block group is cached */
|
||||
int cached;
|
||||
|
||||
/* Max contiguous hole found */
|
||||
u64 max_extent_size;
|
||||
|
||||
/* Total free space from free space cache, not always contiguous */
|
||||
u64 total_free_space;
|
||||
|
||||
/* Found result */
|
||||
u64 found_offset;
|
||||
|
||||
/* Hint where to start looking for an empty space */
|
||||
u64 hint_byte;
|
||||
|
||||
/* Allocation policy */
|
||||
enum btrfs_extent_allocation_policy policy;
|
||||
};
|
||||
|
||||
enum btrfs_inline_ref_type {
|
||||
BTRFS_REF_TYPE_INVALID,
|
||||
BTRFS_REF_TYPE_BLOCK,
|
||||
|
||||
@ -58,6 +58,7 @@
|
||||
#include "scrub.h"
|
||||
#include "verity.h"
|
||||
#include "super.h"
|
||||
#include "extent-tree.h"
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include <trace/events/btrfs.h>
|
||||
|
||||
|
||||
@ -32,6 +32,7 @@ struct prelim_ref;
|
||||
struct btrfs_space_info;
|
||||
struct btrfs_raid_bio;
|
||||
struct raid56_bio_trace_info;
|
||||
struct find_free_extent_ctl;
|
||||
|
||||
#define show_ref_type(type) \
|
||||
__print_symbolic(type, \
|
||||
@ -1241,38 +1242,38 @@ DEFINE_EVENT(btrfs__reserved_extent, btrfs_reserved_extent_free,
|
||||
|
||||
TRACE_EVENT(find_free_extent,
|
||||
|
||||
TP_PROTO(const struct btrfs_root *root, u64 num_bytes,
|
||||
u64 empty_size, u64 data),
|
||||
TP_PROTO(const struct btrfs_root *root,
|
||||
const struct find_free_extent_ctl *ffe_ctl),
|
||||
|
||||
TP_ARGS(root, num_bytes, empty_size, data),
|
||||
TP_ARGS(root, ffe_ctl),
|
||||
|
||||
TP_STRUCT__entry_btrfs(
|
||||
__field( u64, root_objectid )
|
||||
__field( u64, num_bytes )
|
||||
__field( u64, empty_size )
|
||||
__field( u64, data )
|
||||
__field( u64, flags )
|
||||
),
|
||||
|
||||
TP_fast_assign_btrfs(root->fs_info,
|
||||
__entry->root_objectid = root->root_key.objectid;
|
||||
__entry->num_bytes = num_bytes;
|
||||
__entry->empty_size = empty_size;
|
||||
__entry->data = data;
|
||||
__entry->num_bytes = ffe_ctl->num_bytes;
|
||||
__entry->empty_size = ffe_ctl->empty_size;
|
||||
__entry->flags = ffe_ctl->flags;
|
||||
),
|
||||
|
||||
TP_printk_btrfs("root=%llu(%s) len=%llu empty_size=%llu flags=%llu(%s)",
|
||||
show_root_type(__entry->root_objectid),
|
||||
__entry->num_bytes, __entry->empty_size, __entry->data,
|
||||
__print_flags((unsigned long)__entry->data, "|",
|
||||
__entry->num_bytes, __entry->empty_size, __entry->flags,
|
||||
__print_flags((unsigned long)__entry->flags, "|",
|
||||
BTRFS_GROUP_FLAGS))
|
||||
);
|
||||
|
||||
DECLARE_EVENT_CLASS(btrfs__reserve_extent,
|
||||
|
||||
TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
|
||||
u64 len),
|
||||
TP_PROTO(const struct btrfs_block_group *block_group,
|
||||
const struct find_free_extent_ctl *ffe_ctl),
|
||||
|
||||
TP_ARGS(block_group, start, len),
|
||||
TP_ARGS(block_group, ffe_ctl),
|
||||
|
||||
TP_STRUCT__entry_btrfs(
|
||||
__field( u64, bg_objectid )
|
||||
@ -1284,8 +1285,8 @@ DECLARE_EVENT_CLASS(btrfs__reserve_extent,
|
||||
TP_fast_assign_btrfs(block_group->fs_info,
|
||||
__entry->bg_objectid = block_group->start;
|
||||
__entry->flags = block_group->flags;
|
||||
__entry->start = start;
|
||||
__entry->len = len;
|
||||
__entry->start = ffe_ctl->search_start;
|
||||
__entry->len = ffe_ctl->num_bytes;
|
||||
),
|
||||
|
||||
TP_printk_btrfs("root=%llu(%s) block_group=%llu flags=%llu(%s) "
|
||||
@ -1299,18 +1300,18 @@ DECLARE_EVENT_CLASS(btrfs__reserve_extent,
|
||||
|
||||
DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent,
|
||||
|
||||
TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
|
||||
u64 len),
|
||||
TP_PROTO(const struct btrfs_block_group *block_group,
|
||||
const struct find_free_extent_ctl *ffe_ctl),
|
||||
|
||||
TP_ARGS(block_group, start, len)
|
||||
TP_ARGS(block_group, ffe_ctl)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent_cluster,
|
||||
|
||||
TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
|
||||
u64 len),
|
||||
TP_PROTO(const struct btrfs_block_group *block_group,
|
||||
const struct find_free_extent_ctl *ffe_ctl),
|
||||
|
||||
TP_ARGS(block_group, start, len)
|
||||
TP_ARGS(block_group, ffe_ctl)
|
||||
);
|
||||
|
||||
TRACE_EVENT(btrfs_find_cluster,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user