Skip to content

btrfs: fix btrfs_file_extent_item::ram_bytes of btrfs_split_ordered_extent()

Qu Wenruo linux-btrfs 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 5 repliesIn review
  2. v12 patches 2 repliesSuperseded

Changes in v2 from the cover letter

- Update the comment on file extent item tree-checker To be less confusing for future readers.

- Remove one fixes tag of the first patch
The bug goes back to the introduction of zoned ordered extent splitting, thus that oldest commit should be the cause.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2btrfs: set correct ram_bytes when splitting ordered extentfs/btrfs/ordered-data.c+1 -00 replies
2/2btrfs: tree-checker: add one extra file extent item ram_bytes checkfs/btrfs/tree-checker.c+29 -60 replies

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchFilipe MananaJohannes ThumshirnDavid Sterba
SeriesR-b R-b
1/2R-b
2/2R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v2 thread

Cover letter [PATCH v2 0/2] btrfs: fix btrfs_file_extent_item::ram_bytes of btrfs_split_ordered_extent()

[CHANGELOG]
v2:
- Update the comment on file extent item tree-checker To be less confusing for future readers.

- Remove one fixes tag of the first patch
The bug goes back to the introduction of zoned ordered extent splitting, thus that oldest commit should be the cause.

During my extent_map members rework, I added a sanity check to make sure regular non-compressed extent_map would have its disk_num_bytes to match ram_bytes.

But that extent_map sanity check always fail as we have on-disk file extent items which has its ram_bytes much larger than the corresponding disk_num_bytes, even if it's not compressed.

It turns out that, the ram_bytes > disk_num_bytes is caused by btrfs_split_ordered_extent(), where it doesn't properly update ram_bytes, resulting it larger than disk_num_bytes.

Thankfully everything is fine, as our code doesn't really bother ram_bytes for non-compressed regular file extents, so no real damage.

Still I'd like to catch such problem in the future, so add another tree-checker patch for this case.

And since the invalid ram_bytes is already in the wild for a while, we do not want to bother the end users to fix their fs for nothing. So the check is only behind DEBUG builds.

Furthermore, the tree-checker is only to make sure @ram_bytes < @disk_num_bytes for non-compressed file extents.
As we still have other locations to make @ram_bytes < @disk_num_bytes.

And for btrfs-progs, I'm going to add extra check and repair support soon.

Qu Wenruo (2):
btrfs: set correct ram_bytes when splitting ordered extent
btrfs: tree-checker: add one extra file extent item ram_bytes check

 fs/btrfs/ordered-data.c |  1 +
 fs/btrfs/tree-checker.c | 35 +++++++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)
Signature · 1 line
2.44.0