f2fs: add compressed/gc data read IO stat

in order to account data read IOs more accurately.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 4d871d27a85f9a9e2a9855a0dda66eab75b7eaff..48a622b95b76e6ddafcb7c23cd3663de9f94a44e 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2234,6 +2234,7 @@ submit_and_realloc:
 
                inc_page_count(sbi, F2FS_RD_DATA);
                f2fs_update_iostat(sbi, FS_DATA_READ_IO, F2FS_BLKSIZE);
+               f2fs_update_iostat(sbi, FS_CDATA_READ_IO, F2FS_BLKSIZE);
                ClearPageError(page);
                *last_block_in_bio = blkaddr;
        }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 338622069e421ecdeb6c5f75a69b0f5492d537ee..51863e4f5d4e096d63bc038624d2dc1c5c28c770 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1149,6 +1149,8 @@ enum iostat_type {
        APP_READ_IO,                    /* app read IOs */
        APP_MAPPED_READ_IO,             /* app mapped read IOs */
        FS_DATA_READ_IO,                /* data read IOs */
+       FS_GDATA_READ_IO,               /* data read IOs from background gc */
+       FS_CDATA_READ_IO,               /* compressed data read IOs */
        FS_NODE_READ_IO,                /* node read IOs */
        FS_META_READ_IO,                /* meta read IOs */
 

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index f3c45ec2a7e7af5b25c370acb1614620aec840fd..5b95d5a146eb6cde844c7b3b61c44a3b97382b79 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -740,6 +740,7 @@ got_it:
        f2fs_put_page(page, 1);
 
        f2fs_update_iostat(sbi, FS_DATA_READ_IO, F2FS_BLKSIZE);
+       f2fs_update_iostat(sbi, FS_GDATA_READ_IO, F2FS_BLKSIZE);
 
        return 0;
 put_encrypted_page:
@@ -846,6 +847,7 @@ static int move_data_block(struct inode *inode, block_t bidx,
                }
 
                f2fs_update_iostat(fio.sbi, FS_DATA_READ_IO, F2FS_BLKSIZE);
+               f2fs_update_iostat(fio.sbi, FS_GDATA_READ_IO, F2FS_BLKSIZE);
 
                lock_page(mpage);
                if (unlikely(mpage->mapping != META_MAPPING(fio.sbi) ||

diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index eaf8088548f080532f7c0ceb42d6a7c91659be65..a117ae1f9d5f1357f2a27567bfcdf0304f563a91 100644 (file)
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -803,6 +803,7 @@ static int __maybe_unused iostat_info_seq_show(struct seq_file *seq,
        seq_printf(seq, "time:          %-16llu\n", now);
 
        /* print app write IOs */
+       seq_puts(seq, "[WRITE]\n");
        seq_printf(seq, "app buffered:  %-16llu\n",
                                sbi->rw_iostat[APP_BUFFERED_IO]);
        seq_printf(seq, "app direct:    %-16llu\n",
@@ -829,6 +830,7 @@ static int __maybe_unused iostat_info_seq_show(struct seq_file *seq,
                                sbi->rw_iostat[FS_CP_META_IO]);
 
        /* print app read IOs */
+       seq_puts(seq, "[READ]\n");
        seq_printf(seq, "app buffered:  %-16llu\n",
                                sbi->rw_iostat[APP_BUFFERED_READ_IO]);
        seq_printf(seq, "app direct:    %-16llu\n",
@@ -839,12 +841,17 @@ static int __maybe_unused iostat_info_seq_show(struct seq_file *seq,
        /* print fs read IOs */
        seq_printf(seq, "fs data:       %-16llu\n",
                                sbi->rw_iostat[FS_DATA_READ_IO]);
+       seq_printf(seq, "fs gc data:    %-16llu\n",
+                               sbi->rw_iostat[FS_GDATA_READ_IO]);
+       seq_printf(seq, "fs compr_data: %-16llu\n",
+                               sbi->rw_iostat[FS_CDATA_READ_IO]);
        seq_printf(seq, "fs node:       %-16llu\n",
                                sbi->rw_iostat[FS_NODE_READ_IO]);
        seq_printf(seq, "fs meta:       %-16llu\n",
                                sbi->rw_iostat[FS_META_READ_IO]);
 
        /* print other IOs */
+       seq_puts(seq, "[OTHER]\n");
        seq_printf(seq, "fs discard:    %-16llu\n",
                                sbi->rw_iostat[FS_DISCARD]);
 

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 4dbcdc6d273836bd0396935929b0e2ce1ea8f21a..a8e2e83c91cef4cfcccd58a80f18bc0372629e62 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -1840,6 +1840,8 @@ TRACE_EVENT(f2fs_iostat,
                __field(unsigned long long,     app_rio)
                __field(unsigned long long,     app_mrio)
                __field(unsigned long long,     fs_drio)
+               __field(unsigned long long,     fs_gdrio)
+               __field(unsigned long long,     fs_cdrio)
                __field(unsigned long long,     fs_nrio)
                __field(unsigned long long,     fs_mrio)
                __field(unsigned long long,     fs_discard)
@@ -1864,6 +1866,8 @@ TRACE_EVENT(f2fs_iostat,
                __entry->app_rio        = iostat[APP_READ_IO];
                __entry->app_mrio       = iostat[APP_MAPPED_READ_IO];
                __entry->fs_drio        = iostat[FS_DATA_READ_IO];
+               __entry->fs_gdrio       = iostat[FS_GDATA_READ_IO];
+               __entry->fs_cdrio       = iostat[FS_CDATA_READ_IO];
                __entry->fs_nrio        = iostat[FS_NODE_READ_IO];
                __entry->fs_mrio        = iostat[FS_META_READ_IO];
                __entry->fs_discard     = iostat[FS_DISCARD];
@@ -1875,15 +1879,16 @@ TRACE_EVENT(f2fs_iostat,
                "gc [data=%llu, node=%llu], "
                "cp [data=%llu, node=%llu, meta=%llu], "
                "app [read=%llu (direct=%llu, buffered=%llu), mapped=%llu], "
-               "fs [data=%llu, node=%llu, meta=%llu]",
+               "fs [data=%llu, (gc_data=%llu, compr_data=%llu), "
+               "node=%llu, meta=%llu]",
                show_dev(__entry->dev), __entry->app_wio, __entry->app_dio,
                __entry->app_bio, __entry->app_mio, __entry->fs_dio,
                __entry->fs_nio, __entry->fs_mio, __entry->fs_discard,
                __entry->fs_gc_dio, __entry->fs_gc_nio, __entry->fs_cp_dio,
                __entry->fs_cp_nio, __entry->fs_cp_mio,
                __entry->app_rio, __entry->app_drio, __entry->app_brio,
-               __entry->app_mrio, __entry->fs_drio, __entry->fs_nrio,
-               __entry->fs_mrio)
+               __entry->app_mrio, __entry->fs_drio, __entry->fs_gdrio,
+               __entry->fs_cdrio, __entry->fs_nrio, __entry->fs_mrio)
 );
 
 #endif /* _TRACE_F2FS_H */