Skip to content

Commit 28324de

Browse files
chaseyupundiramit
authored andcommitted
f2fs: check in-memory block bitmap
commit 355e78913c0d57492076d545b6f44b94fec2bf6b upstream. This patch adds a mirror for valid block bitmap, and use it to detect in-memory bitmap corruption which may be caused by bit-transition of cache or memory overflow. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent d255c33 commit 28324de

2 files changed

Lines changed: 36 additions & 2 deletions

File tree

fs/f2fs/segment.c

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,14 +1101,32 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)
11011101

11021102
/* Update valid block bitmap */
11031103
if (del > 0) {
1104-
if (f2fs_test_and_set_bit(offset, se->cur_valid_map))
1104+
if (f2fs_test_and_set_bit(offset, se->cur_valid_map)) {
1105+
#ifdef CONFIG_F2FS_CHECK_FS
1106+
if (f2fs_test_and_set_bit(offset,
1107+
se->cur_valid_map_mir))
1108+
f2fs_bug_on(sbi, 1);
1109+
else
1110+
WARN_ON(1);
1111+
#else
11051112
f2fs_bug_on(sbi, 1);
1113+
#endif
1114+
}
11061115
if (f2fs_discard_en(sbi) &&
11071116
!f2fs_test_and_set_bit(offset, se->discard_map))
11081117
sbi->discard_blks--;
11091118
} else {
1110-
if (!f2fs_test_and_clear_bit(offset, se->cur_valid_map))
1119+
if (!f2fs_test_and_clear_bit(offset, se->cur_valid_map)) {
1120+
#ifdef CONFIG_F2FS_CHECK_FS
1121+
if (!f2fs_test_and_clear_bit(offset,
1122+
se->cur_valid_map_mir))
1123+
f2fs_bug_on(sbi, 1);
1124+
else
1125+
WARN_ON(1);
1126+
#else
11111127
f2fs_bug_on(sbi, 1);
1128+
#endif
1129+
}
11121130
if (f2fs_discard_en(sbi) &&
11131131
f2fs_test_and_clear_bit(offset, se->discard_map))
11141132
sbi->discard_blks++;
@@ -2432,6 +2450,13 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
24322450
!sit_i->sentries[start].ckpt_valid_map)
24332451
return -ENOMEM;
24342452

2453+
#ifdef CONFIG_F2FS_CHECK_FS
2454+
sit_i->sentries[start].cur_valid_map_mir
2455+
= kzalloc(SIT_VBLOCK_MAP_SIZE, GFP_KERNEL);
2456+
if (!sit_i->sentries[start].cur_valid_map_mir)
2457+
return -ENOMEM;
2458+
#endif
2459+
24352460
if (f2fs_discard_en(sbi)) {
24362461
sit_i->sentries[start].discard_map
24372462
= kzalloc(SIT_VBLOCK_MAP_SIZE, GFP_KERNEL);
@@ -2861,6 +2886,9 @@ static void destroy_sit_info(struct f2fs_sb_info *sbi)
28612886
if (sit_i->sentries) {
28622887
for (start = 0; start < MAIN_SEGS(sbi); start++) {
28632888
kfree(sit_i->sentries[start].cur_valid_map);
2889+
#ifdef CONFIG_F2FS_CHECK_FS
2890+
kfree(sit_i->sentries[start].cur_valid_map_mir);
2891+
#endif
28642892
kfree(sit_i->sentries[start].ckpt_valid_map);
28652893
kfree(sit_i->sentries[start].discard_map);
28662894
}

fs/f2fs/segment.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ struct seg_entry {
164164
unsigned int ckpt_valid_blocks:10; /* # of valid blocks last cp */
165165
unsigned int padding:6; /* padding */
166166
unsigned char *cur_valid_map; /* validity bitmap of blocks */
167+
#ifdef CONFIG_F2FS_CHECK_FS
168+
unsigned char *cur_valid_map_mir; /* mirror of current valid bitmap */
169+
#endif
167170
/*
168171
* # of valid blocks and the validity bitmap stored in the the last
169172
* checkpoint pack. This information is used by the SSR mode.
@@ -320,6 +323,9 @@ static inline void seg_info_from_raw_sit(struct seg_entry *se,
320323
se->ckpt_valid_blocks = GET_SIT_VBLOCKS(rs);
321324
memcpy(se->cur_valid_map, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
322325
memcpy(se->ckpt_valid_map, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
326+
#ifdef CONFIG_F2FS_CHECK_FS
327+
memcpy(se->cur_valid_map_mir, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
328+
#endif
323329
se->type = GET_SIT_TYPE(rs);
324330
se->mtime = le64_to_cpu(rs->mtime);
325331
}

0 commit comments

Comments
 (0)