btrfs: two small and safe fixes for large folios
v2 cover btrfs: two small and safe fixes for large folios
[CHANGELOG]
v2:
- Fix a bug that page_pgoff() usage lacks left page shift
Two small and simple fixes.
The first one is that with large folios, we can have order 6 folios which reached our current BITS_PER_LONG limit, triggering a previously impossible ASSERT(), which is based on the fact that our largest page size (64K) can not reach BITS_PER_LONG blocks per page.
An easily fix by extending the ASSERT() condition to cover blocks_per_folio == BITS_PER_LONG cases.
The second one is a little more complex, that with large folios, if we still go through the single page bio vec iteration, we can not call page_offset(), as non-head pages of a large folio do not have their page::index initialized properly.
Fix that by going a helper using page_pgoff() to calculate the file offset, which handles both head and non-head pages of a large folio.
Qu Wenruo (2):
btrfs: fix the ASSERT() inside GET_SUBPAGE_BITMAP()
btrfs: fix the file offset calculation inside
btrfs_decompress_buf2page()
fs/btrfs/compression.c | 18 +++++++++++++++++- fs/btrfs/subpage.c | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-)
Signature · 1 line
2.49.0
PATCH v2 1/2 btrfs: fix the ASSERT() inside GET_SUBPAGE_BITMAP()
After enabling large data folios for tests, I hit the ASSERT() inside GET_SUBPAGE_BITMAP() where blocks_per_folio matches BITS_PER_LONG.
The ASSERT() itself is only based on the original subpage fs block size, where we have at most 16 blocks per page, thus "ASSERT(blocks_per_folio < BITS_PER_LONG)".
However the experimental large data folio support will set the max folio order according to the BITS_PER_LONG, so we can have a case where a large folio contains exactly BITS_PER_LONG blocks.
So the ASSERT() is too strict, change to to "ASSERT(blocks_per_folio <= BITS_PER_LONG)" to avoid the false alert.
--- fs/btrfs/subpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/subpage.c +1 -1
@@ -664,7 +664,7 @@ IMPLEMENT_BTRFS_PAGE_OPS(checked, folio_set_checked, folio_clear_checked,btrfs_blocks_per_folio (fs_info, folio); \const struct btrfs_subpage *subpage =folio_get_private (folio); \ \ -ASSERT (blocks_per_folio <BITS_PER_LONG ); \ +ASSERT (blocks_per_folio <=BITS_PER_LONG ); \ *dst =bitmap_read (subpage->bitmaps, \ blocks_per_folio * btrfs_bitmap_nr_##name, \ blocks_per_folio); \
Signature · 1 line
2.49.0
Re: [PATCH v2 1/2] btrfs: fix the ASSERT() inside GET_SUBPAGE_BITMAP()
Quoted 8 lines · Qu Wenruo
After enabling large data folios for tests, I hit the
ASSERT()insideGET_SUBPAGE_BITMAP()whereblocks_per_foliomatchesBITS_PER_LONG.The
ASSERT()itself is only based on the original subpage fs block size, where we have at most 16 blocks per page, thus "ASSERT(blocks_per_folio < BITS_PER_LONG)".
Quoted 5 lines
However the experimental large data folio support will set the max folio order according to the
BITS_PER_LONG, so we can have a case where a large folio contains exactlyBITS_PER_LONGblocks.So the
ASSERT()is too strict, change to to
change to to -> change it to
Quoted 3 lines
"
ASSERT(blocks_per_folio <= BITS_PER_LONG)" to avoid the false alert.Signed-off-by Qu Wenruo <[email protected]>
Thanks.
Quoted 21 lines
--- fs/btrfs/subpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/btrfs/subpage.c +1
-2@@ -664,7 +664,7 @@ IMPLEMENT_BTRFS_PAGE_OPS(checked, folio_set_checked, folio_clear_checked,btrfs_blocks_per_folio (fs_info, folio); \const struct btrfs_subpage *subpage =folio_get_private (folio); \ \ -ASSERT (blocks_per_folio <BITS_PER_LONG ); \ +ASSERT (blocks_per_folio <=BITS_PER_LONG ); \ *dst =bitmap_read (subpage->bitmaps, \ blocks_per_folio * btrfs_bitmap_nr_##name, \ blocks_per_folio); \ --2.49.0
PATCH v2 2/2 btrfs: fix the file offset calculation inside btrfs_decompress_buf2page()
In reply to Qu Wenruo[BUG WITH EXPERIMENTAL LARGE FOLIOS]
When testing the experimental large data folio support with compression, there are several ASSERT()s triggered from btrfs_decompress_buf2page() when running fsstress with compress=zstd mount option:
- ASSERT(copy_len) from btrfs_decompress_buf2page()
- VM_BUG_ON(offset + len > PAGE_SIZE) from memcpy_to_page()
[CAUSE]
Inside btrfs_decompress_buf2page(), we need to grab the file offset from the current bvec.bv_page, to check if we even need to copy data into the bio.
And since we're using single page bvec, and no large folio, every page inside the folio should have its index properly setup.
But when large folios are involved, only the first page (aka, the head page) of a large folio has its index properly initialized.
The other pages inside the large folio will not have their indexes properly initialized.
Thus the page_offset() call inside btrfs_decompress_buf2page() will result garbage, and completely screw up the @copy_len calculation.
[FIX]
Instead of using page->index directly, go with page_pgoff(), which can handle non-head pages correctly.
So introduce a helper, file_offset_from_bvec(), to get the file offset from a single page bio_vec, so the copy_len calculation can be done correctly.
--- fs/btrfs/compression.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
fs/btrfs/compression.c +17 -1
@@ -1137,6 +1137,22 @@ void __cold btrfs_exit_compress(void)bioset_exit (&btrfs_compressed_bioset); } +/* +* The bvec is a single page bvec from a bio that contains folios from a filemap. +* +* Since the folios may be large one, and if the bv_page is not a head page of +* a large folio, then page->index is unreliable. +* +* Thus we need this helper to grab the proper file offset. +*/ +static u64 file_offset_from_bvec (const struct bio_vec *bvec) +{ +const struct page *page = bvec->bv_page; +const struct folio *folio =page_folio (page); + +return (page_pgoff (folio, page) <<PAGE_SHIFT ) + bvec->bv_offset; +} +/* * Copy decompressed data from working buffer to pages. *
@@ -1188,7 +1204,7 @@ int btrfs_decompress_buf2page(const char *buf, u32 buf_len,* cb->start may underflow, but subtracting that value can still * give us correct offset inside the full decompressed extent. */ - bvec_offset =page_offset (bvec.bv_page) + bvec.bv_offset - cb->start; + bvec_offset =file_offset_from_bvec (&bvec) - cb->start;/* Haven't reached the bvec range, exit */ if (decompressed + buf_len <= bvec_offset)
Signature · 1 line
2.49.0
Re: [PATCH v2 2/2] btrfs: fix the file offset calculation inside btrfs_decompress_buf2page()
Quoted 44 lines · Qu Wenruo
[BUG WITH EXPERIMENTAL LARGE FOLIOS]
When testing the experimental large data folio support with compression, there are several ASSERT()s triggered frombtrfs_decompress_buf2page()when running fsstress with compress=zstd mount option:-
ASSERT(copy_len)frombtrfs_decompress_buf2page()
-VM_BUG_ON(offset + len > PAGE_SIZE)frommemcpy_to_page()[CAUSE]
Insidebtrfs_decompress_buf2page(), we need to grab the file offset from the current bvec.bv_page, to check if we even need to copy data into the bio.And since we're using single page bvec, and no large folio, every page inside the folio should have its index properly setup.
But when large folios are involved, only the first page (aka, the head page) of a large folio has its index properly initialized.
The other pages inside the large folio will not have their indexes properly initialized.
Thus the
page_offset()call insidebtrfs_decompress_buf2page()will result garbage, and completely screw up the @copy_len calculation.[FIX]
Instead of usingpage->indexdirectly, go withpage_pgoff(), which can handle non-head pages correctly.So introduce a helper,
file_offset_from_bvec(), to get the file offset from a single pagebio_vec, so thecopy_lencalculation can be done correctly.Signed-off-by Qu Wenruo <[email protected]>--- fs/btrfs/compression.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)fs/btrfs/compression.c +0
-0
fs/btrfs/compression.c void __cold btrfs_exit_compress(void) · line 1143
Quoted 7 lines
fs/btrfs/compression.c +4
-0@@ -1137,6 +1137,22 @@ void __cold btrfs_exit_compress(void)bioset_exit (&btrfs_compressed_bioset); } +/* +* The bvec is a single page bvec from a bio that contains folios from a filemap. +* +* Since the folios may be large one, and if the bv_page is not a head page of
folios -> folio
large -> a large
Otherwise it looks good, thanks.
Quoted 28 lines
fs/btrfs/compression.c +13
-2+* a large folio, then page->index is unreliable. +* +* Thus we need this helper to grab the proper file offset. +*/ +static u64 file_offset_from_bvec (const struct bio_vec *bvec) +{ +const struct page *page = bvec->bv_page; +const struct folio *folio =page_folio (page); + +return (page_pgoff (folio, page) <<PAGE_SHIFT ) + bvec->bv_offset; +} +/* * Copy decompressed data from working buffer to pages. * @@ -1188,7 +1204,7 @@ int btrfs_decompress_buf2page(const char *buf, u32 buf_len,* cb->start may underflow, but subtracting that value can still * give us correct offset inside the full decompressed extent. */ - bvec_offset =page_offset (bvec.bv_page) + bvec.bv_offset - cb->start; + bvec_offset =file_offset_from_bvec (&bvec) - cb->start;/* Haven't reached the bvec range, exit */ if (decompressed + buf_len <= bvec_offset) --2.49.0
Quoted 14 lines · Qu Wenruo
[CHANGELOG]
v2:
- Fix a bug thatpage_pgoff()usage lacks left page shiftTwo small and simple fixes.
The first one is that with large folios, we can have order 6 folios which reached our current
BITS_PER_LONGlimit, triggering a previously impossibleASSERT(), which is based on the fact that our largest page size (64K) can not reachBITS_PER_LONGblocks per page.An easily fix by extending the
ASSERT()condition to coverblocks_per_folio==BITS_PER_LONGcases.
Quoted 7 lines
The second one is a little more complex, that with large folios, if we still go through the single page bio vec iteration, we can not call
page_offset(), as non-head pages of a large folio do not have theirpage::indexinitialized properly.Fix that by going a helper using
page_pgoff()to calculate the file offset, which handles both head and non-head pages of a large folio.
LGTM, thanks.
Quoted 13 lines
Qu Wenruo (2):
btrfs: fix theASSERT()insideGET_SUBPAGE_BITMAP()
btrfs: fix the file offset calculation inside
btrfs_decompress_buf2page()fs/btrfs/compression.c | 18 +++++++++++++++++- fs/btrfs/subpage.c | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-)Signature · 1 line
2.49.0
Quoted 22 lines · Qu Wenruo
[CHANGELOG]
v2:
- Fix a bug thatpage_pgoff()usage lacks left page shiftTwo small and simple fixes.
The first one is that with large folios, we can have order 6 folios which reached our current
BITS_PER_LONGlimit, triggering a previously impossibleASSERT(), which is based on the fact that our largest page size (64K) can not reachBITS_PER_LONGblocks per page.An easily fix by extending the
ASSERT()condition to coverblocks_per_folio==BITS_PER_LONGcases.The second one is a little more complex, that with large folios, if we still go through the single page bio vec iteration, we can not call
page_offset(), as non-head pages of a large folio do not have theirpage::indexinitialized properly.Fix that by going a helper using
page_pgoff()to calculate the file offset, which handles both head and non-head pages of a large folio.
Quoted 9 lines
Qu Wenruo (2):
btrfs: fix theASSERT()insideGET_SUBPAGE_BITMAP()
btrfs: fix the file offset calculation inside
btrfs_decompress_buf2page()fs/btrfs/compression.c | 18 +++++++++++++++++- fs/btrfs/subpage.c | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-)