[f2fs-dev] [PATCH] f2fs: fix to override bi_write_hint in fs-based whint_mode

[Chao Yu <chao@kernel.org>]

If whint_mode=fs-based, for direct write IO, it needs to override
bio.bi_write_hint with the hint provided by filesystem.

Fixes: 0cdd31953967 ("f2fs: support passing down write hints given by users to block layer")
Cc: Hyunchul Lee <cheol.lee@lge.com>
Signed-off-by: Chao Yu <chao.yu@oppo.com>
---
 fs/f2fs/f2fs.h    |  1 +
 fs/f2fs/file.c    | 21 +++++++++++++++++++++
 fs/f2fs/segment.c | 17 +++++++++++------
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 68d791ec8b27..01d1393b8f83 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3629,6 +3629,7 @@ void f2fs_replace_block(struct f2fs_sb_info *sbi, struct dnode_of_data *dn,
 			block_t old_addr, block_t new_addr,
 			unsigned char version, bool recover_curseg,
 			bool recover_newaddr);
+int f2fs_get_segment_temp(int seg_type);
 void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
 			block_t old_blkaddr, block_t *new_blkaddr,
 			struct f2fs_summary *sum, int type,
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index d5c3273c6efe..9a1c4f69a39a 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4458,6 +4458,26 @@ static ssize_t f2fs_buffered_write_iter(struct kiocb *iocb,
 	return ret;
 }
 
+
+static void f2fs_dio_submit_io(const struct iomap_iter *iter, struct bio *bio,
+							  loff_t file_offset)
+{
+	struct inode *inode = iter->inode;
+	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+
+	if (F2FS_OPTION(sbi).whint_mode == WHINT_MODE_FS) {
+		int seg_type = f2fs_rw_hint_to_seg_type(bio->bi_write_hint);
+		enum temp_type temp = f2fs_get_segment_temp(seg_type);
+
+		/*
+		 * in fs-based whint_mode, override bi_write_hint w/
+		 * the hint provided by filesystem.
+		 */
+		bio->bi_write_hint = f2fs_io_type_to_rw_hint(sbi, DATA, temp);
+	}
+	submit_bio(bio);
+}
+
 static int f2fs_dio_write_end_io(struct kiocb *iocb, ssize_t size, int error,
 				 unsigned int flags)
 {
@@ -4472,6 +4492,7 @@ static int f2fs_dio_write_end_io(struct kiocb *iocb, ssize_t size, int error,
 
 static const struct iomap_dio_ops f2fs_iomap_dio_write_ops = {
 	.end_io = f2fs_dio_write_end_io,
+	.submit_io = f2fs_dio_submit_io,
 };
 
 static ssize_t f2fs_dio_write_iter(struct kiocb *iocb, struct iov_iter *from,
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 012524db7437..20aa9f11de5e 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3397,6 +3397,15 @@ static int __get_segment_type_6(struct f2fs_io_info *fio)
 	}
 }
 
+int f2fs_get_segment_temp(int seg_type)
+{
+	if (IS_HOT(seg_type))
+		return HOT;
+	else if (IS_WARM(seg_type))
+		return WARM;
+	return COLD;
+}
+
 static int __get_segment_type(struct f2fs_io_info *fio)
 {
 	int type = 0;
@@ -3415,12 +3424,8 @@ static int __get_segment_type(struct f2fs_io_info *fio)
 		f2fs_bug_on(fio->sbi, true);
 	}
 
-	if (IS_HOT(type))
-		fio->temp = HOT;
-	else if (IS_WARM(type))
-		fio->temp = WARM;
-	else
-		fio->temp = COLD;
+	fio->temp = f2fs_get_segment_temp(type);
+
 	return type;
 }
 
-- 
2.25.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel