f2fs: fix to avoid allocating WARM_DATA segment for direct IO
Chao Yu
maintainerPATCH 1/1 f2fs: fix to avoid allocating WARM_DATA segment for direct IO
If active_log is not 6, we never use WARM_DATA segment, let's avoid allocating WARM_DATA segment for direct IO.
Signed-off-by Yunlei He <[email protected]>
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/data.c | 3 ++- fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 5 +++-- fs/f2fs/segment.c | 11 +++++++++-- 4 files changed, 15 insertions(+), 6 deletions(-)
fs/f2fs/data.c +2 -1
@@ -4179,7 +4179,8 @@ static int f2fs_iomap_begin(struct inode *inode, loff_t offset, loff_t length, map.m_lblk =bytes_to_blks (inode, offset); map.m_len =bytes_to_blks (inode, offset + length -1 ) - map.m_lblk +1 ; map.m_next_pgofs = &next_pgofs; - map.m_seg_type =f2fs_rw_hint_to_seg_type (inode->i_write_hint); + map.m_seg_type =f2fs_rw_hint_to_seg_type (F2FS_I_SB (inode), + inode->i_write_hint);if (flags &IOMAP_WRITE ) map.m_may_create = true;
fs/f2fs/f2fs.h +1 -1
@@ -3747,7 +3747,7 @@ int f2fs_build_segment_manager(struct f2fs_sb_info *sbi);void f2fs_destroy_segment_manager (struct f2fs_sb_info *sbi);int __init f2fs_create_segment_manager_caches (void );void f2fs_destroy_segment_manager_caches (void ); -int f2fs_rw_hint_to_seg_type (enum rw_hint hint); +int f2fs_rw_hint_to_seg_type (struct f2fs_sb_info *sbi,enum rw_hint hint);enum rw_hint f2fs_io_type_to_rw_hint (struct f2fs_sb_info *sbi,enum page_type type,enum temp_type temp); unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi,
fs/f2fs/file.c +3 -2
@@ -4643,7 +4643,8 @@ static int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *iter, map.m_may_create = true;if (dio) { - map.m_seg_type =f2fs_rw_hint_to_seg_type (inode->i_write_hint); + map.m_seg_type =f2fs_rw_hint_to_seg_type (sbi, + inode->i_write_hint); flag =F2FS_GET_BLOCK_PRE_DIO ; }else { map.m_seg_type =NO_CHECK_TYPE ;
@@ -4696,7 +4697,7 @@ static void f2fs_dio_write_submit_io(const struct iomap_iter *iter, {struct inode *inode = iter->inode;struct f2fs_sb_info *sbi =F2FS_I_SB (inode); -int seg_type =f2fs_rw_hint_to_seg_type (inode->i_write_hint); +int seg_type =f2fs_rw_hint_to_seg_type (sbi, inode->i_write_hint);enum temp_type temp =f2fs_get_segment_temp (seg_type); bio->bi_write_hint =f2fs_io_type_to_rw_hint (sbi,DATA , temp);
fs/f2fs/segment.c +9 -2
@@ -3358,8 +3358,14 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range)return err; } -int f2fs_rw_hint_to_seg_type (enum rw_hint hint) +int f2fs_rw_hint_to_seg_type (struct f2fs_sb_info *sbi,enum rw_hint hint) { +if (F2FS_OPTION (sbi).active_logs ==2 ) +return CURSEG_HOT_DATA ; +else if (F2FS_OPTION (sbi).active_logs ==4 ) +return CURSEG_COLD_DATA ; + +/* active_log == 6 */ switch (hint) {case WRITE_LIFE_SHORT :return CURSEG_HOT_DATA ;
@@ -3499,7 +3505,8 @@ static int __get_segment_type_6(struct f2fs_io_info *fio) is_inode_flag_set(inode, FI_HOT_DATA) || f2fs_is_cow_file(inode))return CURSEG_HOT_DATA ; -return f2fs_rw_hint_to_seg_type (inode->i_write_hint); +return f2fs_rw_hint_to_seg_type (F2FS_I_SB (inode), + inode->i_write_hint); }else {if (IS_DNODE (fio->page)) return is_cold_node(fio->page) ? CURSEG_WARM_NODE :
Signature · 1 line
2.40.1
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 11 lines · On Fri, 26 Apr 2024 17:33:48 +0800 you wrote:
If
active_logis not 6, we never useWARM_DATAsegment, let's avoid allocatingWARM_DATAsegment for direct IO.Signed-off-by Yunlei He <[email protected]>Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/data.c | 3 ++- fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 5 +++-- fs/f2fs/segment.c | 11 +++++++++-- 4 files changed, 15 insertions(+), 6 deletions(-)
Here is the summary with links:
- [f2fs-dev] f2fs: fix to avoid allocating WARM_DATA segment for direct IO
https://git.kernel.org/jaegeuk/f2fs/c/a320b2f08b3b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html