f2fs: add to account meta IO
PATCH 1/2 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 <[email protected]>
--- fs/f2fs/debug.c | 13 +++++++++++++ fs/f2fs/f2fs.h | 15 +++++++++++++++ fs/f2fs/segment.c | 1 + 3 files changed, 29 insertions(+)
fs/f2fs/debug.c +13 -0
@@ -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 );
fs/f2fs/f2fs.h +15 -0
@@ -202,6 +202,7 @@ enum {META_NAT ,META_SIT ,META_SSA , +META_MAX ,META_POR ,DATA_GENERIC , META_GENERIC,
@@ -1267,6 +1268,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 */
@@ -3146,6 +3148,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;
@@ -3197,6 +3200,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) \
@@ -3284,6 +3298,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)
fs/f2fs/segment.c +1 -0
@@ -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 ); }
Signature · 1 line
2.18.0.rc1
PATCH 2/2 f2fs: add to account skip count of background GC
This patch adds to account skip count of background GC, and show stat info via 'status' debugfs entry.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/debug.c | 4 ++++ fs/f2fs/f2fs.h | 7 +++++++ fs/f2fs/gc.c | 14 +++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-)
fs/f2fs/debug.c +4 -0
@@ -101,6 +101,8 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->avail_nids =NM_I (sbi)->available_nids; si->alloc_nids =NM_I (sbi)->nid_cnt[PREALLOC_NID ]; si->bg_gc = sbi->bg_gc; + si->io_skip_bggc = sbi->io_skip_bggc; + si->other_skip_bggc = sbi->other_skip_bggc; si->skipped_atomic_files[BG_GC ] = sbi->skipped_atomic_files[BG_GC ]; si->skipped_atomic_files[FG_GC ] = sbi->skipped_atomic_files[FG_GC ]; si->util_free = (int )(free_user_blocks (sbi) >> sbi->log_blocks_per_seg)
@@ -355,6 +357,8 @@ static int stat_show(struct seq_file *s, void *v) si->skipped_atomic_files[BG_GC ] + si->skipped_atomic_files[FG_GC ], si->skipped_atomic_files[BG_GC]); +seq_printf (s,"BG skip : IO: %u, Other: %u\n" , + si->io_skip_bggc, si->other_skip_bggc);seq_puts (s,"\nExtent Cache:\n" ); seq_printf(s, " - Hit Count: L1-1:%llu L1-2:%llu L2:%llu\n", si->hit_largest, si->hit_cached,
fs/f2fs/f2fs.h +7 -0
@@ -1284,6 +1284,8 @@ struct f2fs_sb_info {atomic_t max_aw_cnt;/* max # of atomic writes */ atomic_t max_vw_cnt;/* max # of volatile writes */ int bg_gc;/* background gc calls */ +unsigned int io_skip_bggc;/* skip background gc for in-flight IO */ +unsigned int other_skip_bggc;/* skip background gc for other reasons */ unsigned int ndirty_inode[NR_INODE_TYPE ];/* # of dirty inodes */ #endif spinlock_t stat_lock;/* lock for stat operations */
@@ -3127,6 +3129,7 @@ struct f2fs_stat_info {int free_nids, avail_nids, alloc_nids;int total_count, utilization;int bg_gc, nr_wb_cp_data, nr_wb_data; +unsigned int io_skip_bggc, other_skip_bggc;int nr_flushing, nr_flushed, flush_list_empty;int nr_discarding, nr_discarded;int nr_discard_cmd;
@@ -3164,6 +3167,8 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)#define stat_inc_bg_cp_count (si) ((si)->bg_cp_count++)#define stat_inc_call_count (si) ((si)->call_count++)#define stat_inc_bggc_count (sbi) ((sbi)->bg_gc++) +#define stat_io_skip_bggc_count (sbi) ((sbi)->io_skip_bggc++) +#define stat_other_skip_bggc_count (sbi) ((sbi)->other_skip_bggc++)#define stat_inc_dirty_inode (sbi, type) ((sbi)->ndirty_inode[type]++)#define stat_dec_dirty_inode (sbi, type) ((sbi)->ndirty_inode[type]--)#define stat_inc_total_hit (sbi) (atomic64_inc(&(sbi)->total_hit_ext))
@@ -3280,6 +3285,8 @@ void f2fs_destroy_root_stats(void);#define stat_inc_bg_cp_count (si) do { } while (0)#define stat_inc_call_count (si) do { } while (0)#define stat_inc_bggc_count (si) do { } while (0) +#define stat_io_skip_bggc_count (sbi) do { } while (0) +#define stat_other_skip_bggc_count (sbi) do { } while (0)#define stat_inc_dirty_inode (sbi, type) do { } while (0)#define stat_dec_dirty_inode (sbi, type) do { } while (0)#define stat_inc_total_hit (sb) do { } while (0)
fs/f2fs/gc.c +11 -3
@@ -40,13 +40,16 @@ static int gc_thread_func(void *data)if (gc_th->gc_wake) gc_th->gc_wake =0 ; -if (try_to_freeze ()) +if (try_to_freeze ()) { +stat_other_skip_bggc_count (sbi);continue ; + }if (kthread_should_stop ())break ;if (sbi->sb->s_writers.frozen >=SB_FREEZE_WRITE ) {increase_sleep_time (gc_th, &wait_ms); +stat_other_skip_bggc_count (sbi);continue ; }
@@ -55,8 +58,10 @@ static int gc_thread_func(void *data)f2fs_stop_checkpoint (sbi, false); } -if (!sb_start_write_trylock (sbi->sb)) +if (!sb_start_write_trylock (sbi->sb)) { +stat_other_skip_bggc_count (sbi);continue ; + }/* * [GC triggering condition]
@@ -77,12 +82,15 @@ static int gc_thread_func(void *data) goto do_gc; } -if (!mutex_trylock (&sbi->gc_mutex)) +if (!mutex_trylock (&sbi->gc_mutex)) { +stat_other_skip_bggc_count (sbi); goto next; + }if (!is_idle (sbi,GC_TIME )) {increase_sleep_time (gc_th, &wait_ms);mutex_unlock (&sbi->gc_mutex); +stat_io_skip_bggc_count (sbi); goto next; }
Signature · 1 line
2.18.0.rc1