diff options
| author | Wu Bo <bo.wu@vivo.com> | 2023-09-28 03:20:51 -0600 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2023-10-02 08:33:36 -0700 |
| commit | 220d716f9b3ef579153816990f8498c3eeb2aa19 (patch) | |
| tree | 736c5fd940e8d0481de1c53317b62a15b27e1994 | |
| parent | 91a95e9d90edf436c4346ecf1c893363e1feb573 (diff) | |
| download | f2fs-tools-220d716f9b3ef579153816990f8498c3eeb2aa19.tar.gz | |
f2fs-tools: cache free segments count to improve perfmance
'get_free_segments()' is implemented by traversing all segments to
calculate the total free segments. It cosume much time.
Every time when call 'find_next_free_block()' this calculation will
do it again. So if we cache the free segments count, it will greatly
improve performance of dfrag & resize & sload.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/f2fs.h | 1 | ||||
| -rw-r--r-- | fsck/mount.c | 9 | ||||
| -rw-r--r-- | fsck/segment.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/fsck/f2fs.h b/fsck/f2fs.h index a0fca45..b073a94 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -198,6 +198,7 @@ struct f2fs_sm_info { unsigned int main_segments; unsigned int reserved_segments; unsigned int ovp_segments; + unsigned int free_segments; }; struct f2fs_dentry_ptr { diff --git a/fsck/mount.c b/fsck/mount.c index ed8f6e1..9d786ea 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -125,7 +125,7 @@ void update_free_segments(struct f2fs_sb_info *sbi) if (c.dbg_lv) return; - MSG(0, "\r [ %c ] Free segments: 0x%x", progress[i % 5], get_free_segments(sbi)); + MSG(0, "\r [ %c ] Free segments: 0x%x", progress[i % 5], SM_I(sbi)->free_segments); fflush(stdout); i++; } @@ -2552,6 +2552,10 @@ static int build_sit_entries(struct f2fs_sb_info *sbi) check_block_count(sbi, segno, &sit); seg_info_from_raw_sit(sbi, se, &sit); + if (se->valid_blocks == 0x0 && + is_usable_seg(sbi, segno) && + !IS_CUR_SEGNO(sbi, segno)) + SM_I(sbi)->free_segments++; } start_blk += readed; } while (start_blk < sit_blk_cnt); @@ -2607,6 +2611,7 @@ static int early_build_segment_manager(struct f2fs_sb_info *sbi) sm_info->ovp_segments = get_cp(overprov_segment_count); sm_info->main_segments = get_sb(segment_count_main); sm_info->ssa_blkaddr = get_sb(ssa_blkaddr); + sm_info->free_segments = 0; if (build_sit_info(sbi) || build_curseg(sbi)) { free(sm_info); @@ -2931,7 +2936,7 @@ int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, if (*to > 0) *to -= left; - if (get_free_segments(sbi) <= SM_I(sbi)->reserved_segments + 1) + if (SM_I(sbi)->free_segments <= SM_I(sbi)->reserved_segments + 1) not_enough = 1; while (*to >= SM_I(sbi)->main_blkaddr && *to < end_blkaddr) { diff --git a/fsck/segment.c b/fsck/segment.c index 73a7276..3a9500f 100644 --- a/fsck/segment.c +++ b/fsck/segment.c @@ -77,6 +77,8 @@ int reserve_new_block(struct f2fs_sb_info *sbi, block_t *to, se = get_seg_entry(sbi, GET_SEGNO(sbi, blkaddr)); offset = OFFSET_IN_SEG(sbi, blkaddr); se->type = type; + if (se->valid_blocks == 0) + SM_I(sbi)->free_segments--; se->valid_blocks++; f2fs_set_bit(offset, (char *)se->cur_valid_map); if (need_fsync_data_record(sbi)) { |