Skip to content

btrfs: subpage compressed read path fixes

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 Latest4 patches 1 replyIn review
  2. v14 patches 4 repliesSuperseded

Changes in v2 from the cover letter

- Fix an ASSERT() when compressed extent is reflinked to lower bytenr This is caused by cb->start which can underflow in that case. This makes it impossible to use file_offset as the main cursor

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4btrfs: grab correct extent map for subpage compressed extent readfs/btrfs/compression.c+6 -30 replies
2/4btrfs: remove the GFP_HIGHMEM flag for compression codefs/btrfs/compression.c fs/btrfs/lzo.c fs/btrfs/zlib.c +1 more+9 -100 replies
3/4btrfs: rework btrfs_decompress_buf2page()fs/btrfs/compression.c fs/btrfs/compression.h fs/btrfs/lzo.c +2 more+74 -971 reply
4/4btrfs: rework lzo_decompress_bio() to make it subpage compatiblefs/btrfs/lzo.c+86 -1160 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/4] btrfs: subpage compressed read path fixes

During the development of subpage write support for compressed file extents, there is a strange failure in btrfs/038 which results -EIO during file read on compressed extents.

It exposed a rabbit hole of problems inside compression code, especially for subpage case. Those problems including:

- bv_offset is not taken into consideration
This involves several functions:

* btrfs_submit_compressed_read()
Without bv_offset taken into consideration, it can get a wrong extent map (can even be uncompressed extent) and cause tons of problems when doing decompression

* btrfs_decompress_buf2page()
It doesn't take bv_offset into consideration, which means it can copy wrong data into inode pages.

- PAGE_SIZE abuse inside lzo decompress code
This makes padding zero behavior differ between different page size.

- Super awful code quality
Anything involving two page switching is way more complex than it needs to be.
Tons of comments for parameters are completely meaningless. Way too many helper variables, that makes it super hard to grab which is the main iteration cursor.

This patchset will fix them by:

- Make btrfs_submit_compressed_read() to do proper calculation Just a small fix

- Rework btrfs_decompress_buf2page()
Not only to make it subpage compatible, but also introduce ASCII art to explain the parameter list.
As there are several different offsets involved.

Use single cursor for the main loop, separate page switching to different loops

- Rework lzo_decompress_bio()
The same style applied to lzo_decompress_bio(), with proper sectorsize/PAGE_SIZE usage.

All the rework result smaller code size, even with the excessive comments style and extra ASSERT()s.

Since this affects the enablement of basic subpage support (affects the ability to read existing compressed extents), thus this patchset needs to be merged before the enablement patch.

It will be re-sent with the unmerged subpage patches, but since it's touching the common compression code, it's better to be merged early and get more tests.

Thankfully all those patches should bring minimal amount of conflicts as they are in compression path, not a location touched by subpage support.

Changelog:
v2:
- Fix an ASSERT() when compressed extent is reflinked to lower bytenr This is caused by cb->start which can underflow in that case. This makes it impossible to use file_offset as the main cursor

Fix it by using offset inside the full decompressed extent. Since cb->start or any file offset will be substracted, with underflow value it will work correctly.

- Fix an false ASSERT() in btrfs_decompress_buf2page() It's caused by the wrong value involved in the ASSERT().

- Fix a bug that bio_advance() is only called when we reach page boudnary
This prevents some bio from finishing.
Fix it by always call bio_advance().

Qu Wenruo (4):
btrfs: grab correct extent map for subpage compressed extent read
btrfs: remove the GFP_HIGHMEM flag for compression code
btrfs: rework btrfs_decompress_buf2page()
btrfs: rework lzo_decompress_bio() to make it subpage compatible

 fs/btrfs/compression.c | 152 ++++++++++++++---------------
 fs/btrfs/compression.h |   5 +-
 fs/btrfs/lzo.c         | 210 +++++++++++++++++------------------------
 fs/btrfs/zlib.c        |  18 ++--
 fs/btrfs/zstd.c        |  12 +--
 5 files changed, 173 insertions(+), 224 deletions(-)
Signature · 1 line
2.32.0