f2fs: add iostat latency tracking for direct IO

F2FS did not collect iostat latency for direct IO reads and writes,
hook iomap_dio_ops.submit_io to bind an iostat context and record the
submission timestamp. Replace bi_end_io with f2fs_dio_end_bio() to
collect IO latency on completion before calling back to the original
iomap_dio_bio_end_io(), to add iostat latency tracking support for
F2FS DIO.

Signed-off-by: shengyong1 <shengyong1@xiaomi.com>
Signed-off-by: liujinbao1 <liujinbao1@xiaomi.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 2d8b383ecf52f615a9f03578f9ea619541e66383..6edf0105dbc8f52a85d52c30e08dcf0a38b4b7eb 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4784,6 +4784,30 @@ static bool f2fs_should_use_dio(struct inode *inode, struct kiocb *iocb,
        return true;
 }
 
+#ifdef CONFIG_F2FS_IOSTAT
+static void f2fs_dio_end_bio(struct bio *bio)
+{
+       struct bio_iostat_ctx *iostat_ctx = bio->bi_private;
+       void *orig_bi_private = iostat_ctx->post_read_ctx;
+
+       iostat_update_and_unbind_ctx(bio);
+       bio->bi_private = orig_bi_private;
+       iomap_dio_bio_end_io(bio);
+}
+
+static void f2fs_dio_iostat_start(struct f2fs_sb_info *sbi, struct bio *bio)
+{
+       void *bi_private = bio->bi_private;
+
+       iostat_alloc_and_bind_ctx(sbi, bio, bi_private);
+       iostat_update_submit_ctx(bio, DATA);
+       bio->bi_end_io = f2fs_dio_end_bio;
+}
+#else
+static inline void f2fs_dio_iostat_start(struct f2fs_sb_info *sbi,
+                                        struct bio *bio) {}
+#endif
+
 static int f2fs_dio_read_end_io(struct kiocb *iocb, ssize_t size, int error,
                                unsigned int flags)
 {
@@ -4796,8 +4820,18 @@ static int f2fs_dio_read_end_io(struct kiocb *iocb, ssize_t size, int error,
        return 0;
 }
 
+static void f2fs_dio_read_submit_io(const struct iomap_iter *iter,
+                                       struct bio *bio, loff_t file_offset)
+{
+       struct f2fs_sb_info *sbi = F2FS_I_SB(iter->inode);
+
+       f2fs_dio_iostat_start(sbi, bio);
+       blk_crypto_submit_bio(bio);
+}
+
 static const struct iomap_dio_ops f2fs_iomap_dio_read_ops = {
        .end_io = f2fs_dio_read_end_io,
+       .submit_io = f2fs_dio_read_submit_io,
 };
 
 static ssize_t f2fs_dio_read_iter(struct kiocb *iocb, struct iov_iter *to)
@@ -5078,6 +5112,7 @@ static void f2fs_dio_write_submit_io(const struct iomap_iter *iter,
        bio->bi_write_hint = f2fs_io_type_to_rw_hint(sbi, DATA, temp);
        bio->bi_write_stream =
                f2fs_io_type_to_write_stream(bio->bi_bdev, DATA, temp);
+       f2fs_dio_iostat_start(sbi, bio);
        blk_crypto_submit_bio(bio);
 }