Skip to content

Commit 2bb1504

Browse files
chaseyupundiramit
authored andcommitted
f2fs: check in-memory nat version bitmap
commit 599a09b2c1ac222e6aad0c22515d1ccde7c3b702 upstream. This patch adds a mirror for nat version 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 28324de commit 2bb1504

3 files changed

Lines changed: 29 additions & 0 deletions

File tree

fs/f2fs/f2fs.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,9 @@ struct f2fs_nm_info {
607607

608608
/* for checkpoint */
609609
char *nat_bitmap; /* NAT bitmap pointer */
610+
#ifdef CONFIG_F2FS_CHECK_FS
611+
char *nat_bitmap_mir; /* NAT bitmap mirror */
612+
#endif
610613
int bitmap_size; /* bitmap size */
611614
};
612615

fs/f2fs/node.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2366,6 +2366,14 @@ static int init_node_manager(struct f2fs_sb_info *sbi)
23662366
GFP_KERNEL);
23672367
if (!nm_i->nat_bitmap)
23682368
return -ENOMEM;
2369+
2370+
#ifdef CONFIG_F2FS_CHECK_FS
2371+
nm_i->nat_bitmap_mir = kmemdup(version_bitmap, nm_i->bitmap_size,
2372+
GFP_KERNEL);
2373+
if (!nm_i->nat_bitmap_mir)
2374+
return -ENOMEM;
2375+
#endif
2376+
23692377
return 0;
23702378
}
23712379

@@ -2440,6 +2448,9 @@ void destroy_node_manager(struct f2fs_sb_info *sbi)
24402448
up_write(&nm_i->nat_tree_lock);
24412449

24422450
kfree(nm_i->nat_bitmap);
2451+
#ifdef CONFIG_F2FS_CHECK_FS
2452+
kfree(nm_i->nat_bitmap_mir);
2453+
#endif
24432454
sbi->nm_info = NULL;
24442455
kfree(nm_i);
24452456
}

fs/f2fs/node.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,12 @@ static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid)
186186
static inline void get_nat_bitmap(struct f2fs_sb_info *sbi, void *addr)
187187
{
188188
struct f2fs_nm_info *nm_i = NM_I(sbi);
189+
190+
#ifdef CONFIG_F2FS_CHECK_FS
191+
if (memcmp(nm_i->nat_bitmap, nm_i->nat_bitmap_mir,
192+
nm_i->bitmap_size))
193+
f2fs_bug_on(sbi, 1);
194+
#endif
189195
memcpy(addr, nm_i->nat_bitmap, nm_i->bitmap_size);
190196
}
191197

@@ -203,6 +209,12 @@ static inline pgoff_t current_nat_addr(struct f2fs_sb_info *sbi, nid_t start)
203209
(seg_off << sbi->log_blocks_per_seg << 1) +
204210
(block_off & (sbi->blocks_per_seg - 1)));
205211

212+
#ifdef CONFIG_F2FS_CHECK_FS
213+
if (f2fs_test_bit(block_off, nm_i->nat_bitmap) !=
214+
f2fs_test_bit(block_off, nm_i->nat_bitmap_mir))
215+
f2fs_bug_on(sbi, 1);
216+
#endif
217+
206218
if (f2fs_test_bit(block_off, nm_i->nat_bitmap))
207219
block_addr += sbi->blocks_per_seg;
208220

@@ -228,6 +240,9 @@ static inline void set_to_next_nat(struct f2fs_nm_info *nm_i, nid_t start_nid)
228240
unsigned int block_off = NAT_BLOCK_OFFSET(start_nid);
229241

230242
f2fs_change_bit(block_off, nm_i->nat_bitmap);
243+
#ifdef CONFIG_F2FS_CHECK_FS
244+
f2fs_change_bit(block_off, nm_i->nat_bitmap_mir);
245+
#endif
231246
}
232247

233248
static inline nid_t ino_of_node(struct page *node_page)

0 commit comments

Comments
 (0)