Skip to content

L
linux
Commit 7b31e045 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files
Options

btrfs: dev-replace: properly follow its read mode 

[BUG]
Although dev replace ioctl has a way to specify the mode on whether we
should read from the source device, it's not properly followed.

 # mkfs.btrfs -f -d raid1 -m raid1 $dev1 $dev2
 # mount $dev1 $mnt
 # xfs_io -f -c "pwrite 0 32M" $mnt/file
 # sync
 # btrfs replace start -r -f 1 $dev3 $mnt

And one extra trace is added to scrub_submit(), showing the detail about
the bio:

  btrfs-11569 [005] ...  37.0270: scrub_submit.part.0: devid=1 logical=22036480 phy=22036480 len=16384
  btrfs-11569 [005] ...  37.0273: scrub_submit.part.0: devid=1 logical=30457856 phy=30457856 len=32768
  btrfs-11569 [005] ...  37.0274: scrub_submit.part.0: devid=1 logical=30507008 phy=30507008 len=49152
  btrfs-11569 [005] ...  37.0274: scrub_submit.part.0: devid=1 logical=30605312 phy=30605312 len=32768
  btrfs-11569 [005] ...  37.0275: scrub_submit.part.0: devid=1 logical=30703616 phy=30703616 len=65536
  btrfs-11569 [005] ...  37.0281: scrub_submit.part.0: devid=1 logical=298844160 phy=298844160 len=131072
  ...
  btrfs-11569 [005] ...  37.0762: scrub_submit.part.0: devid=1 logical=322961408 phy=322961408 len=131072
  btrfs-11569 [005] ...  37.0762: scrub_submit.part.0: devid=1 logical=323092480 phy=323092480 len=131072

One can see that all the reads are submitted to devid 1, even if we have
specified "-r" option to avoid reading from the source device.

[CAUSE]
The dev-replace read mode is only set but not followed by scrub code at
all.  In fact, only common read path is properly following the read
mode, but scrub itself has its own read path, thus not following the
mode.

[FIX]
Here we enhance scrub_find_good_copy() to also follow the read mode.

The idea is pretty simple, in the first loop, we avoid the following
devices:

- Missing devices
  This is the existing condition

- The source device if the replace wants to avoid it.

And if above loop found no candidate (e.g. replace a single device),
then we discard the 2nd condition, and try again.

Since we're here, also enhance the function scrub_find_good_copy() by:

- Remove the forward declaration

- Makes it return int
  To indicates errors, e.g. no good mirror found.

- Add extra error messages

Now with the same trace, "btrfs replace start -r" works as expected:

  btrfs-1213 [000] ...  991.9059: scrub_submit.part.0: devid=2 logical=22036480 phy=1064960 len=16384
  btrfs-1213 [000] ...  991.9062: scrub_submit.part.0: devid=2 logical=30457856 phy=9486336 len=32768
  btrfs-1213 [000] ...  991.9063: scrub_submit.part.0: devid=2 logical=30507008 phy=9535488 len=49152
  btrfs-1213 [000] ...  991.9064: scrub_submit.part.0: devid=2 logical=30605312 phy=9633792 len=32768
  btrfs-1213 [000] ...  991.9065: scrub_submit.part.0: devid=2 logical=30703616 phy=9732096 len=65536
  btrfs-1213 [000] ...  991.9073: scrub_submit.part.0: devid=2 logical=298844160 phy=277872640 len=131072
  btrfs-1213 [000] ...  991.9075: scrub_submit.part.0: devid=2 logical=298975232 phy=278003712 len=131072
  btrfs-1213 [000] ...  991.9078: scrub_submit.part.0: devid=2 logical=299106304 phy=278134784 len=131072
  ...
  btrfs-1213 [000] ...  991.9474: scrub_submit.part.0: devid=2 logical=318504960 phy=297533440 len=131072
  btrfs-1213 [000] ...  991.9476: scrub_submit.part.0: devid=2 logical=318636032 phy=297664512 len=131072
  btrfs-1213 [000] ...  991.9479: scrub_submit.part.0: devid=2 logical=318767104 phy=297795584 len=131072
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f9327a70
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 40 deletions
fs/btrfs/scrub.c
View file @ 7b31e045
......@@ -423,11 +423,6 @@ static int scrub_sectors(struct scrub_ctx *sctx, u64 logical, u32 len,
static void scrub_bio_end_io(struct bio *bio);
static void scrub_bio_end_io_worker(struct work_struct *work);
static void scrub_block_complete(struct scrub_block *sblock);
static void scrub_find_good_copy(struct btrfs_fs_info *fs_info,
u64 extent_logical, u32 extent_len,
u64 *extent_physical,
struct btrfs_device **extent_dev,
int *extent_mirror_num);
static int scrub_add_sector_to_wr_bio(struct scrub_ctx *sctx,
struct scrub_sector *sector);
static void scrub_wr_submit(struct scrub_ctx *sctx);
......@@ -2710,6 +2705,110 @@ static int scrub_find_csum(struct scrub_ctx *sctx, u64 logical, u8 *csum)
return 1;
}
static bool should_use_device(struct btrfs_fs_info *fs_info,
struct btrfs_device *dev,
bool follow_replace_read_mode)
{
struct btrfs_device *replace_srcdev = fs_info->dev_replace.srcdev;
struct btrfs_device *replace_tgtdev = fs_info->dev_replace.tgtdev;
if (!dev->bdev)
return false;
/*
* We're doing scrub/replace, if it's pure scrub, no tgtdev should be
* here. If it's replace, we're going to write data to tgtdev, thus
* the current data of the tgtdev is all garbage, thus we can not use
* it at all.
*/
if (dev == replace_tgtdev)
return false;
/* No need to follow replace read mode, any existing device is fine. */
if (!follow_replace_read_mode)
return true;
/* Need to follow the mode. */
if (fs_info->dev_replace.cont_reading_from_srcdev_mode ==
BTRFS_DEV_REPLACE_ITEM_CONT_READING_FROM_SRCDEV_MODE_AVOID)
return dev != replace_srcdev;
return true;
}
static int scrub_find_good_copy(struct btrfs_fs_info *fs_info,
u64 extent_logical, u32 extent_len,
u64 *extent_physical,
struct btrfs_device **extent_dev,
int *extent_mirror_num)
{
u64 mapped_length;
struct btrfs_io_context *bioc = NULL;
int ret;
int i;
mapped_length = extent_len;
ret = btrfs_map_block(fs_info, BTRFS_MAP_GET_READ_MIRRORS,
extent_logical, &mapped_length, &bioc, 0);
if (ret || !bioc || mapped_length < extent_len) {
btrfs_put_bioc(bioc);
btrfs_err_rl(fs_info, "btrfs_map_block() failed for logical %llu: %d",
extent_logical, ret);
return -EIO;
}
/*
* First loop to exclude all missing devices and the source device if
* needed. And we don't want to use target device as mirror either, as
* we're doing the replace, the target device range contains nothing.
*/
for (i = 0; i < bioc->num_stripes - bioc->replace_nr_stripes; i++) {
struct btrfs_io_stripe *stripe = &bioc->stripes[i];
if (!should_use_device(fs_info, stripe->dev, true))
continue;
goto found;
}
/*
* We didn't find any alternative mirrors, we have to break our replace
* read mode, or we can not read at all.
*/
for (i = 0; i < bioc->num_stripes - bioc->replace_nr_stripes; i++) {
struct btrfs_io_stripe *stripe = &bioc->stripes[i];
if (!should_use_device(fs_info, stripe->dev, false))
continue;
goto found;
}
btrfs_err_rl(fs_info, "failed to find any live mirror for logical %llu",
extent_logical);
return -EIO;
found:
*extent_physical = bioc->stripes[i].physical;
*extent_mirror_num = i + 1;
*extent_dev = bioc->stripes[i].dev;
btrfs_put_bioc(bioc);
return 0;
}
static bool scrub_need_different_mirror(struct scrub_ctx *sctx,
struct map_lookup *map,
struct btrfs_device *dev)
{
/*
* For RAID56, all the extra mirrors are rebuilt from other P/Q,
* cannot utilize other mirrors directly.
*/
if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK)
return false;
if (!dev->bdev)
return true;
return sctx->fs_info->dev_replace.cont_reading_from_srcdev_mode ==
BTRFS_DEV_REPLACE_ITEM_CONT_READING_FROM_SRCDEV_MODE_AVOID;
}
/* scrub extent tries to collect up to 64 kB for each bio */
static int scrub_extent(struct scrub_ctx *sctx, struct map_lookup *map,
u64 logical, u32 len,
......@@ -2747,17 +2846,15 @@ static int scrub_extent(struct scrub_ctx *sctx, struct map_lookup *map,
}
/*
* For dev-replace case, we can have @dev being a missing device.
* Regular scrub will avoid its execution on missing device at all,
* as that would trigger tons of read error.
*
* Reading from missing device will cause read error counts to
* increase unnecessarily.
* So here we change the read source to a good mirror.
* For dev-replace case, we can have @dev being a missing device, or
* we want to avoid reading from the source device if possible.
*/
if (sctx->is_dev_replace && !dev->bdev)
scrub_find_good_copy(sctx->fs_info, logical, len, &src_physical,
&src_dev, &src_mirror);
if (sctx->is_dev_replace && scrub_need_different_mirror(sctx, map, dev)) {
ret = scrub_find_good_copy(sctx->fs_info, logical, len,
&src_physical, &src_dev, &src_mirror);
if (ret < 0)
return ret;
}
while (len) {
u32 l = min(len, blocksize);
int have_csum = 0;
......@@ -4544,28 +4641,3 @@ int btrfs_scrub_progress(struct btrfs_fs_info *fs_info, u64 devid,
return dev ? (sctx ? 0 : -ENOTCONN) : -ENODEV;
}
static void scrub_find_good_copy(struct btrfs_fs_info *fs_info,
u64 extent_logical, u32 extent_len,
u64 *extent_physical,
struct btrfs_device **extent_dev,
int *extent_mirror_num)
{
u64 mapped_length;
struct btrfs_io_context *bioc = NULL;
int ret;
mapped_length = extent_len;
ret = btrfs_map_block(fs_info, BTRFS_MAP_READ, extent_logical,
&mapped_length, &bioc, 0);
if (ret || !bioc || mapped_length < extent_len ||
!bioc->stripes[0].dev->bdev) {
btrfs_put_bioc(bioc);
return;
}
*extent_physical = bioc->stripes[0].physical;
*extent_mirror_num = bioc->mirror_num;
*extent_dev = bioc->stripes[0].dev;
btrfs_put_bioc(bioc);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7