f2fs: Fix DIO flags and add ioprio hint
cover f2fs: Fix DIO flags and add ioprio hint
The first patch corrects an issue where Direct I/O (DIO) writes ignore bio flag hints (e.g., F2FS_IOPRIO_WRITE for REQ_PRIO), making them inconsistent with buffered I/O.
The second patch is to set an I/O priority hint for hot files on creation and pinned files by default.
Daniel Lee (2):
f2fs: Apply bio flags to direct I/O
f2fs: use ioprio hint for hot and pinned files
fs/f2fs/data.c | 8 ++++---- fs/f2fs/f2fs.h | 23 +++++++++++++++++++++++ fs/f2fs/file.c | 15 +++++++++++++++ fs/f2fs/namei.c | 11 +++++++---- 4 files changed, 49 insertions(+), 8 deletions(-)
Signature · 1 line
2.50.0.rc1.591.g9c95f17f64-goog
PATCH 1/2 f2fs: Apply bio flags to direct I/O
Bio flags like REQ_PRIO, REQ_META, and REQ_FUA, determined by f2fs_io_flags(), were not being applied to direct I/O (DIO) writes. This meant that DIO writes would not respect filesystem-level hints (for REQ_META/FUA) or inode-level hints (like F2FS_IOPRIO_WRITE).
This patch refactors f2fs_io_flags() to use a direct inode pointer instead of deriving it from a page. The function is then called from the DIO write path, ensuring that bio flags are handled consistently for both buffered and DIO writes.
--- fs/f2fs/data.c | 8 ++++---- fs/f2fs/f2fs.h | 2 ++ fs/f2fs/file.c | 12 ++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-)
fs/f2fs/data.c +4 -4
@@ -416,10 +416,9 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr)return 0 ; } -static blk_opf_t f2fs_io_flags (struct f2fs_io_info *fio) +blk_opf_t f2fs_io_flags (struct f2fs_io_info *fio) {unsigned int temp_mask =GENMASK (NR_TEMP_TYPE -1 ,0 ); -struct folio *fio_folio =page_folio (fio->page);unsigned int fua_flag, meta_flag, io_flag;blk_opf_t op_flags =0 ;
@@ -446,8 +445,8 @@ static blk_opf_t f2fs_io_flags(struct f2fs_io_info *fio)if (BIT (fio->temp) & fua_flag) op_flags |=REQ_FUA ; -if (fio->type ==DATA && -F2FS_I (fio_folio->mapping->host)->ioprio_hint ==F2FS_IOPRIO_WRITE ) +if (fio->inode && fio->type ==DATA && +F2FS_I (fio->inode)->ioprio_hint ==F2FS_IOPRIO_WRITE ) op_flags |=REQ_PRIO ;return op_flags;
@@ -2783,6 +2782,7 @@ int f2fs_write_single_data_page(struct folio *folio, int *submitted,int err =0 ;struct f2fs_io_info fio = { .sbi = sbi, + .inode = inode, .ino = inode->i_ino, .type =DATA , .op =REQ_OP_WRITE ,
fs/f2fs/f2fs.h +2 -0
@@ -1233,6 +1233,7 @@ enum iostat_type {struct f2fs_io_info {struct f2fs_sb_info *sbi;/* f2fs_sb_info pointer */ +struct inode *inode;nid_t ino;/* inode number */ enum page_type type;/* contains DATA/NODE/META/META_FLUSH */ enum temp_type temp;/* contains HOT/WARM/COLD */
@@ -3972,6 +3973,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio);struct block_device *f2fs_target_device (struct f2fs_sb_info *sbi,block_t blk_addr,sector_t *sector);int f2fs_target_device_index (struct f2fs_sb_info *sbi,block_t blkaddr); +blk_opf_t f2fs_io_flags (struct f2fs_io_info *fio);void f2fs_set_data_blkaddr (struct dnode_of_data *dn,block_t blkaddr);void f2fs_update_data_blkaddr (struct dnode_of_data *dn,block_t blkaddr);int f2fs_reserve_new_blocks (struct dnode_of_data *dn,blkcnt_t count);
fs/f2fs/file.c +12 -0
@@ -5015,6 +5015,18 @@ static void f2fs_dio_write_submit_io(const struct iomap_iter *iter,enum log_type type =f2fs_rw_hint_to_seg_type (sbi, inode->i_write_hint);enum temp_type temp =f2fs_get_segment_temp (sbi, type); +/* if fadvise set to hot, override the temperature */ +struct f2fs_io_info fio = { + .sbi = sbi, + .inode = inode, + .type =DATA , + .op =REQ_OP_WRITE , + .temp =file_is_hot (inode) ?HOT : temp, + .op_flags = bio->bi_opf, + .page =NULL , + }; + bio->bi_opf |=f2fs_io_flags (&fio); + bio->bi_write_hint =f2fs_io_type_to_rw_hint (sbi,DATA , temp);submit_bio (bio); }
Signature · 1 line
2.50.0.rc1.591.g9c95f17f64-goog
Chao Yu
maintainerRe: [PATCH 1/2] f2fs: Apply bio flags to direct I/O
Quoted 34 lines · Daniel Lee
Bio flags like
REQ_PRIO,REQ_META, andREQ_FUA, determined byf2fs_io_flags(), were not being applied to direct I/O (DIO) writes. This meant that DIO writes would not respect filesystem-level hints (for REQ_META/FUA) or inode-level hints (likeF2FS_IOPRIO_WRITE).This patch refactors
f2fs_io_flags()to use a direct inode pointer instead of deriving it from a page. The function is then called from the DIO write path, ensuring that bio flags are handled consistently for both buffered and DIO writes.Signed-off-by Daniel Lee <[email protected]>--- fs/f2fs/data.c | 8 ++++---- fs/f2fs/f2fs.h | 2 ++ fs/f2fs/file.c | 12 ++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-)fs/f2fs/data.c +1
-2@@ -416,10 +416,9 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr)return 0 ; } -static blk_opf_t f2fs_io_flags (struct f2fs_io_info *fio) +blk_opf_t f2fs_io_flags (struct f2fs_io_info *fio) {unsigned int temp_mask =GENMASK (NR_TEMP_TYPE -1 ,0 ); -struct folio *fio_folio =page_folio (fio->page);unsigned int fua_flag, meta_flag, io_flag;blk_opf_t op_flags =0 ;
fs/f2fs/data.c static blk_opf_t f2fs_io_flags(struct f2fs_io_info *fio) · line 448
Quoted 6 lines
fs/f2fs/data.c +1
-2@@ -446,8 +445,8 @@ static blk_opf_t f2fs_io_flags(struct f2fs_io_info *fio)if (BIT (fio->temp) & fua_flag) op_flags |=REQ_FUA ; -if (fio->type ==DATA && -F2FS_I (fio_folio->mapping->host)->ioprio_hint ==F2FS_IOPRIO_WRITE ) + if (fio->inode && fio->type == DATA &&
It seems that it changes the logic, if fio->inode is NULL we will not tag op_flags w/ REQ_PRIO, path like GC? do we need to assign fio.inode for all paths?
Thanks,
Quoted 55 lines
fs/f2fs/data.c +2
-0+ F2FS_I(fio->inode)->ioprio_hint == F2FS_IOPRIO_WRITE) op_flags |=REQ_PRIO ;return op_flags;@@ -2783,6 +2782,7 @@ int f2fs_write_single_data_page(struct folio *folio, int *submitted,int err =0 ;struct f2fs_io_info fio = { .sbi = sbi, + .inode = inode, .ino = inode->i_ino, .type =DATA , .op =REQ_OP_WRITE ,fs/f2fs/f2fs.h +2
-0@@ -1233,6 +1233,7 @@ enum iostat_type {struct f2fs_io_info {struct f2fs_sb_info *sbi;/* f2fs_sb_info pointer */ +struct inode *inode;nid_t ino;/* inode number */ enum page_type type;/* contains DATA/NODE/META/META_FLUSH */ enum temp_type temp;/* contains HOT/WARM/COLD */ @@ -3972,6 +3973,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio);struct block_device *f2fs_target_device (struct f2fs_sb_info *sbi,block_t blk_addr,sector_t *sector);int f2fs_target_device_index (struct f2fs_sb_info *sbi,block_t blkaddr); +blk_opf_t f2fs_io_flags (struct f2fs_io_info *fio);void f2fs_set_data_blkaddr (struct dnode_of_data *dn,block_t blkaddr);void f2fs_update_data_blkaddr (struct dnode_of_data *dn,block_t blkaddr);int f2fs_reserve_new_blocks (struct dnode_of_data *dn,blkcnt_t count);fs/f2fs/file.c +12
-0@@ -5015,6 +5015,18 @@ static void f2fs_dio_write_submit_io(const struct iomap_iter *iter,enum log_type type =f2fs_rw_hint_to_seg_type (sbi, inode->i_write_hint);enum temp_type temp =f2fs_get_segment_temp (sbi, type); +/* if fadvise set to hot, override the temperature */ +struct f2fs_io_info fio = { + .sbi = sbi, + .inode = inode, + .type =DATA , + .op =REQ_OP_WRITE , + .temp =file_is_hot (inode) ?HOT : temp, + .op_flags = bio->bi_opf, + .page =NULL , + }; + bio->bi_opf |=f2fs_io_flags (&fio); + bio->bi_write_hint =f2fs_io_type_to_rw_hint (sbi,DATA , temp);submit_bio (bio); }
PATCH 2/2 f2fs: use ioprio hint for hot and pinned files
In reply to Daniel LeeApply the ioprio_hint to set F2FS_IOPRIO_WRITE priority on files identified as "hot" at creation and on files that are pinned via ioctl.
--- fs/f2fs/f2fs.h | 21 +++++++++++++++++++++ fs/f2fs/file.c | 3 +++ fs/f2fs/namei.c | 11 +++++++---- 3 files changed, 31 insertions(+), 4 deletions(-)
fs/f2fs/f2fs.h +21 -0
@@ -3441,6 +3441,27 @@ static inline void set_file(struct inode *inode, int type)f2fs_mark_inode_dirty_sync (inode, true); } +static inline int get_ioprio (struct inode *inode) +{ +return F2FS_I (inode)->ioprio_hint; +} + +static inline void set_ioprio (struct inode *inode,int level) +{ +if (get_ioprio (inode) == level) +return ; +F2FS_I (inode)->ioprio_hint = level; +f2fs_mark_inode_dirty_sync (inode, true); +} + +static inline void clear_ioprio (struct inode *inode) +{ +if (get_ioprio (inode) ==0 ) +return ; +F2FS_I (inode)->ioprio_hint =0 ; +f2fs_mark_inode_dirty_sync (inode, true); +} +static inline void clear_file (struct inode *inode,int type) {if (!is_file (inode, type))
fs/f2fs/file.c +3 -0
@@ -3496,6 +3496,7 @@ static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg)if (!pin) {clear_inode_flag (inode,FI_PIN_FILE ); +clear_ioprio (inode);f2fs_i_gc_failures_write (inode,0 ); goto done; }else if (f2fs_is_pinned_file (inode)) {
@@ -3529,6 +3530,8 @@ static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg) }set_inode_flag (inode,FI_PIN_FILE ); +file_set_hot (inode); +set_ioprio (inode,F2FS_IOPRIO_WRITE ); ret =F2FS_I (inode)->i_gc_failures; done:f2fs_update_time (sbi,REQ_TIME );
fs/f2fs/namei.c +7 -4
@@ -191,9 +191,10 @@ static void set_compress_new_inode(struct f2fs_sb_info *sbi, struct inode *dir, }/* -* Set file's temperature for hot/cold data separation +* Set file's temperature (for hot/cold data separation) and +* I/O priority, based on filename extension */ -static void set_file_temperature (struct f2fs_sb_info *sbi,struct inode *inode, +static void set_file_temp_prio (struct f2fs_sb_info *sbi,struct inode *inode,const unsigned char *name) {__u8 (*extlist)[F2FS_EXTENSION_LEN ] = sbi->raw_super->extension_list;
@@ -212,8 +213,10 @@ static void set_file_temperature(struct f2fs_sb_info *sbi, struct inode *inode,if (i < cold_count)file_set_cold (inode); -else +else {file_set_hot (inode); +set_ioprio (inode,F2FS_IOPRIO_WRITE ); + } } static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,
@@ -317,7 +320,7 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,set_inode_flag (inode,FI_INLINE_DATA );if (name && !test_opt (sbi,DISABLE_EXT_IDENTIFY )) -set_file_temperature (sbi, inode, name); +set_file_temp_prio (sbi, inode, name);stat_inc_inline_xattr (inode);stat_inc_inline_inode (inode);
Signature · 1 line
2.50.0.rc1.591.g9c95f17f64-goog
Chao Yu
maintainerRe: [PATCH 2/2] f2fs: use ioprio hint for hot and pinned files
Quoted 20 lines · Daniel Lee
Apply the
ioprio_hintto setF2FS_IOPRIO_WRITEpriority on files identified as "hot" at creation and on files that are pinned via ioctl.Signed-off-by Daniel Lee <[email protected]>--- fs/f2fs/f2fs.h | 21 +++++++++++++++++++++ fs/f2fs/file.c | 3 +++ fs/f2fs/namei.c | 11 +++++++---- 3 files changed, 31 insertions(+), 4 deletions(-)fs/f2fs/f2fs.h +1
-0@@ -3441,6 +3441,27 @@ static inline void set_file(struct inode *inode, int type)f2fs_mark_inode_dirty_sync (inode, true); } +static inline int get_ioprio (struct inode *inode)
fs/f2fs/f2fs.h static inline void set_file(struct inode *inode, int type) · line 3454
Quoted 10 lines
fs/f2fs/f2fs.h +10
-0+{ +return F2FS_I (inode)->ioprio_hint; +} + +static inline void set_ioprio (struct inode *inode,int level) +{ +if (get_ioprio (inode) == level) +return ; +F2FS_I (inode)->ioprio_hint = level; +f2fs_mark_inode_dirty_sync (inode, true);
We don't need to mark inode dirty? IIRC, .ioprio_hint is just in-memory variable?
fs/f2fs/f2fs.h static inline void set_file(struct inode *inode, int type) · line 3462
Quoted 8 lines
fs/f2fs/f2fs.h +8
-0+} + +static inline void clear_ioprio (struct inode *inode) +{ +if (get_ioprio (inode) ==0 ) +return ; +F2FS_I (inode)->ioprio_hint =0 ; +f2fs_mark_inode_dirty_sync (inode, true);
Ditto,
Quoted 64 lines
fs/f2fs/f2fs.h +2
-0+} +static inline void clear_file (struct inode *inode,int type) {if (!is_file (inode, type))fs/f2fs/file.c +3
-0@@ -3496,6 +3496,7 @@ static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg)if (!pin) {clear_inode_flag (inode,FI_PIN_FILE ); +clear_ioprio (inode);f2fs_i_gc_failures_write (inode,0 ); goto done; }else if (f2fs_is_pinned_file (inode)) {@@ -3529,6 +3530,8 @@ static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg) }set_inode_flag (inode,FI_PIN_FILE ); +file_set_hot (inode); +set_ioprio (inode,F2FS_IOPRIO_WRITE ); ret =F2FS_I (inode)->i_gc_failures; done:f2fs_update_time (sbi,REQ_TIME );fs/f2fs/namei.c +7
-4@@ -191,9 +191,10 @@ static void set_compress_new_inode(struct f2fs_sb_info *sbi, struct inode *dir, }/* -* Set file's temperature for hot/cold data separation +* Set file's temperature (for hot/cold data separation) and +* I/O priority, based on filename extension */ -static void set_file_temperature (struct f2fs_sb_info *sbi,struct inode *inode, +static void set_file_temp_prio (struct f2fs_sb_info *sbi,struct inode *inode,const unsigned char *name) {__u8 (*extlist)[F2FS_EXTENSION_LEN ] = sbi->raw_super->extension_list;@@ -212,8 +213,10 @@ static void set_file_temperature(struct f2fs_sb_info *sbi, struct inode *inode,if (i < cold_count)file_set_cold (inode); -else +else {file_set_hot (inode); +set_ioprio (inode,F2FS_IOPRIO_WRITE ); + } } static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,@@ -317,7 +320,7 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,set_inode_flag (inode,FI_INLINE_DATA );if (name && !test_opt (sbi,DISABLE_EXT_IDENTIFY )) -set_file_temperature (sbi, inode, name); +set_file_temp_prio (sbi, inode, name);stat_inc_inline_xattr (inode);stat_inc_inline_inode (inode);