leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs/btrfs: handle data extents, which crosss stripe boundaries, correctly

Browse Source 
[BUG]
Since btrfs supports single device RAID0 at mkfs time after btrfs-progs
v5.14, if we create a single device raid0 btrfs, and created a file
crossing stripe boundary:

  # mkfs.btrfs -m dup -d raid0 test.img
  # mount test.img mnt
  # xfs_io -f -c "pwrite 0 128K" mnt/file
  # umount mnt

Since btrfs is using 64K as stripe length, above 128K data write is
definitely going to cross at least one stripe boundary.

Then u-boot would fail to read above 128K file:

 => host bind 0 /home/adam/test.img
 => ls host 0
 <   >     131072  Fri Dec 30 00:18:25 2022  file
 => load host 0 0 file
 BTRFS: An error occurred while reading file file
 Failed to load 'file'

[CAUSE]
Unlike tree blocks read, data extent reads doesn't consider cases in which
one data extent can cross stripe boundary.

In read_data_extent(), we just call btrfs_map_block() once and read the
first mapped range.

And if the first mapped range is smaller than the desired range, it
would return error.

But since even single device btrfs can utilize RAID0 profiles, the first
mapped range can only be at most 64K for RAID0 profiles, and cause false
error.

[FIX]
Just like read_whole_eb(), we should call btrfs_map_block() in a loop
until we read all data.

Since we're here, also add extra error messages for the following cases:

- btrfs_map_block() failure
  We already have the error message for it.

- Missing device
  This should not happen, as we only support single device for now.

- __btrfs_devread() failure

With this bug fixed, btrfs driver of u-boot can properly read the above
128K file, and have the correct content:

 => host bind 0 /home/adam/test.img
 => ls host 0
 <   >     131072  Fri Dec 30 00:18:25 2022  file
 => load host 0 0 file
 131072 bytes read in 0 ms
 => md5sum 0 0x20000
 md5 for 00000000 ... 0001ffff ==> d48858312a922db7eb86377f638dbc9f
 ^^^ Above md5sum also matches.

Reported-by: Sam Winchenbach <swichenbach@tethers.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
This commit is contained in:
Qu Wenruo 2022-12-30 09:07:05 +08:00 committed by Tom Rini
parent 3133651aa4
commit 11d5670125
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fs/btrfs/disk-io.c
View File

@ -541,34 +541,39 @@ struct extent_buffer* read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
int read_extent_data(struct btrfs_fs_info *fs_info, char *data, u64 logical, int read_extent_data(struct btrfs_fs_info *fs_info, char *data, u64 logical,
u64 *len, int mirror) u64 *len, int mirror)
{ {
u64 offset = 0; u64 orig_len = *len;
u64 cur = logical;
struct btrfs_multi_bio *multi = NULL; struct btrfs_multi_bio *multi = NULL;
struct btrfs_device *device; struct btrfs_device *device;
int ret = 0; int ret = 0;
u64 max_len = *len;
ret = btrfs_map_block(fs_info, READ, logical, len, &multi, mirror, while (cur < logical + orig_len) {
NULL); u64 cur_len = logical + orig_len - cur;
if (ret) {
fprintf(stderr, "Couldn't map the block %llu\n",
logical + offset);
goto err;
}
device = multi->stripes[0].dev;
if (*len > max_len) ret = btrfs_map_block(fs_info, READ, cur, &cur_len, &multi,
*len = max_len; mirror, NULL);
if (!device->desc || !device->part) { if (ret) {
ret = -EIO; error("Couldn't map the block %llu", cur);
goto err; goto err;
} }
device = multi->stripes[0].dev;
ret = __btrfs_devread(device->desc, device->part, data, *len, if (!device->desc || !device->part) {
multi->stripes[0].physical); error("devid %llu is missing", device->devid);
if (ret != *len) ret = -EIO;
ret = -EIO; goto err;
else }
ret = __btrfs_devread(device->desc, device->part,
data + (cur - logical), cur_len,
multi->stripes[0].physical);
if (ret != cur_len) {
error("read failed on devid %llu physical %llu",
device->devid, multi->stripes[0].physical);
ret = -EIO;
goto err;
}
cur += cur_len;
ret = 0; ret = 0;
}
err: err:
kfree(multi); kfree(multi);
return ret; return ret;