Skip to content

Commit 32a93f5

Browse files
jankaratytso
authored andcommitted
ext4: fix calculation of credits for extent tree modification
Luis and David are reporting that after running generic/750 test for 90+ hours on 2k ext4 filesystem, they are able to trigger a warning in jbd2_journal_dirty_metadata() complaining that there are not enough credits in the running transaction started in ext4_do_writepages(). Indeed the code in ext4_do_writepages() is racy and the extent tree can change between the time we compute credits necessary for extent tree computation and the time we actually modify the extent tree. Thus it may happen that the number of credits actually needed is higher. Modify ext4_ext_index_trans_blocks() to count with the worst case of maximum tree depth. This can reduce the possible number of writers that can operate in the system in parallel (because the credit estimates now won't fit in one transaction) but for reasonably sized journals this shouldn't really be an issue. So just go with a safe and simple fix. Link: https://lore.kernel.org/all/20250415013641.f2ppw6wov4kn4wq2@offworld Reported-by: Davidlohr Bueso <dave@stgolabs.net> Reported-by: Luis Chamberlain <mcgrof@kernel.org> Tested-by: kdevops@lists.linux.dev Signed-off-by: Jan Kara <jack@suse.cz> Reviewed-by: Zhang Yi <yi.zhang@huawei.com> Link: https://patch.msgid.link/20250429175535.23125-2-jack@suse.cz Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org
1 parent d612a07 commit 32a93f5

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

fs/ext4/extents.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,18 +2399,19 @@ int ext4_ext_calc_credits_for_single_extent(struct inode *inode, int nrblocks,
23992399
int ext4_ext_index_trans_blocks(struct inode *inode, int extents)
24002400
{
24012401
int index;
2402-
int depth;
24032402

24042403
/* If we are converting the inline data, only one is needed here. */
24052404
if (ext4_has_inline_data(inode))
24062405
return 1;
24072406

2408-
depth = ext_depth(inode);
2409-
2407+
/*
2408+
* Extent tree can change between the time we estimate credits and
2409+
* the time we actually modify the tree. Assume the worst case.
2410+
*/
24102411
if (extents <= 1)
2411-
index = depth * 2;
2412+
index = EXT4_MAX_EXTENT_DEPTH * 2;
24122413
else
2413-
index = depth * 3;
2414+
index = EXT4_MAX_EXTENT_DEPTH * 3;
24142415

24152416
return index;
24162417
}

0 commit comments

Comments
 (0)