Skip to content

Commit f06c0f8

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: fix to update user block counts in block_operations()
Commit 59c9081 ("f2fs: allow write page cache when writting cp") allows write() to write data to page cache during checkpoint, so block count fields like .total_valid_block_count, .alloc_valid_block_count and .rf_node_block_count may encounter race condition as below: CP Thread A - write_checkpoint - block_operations - f2fs_down_write(&sbi->node_change) - __prepare_cp_block : ckpt->valid_block_count = .total_valid_block_count - f2fs_up_write(&sbi->node_change) - write - f2fs_preallocate_blocks - f2fs_map_blocks(,F2FS_GET_BLOCK_PRE_AIO) - f2fs_map_lock - f2fs_down_read(&sbi->node_change) - f2fs_reserve_new_blocks - inc_valid_block_count : percpu_counter_add(&sbi->alloc_valid_block_count, count) : sbi->total_valid_block_count += count - f2fs_up_read(&sbi->node_change) - do_checkpoint : sbi->last_valid_block_count = sbi->total_valid_block_count : percpu_counter_set(&sbi->alloc_valid_block_count, 0) : percpu_counter_set(&sbi->rf_node_block_count, 0) - fsync - need_do_checkpoint - f2fs_space_for_roll_forward : alloc_valid_block_count was reset to zero, so, it may missed last data during checkpoint Let's change to update .total_valid_block_count, .alloc_valid_block_count and .rf_node_block_count in block_operations(), then their access can be protected by .node_change and .cp_rwsem lock, so that it can avoid above race condition. Fixes: 59c9081 ("f2fs: allow write page cache when writting cp") Cc: Yunlei He <[email protected]> Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 54f43a1 commit f06c0f8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/f2fs/checkpoint.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,11 @@ static void __prepare_cp_block(struct f2fs_sb_info *sbi)
11861186
ckpt->valid_node_count = cpu_to_le32(valid_node_count(sbi));
11871187
ckpt->valid_inode_count = cpu_to_le32(valid_inode_count(sbi));
11881188
ckpt->next_free_nid = cpu_to_le32(last_nid);
1189+
1190+
/* update user_block_counts */
1191+
sbi->last_valid_block_count = sbi->total_valid_block_count;
1192+
percpu_counter_set(&sbi->alloc_valid_block_count, 0);
1193+
percpu_counter_set(&sbi->rf_node_block_count, 0);
11891194
}
11901195

11911196
static bool __need_flush_quota(struct f2fs_sb_info *sbi)
@@ -1575,11 +1580,6 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
15751580
start_blk += NR_CURSEG_NODE_TYPE;
15761581
}
15771582

1578-
/* update user_block_counts */
1579-
sbi->last_valid_block_count = sbi->total_valid_block_count;
1580-
percpu_counter_set(&sbi->alloc_valid_block_count, 0);
1581-
percpu_counter_set(&sbi->rf_node_block_count, 0);
1582-
15831583
/* Here, we have one bio having CP pack except cp pack 2 page */
15841584
f2fs_sync_meta_pages(sbi, META, LONG_MAX, FS_CP_META_IO);
15851585
/* Wait for all dirty meta pages to be submitted for IO */

0 commit comments

Comments
 (0)