diff options
| author | Chao Yu <chao@kernel.org> | 2022-10-06 23:16:56 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2022-10-10 13:24:56 -0700 |
| commit | 3486b62aa023a01c5e8e45b381171987e5723163 (patch) | |
| tree | 806df905bb20f95839c3ad2b5123035373156511 | |
| parent | bdd51e53042490b573629fe172047ef0519c7832 (diff) | |
| download | f2fs-tools-3486b62aa023a01c5e8e45b381171987e5723163.tar.gz | |
mkfs.f2fs: update allocation policy for ro feature
Update allocation policy for ro feature:
- hot_data: allocating blocks by LBA ascending order
- hot_node: allocating blocks by LBA descending order
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/mount.c | 8 | ||||
| -rw-r--r-- | fsck/segment.c | 15 | ||||
| -rw-r--r-- | mkfs/f2fs_format.c | 4 |
3 files changed, 24 insertions, 3 deletions
diff --git a/fsck/mount.c b/fsck/mount.c index af24484..aebe363 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -2777,6 +2777,14 @@ static void move_one_curseg_info(struct f2fs_sb_info *sbi, u64 from, int left, if ((get_sb(feature) & cpu_to_le32(F2FS_FEATURE_RO))) { if (i != CURSEG_HOT_DATA && i != CURSEG_HOT_NODE) return; + + if (i == CURSEG_HOT_DATA) { + left = 0; + from = SM_I(sbi)->main_blkaddr; + } else { + left = 1; + from = __end_block_addr(sbi); + } goto bypass_ssa; } diff --git a/fsck/segment.c b/fsck/segment.c index 401cbb6..0307bdd 100644 --- a/fsck/segment.c +++ b/fsck/segment.c @@ -28,6 +28,7 @@ int reserve_new_block(struct f2fs_sb_info *sbi, block_t *to, u64 blkaddr, offset; u64 old_blkaddr = *to; bool is_node = IS_NODESEG(type); + int left = 0; if (old_blkaddr == NULL_ADDR) { if (c.func == FSCK) { @@ -56,7 +57,19 @@ int reserve_new_block(struct f2fs_sb_info *sbi, block_t *to, blkaddr = SM_I(sbi)->main_blkaddr; - if (find_next_free_block(sbi, &blkaddr, 0, type, false)) { + if (sbi->raw_super->feature & cpu_to_le32(F2FS_FEATURE_RO)) { + if (IS_NODESEG(type)) { + type = CURSEG_HOT_NODE; + blkaddr = __end_block_addr(sbi); + left = 1; + } else if (IS_DATASEG(type)) { + type = CURSEG_HOT_DATA; + blkaddr = SM_I(sbi)->main_blkaddr; + left = 0; + } + } + + if (find_next_free_block(sbi, &blkaddr, left, type, false)) { ERR_MSG("Can't find free block"); ASSERT(0); } diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index 40ac589..8d0f410 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -544,10 +544,10 @@ static int f2fs_prepare_super_block(void) } if (c.feature & cpu_to_le32(F2FS_FEATURE_RO)) { - c.cur_seg[CURSEG_HOT_NODE] = 0; + c.cur_seg[CURSEG_HOT_NODE] = last_section(last_zone(total_zones)); c.cur_seg[CURSEG_WARM_NODE] = 0; c.cur_seg[CURSEG_COLD_NODE] = 0; - c.cur_seg[CURSEG_HOT_DATA] = 1; + c.cur_seg[CURSEG_HOT_DATA] = 0; c.cur_seg[CURSEG_COLD_DATA] = 0; c.cur_seg[CURSEG_WARM_DATA] = 0; } else if (c.heap) { |