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

Commit b0244199 authored by Miao Xie's avatar Miao Xie Committed by Chris Mason
Browse files

Btrfs: don't wait for the completion of all the ordered extents 



It is very likely that there are lots of ordered extents in the filesytem,
if we wait for the completion of all of them when we want to reclaim some
space for the metadata space reservation, we would be blocked for a long
time. The performance would drop down suddenly for a long time.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 9f3a074d

fs/btrfs/dev-replace.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -391,7 +391,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;

	args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;

	btrfs_dev_replace_unlock(dev_replace);

	btrfs_dev_replace_unlock(dev_replace);





	btrfs_wait_all_ordered_extents(root->fs_info);

	btrfs_wait_ordered_roots(root->fs_info, -1);





	/* force writing the updated state information to disk */

	/* force writing the updated state information to disk */

	trans = btrfs_start_transaction(root, 0);

	trans = btrfs_start_transaction(root, 0);
@@ -466,7 +466,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);

		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);

		return ret;

		return ret;

	}

	}

	btrfs_wait_all_ordered_extents(root->fs_info);

	btrfs_wait_ordered_roots(root->fs_info, -1);





	trans = btrfs_start_transaction(root, 0);

	trans = btrfs_start_transaction(root, 0);

	if (IS_ERR(trans)) {

	if (IS_ERR(trans)) {

fs/btrfs/extent-tree.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -4018,7 +4018,7 @@ static void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root, 
		 */

		 */

		btrfs_start_all_delalloc_inodes(root->fs_info, 0);

		btrfs_start_all_delalloc_inodes(root->fs_info, 0);

		if (!current->journal_info)

		if (!current->journal_info)

			btrfs_wait_all_ordered_extents(root->fs_info);

			btrfs_wait_ordered_roots(root->fs_info, -1);

	}

	}

}

}
@@ -4050,11 +4050,12 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, 
	long time_left;

	long time_left;

	unsigned long nr_pages;

	unsigned long nr_pages;

	int loops;

	int loops;

	int items;

	enum btrfs_reserve_flush_enum flush;

	enum btrfs_reserve_flush_enum flush;





	/* Calc the number of the pages we need flush for space reservation */

	/* Calc the number of the pages we need flush for space reservation */

	to_reclaim = calc_reclaim_items_nr(root, to_reclaim);

	items = calc_reclaim_items_nr(root, to_reclaim);

	to_reclaim *= EXTENT_SIZE_PER_ITEM;

	to_reclaim = items * EXTENT_SIZE_PER_ITEM;





	trans = (struct btrfs_trans_handle *)current->journal_info;

	trans = (struct btrfs_trans_handle *)current->journal_info;

	block_rsv = &root->fs_info->delalloc_block_rsv;

	block_rsv = &root->fs_info->delalloc_block_rsv;
@@ -4066,7 +4067,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, 
		if (trans)

		if (trans)

			return;

			return;

		if (wait_ordered)

		if (wait_ordered)

			btrfs_wait_all_ordered_extents(root->fs_info);

			btrfs_wait_ordered_roots(root->fs_info, items);

		return;

		return;

	}

	}
@@ -4105,7 +4106,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig, 




		loops++;

		loops++;

		if (wait_ordered && !trans) {

		if (wait_ordered && !trans) {

			btrfs_wait_all_ordered_extents(root->fs_info);

			btrfs_wait_ordered_roots(root->fs_info, items);

		} else {

		} else {

			time_left = schedule_timeout_killable(1);

			time_left = schedule_timeout_killable(1);

			if (time_left)

			if (time_left)

fs/btrfs/ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -572,7 +572,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	btrfs_wait_ordered_extents(root);

	btrfs_wait_ordered_extents(root, -1);





	pending_snapshot = kzalloc(sizeof(*pending_snapshot), GFP_NOFS);

	pending_snapshot = kzalloc(sizeof(*pending_snapshot), GFP_NOFS);

	if (!pending_snapshot)

	if (!pending_snapshot)

fs/btrfs/ordered-data.c

+17 −5
Original line number Original line Diff line number Diff line
@@ -565,10 +565,11 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work) 
 * wait for all the ordered extents in a root.  This is done when balancing

 * wait for all the ordered extents in a root.  This is done when balancing

 * space between drives.

 * space between drives.

 */

 */

void btrfs_wait_ordered_extents(struct btrfs_root *root)

int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr)

{

{

	struct list_head splice, works;

	struct list_head splice, works;

	struct btrfs_ordered_extent *ordered, *next;

	struct btrfs_ordered_extent *ordered, *next;

	int count = 0;





	INIT_LIST_HEAD(&splice);

	INIT_LIST_HEAD(&splice);

	INIT_LIST_HEAD(&works);

	INIT_LIST_HEAD(&works);
@@ -576,7 +577,7 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root) 
	mutex_lock(&root->fs_info->ordered_operations_mutex);

	mutex_lock(&root->fs_info->ordered_operations_mutex);

	spin_lock(&root->ordered_extent_lock);

	spin_lock(&root->ordered_extent_lock);

	list_splice_init(&root->ordered_extents, &splice);

	list_splice_init(&root->ordered_extents, &splice);

	while (!list_empty(&splice)) {

	while (!list_empty(&splice) && nr) {

		ordered = list_first_entry(&splice, struct btrfs_ordered_extent,

		ordered = list_first_entry(&splice, struct btrfs_ordered_extent,

					   root_extent_list);

					   root_extent_list);

		list_move_tail(&ordered->root_extent_list,

		list_move_tail(&ordered->root_extent_list,
@@ -591,7 +592,11 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root) 




		cond_resched();

		cond_resched();

		spin_lock(&root->ordered_extent_lock);

		spin_lock(&root->ordered_extent_lock);

		if (nr != -1)

			nr--;

		count++;

	}

	}

	list_splice_tail(&splice, &root->ordered_extents);

	spin_unlock(&root->ordered_extent_lock);

	spin_unlock(&root->ordered_extent_lock);





	list_for_each_entry_safe(ordered, next, &works, work_list) {

	list_for_each_entry_safe(ordered, next, &works, work_list) {
@@ -601,18 +606,21 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root) 
		cond_resched();

		cond_resched();

	}

	}

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

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



	return count;

}

}





void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info)

void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr)

{

{

	struct btrfs_root *root;

	struct btrfs_root *root;

	struct list_head splice;

	struct list_head splice;

	int done;





	INIT_LIST_HEAD(&splice);

	INIT_LIST_HEAD(&splice);





	spin_lock(&fs_info->ordered_root_lock);

	spin_lock(&fs_info->ordered_root_lock);

	list_splice_init(&fs_info->ordered_roots, &splice);

	list_splice_init(&fs_info->ordered_roots, &splice);

	while (!list_empty(&splice)) {

	while (!list_empty(&splice) && nr) {

		root = list_first_entry(&splice, struct btrfs_root,

		root = list_first_entry(&splice, struct btrfs_root,

					ordered_root);

					ordered_root);

		root = btrfs_grab_fs_root(root);

		root = btrfs_grab_fs_root(root);
@@ -621,10 +629,14 @@ void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info) 
			       &fs_info->ordered_roots);

			       &fs_info->ordered_roots);

		spin_unlock(&fs_info->ordered_root_lock);

		spin_unlock(&fs_info->ordered_root_lock);





		btrfs_wait_ordered_extents(root);

		done = btrfs_wait_ordered_extents(root, nr);

		btrfs_put_fs_root(root);

		btrfs_put_fs_root(root);





		spin_lock(&fs_info->ordered_root_lock);

		spin_lock(&fs_info->ordered_root_lock);

		if (nr != -1) {

			nr -= done;

			WARN_ON(nr < 0);

		}

	}

	}

	spin_unlock(&fs_info->ordered_root_lock);

	spin_unlock(&fs_info->ordered_root_lock);

}

}

fs/btrfs/ordered-data.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -195,8 +195,8 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans, 
void btrfs_add_ordered_operation(struct btrfs_trans_handle *trans,

void btrfs_add_ordered_operation(struct btrfs_trans_handle *trans,

				 struct btrfs_root *root,

				 struct btrfs_root *root,

				 struct inode *inode);

				 struct inode *inode);

void btrfs_wait_ordered_extents(struct btrfs_root *root);

int btrfs_wait_ordered_extents(struct btrfs_root *root, int nr);

void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info);

void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, int nr);

void btrfs_get_logged_extents(struct btrfs_root *log, struct inode *inode);

void btrfs_get_logged_extents(struct btrfs_root *log, struct inode *inode);

void btrfs_wait_logged_extents(struct btrfs_root *log, u64 transid);

void btrfs_wait_logged_extents(struct btrfs_root *log, u64 transid);

void btrfs_free_logged_extents(struct btrfs_root *log, u64 transid);

void btrfs_free_logged_extents(struct btrfs_root *log, u64 transid);