f2fs: check in-memory nat version bitmap

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>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 94250a69762a194893eeac85da02b2c006d7bdf4..4a84b3fbbfd1ec6dbe8c31eb24ec15a2d9244436 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -540,6 +540,9 @@ struct f2fs_nm_info {
 
        /* for checkpoint */
        char *nat_bitmap;               /* NAT bitmap pointer */
+#ifdef CONFIG_F2FS_CHECK_FS
+       char *nat_bitmap_mir;           /* NAT bitmap mirror */
+#endif
        int bitmap_size;                /* bitmap size */
 };
 

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 03a1f90435587b481aa898841de88093f2a00105..69c38a0022e7ed7db0ea5a3891dc7bce17290804 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2363,6 +2363,14 @@ static int init_node_manager(struct f2fs_sb_info *sbi)
                                        GFP_KERNEL);
        if (!nm_i->nat_bitmap)
                return -ENOMEM;
+
+#ifdef CONFIG_F2FS_CHECK_FS
+       nm_i->nat_bitmap_mir = kmemdup(version_bitmap, nm_i->bitmap_size,
+                                       GFP_KERNEL);
+       if (!nm_i->nat_bitmap_mir)
+               return -ENOMEM;
+#endif
+
        return 0;
 }
 
@@ -2437,6 +2445,9 @@ void destroy_node_manager(struct f2fs_sb_info *sbi)
        up_write(&nm_i->nat_tree_lock);
 
        kfree(nm_i->nat_bitmap);
+#ifdef CONFIG_F2FS_CHECK_FS
+       kfree(nm_i->nat_bitmap_mir);
+#endif
        sbi->nm_info = NULL;
        kfree(nm_i);
 }

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index 9278b21ee07381f5972d7b9a65814db25c7c8067..29ff783eb9c3057326b0e10073c746643c34b558 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -186,6 +186,12 @@ static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid)
 static inline void get_nat_bitmap(struct f2fs_sb_info *sbi, void *addr)
 {
        struct f2fs_nm_info *nm_i = NM_I(sbi);
+
+#ifdef CONFIG_F2FS_CHECK_FS
+       if (memcmp(nm_i->nat_bitmap, nm_i->nat_bitmap_mir,
+                                               nm_i->bitmap_size))
+               f2fs_bug_on(sbi, 1);
+#endif
        memcpy(addr, nm_i->nat_bitmap, nm_i->bitmap_size);
 }
 
@@ -203,6 +209,12 @@ static inline pgoff_t current_nat_addr(struct f2fs_sb_info *sbi, nid_t start)
                (seg_off << sbi->log_blocks_per_seg << 1) +
                (block_off & (sbi->blocks_per_seg - 1)));
 
+#ifdef CONFIG_F2FS_CHECK_FS
+       if (f2fs_test_bit(block_off, nm_i->nat_bitmap) !=
+                       f2fs_test_bit(block_off, nm_i->nat_bitmap_mir))
+               f2fs_bug_on(sbi, 1);
+#endif
+
        if (f2fs_test_bit(block_off, nm_i->nat_bitmap))
                block_addr += sbi->blocks_per_seg;
 
@@ -228,6 +240,9 @@ static inline void set_to_next_nat(struct f2fs_nm_info *nm_i, nid_t start_nid)
        unsigned int block_off = NAT_BLOCK_OFFSET(start_nid);
 
        f2fs_change_bit(block_off, nm_i->nat_bitmap);
+#ifdef CONFIG_F2FS_CHECK_FS
+       f2fs_change_bit(block_off, nm_i->nat_bitmap_mir);
+#endif
 }
 
 static inline nid_t ino_of_node(struct page *node_page)