Commit 11833d66 authored by Yan Zheng's avatar Yan Zheng Committed by Chris Mason
Browse files

Btrfs: improve async block group caching 



This patch gets rid of two limitations of async block group caching.
The old code delays handling pinned extents when block group is in
caching. To allocate logged file extents, the old code need wait
until block group is fully cached. To get rid of the limitations,
This patch introduces a data structure to track the progress of
caching. Base on the caching progress, we know which extents should
be added to the free space cache when handling the pinned extents.
The logged file extents are also handled in a similar way.

This patch also changes how pinned extents are tracked. The old
code uses one tree to track pinned extents, and copy the pinned
extents tree at transaction commit time. This patch makes it use
two trees to track pinned extents. One tree for extents that are
pinned in the running transaction, one tree for extents that can
be unpinned. At transaction commit time, we swap the two trees.

Signed-off-by: default avatarYan Zheng <zheng.yan@oracle.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 6e74057c

fs/btrfs/ctree.h

+20 −9
Original line number Diff line number Diff line
@@ -726,6 +726,15 @@ enum btrfs_caching_type { 
	BTRFS_CACHE_FINISHED	= 2,

};



struct btrfs_caching_control {

	struct list_head list;

	struct mutex mutex;

	wait_queue_head_t wait;

	struct btrfs_block_group_cache *block_group;

	u64 progress;

	atomic_t count;

};



struct btrfs_block_group_cache {

	struct btrfs_key key;

	struct btrfs_block_group_item item;
@@ -742,8 +751,9 @@ struct btrfs_block_group_cache { 
	int dirty;



	/* cache tracking stuff */

	wait_queue_head_t caching_q;

	int cached;

	struct btrfs_caching_control *caching_ctl;

	u64 last_byte_to_unpin;



	struct btrfs_space_info *space_info;
@@ -788,7 +798,8 @@ struct btrfs_fs_info { 
	spinlock_t block_group_cache_lock;

	struct rb_root block_group_cache_tree;



	struct extent_io_tree pinned_extents;

	struct extent_io_tree freed_extents[2];

	struct extent_io_tree *pinned_extents;



	/* logical->physical extent mapping */

	struct btrfs_mapping_tree mapping_tree;
@@ -825,8 +836,6 @@ struct btrfs_fs_info { 
	struct mutex drop_mutex;

	struct mutex volume_mutex;

	struct mutex tree_reloc_mutex;

	struct rw_semaphore extent_commit_sem;



	/*

	 * this protects the ordered operations list only while we are

	 * processing all of the entries on it.  This way we make
@@ -835,10 +844,12 @@ struct btrfs_fs_info { 
	 * before jumping into the main commit.

	 */

	struct mutex ordered_operations_mutex;

	struct rw_semaphore extent_commit_sem;



	struct list_head trans_list;

	struct list_head hashers;

	struct list_head dead_roots;

	struct list_head caching_block_groups;



	atomic_t nr_async_submits;

	atomic_t async_submit_draining;
@@ -1920,8 +1931,8 @@ void btrfs_put_block_group(struct btrfs_block_group_cache *cache); 
int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,

			   struct btrfs_root *root, unsigned long count);

int btrfs_lookup_extent(struct btrfs_root *root, u64 start, u64 len);

int btrfs_update_pinned_extents(struct btrfs_root *root,

				u64 bytenr, u64 num, int pin);

int btrfs_pin_extent(struct btrfs_root *root,

		     u64 bytenr, u64 num, int reserved);

int btrfs_drop_leaf_ref(struct btrfs_trans_handle *trans,

			struct btrfs_root *root, struct extent_buffer *leaf);

int btrfs_cross_ref_exist(struct btrfs_trans_handle *trans,
@@ -1971,9 +1982,10 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, 
		      u64 root_objectid, u64 owner, u64 offset);



int btrfs_free_reserved_extent(struct btrfs_root *root, u64 start, u64 len);

int btrfs_prepare_extent_commit(struct btrfs_trans_handle *trans,

				struct btrfs_root *root);

int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,

			       struct btrfs_root *root,

			       struct extent_io_tree *unpin);

			       struct btrfs_root *root);

int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,

			 struct btrfs_root *root,

			 u64 bytenr, u64 num_bytes, u64 parent,
@@ -2006,7 +2018,6 @@ void btrfs_delalloc_reserve_space(struct btrfs_root *root, struct inode *inode, 
				 u64 bytes);

void btrfs_delalloc_free_space(struct btrfs_root *root, struct inode *inode,

			      u64 bytes);

void btrfs_free_pinned_extents(struct btrfs_fs_info *info);

/* ctree.c */

int btrfs_bin_search(struct extent_buffer *eb, struct btrfs_key *key,

		     int level, int *slot);

fs/btrfs/disk-io.c

+5 −2
Original line number Diff line number Diff line
@@ -1563,6 +1563,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	INIT_LIST_HEAD(&fs_info->hashers);

	INIT_LIST_HEAD(&fs_info->delalloc_inodes);

	INIT_LIST_HEAD(&fs_info->ordered_operations);

	INIT_LIST_HEAD(&fs_info->caching_block_groups);

	spin_lock_init(&fs_info->delalloc_lock);

	spin_lock_init(&fs_info->new_trans_lock);

	spin_lock_init(&fs_info->ref_cache_lock);
@@ -1621,8 +1622,11 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	spin_lock_init(&fs_info->block_group_cache_lock);

	fs_info->block_group_cache_tree.rb_node = NULL;



	extent_io_tree_init(&fs_info->pinned_extents,

	extent_io_tree_init(&fs_info->freed_extents[0],

			     fs_info->btree_inode->i_mapping, GFP_NOFS);

	extent_io_tree_init(&fs_info->freed_extents[1],

			     fs_info->btree_inode->i_mapping, GFP_NOFS);

	fs_info->pinned_extents = &fs_info->freed_extents[0];

	fs_info->do_barriers = 1;



	BTRFS_I(fs_info->btree_inode)->root = tree_root;
@@ -2359,7 +2363,6 @@ int close_ctree(struct btrfs_root *root) 
	free_extent_buffer(root->fs_info->csum_root->commit_root);



	btrfs_free_block_groups(root->fs_info);

	btrfs_free_pinned_extents(root->fs_info);



	del_fs_roots(fs_info);

fs/btrfs/extent-tree.c

+352 −234

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/transaction.c

+3 −12
Original line number Diff line number Diff line
@@ -874,7 +874,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
	unsigned long timeout = 1;

	struct btrfs_transaction *cur_trans;

	struct btrfs_transaction *prev_trans = NULL;

	struct extent_io_tree *pinned_copy;

	DEFINE_WAIT(wait);

	int ret;

	int should_grow = 0;
@@ -915,13 +914,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
		return 0;

	}



	pinned_copy = kmalloc(sizeof(*pinned_copy), GFP_NOFS);

	if (!pinned_copy)

		return -ENOMEM;



	extent_io_tree_init(pinned_copy,

			     root->fs_info->btree_inode->i_mapping, GFP_NOFS);



	trans->transaction->in_commit = 1;

	trans->transaction->blocked = 1;

	if (cur_trans->list.prev != &root->fs_info->trans_list) {
@@ -1019,6 +1011,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
	ret = commit_cowonly_roots(trans, root);

	BUG_ON(ret);



	btrfs_prepare_extent_commit(trans, root);



	cur_trans = root->fs_info->running_transaction;

	spin_lock(&root->fs_info->new_trans_lock);

	root->fs_info->running_transaction = NULL;
@@ -1042,8 +1036,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
	memcpy(&root->fs_info->super_for_commit, &root->fs_info->super_copy,

	       sizeof(root->fs_info->super_copy));



	btrfs_copy_pinned(root, pinned_copy);



	trans->transaction->blocked = 0;



	wake_up(&root->fs_info->transaction_wait);
@@ -1059,8 +1051,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
	 */

	mutex_unlock(&root->fs_info->tree_log_mutex);



	btrfs_finish_extent_commit(trans, root, pinned_copy);

	kfree(pinned_copy);

	btrfs_finish_extent_commit(trans, root);



	/* do the directory inserts of any pending snapshot creations */

	finish_pending_snapshots(trans, root->fs_info);

fs/btrfs/tree-log.c

+2 −2
Original line number Diff line number Diff line
@@ -263,8 +263,8 @@ static int process_one_buffer(struct btrfs_root *log, 
			      struct walk_control *wc, u64 gen)

{

	if (wc->pin)

		btrfs_update_pinned_extents(log->fs_info->extent_root,

					    eb->start, eb->len, 1);

		btrfs_pin_extent(log->fs_info->extent_root,

				 eb->start, eb->len, 0);



	if (btrfs_buffer_uptodate(eb, gen)) {

		if (wc->write)

CRA Git | Maintained and supported by SUSTech CRA and CCSE