Skip to content

Commit ed78aee

Browse files
Yongpeng YangJaegeuk Kim
authored andcommitted
f2fs: fix node_cnt race between extent node destroy and writeback
f2fs_destroy_extent_node() does not set FI_NO_EXTENT before clearing extent nodes. When called from f2fs_drop_inode() with I_SYNC set, concurrent kworker writeback can insert new extent nodes into the same extent tree, racing with the destroy and triggering f2fs_bug_on() in __destroy_extent_node(). The scenario is as follows: drop inode writeback - iput - f2fs_drop_inode // I_SYNC set - f2fs_destroy_extent_node - __destroy_extent_node - while (node_cnt) { write_lock(&et->lock) __free_extent_tree write_unlock(&et->lock) - __writeback_single_inode - f2fs_outplace_write_data - f2fs_update_read_extent_cache - __update_extent_tree_range // FI_NO_EXTENT not set, // insert new extent node } // node_cnt == 0, exit while - f2fs_bug_on(node_cnt) // node_cnt > 0 Additionally, __update_extent_tree_range() only checks FI_NO_EXTENT for EX_READ type, leaving EX_BLOCK_AGE updates completely unprotected. This patch set FI_NO_EXTENT under et->lock in __destroy_extent_node(), consistent with other callers (__update_extent_tree_range and __drop_extent_tree) and check FI_NO_EXTENT for both EX_READ and EX_BLOCK_AGE tree. Fixes: 3fc5d5a ("f2fs: fix to shrink read extent node in batches") Cc: [email protected] Signed-off-by: Yongpeng Yang <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 2a3db1e commit ed78aee

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

fs/f2fs/extent_cache.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,10 @@ static bool __may_extent_tree(struct inode *inode, enum extent_type type)
119119
if (!__init_may_extent_tree(inode, type))
120120
return false;
121121

122+
if (is_inode_flag_set(inode, FI_NO_EXTENT))
123+
return false;
124+
122125
if (type == EX_READ) {
123-
if (is_inode_flag_set(inode, FI_NO_EXTENT))
124-
return false;
125126
if (is_inode_flag_set(inode, FI_COMPRESSED_FILE) &&
126127
!f2fs_sb_has_readonly(F2FS_I_SB(inode)))
127128
return false;
@@ -644,6 +645,8 @@ static unsigned int __destroy_extent_node(struct inode *inode,
644645

645646
while (atomic_read(&et->node_cnt)) {
646647
write_lock(&et->lock);
648+
if (!is_inode_flag_set(inode, FI_NO_EXTENT))
649+
set_inode_flag(inode, FI_NO_EXTENT);
647650
node_cnt += __free_extent_tree(sbi, et, nr_shrink);
648651
write_unlock(&et->lock);
649652
}
@@ -688,12 +691,12 @@ static void __update_extent_tree_range(struct inode *inode,
688691

689692
write_lock(&et->lock);
690693

691-
if (type == EX_READ) {
692-
if (is_inode_flag_set(inode, FI_NO_EXTENT)) {
693-
write_unlock(&et->lock);
694-
return;
695-
}
694+
if (is_inode_flag_set(inode, FI_NO_EXTENT)) {
695+
write_unlock(&et->lock);
696+
return;
697+
}
696698

699+
if (type == EX_READ) {
697700
prev = et->largest;
698701
dei.len = 0;
699702

0 commit comments

Comments
 (0)