Commit debd1c06 authored May 17, 2019 by Nikolay Borisov Committed by David Sterba May 28, 2019

btrfs: Ensure replaced device doesn't have pending chunk allocation

Recent FITRIM work, namely bbbf7243 ("btrfs: combine device update
operations during transaction commit") combined the way certain
operations are recoded in a transaction. As a result an ASSERT was added
in dev_replace_finish to ensure the new code works correctly.
Unfortunately I got reports that it's possible to trigger the assert,
meaning that during a device replace it's possible to have an unfinished
chunk allocation on the source device.

This is supposed to be prevented by the fact that a transaction is
committed before finishing the replace oepration and alter acquiring the
chunk mutex. This is not sufficient since by the time the transaction is
committed and the chunk mutex acquired it's possible to allocate a chunk
depending on the workload being executed on the replaced device. This
bug has been present ever since device replace was introduced but there
was never code which checks for it.

The correct way to fix is to ensure that there is no pending device
modification operation when the chunk mutex is acquire and if there is
repeat transaction commit. Unfortunately it's not possible to just
exclude the source device from btrfs_fs_devices::dev_alloc_list since
this causes ENOSPC to be hit in transaction commit.

Fixing that in another way would need to add special cases to handle the
last writes and forbid new ones. The looped transaction fix is more
obvious, and can be easily backported. The runtime of dev-replace is
long so there's no noticeable delay caused by that.

Reported-by: David Sterba <dsterba@suse.com>
Fixes: 391cd9df ("Btrfs: fix unprotected alloc list insertion during the finishing procedure of replace")
CC: stable@vger.kernel.org # 4.4+
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 4e9845ef

fs/btrfs/dev-replace.c

+25 −10

Original line number	Diff line number	Diff line
		@@ -603,6 +603,12 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
		}
		btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);

		/*
		* We have to use this loop approach because at this point src_device
		* has to be available for transaction commit to complete, yet new
		* chunks shouldn't be allocated on the device.
		*/
		while (1) {
		trans = btrfs_start_transaction(root, 0);
		if (IS_ERR(trans)) {
		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
		@@ -611,9 +617,19 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
		ret = btrfs_commit_transaction(trans);
		WARN_ON(ret);

		/* keep away write_all_supers() during the finishing procedure */
		/* Prevent write_all_supers() during the finishing procedure */
		mutex_lock(&fs_info->fs_devices->device_list_mutex);
		/* Prevent new chunks being allocated on the source device */
		mutex_lock(&fs_info->chunk_mutex);

		if (!list_empty(&src_device->post_commit_list)) {
		mutex_unlock(&fs_info->fs_devices->device_list_mutex);
		mutex_unlock(&fs_info->chunk_mutex);
		} else {
		break;
		}
		}

		down_write(&dev_replace->rwsem);
		dev_replace->replace_state =
		scrub_ret ? BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED
		@@ -662,7 +678,6 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
		btrfs_device_set_disk_total_bytes(tgt_device,
		src_device->disk_total_bytes);
		btrfs_device_set_bytes_used(tgt_device, src_device->bytes_used);
		ASSERT(list_empty(&src_device->post_commit_list));
		tgt_device->commit_total_bytes = src_device->commit_total_bytes;
		tgt_device->commit_bytes_used = src_device->bytes_used;

Admin message