Skip to content

Commit 019f9dd

Browse files
Yongpeng YangJaegeuk Kim
authored andcommitted
f2fs: fix fsck inconsistency caused by incorrect nat_entry flag usage
f2fs_need_dentry_mark() reads nat_entry flags without mutual exclusion with the checkpoint path, which can result in an incorrect inode block marking state. The scenario is as follows: create & write & fsync 'file A' write checkpoint - f2fs_do_sync_file // inline inode - f2fs_write_inode // inode folio is dirty - f2fs_write_checkpoint - f2fs_flush_merged_writes - f2fs_sync_node_pages - f2fs_fsync_node_pages // no dirty node - f2fs_need_inode_block_update // return true - f2fs_fsync_node_pages // inode dirtied - f2fs_need_dentry_mark //return true - f2fs_flush_nat_entries - f2fs_write_checkpoint end - __write_node_folio // inode with DENT_BIT_SHIFT set SPO, "fsck --dry-run" find inode has already checkpointed but still with DENT_BIT_SHIFT set The state observed by f2fs_need_dentry_mark() can differ from the state observed in __write_node_folio() after acquiring sbi->node_write. The root cause is that the semantics of IS_CHECKPOINTED and HAS_FSYNCED_INODE are only guaranteed after the checkpoint write has fully completed. This patch moves set_dentry_mark() into __write_node_folio() and protects it with the sbi->node_write lock. Cc: stable@kernel.org Fixes: 88bd02c ("f2fs: fix conditions to remain recovery information in f2fs_sync_file") Signed-off-by: Yongpeng Yang <yangyongpeng@xiaomi.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 6af249c commit 019f9dd

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

fs/f2fs/node.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,13 +1799,12 @@ static bool __write_node_folio(struct folio *folio, bool atomic, bool *submitted
17991799
goto redirty_out;
18001800
}
18011801

1802-
if (atomic) {
1803-
if (!test_opt(sbi, NOBARRIER))
1804-
fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
1805-
if (IS_INODE(folio))
1806-
set_dentry_mark(folio,
1802+
if (atomic && !test_opt(sbi, NOBARRIER))
1803+
fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
1804+
1805+
if (IS_INODE(folio) && (atomic || is_fsync_dnode(folio)))
1806+
set_dentry_mark(folio,
18071807
f2fs_need_dentry_mark(sbi, ino_of_node(folio)));
1808-
}
18091808

18101809
/* should add to global list before clearing PAGECACHE status */
18111810
if (f2fs_in_warm_node_list(folio)) {
@@ -1956,9 +1955,6 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
19561955
if (is_inode_flag_set(inode,
19571956
FI_DIRTY_INODE))
19581957
f2fs_update_inode(inode, folio);
1959-
if (!atomic)
1960-
set_dentry_mark(folio,
1961-
f2fs_need_dentry_mark(sbi, ino));
19621958
}
19631959
/* may be written by other thread */
19641960
if (!folio_test_dirty(folio))

0 commit comments

Comments
 (0)