diff options
author | Qu Wenruo <wqu@suse.com> | 2019-01-08 01:08:18 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2019-01-10 11:13:00 -0500 |
commit | 1b3922a8bc74231f9a767d1be6d9a061a4d4eeab (patch) | |
tree | 6f864443b020a1d7c3db39bfaf6abcc08b06ebc1 | |
parent | a6d8654d885d7d79a3fb82da64eaa489ca332a82 (diff) |
btrfs: Use real device structure to verify dev extent
[BUG]
Linux v5.0-rc1 will fail fstests/btrfs/163 with the following kernel
message:
BTRFS error (device dm-6): dev extent devid 1 physical offset 13631488 len 8388608 is beyond device boundary 0
BTRFS error (device dm-6): failed to verify dev extents against chunks: -117
BTRFS error (device dm-6): open_ctree failed
[CAUSE]
Commit cf90d884b347 ("btrfs: Introduce mount time chunk <-> dev extent
mapping check") introduced strict check on dev extents.
We use btrfs_find_device() with dev uuid and fs uuid set to NULL, and
only dependent on @devid to find the real device.
For seed devices, we call clone_fs_devices() in open_seed_devices() to
allow us search seed devices directly.
However clone_fs_devices() just populates devices with devid and dev
uuid, without populating other essential members, like disk_total_bytes.
This makes any device returned by btrfs_find_device(fs_info, devid,
NULL, NULL) is just a dummy, with 0 disk_total_bytes, and any dev
extents on the seed device will not pass the device boundary check.
[FIX]
This patch will try to verify the device returned by btrfs_find_device()
and if it's a dummy then re-search in seed devices.
Fixes: cf90d884b347 ("btrfs: Introduce mount time chunk <-> dev extent mapping check")
CC: stable@vger.kernel.org # 4.19+
Reported-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/volumes.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 2576b1a379c9..3e4f8f88353e 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -7825,6 +7825,18 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info, | |||
7825 | ret = -EUCLEAN; | 7825 | ret = -EUCLEAN; |
7826 | goto out; | 7826 | goto out; |
7827 | } | 7827 | } |
7828 | |||
7829 | /* It's possible this device is a dummy for seed device */ | ||
7830 | if (dev->disk_total_bytes == 0) { | ||
7831 | dev = find_device(fs_info->fs_devices->seed, devid, NULL); | ||
7832 | if (!dev) { | ||
7833 | btrfs_err(fs_info, "failed to find seed devid %llu", | ||
7834 | devid); | ||
7835 | ret = -EUCLEAN; | ||
7836 | goto out; | ||
7837 | } | ||
7838 | } | ||
7839 | |||
7828 | if (physical_offset + physical_len > dev->disk_total_bytes) { | 7840 | if (physical_offset + physical_len > dev->disk_total_bytes) { |
7829 | btrfs_err(fs_info, | 7841 | btrfs_err(fs_info, |
7830 | "dev extent devid %llu physical offset %llu len %llu is beyond device boundary %llu", | 7842 | "dev extent devid %llu physical offset %llu len %llu is beyond device boundary %llu", |