Commit 2fde3dd1 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim

f2fs: allocate memory in batch in build_sit_info()

build_sit_info() allocate all bitmaps for each segment one by one,
it's quite low efficiency, this pach changes to allocate large
continuous memory at a time, and divide it and assign for each bitmaps
of segment. For large size image, it can expect improving its mount
speed.
Signed-off-by: default avatarChen Gong <gongchen4@huawei.com>
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 4507847c
...@@ -3945,7 +3945,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi) ...@@ -3945,7 +3945,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);
struct sit_info *sit_i; struct sit_info *sit_i;
unsigned int sit_segs, start; unsigned int sit_segs, start;
char *src_bitmap; char *src_bitmap, *bitmap;
unsigned int bitmap_size; unsigned int bitmap_size;
/* allocate memory for SIT information */ /* allocate memory for SIT information */
...@@ -3968,27 +3968,31 @@ static int build_sit_info(struct f2fs_sb_info *sbi) ...@@ -3968,27 +3968,31 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
if (!sit_i->dirty_sentries_bitmap) if (!sit_i->dirty_sentries_bitmap)
return -ENOMEM; return -ENOMEM;
#ifdef CONFIG_F2FS_CHECK_FS
bitmap_size = MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE * 4;
#else
bitmap_size = MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE * 3;
#endif
sit_i->bitmap = f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL);
if (!sit_i->bitmap)
return -ENOMEM;
bitmap = sit_i->bitmap;
for (start = 0; start < MAIN_SEGS(sbi); start++) { for (start = 0; start < MAIN_SEGS(sbi); start++) {
sit_i->sentries[start].cur_valid_map sit_i->sentries[start].cur_valid_map = bitmap;
= f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL); bitmap += SIT_VBLOCK_MAP_SIZE;
sit_i->sentries[start].ckpt_valid_map
= f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL); sit_i->sentries[start].ckpt_valid_map = bitmap;
if (!sit_i->sentries[start].cur_valid_map || bitmap += SIT_VBLOCK_MAP_SIZE;
!sit_i->sentries[start].ckpt_valid_map)
return -ENOMEM;
#ifdef CONFIG_F2FS_CHECK_FS #ifdef CONFIG_F2FS_CHECK_FS
sit_i->sentries[start].cur_valid_map_mir sit_i->sentries[start].cur_valid_map_mir = bitmap;
= f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL); bitmap += SIT_VBLOCK_MAP_SIZE;
if (!sit_i->sentries[start].cur_valid_map_mir)
return -ENOMEM;
#endif #endif
sit_i->sentries[start].discard_map sit_i->sentries[start].discard_map = bitmap;
= f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, bitmap += SIT_VBLOCK_MAP_SIZE;
GFP_KERNEL);
if (!sit_i->sentries[start].discard_map)
return -ENOMEM;
} }
sit_i->tmp_map = f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL); sit_i->tmp_map = f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL);
...@@ -4494,21 +4498,12 @@ static void destroy_free_segmap(struct f2fs_sb_info *sbi) ...@@ -4494,21 +4498,12 @@ static void destroy_free_segmap(struct f2fs_sb_info *sbi)
static void destroy_sit_info(struct f2fs_sb_info *sbi) static void destroy_sit_info(struct f2fs_sb_info *sbi)
{ {
struct sit_info *sit_i = SIT_I(sbi); struct sit_info *sit_i = SIT_I(sbi);
unsigned int start;
if (!sit_i) if (!sit_i)
return; return;
if (sit_i->sentries) { if (sit_i->sentries)
for (start = 0; start < MAIN_SEGS(sbi); start++) { kvfree(sit_i->bitmap);
kvfree(sit_i->sentries[start].cur_valid_map);
#ifdef CONFIG_F2FS_CHECK_FS
kvfree(sit_i->sentries[start].cur_valid_map_mir);
#endif
kvfree(sit_i->sentries[start].ckpt_valid_map);
kvfree(sit_i->sentries[start].discard_map);
}
}
kvfree(sit_i->tmp_map); kvfree(sit_i->tmp_map);
kvfree(sit_i->sentries); kvfree(sit_i->sentries);
......
...@@ -226,6 +226,7 @@ struct sit_info { ...@@ -226,6 +226,7 @@ struct sit_info {
block_t sit_base_addr; /* start block address of SIT area */ block_t sit_base_addr; /* start block address of SIT area */
block_t sit_blocks; /* # of blocks used by SIT area */ block_t sit_blocks; /* # of blocks used by SIT area */
block_t written_valid_blocks; /* # of valid blocks in main area */ block_t written_valid_blocks; /* # of valid blocks in main area */
char *bitmap; /* all bitmaps pointer */
char *sit_bitmap; /* SIT bitmap pointer */ char *sit_bitmap; /* SIT bitmap pointer */
#ifdef CONFIG_F2FS_CHECK_FS #ifdef CONFIG_F2FS_CHECK_FS
char *sit_bitmap_mir; /* SIT bitmap mirror */ char *sit_bitmap_mir; /* SIT bitmap mirror */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment