Skip to content

Commit 1acd73e

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: fix to account dirty data in __get_secs_required()
It will trigger system panic w/ testcase in [1]: ------------[ cut here ]------------ kernel BUG at fs/f2fs/segment.c:2752! RIP: 0010:new_curseg+0xc81/0x2110 Call Trace: f2fs_allocate_data_block+0x1c91/0x4540 do_write_page+0x163/0xdf0 f2fs_outplace_write_data+0x1aa/0x340 f2fs_do_write_data_page+0x797/0x2280 f2fs_write_single_data_page+0x16cd/0x2190 f2fs_write_cache_pages+0x994/0x1c80 f2fs_write_data_pages+0x9cc/0xea0 do_writepages+0x194/0x7a0 filemap_fdatawrite_wbc+0x12b/0x1a0 __filemap_fdatawrite_range+0xbb/0xf0 file_write_and_wait_range+0xa1/0x110 f2fs_do_sync_file+0x26f/0x1c50 f2fs_sync_file+0x12b/0x1d0 vfs_fsync_range+0xfa/0x230 do_fsync+0x3d/0x80 __x64_sys_fsync+0x37/0x50 x64_sys_call+0x1e88/0x20d0 do_syscall_64+0x4b/0x110 entry_SYSCALL_64_after_hwframe+0x76/0x7e The root cause is if checkpoint_disabling and lfs_mode are both on, it will trigger OPU for all overwritten data, it may cost more free segment than expected, so f2fs must account those data correctly to calculate cosumed free segments later, and return ENOSPC earlier to avoid run out of free segment during block allocation. [1] https://lore.kernel.org/fstests/[email protected]/ Fixes: 4354994 ("f2fs: checkpoint disabling") Cc: Daniel Rosenberg <[email protected]> Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent b7d0a97 commit 1acd73e

File tree

1 file changed

+25
-10
lines changed

1 file changed

+25
-10
lines changed

fs/f2fs/segment.h

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -561,18 +561,21 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi)
561561
}
562562

563563
static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,
564-
unsigned int node_blocks, unsigned int dent_blocks)
564+
unsigned int node_blocks, unsigned int data_blocks,
565+
unsigned int dent_blocks)
565566
{
566567

567-
unsigned segno, left_blocks;
568+
unsigned int segno, left_blocks, blocks;
568569
int i;
569570

570-
/* check current node sections in the worst case. */
571-
for (i = CURSEG_HOT_NODE; i <= CURSEG_COLD_NODE; i++) {
571+
/* check current data/node sections in the worst case. */
572+
for (i = CURSEG_HOT_DATA; i < NR_PERSISTENT_LOG; i++) {
572573
segno = CURSEG_I(sbi, i)->segno;
573574
left_blocks = CAP_BLKS_PER_SEC(sbi) -
574575
get_ckpt_valid_blocks(sbi, segno, true);
575-
if (node_blocks > left_blocks)
576+
577+
blocks = i <= CURSEG_COLD_DATA ? data_blocks : node_blocks;
578+
if (blocks > left_blocks)
576579
return false;
577580
}
578581

@@ -586,8 +589,9 @@ static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,
586589
}
587590

588591
/*
589-
* calculate needed sections for dirty node/dentry
590-
* and call has_curseg_enough_space
592+
* calculate needed sections for dirty node/dentry and call
593+
* has_curseg_enough_space, please note that, it needs to account
594+
* dirty data as well in lfs mode when checkpoint is disabled.
591595
*/
592596
static inline void __get_secs_required(struct f2fs_sb_info *sbi,
593597
unsigned int *lower_p, unsigned int *upper_p, bool *curseg_p)
@@ -596,19 +600,30 @@ static inline void __get_secs_required(struct f2fs_sb_info *sbi,
596600
get_pages(sbi, F2FS_DIRTY_DENTS) +
597601
get_pages(sbi, F2FS_DIRTY_IMETA);
598602
unsigned int total_dent_blocks = get_pages(sbi, F2FS_DIRTY_DENTS);
603+
unsigned int total_data_blocks = 0;
599604
unsigned int node_secs = total_node_blocks / CAP_BLKS_PER_SEC(sbi);
600605
unsigned int dent_secs = total_dent_blocks / CAP_BLKS_PER_SEC(sbi);
606+
unsigned int data_secs = 0;
601607
unsigned int node_blocks = total_node_blocks % CAP_BLKS_PER_SEC(sbi);
602608
unsigned int dent_blocks = total_dent_blocks % CAP_BLKS_PER_SEC(sbi);
609+
unsigned int data_blocks = 0;
610+
611+
if (f2fs_lfs_mode(sbi) &&
612+
unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
613+
total_data_blocks = get_pages(sbi, F2FS_DIRTY_DATA);
614+
data_secs = total_data_blocks / CAP_BLKS_PER_SEC(sbi);
615+
data_blocks = total_data_blocks % CAP_BLKS_PER_SEC(sbi);
616+
}
603617

604618
if (lower_p)
605-
*lower_p = node_secs + dent_secs;
619+
*lower_p = node_secs + dent_secs + data_secs;
606620
if (upper_p)
607621
*upper_p = node_secs + dent_secs +
608-
(node_blocks ? 1 : 0) + (dent_blocks ? 1 : 0);
622+
(node_blocks ? 1 : 0) + (dent_blocks ? 1 : 0) +
623+
(data_blocks ? 1 : 0);
609624
if (curseg_p)
610625
*curseg_p = has_curseg_enough_space(sbi,
611-
node_blocks, dent_blocks);
626+
node_blocks, data_blocks, dent_blocks);
612627
}
613628

614629
static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,

0 commit comments

Comments
 (0)