Commit 7f9fe614 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: improve global reserve stealing logic 



For unlink transactions and block group removal
btrfs_start_transaction_fallback_global_rsv will first try to start an
ordinary transaction and if it fails it will fall back to reserving the
required amount by stealing from the global reserve. This is problematic
because of all the same reasons we had with previous iterations of the
ENOSPC handling, thundering herd.  We get a bunch of failures all at
once, everybody tries to allocate from the global reserve, some win and
some lose, we get an ENSOPC.

Fix this behavior by introducing BTRFS_RESERVE_FLUSH_ALL_STEAL. It's
used to mark unlink reservation. To fix this we need to integrate this
logic into the normal ENOSPC infrastructure.  We still go through all of
the normal flushing work, and at the moment we begin to fail all the
tickets we try to satisfy any tickets that are allowed to steal by
stealing from the global reserve.  If this works we start the flushing
system over again just like we would with a normal ticket satisfaction.
This serializes our global reserve stealing, so we don't have the
thundering herd problem.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Tested-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 876de781

fs/btrfs/block-group.c

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ struct btrfs_trans_handle *btrfs_start_trans_remove_block_group( 
	free_extent_map(em);



	return btrfs_start_transaction_fallback_global_rsv(fs_info->extent_root,

							   num_items, 1);

							   num_items);

}



/*

fs/btrfs/ctree.h

+1 −0
Original line number Diff line number Diff line
@@ -2512,6 +2512,7 @@ enum btrfs_reserve_flush_enum { 
	BTRFS_RESERVE_FLUSH_LIMIT,

	BTRFS_RESERVE_FLUSH_EVICT,

	BTRFS_RESERVE_FLUSH_ALL,

	BTRFS_RESERVE_FLUSH_ALL_STEAL,

};



enum btrfs_flush_state {

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3618,7 +3618,7 @@ static struct btrfs_trans_handle *__unlink_start_trans(struct inode *dir) 
	 * 1 for the inode ref

	 * 1 for the inode

	 */

	return btrfs_start_transaction_fallback_global_rsv(root, 5, 5);

	return btrfs_start_transaction_fallback_global_rsv(root, 5);

}



static int btrfs_unlink(struct inode *dir, struct dentry *dentry)

fs/btrfs/space-info.c

+36 −1
Original line number Diff line number Diff line
@@ -856,6 +856,34 @@ static inline int need_do_async_reclaim(struct btrfs_fs_info *fs_info, 
		!test_bit(BTRFS_FS_STATE_REMOUNTING, &fs_info->fs_state));

}



static bool steal_from_global_rsv(struct btrfs_fs_info *fs_info,

				  struct btrfs_space_info *space_info,

				  struct reserve_ticket *ticket)

{

	struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;

	u64 min_bytes;



	if (global_rsv->space_info != space_info)

		return false;



	spin_lock(&global_rsv->lock);

	min_bytes = div_factor(global_rsv->size, 5);

	if (global_rsv->reserved < min_bytes + ticket->bytes) {

		spin_unlock(&global_rsv->lock);

		return false;

	}

	global_rsv->reserved -= ticket->bytes;

	ticket->bytes = 0;

	list_del_init(&ticket->list);

	wake_up(&ticket->wait);

	space_info->tickets_id++;

	if (global_rsv->reserved < global_rsv->size)

		global_rsv->full = 0;

	spin_unlock(&global_rsv->lock);



	return true;

}



/*

 * maybe_fail_all_tickets - we've exhausted our flushing, start failing tickets

 * @fs_info - fs_info for this fs
@@ -888,6 +916,10 @@ static bool maybe_fail_all_tickets(struct btrfs_fs_info *fs_info, 
		ticket = list_first_entry(&space_info->tickets,

					  struct reserve_ticket, list);



		if (ticket->steal &&

		    steal_from_global_rsv(fs_info, space_info, ticket))

			return true;



		/*

		 * may_commit_transaction will avoid committing the transaction

		 * if it doesn't feel like the space reclaimed by the commit
@@ -1104,6 +1136,7 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info, 


	switch (flush) {

	case BTRFS_RESERVE_FLUSH_ALL:

	case BTRFS_RESERVE_FLUSH_ALL_STEAL:

		wait_reserve_ticket(fs_info, space_info, ticket);

		break;

	case BTRFS_RESERVE_FLUSH_LIMIT:
@@ -1203,7 +1236,9 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info *fs_info, 
		ticket.error = 0;

		space_info->reclaim_size += ticket.bytes;

		init_waitqueue_head(&ticket.wait);

		if (flush == BTRFS_RESERVE_FLUSH_ALL) {

		ticket.steal = (flush == BTRFS_RESERVE_FLUSH_ALL_STEAL);

		if (flush == BTRFS_RESERVE_FLUSH_ALL ||

		    flush == BTRFS_RESERVE_FLUSH_ALL_STEAL) {

			list_add_tail(&ticket.list, &space_info->tickets);

			if (!space_info->flush) {

				space_info->flush = 1;

fs/btrfs/space-info.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct btrfs_space_info { 
struct reserve_ticket {

	u64 bytes;

	int error;

	bool steal;

	struct list_head list;

	wait_queue_head_t wait;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE