Skip to content

Commit 7807d19

Browse files
adam900710kdave
authored andcommitted
btrfs: fix double accounting of ordered extents during errors
[BUG] Btrfs will fail generic/750 randomly if its sector size is smaller than page size. One of the warning looks like this: ------------[ cut here ]------------ WARNING: CPU: 1 PID: 90263 at fs/btrfs/ordered-data.c:360 can_finish_ordered_extent+0x33c/0x390 [btrfs] CPU: 1 UID: 0 PID: 90263 Comm: kworker/u18:1 Tainted: G OE 6.12.0-rc3-custom+ torvalds#79 Workqueue: events_unbound btrfs_async_reclaim_metadata_space [btrfs] pc : can_finish_ordered_extent+0x33c/0x390 [btrfs] lr : can_finish_ordered_extent+0xdc/0x390 [btrfs] Call trace: can_finish_ordered_extent+0x33c/0x390 [btrfs] btrfs_mark_ordered_io_finished+0x130/0x2b8 [btrfs] extent_writepage+0xfc/0x338 [btrfs] extent_write_cache_pages+0x1d4/0x4b8 [btrfs] btrfs_writepages+0x94/0x158 [btrfs] do_writepages+0x74/0x190 filemap_fdatawrite_wbc+0x88/0xc8 start_delalloc_inodes+0x180/0x3b0 [btrfs] btrfs_start_delalloc_roots+0x17c/0x288 [btrfs] shrink_delalloc+0x11c/0x280 [btrfs] flush_space+0x27c/0x310 [btrfs] btrfs_async_reclaim_metadata_space+0xcc/0x208 [btrfs] process_one_work+0x228/0x670 worker_thread+0x1bc/0x360 kthread+0x100/0x118 ret_from_fork+0x10/0x20 irq event stamp: 9784200 hardirqs last enabled at (9784199): [<ffffd21ec54dc01c>] _raw_spin_unlock_irqrestore+0x74/0x80 hardirqs last disabled at (9784200): [<ffffd21ec54db374>] _raw_spin_lock_irqsave+0x8c/0xa0 softirqs last enabled at (9784148): [<ffffd21ec472ff44>] handle_softirqs+0x45c/0x4b0 softirqs last disabled at (9784141): [<ffffd21ec46d01e4>] __do_softirq+0x1c/0x28 ---[ end trace 0000000000000000 ]--- BTRFS critical (device dm-2): bad ordered extent accounting, root=5 ino=1492 OE offset=1654784 OE len=57344 to_dec=49152 left=0 [CAUSE] The function btrfs_mark_ordered_io_finished() is called for marking all ordered extents in the page range as finished, for error handling. But for sector size < page size cases, we can have multiple ordered extents in one page. If extent_writepage_io() failed (the only possible case is submit_one_sector() failed to grab an extent map), then the call site inside extent_writepage() will call btrfs_mark_ordered_io_finished() to finish the created ordered extents. However some range of the ordered extent may have been submitted already, then btrfs_mark_ordered_io_finished() is called on the same range, causing double accounting. [FIX] - Introduce a new member btrfs_bio_ctrl::last_submitted This will trace the last sector submitted through extent_writepage_io(). So for the above extent_writepage() case, we will know exactly which sectors are submitted and should not do the ordered extent accounting. - Introduce a helper cleanup_ordered_extents() This will do a sector-by-sector cleanup with btrfs_bio_ctrl::last_submitted and btrfs_bio_ctrl::submit_bitmap into consideartion. Using @last_submitted is to avoid double accounting on the submitted ranges. Meanwhile using @submit_bitmap is to avoid touching ranges going through compression. Signed-off-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent ce6203f commit 7807d19

File tree

1 file changed

+37
-4
lines changed

1 file changed

+37
-4
lines changed

fs/btrfs/extent_io.c

+37-4
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,14 @@ struct btrfs_bio_ctrl {
108108
* This is to avoid touching ranges covered by compression/inline.
109109
*/
110110
unsigned long submit_bitmap;
111+
112+
/*
113+
* The end (exclusive) of the last submitted range in the folio.
114+
*
115+
* This is for sector size < page size case where we may hit error
116+
* half way.
117+
*/
118+
u64 last_submitted;
111119
};
112120

113121
static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)
@@ -1435,6 +1443,7 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
14351443
ret = submit_one_sector(inode, folio, cur, bio_ctrl, i_size);
14361444
if (ret < 0)
14371445
goto out;
1446+
bio_ctrl->last_submitted = cur + fs_info->sectorsize;
14381447
submitted_io = true;
14391448
}
14401449
out:
@@ -1453,6 +1462,24 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
14531462
return ret;
14541463
}
14551464

1465+
static void cleanup_ordered_extents(struct btrfs_inode *inode,
1466+
struct folio *folio, u64 file_pos,
1467+
u64 num_bytes, unsigned long *bitmap)
1468+
{
1469+
struct btrfs_fs_info *fs_info = inode->root->fs_info;
1470+
unsigned int cur_bit = (file_pos - folio_pos(folio)) >> fs_info->sectorsize_bits;
1471+
1472+
for_each_set_bit_from(cur_bit, bitmap, fs_info->sectors_per_page) {
1473+
u64 cur_pos = folio_pos(folio) + (cur_bit << fs_info->sectorsize_bits);
1474+
1475+
if (cur_pos >= file_pos + num_bytes)
1476+
break;
1477+
1478+
btrfs_mark_ordered_io_finished(inode, folio, cur_pos,
1479+
fs_info->sectorsize, false);
1480+
}
1481+
}
1482+
14561483
/*
14571484
* the writepage semantics are similar to regular writepage. extent
14581485
* records are inserted to lock ranges in the tree, and as dirty areas
@@ -1492,6 +1519,7 @@ static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl
14921519
* The proper bitmap can only be initialized until writepage_delalloc().
14931520
*/
14941521
bio_ctrl->submit_bitmap = (unsigned long)-1;
1522+
bio_ctrl->last_submitted = page_start;
14951523
ret = set_folio_extent_mapped(folio);
14961524
if (ret < 0)
14971525
goto done;
@@ -1511,8 +1539,10 @@ static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl
15111539

15121540
done:
15131541
if (ret) {
1514-
btrfs_mark_ordered_io_finished(BTRFS_I(inode), folio,
1515-
page_start, PAGE_SIZE, !ret);
1542+
cleanup_ordered_extents(BTRFS_I(inode), folio,
1543+
bio_ctrl->last_submitted,
1544+
page_start + PAGE_SIZE - bio_ctrl->last_submitted,
1545+
&bio_ctrl->submit_bitmap);
15161546
mapping_set_error(folio->mapping, ret);
15171547
}
15181548

@@ -2288,14 +2318,17 @@ void extent_write_locked_range(struct inode *inode, const struct folio *locked_f
22882318
* extent_writepage_io() will do the truncation correctly.
22892319
*/
22902320
bio_ctrl.submit_bitmap = (unsigned long)-1;
2321+
bio_ctrl.last_submitted = cur;
22912322
ret = extent_writepage_io(BTRFS_I(inode), folio, cur, cur_len,
22922323
&bio_ctrl, i_size);
22932324
if (ret == 1)
22942325
goto next_page;
22952326

22962327
if (ret) {
2297-
btrfs_mark_ordered_io_finished(BTRFS_I(inode), folio,
2298-
cur, cur_len, !ret);
2328+
cleanup_ordered_extents(BTRFS_I(inode), folio,
2329+
bio_ctrl.last_submitted,
2330+
cur_end + 1 - bio_ctrl.last_submitted,
2331+
&bio_ctrl.submit_bitmap);
22992332
mapping_set_error(mapping, ret);
23002333
}
23012334
btrfs_folio_end_lock(fs_info, folio, cur, cur_len);

0 commit comments

Comments
 (0)