btrfs: fix a bug where a compressed write can cross stripe boundary
PATCH 1/1 btrfs: fix a bug where a compressed write can cross stripe boundary
[BUG]
When running btrfs/027 with "-o compress" mount option, it always crash with the following call trace:
BTRFS critical (device dm-4): mapping failed logical 298901504 bio len 12288 len 8192
------------[ cut here ]------------ kernel BUG at fs/btrfs/volumes.c:6651! invalid opcode: 0000 [#1] PREEMPT SMP NOPTI CPU: 5 PID: 31089 Comm: kworker/u24:10 Tainted: G OE 5.13.0-rc2-custom+ #26 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 Workqueue: btrfs-delalloc btrfs_work_helper [btrfs] RIP: 0010:btrfs_map_bio.cold+0x58/0x5a [btrfs] Call Trace: btrfs_submit_compressed_write+0x2d7/0x470 [btrfs] submit_compressed_extents+0x3b0/0x470 [btrfs] ? mark_held_locks+0x49/0x70 btrfs_work_helper+0x131/0x3e0 [btrfs] process_one_work+0x28f/0x5d0 worker_thread+0x55/0x3c0 ? process_one_work+0x5d0/0x5d0 kthread+0x141/0x160 ? __kthread_bind_mask+0x60/0x60 ret_from_fork+0x22/0x30 ---[ end trace 63113a3a91f34e68 ]---
[CAUSE]
The critical message before the crash means we have a bio at logical bytenr 298901504 length 12288, but only 8192 bytes can fit into one stripe, the remaining 4096 bytes is into another stripe.
In btrfs, all bio is properly split to avoid cross stripe boundary, but commit 764c7c9a464b ("btrfs: zoned: fix parallel compressed writes") changed the behavior for compressed write.
The offending code looks like this:
submit = btrfs_bio_fits_in_stripe(page, PAGE_SIZE, bio,
0);
+ if (pg_index == 0 && use_append)
+ len = bio_add_zone_append_page(bio, page, PAGE_SIZE, 0);
+ else
+ len = bio_add_page(bio, page, PAGE_SIZE, 0);
+
page->mapping = NULL;
- if (submit || bio_add_page(bio, page, PAGE_SIZE, 0) <
- PAGE_SIZE) {
+ if (submit || len < PAGE_SIZE) {
Previously if we find our new page can't be fitted into current stripe, aka "submitted == 1" case, we submit current bio without adding current page.
But after the modification, we will add the page no matter if it crosses stripe boundary, leading to the above crash.
[FIX]
It's no longer possible to revert to the original code style as we have two different bio_add_*_page() calls now.
The new fix is to skip the bio_add_*_page() call if @submit is true.
Also to avoid @len to be uninitialized, always initialize it to zero.
If @submit is true, @len will not be checked.
If @submit is not true, @len will be the return value of bio_add_*_page() call.
Either way, the behavior is still the same as the old code.
--- fs/btrfs/compression.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
fs/btrfs/compression.c +12 -5
@@ -457,7 +457,7 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, bytes_left = compressed_len;for (pg_index =0 ; pg_index < cb->nr_pages; pg_index++) {int submit =0 ; -int len; +int len =0 ; page = compressed_pages[pg_index]; page->mapping = inode->vfs_inode.i_mapping;
@@ -465,10 +465,17 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, submit =btrfs_bio_fits_in_stripe (page,PAGE_SIZE , bio,0 ); -if (pg_index ==0 && use_append) - len =bio_add_zone_append_page (bio, page,PAGE_SIZE ,0 ); -else - len =bio_add_page (bio, page,PAGE_SIZE ,0 ); +/* +* Page can only be added to bio if the current bio fits in +* stripe. +*/ +if (!submit) { +if (pg_index ==0 && use_append) + len =bio_add_zone_append_page (bio, page, +PAGE_SIZE ,0 ); +else + len =bio_add_page (bio, page,PAGE_SIZE ,0 ); + } page->mapping =NULL ;if (submit || len <PAGE_SIZE ) {
Signature · 1 line
2.31.1
Quoted 69 lines · Qu Wenruo
[BUG]
When running btrfs/027 with "-o compress" mount option, it always crash with the following call trace:BTRFS critical (device dm-4): mapping failed logical 298901504 bio len 12288 len 8192
------------[ cut here ]------------ kernel BUG at fs/btrfs/volumes.c:6651! invalid opcode: 0000 [#1] PREEMPT SMP NOPTI CPU: 5 PID: 31089 Comm: kworker/u24:10 Tainted: G OE 5.13.0-rc2-custom+ #26 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 Workqueue: btrfs-delalloc btrfs_work_helper [btrfs] RIP: 0010:btrfs_map_bio.cold+0x58/0x5a [btrfs] Call Trace: btrfs_submit_compressed_write+0x2d7/0x470 [btrfs] submit_compressed_extents+0x3b0/0x470 [btrfs] ? mark_held_locks+0x49/0x70 btrfs_work_helper+0x131/0x3e0 [btrfs] process_one_work+0x28f/0x5d0 worker_thread+0x55/0x3c0 ? process_one_work+0x5d0/0x5d0 kthread+0x141/0x160 ? __kthread_bind_mask+0x60/0x60 ret_from_fork+0x22/0x30 ---[ end trace 63113a3a91f34e68 ]---[CAUSE]
The critical message before the crash means we have a bio at logical bytenr 298901504 length 12288, but only 8192 bytes can fit into one stripe, the remaining 4096 bytes is into another stripe.In btrfs, all bio is properly split to avoid cross stripe boundary, but commit
764c7c9a464b("btrfs: zoned: fix parallel compressed writes") changed the behavior for compressed write.The offending code looks like this:
submit = btrfs_bio_fits_in_stripe(page,
PAGE_SIZE, bio,
0);(quoted diff) +6
-2+ if (pg_index == 0 && use_append) + len = bio_add_zone_append_page(bio, page, PAGE_SIZE, 0); + else + len = bio_add_page(bio, page, PAGE_SIZE, 0); + page->mapping = NULL; - if (submit || bio_add_page(bio, page, PAGE_SIZE, 0) < - PAGE_SIZE) { + if (submit || len < PAGE_SIZE) {Previously if we find our new page can't be fitted into current stripe, aka "submitted == 1" case, we submit current bio without adding current page.
But after the modification, we will add the page no matter if it crosses stripe boundary, leading to the above crash.
[FIX]
It's no longer possible to revert to the original code style as we have two different bio_add_*_page() calls now.The new fix is to skip the bio_add_*_page() call if @submit is true.
Also to avoid @len to be uninitialized, always initialize it to zero.
If @submit is true, @len will not be checked.
If @submit is not true, @len will be the return value of bio_add_*_page() call.
Either way, the behavior is still the same as the old code.
Quoted 4 lines
Reported-by Josef Bacik <[email protected]>Fixes 764c7c9a464b ("btrfs: zoned: fix parallel compressed writes")Signed-off-by Qu Wenruo <[email protected]>---
Looks good, thanks.
And sorry for breaking it.
Quoted 39 lines · Qu Wenruo
[BUG]
When running btrfs/027 with "-o compress" mount option, it always crash with the following call trace:BTRFS critical (device dm-4): mapping failed logical 298901504 bio len 12288 len 8192
------------[ cut here ]------------ kernel BUG at fs/btrfs/volumes.c:6651! invalid opcode: 0000 [#1] PREEMPT SMP NOPTI CPU: 5 PID: 31089 Comm: kworker/u24:10 Tainted: G OE 5.13.0-rc2-custom+ #26 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 Workqueue: btrfs-delalloc btrfs_work_helper [btrfs] RIP: 0010:btrfs_map_bio.cold+0x58/0x5a [btrfs] Call Trace: btrfs_submit_compressed_write+0x2d7/0x470 [btrfs] submit_compressed_extents+0x3b0/0x470 [btrfs] ? mark_held_locks+0x49/0x70 btrfs_work_helper+0x131/0x3e0 [btrfs] process_one_work+0x28f/0x5d0 worker_thread+0x55/0x3c0 ? process_one_work+0x5d0/0x5d0 kthread+0x141/0x160 ? __kthread_bind_mask+0x60/0x60 ret_from_fork+0x22/0x30 ---[ end trace 63113a3a91f34e68 ]---[CAUSE]
The critical message before the crash means we have a bio at logical bytenr 298901504 length 12288, but only 8192 bytes can fit into one stripe, the remaining 4096 bytes is into another stripe.In btrfs, all bio is properly split to avoid cross stripe boundary, but commit
764c7c9a464b("btrfs: zoned: fix parallel compressed writes") changed the behavior for compressed write.The offending code looks like this:
submit = btrfs_bio_fits_in_stripe(page,
PAGE_SIZE, bio,
0);
Review
Quoted 9 lines
(quoted diff) +6
-2+ if (pg_index == 0 && use_append) + len = bio_add_zone_append_page(bio, page, PAGE_SIZE, 0); + else + len = bio_add_page(bio, page, PAGE_SIZE, 0); + page->mapping = NULL; - if (submit || bio_add_page(bio, page, PAGE_SIZE, 0) < - PAGE_SIZE) { + if (submit || len < PAGE_SIZE) {
Please don't put diffs into changelogs, it's harder to read than two code fragments before and after.
Quoted 3 lines
Previously if we find our new page can't be fitted into current stripe, aka "submitted == 1" case, we submit current bio without adding current page.
So here would go the "-" part.
Quoted 2 lines
But after the modification, we will add the page no matter if it crosses stripe boundary, leading to the above crash.
And here the "+" part.
Quoted 8 lines
[FIX]
It's no longer possible to revert to the original code style as we have two different bio_add_*_page() calls now.The new fix is to skip the bio_add_*_page() call if @submit is true.
Also to avoid @len to be uninitialized, always initialize it to zero.
Quoted 8 lines
If @submit is true, @len will not be checked.
If @submit is not true, @len will be the return value of bio_add_*_page() call.
Either way, the behavior is still the same as the old code.Reported-by Josef Bacik <[email protected]>Fixes 764c7c9a464b ("btrfs: zoned: fix parallel compressed writes")Signed-off-by Qu Wenruo <[email protected]>
Thanks for the fix, I'll have to send it to Linus this week but I want to be sure there are no more surprises so this will stay in the tested branches for a few days.