f2fs: add to account meta IO

This patch supports to account meta IO, it enables to show write IO
from f2fs more comprehensively via 'status' debugfs entry.

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

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index d3c402183e3c49f5bbee67fd2e0c232ab0c583f3..da1cabbc4973f5510bf22585da648759837b9105 100644 (file)
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -118,6 +118,9 @@ static void update_general_status(struct f2fs_sb_info *sbi)
                si->curzone[i] = GET_ZONE_FROM_SEC(sbi, si->cursec[i]);
        }
 
+       for (i = META_CP; i < META_MAX; i++)
+               si->meta_count[i] = atomic_read(&sbi->meta_count[i]);
+
        for (i = 0; i < 2; i++) {
                si->segment_count[i] = sbi->segment_count[i];
                si->block_count[i] = sbi->block_count[i];
@@ -329,6 +332,13 @@ static int stat_show(struct seq_file *s, void *v)
                           si->prefree_count, si->free_segs, si->free_secs);
                seq_printf(s, "CP calls: %d (BG: %d)\n",
                                si->cp_count, si->bg_cp_count);
+               seq_printf(s, "  - cp blocks : %u\n", si->meta_count[META_CP]);
+               seq_printf(s, "  - sit blocks : %u\n",
+                               si->meta_count[META_SIT]);
+               seq_printf(s, "  - nat blocks : %u\n",
+                               si->meta_count[META_NAT]);
+               seq_printf(s, "  - ssa blocks : %u\n",
+                               si->meta_count[META_SSA]);
                seq_printf(s, "GC calls: %d (BG: %d)\n",
                           si->call_count, si->bg_gc);
                seq_printf(s, "  - data segments : %d (%d)\n",
@@ -441,6 +451,7 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
 {
        struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);
        struct f2fs_stat_info *si;
+       int i;
 
        si = f2fs_kzalloc(sbi, sizeof(struct f2fs_stat_info), GFP_KERNEL);
        if (!si)
@@ -466,6 +477,8 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
        atomic_set(&sbi->inline_inode, 0);
        atomic_set(&sbi->inline_dir, 0);
        atomic_set(&sbi->inplace_count, 0);
+       for (i = META_CP; i < META_MAX; i++)
+               atomic_set(&sbi->meta_count[i], 0);
 
        atomic_set(&sbi->aw_cnt, 0);
        atomic_set(&sbi->vw_cnt, 0);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index dcfa6a94676eeb99d9e8a2434a6b117bc9984b80..46cdb532e47d68e188ee625c699da1735fb3d9e1 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -201,6 +201,7 @@ enum {
        META_NAT,
        META_SIT,
        META_SSA,
+       META_MAX,
        META_POR,
        DATA_GENERIC,
        META_GENERIC,
@@ -1260,6 +1261,7 @@ struct f2fs_sb_info {
         */
 #ifdef CONFIG_F2FS_STAT_FS
        struct f2fs_stat_info *stat_info;       /* FS status information */
+       atomic_t meta_count[META_MAX];          /* # of meta blocks */
        unsigned int segment_count[2];          /* # of allocated segments */
        unsigned int block_count[2];            /* # of allocated blocks */
        atomic_t inplace_count;         /* # of inplace update */
@@ -3123,6 +3125,7 @@ struct f2fs_stat_info {
        int cursec[NR_CURSEG_TYPE];
        int curzone[NR_CURSEG_TYPE];
 
+       unsigned int meta_count[META_MAX];
        unsigned int segment_count[2];
        unsigned int block_count[2];
        unsigned int inplace_count;
@@ -3174,6 +3177,17 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)
                if (f2fs_has_inline_dentry(inode))                      \
                        (atomic_dec(&F2FS_I_SB(inode)->inline_dir));    \
        } while (0)
+#define stat_inc_meta_count(sbi, blkaddr)                              \
+       do {                                                            \
+               if (blkaddr < SIT_I(sbi)->sit_base_addr)                \
+                       atomic_inc(&(sbi)->meta_count[META_CP]);        \
+               else if (blkaddr < NM_I(sbi)->nat_blkaddr)              \
+                       atomic_inc(&(sbi)->meta_count[META_SIT]);       \
+               else if (blkaddr < SM_I(sbi)->ssa_blkaddr)              \
+                       atomic_inc(&(sbi)->meta_count[META_NAT]);       \
+               else if (blkaddr < SM_I(sbi)->main_blkaddr)             \
+                       atomic_inc(&(sbi)->meta_count[META_SSA]);       \
+       } while (0)
 #define stat_inc_seg_type(sbi, curseg)                                 \
                ((sbi)->segment_count[(curseg)->alloc_type]++)
 #define stat_inc_block_count(sbi, curseg)                              \
@@ -3261,6 +3275,7 @@ void f2fs_destroy_root_stats(void);
 #define stat_inc_volatile_write(inode)                 do { } while (0)
 #define stat_dec_volatile_write(inode)                 do { } while (0)
 #define stat_update_max_volatile_write(inode)          do { } while (0)
+#define stat_inc_meta_count(sbi, blkaddr)              do { } while (0)
 #define stat_inc_seg_type(sbi, curseg)                 do { } while (0)
 #define stat_inc_block_count(sbi, curseg)              do { } while (0)
 #define stat_inc_inplace_blocks(sbi)                   do { } while (0)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index d33e9d0d5d47a5cc4c5f2fa55f65115e48632d21..3fa8870569ccb3e74ed62f9601a0fcd6becc344d 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3018,6 +3018,7 @@ void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct page *page,
        ClearPageError(page);
        f2fs_submit_page_write(&fio);
 
+       stat_inc_meta_count(sbi, page->index);
        f2fs_update_iostat(sbi, io_type, F2FS_BLKSIZE);
 }