f2fs: fix to account gc stats correctly
Chao Yu
maintainerPATCH 1/2 f2fs: fix to account gc stats correctly
As reported, status debugfs entry shows inconsistent GC stats as below:
GC calls: 6008 (BG: 6161)
- data segments : 3053 (BG: 3053)
- node segments : 2955 (BG: 2955)
Total GC calls is larger than BGGC calls, the reason is:
- f2fs_stat_info.call_count accounts total migrated section count by f2fs_gc()
- f2fs_stat_info.bg_gc accounts total call times of f2fs_gc() from background gc_thread
Another issue is gc_foreground_calls sysfs entry shows total GC call count rather than FGGC call count.
This patch changes as below for fix:
- account GC calls and migrated segment count separately
- support to account migrated section count if it enables large section mode
- fix to show correct value in gc_foreground_calls sysfs entry
--- fs/f2fs/debug.c | 24 ++++++++++++++++++------ fs/f2fs/f2fs.h | 42 +++++++++++++++++++++--------------------- fs/f2fs/file.c | 4 ++++ fs/f2fs/gc.c | 13 +++++++------ fs/f2fs/segment.c | 1 + fs/f2fs/super.c | 1 + fs/f2fs/sysfs.c | 4 ++-- 7 files changed, 54 insertions(+), 35 deletions(-)
fs/f2fs/debug.c +18 -6
@@ -511,12 +511,24 @@ static int stat_show(struct seq_file *s, void *v)seq_printf (s," - Total : %4d\n" , si->nr_total_ckpt);seq_printf (s," - Cur time : %4d(ms)\n" , si->cur_ckpt_time);seq_printf (s," - Peak time : %4d(ms)\n" , si->peak_ckpt_time); -seq_printf (s,"GC calls: %d (BG: %d)\n" , - si->call_count, si->bg_gc); -seq_printf (s," - data segments : %d (%d)\n" , - si->data_segs, si->bg_data_segs); -seq_printf (s," - node segments : %d (%d)\n" , - si->node_segs, si->bg_node_segs); +seq_printf (s,"GC calls: %d (gc_thread: %d)\n" , + si->gc_call_count[BACKGROUND ] + + si->gc_call_count[FOREGROUND ], + si->gc_call_count[BACKGROUND ]); +if (__is_large_section (sbi)) { +seq_printf (s," - data sections : %d (BG: %d)\n" , + si->gc_secs[DATA ][BG_GC ] + si->gc_secs[DATA ][FG_GC ], + si->gc_secs[DATA ][BG_GC ]); +seq_printf (s," - node sections : %d (BG: %d)\n" , + si->gc_secs[NODE ][BG_GC ] + si->gc_secs[NODE ][FG_GC ], + si->gc_secs[NODE ][BG_GC ]); + } +seq_printf (s," - data segments : %d (BG: %d)\n" , + si->gc_segs[DATA ][BG_GC ] + si->gc_segs[DATA ][FG_GC ], + si->gc_segs[DATA ][BG_GC ]); +seq_printf (s," - node segments : %d (BG: %d)\n" , + si->gc_segs[NODE ][BG_GC ] + si->gc_segs[NODE ][FG_GC ], + si->gc_segs[NODE ][BG_GC ]);seq_puts (s," - Reclaimed segs :\n" );seq_printf (s," - Normal : %d\n" , sbi->gc_reclaimed_segs[GC_NORMAL ]);seq_printf (s," - Idle CB : %d\n" , sbi->gc_reclaimed_segs[GC_IDLE_CB ]);
fs/f2fs/f2fs.h +21 -21
84 lines not on this page · raw message
fs/f2fs/file.c +4 -0
@@ -1728,6 +1728,7 @@ static int f2fs_expand_inode_data(struct inode *inode, loff_t offset,if (has_not_enough_free_secs (sbi,0 ,GET_SEC_FROM_SEG (sbi,overprovision_segments (sbi)))) {f2fs_down_write (&sbi->gc_lock); +stat_inc_gc_call_count (sbi,FOREGROUND ); err =f2fs_gc (sbi, &gc_control);if (err && err != -ENODATA ) goto out_err;
@@ -2476,6 +2477,7 @@ static int f2fs_ioc_gc(struct file *filp, unsigned long arg) gc_control.init_gc_type = sync ?FG_GC :BG_GC ; gc_control.err_gc_skipped = sync; +stat_inc_gc_call_count (sbi,FOREGROUND ); ret =f2fs_gc (sbi, &gc_control); out:mnt_drop_write_file (filp);
@@ -2519,6 +2521,7 @@ static int __f2fs_ioc_gc_range(struct file *filp, struct f2fs_gc_range *range) } gc_control.victim_segno =GET_SEGNO (sbi, range->start); +stat_inc_gc_call_count (sbi,FOREGROUND ); ret =f2fs_gc (sbi, &gc_control);if (ret) {if (ret == -EBUSY )
@@ -3001,6 +3004,7 @@ static int f2fs_ioc_flush_device(struct file *filp, unsigned long arg) sm->last_victim[ALLOC_NEXT ] = end_segno +1 ; gc_control.victim_segno = start_segno; +stat_inc_gc_call_count (sbi,FOREGROUND ); ret =f2fs_gc (sbi, &gc_control);if (ret == -EAGAIN ) ret =0 ;
fs/f2fs/gc.c +7 -6
@@ -121,8 +121,8 @@ static int gc_thread_func(void *data)else increase_sleep_time (gc_th, &wait_ms); do_gc: -if (!foreground) -stat_inc_bggc_count (sbi->stat_info); +stat_inc_gc_call_count (sbi, foreground ? +FOREGROUND :BACKGROUND ); sync_mode =F2FS_OPTION (sbi).bggc_mode ==BGGC_MODE_SYNC ;
@@ -1685,6 +1685,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,int seg_freed =0 , migrated =0 ;unsigned char type =IS_DATASEG (get_seg_entry (sbi, segno)->type) ?SUM_TYPE_DATA :SUM_TYPE_NODE ; +unsigned char data_type = (type ==SUM_TYPE_DATA ) ?DATA :NODE ;int submitted =0 ;if (__is_large_section (sbi))
@@ -1766,7 +1767,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, segno, gc_type, force_migrate); -stat_inc_seg_count (sbi, type, gc_type); +stat_inc_gc_seg_count (sbi, data_type, gc_type); sbi->gc_reclaimed_segs[sbi->gc_mode]++; migrated++;
@@ -1783,12 +1784,12 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, }if (submitted) -f2fs_submit_merged_write (sbi, - (type ==SUM_TYPE_NODE ) ?NODE :DATA ); +f2fs_submit_merged_write (sbi, data_type);blk_finish_plug (&plug); -stat_inc_call_count (sbi->stat_info); +if (migrated) +stat_inc_gc_sec_count (sbi, data_type, gc_type);return seg_freed; }
fs/f2fs/segment.c +1 -0
@@ -435,6 +435,7 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need) .err_gc_skipped = false, .nr_free_secs = 1 };f2fs_down_write (&sbi->gc_lock); +stat_inc_gc_call_count (sbi,FOREGROUND );f2fs_gc (sbi, &gc_control); } }
fs/f2fs/super.c +1 -0
@@ -2206,6 +2206,7 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi) .nr_free_secs = 1 };f2fs_down_write (&sbi->gc_lock); +stat_inc_gc_call_count (sbi,FOREGROUND ); err =f2fs_gc (sbi, &gc_control);if (err == -ENODATA ) { err =0 ;
fs/f2fs/sysfs.c +2 -2
@@ -974,8 +974,8 @@ F2FS_SBI_GENERAL_RO_ATTR(unusable_blocks_per_sec);#ifdef CONFIG_F2FS_STAT_FS STAT_INFO_RO_ATTR (cp_foreground_calls, cp_count);STAT_INFO_RO_ATTR (cp_background_calls, bg_cp_count); -STAT_INFO_RO_ATTR (gc_foreground_calls, call_count); -STAT_INFO_RO_ATTR (gc_background_calls, bg_gc); +STAT_INFO_RO_ATTR (gc_foreground_calls, gc_call_count[FOREGROUND ]); +STAT_INFO_RO_ATTR (gc_background_calls, gc_call_count[BACKGROUND ]);#endif /* FAULT_INFO ATTR */
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 2/2 f2fs: fix to account cp stats correctly
cp_foreground_calls sysfs entry shows total CP call count rather than foreground CP call count, fix it.
--- fs/f2fs/checkpoint.c | 2 +- fs/f2fs/debug.c | 9 ++++++++- fs/f2fs/f2fs.h | 25 ++++++++++++++----------- fs/f2fs/gc.c | 5 +++++ fs/f2fs/recovery.c | 1 + fs/f2fs/segment.c | 3 ++- fs/f2fs/super.c | 8 +++++++- fs/f2fs/sysfs.c | 14 ++++++++++++-- 8 files changed, 50 insertions(+), 17 deletions(-)
fs/f2fs/checkpoint.c +1 -1
@@ -1701,9 +1701,9 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) }f2fs_restore_inmem_curseg (sbi); +stat_inc_cp_count (sbi); stop:unblock_operations (sbi); -stat_inc_cp_count (sbi->stat_info);if (cpc->reason &CP_RECOVERY )f2fs_notice (sbi,"checkpoint: version = %llx" , ckpt_ver);
fs/f2fs/debug.c +8 -1
@@ -215,6 +215,9 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->valid_blks[type] += blks; } +for (i =0 ; i <MAX_CALL_TYPE ; i++) + si->cp_call_count[i] =atomic_read (&sbi->cp_call_count[i]); +for (i =0 ; i <2 ; i++) { si->segment_count[i] = sbi->segment_count[i]; si->block_count[i] = sbi->block_count[i];
@@ -497,7 +500,9 @@ static int stat_show(struct seq_file *s, void *v)seq_printf (s," - Prefree: %d\n - Free: %d (%d)\n\n" , 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); + si->cp_call_count[TOTAL_CALL ], + si->cp_call_count[BACKGROUND ]); +seq_printf (s,"CP count: %d\n" , si->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 ]);
@@ -699,6 +704,8 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)atomic_set (&sbi->inplace_count,0 );for (i =META_CP ; i <META_MAX ; i++)atomic_set (&sbi->meta_count[i],0 ); +for (i =0 ; i <MAX_CALL_TYPE ; i++) +atomic_set (&sbi->cp_call_count[i],0 );atomic_set (&sbi->max_aw_cnt,0 );
fs/f2fs/f2fs.h +14 -11
@@ -1383,6 +1383,13 @@ enum errors_option { MOUNT_ERRORS_PANIC, /* panic on errors */ }; +enum { +BACKGROUND , +FOREGROUND , +MAX_CALL_TYPE , +TOTAL_CALL =FOREGROUND , +}; +static inline int f2fs_test_bit (unsigned int nr,char *addr);static inline void f2fs_set_bit (unsigned int nr,char *addr);static inline void f2fs_clear_bit (unsigned int nr,char *addr);
@@ -1695,6 +1702,7 @@ struct f2fs_sb_info {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 */ +atomic_t cp_call_count[MAX_CALL_TYPE ];/* # of cp call */ #endif spinlock_t stat_lock;/* lock for stat operations */
@@ -3860,12 +3868,6 @@ void f2fs_destroy_recovery_cache(void);/* * debug.c */ -enum { -BACKGROUND , -FOREGROUND , -MAX_CALL_TYPE -}; - #ifdef CONFIG_F2FS_STAT_FS struct f2fs_stat_info { struct list_head stat_list;
@@ -3912,7 +3914,7 @@ struct f2fs_stat_info {int dirty_count, node_pages, meta_pages, compress_pages;int compress_page_hit;int prefree_count, free_segs, free_secs; -int cp_count, bg_cp_count; +int cp_call_count[MAX_CALL_TYPE ], cp_count;int gc_call_count[MAX_CALL_TYPE ];int gc_segs[2 ][2 ];int gc_secs[2 ][2 ];
@@ -3937,8 +3939,9 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)return (struct f2fs_stat_info *)sbi->stat_info; } -#define stat_inc_cp_count (si) ((si)->cp_count++) -#define stat_inc_bg_cp_count (si) ((si)->bg_cp_count++) +#define stat_inc_cp_call_count (sbi, foreground) \ + atomic_inc(&sbi->cp_call_count[(foreground)]) +#define stat_inc_cp_count (si) (F2FS_STAT(sbi)->cp_count++)#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]++)
@@ -4055,8 +4058,8 @@ void __init f2fs_create_root_stats(void);void f2fs_destroy_root_stats (void );void f2fs_update_sit_info (struct f2fs_sb_info *sbi);#else -#define stat_inc_cp_count (si) do { } while (0) -#define stat_inc_bg_cp_count (si) do { } while (0) +#define stat_inc_cp_call_count (sbi, foreground) do { } while (0) +#define stat_inc_cp_count (sbi) 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)
fs/f2fs/gc.c +5 -0
@@ -1840,6 +1840,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_control *gc_control)* secure free segments which doesn't need fggc any more. */ if (prefree_segments (sbi)) { +stat_inc_cp_call_count (sbi,TOTAL_CALL ); ret =f2fs_write_checkpoint (sbi, &cpc);if (ret) goto stop;
@@ -1888,6 +1889,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_control *gc_control) round++;if (skipped_round >MAX_SKIP_GC_COUNT && skipped_round *2 >= round) { +stat_inc_cp_call_count (sbi,TOTAL_CALL ); ret =f2fs_write_checkpoint (sbi, &cpc); goto stop; }
@@ -1903,6 +1905,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_control *gc_control)*/ if (free_sections (sbi) <= upper_secs +NR_GC_CHECKPOINT_SECS &&prefree_segments (sbi)) { +stat_inc_cp_call_count (sbi,TOTAL_CALL ); ret =f2fs_write_checkpoint (sbi, &cpc);if (ret) goto stop;
@@ -2030,6 +2033,7 @@ static int free_segment_range(struct f2fs_sb_info *sbi,if (gc_only) goto out; +stat_inc_cp_call_count (sbi,TOTAL_CALL ); err =f2fs_write_checkpoint (sbi, &cpc);if (err) goto out;
@@ -2222,6 +2226,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)clear_sbi_flag (sbi,SBI_IS_RESIZEFS );set_sbi_flag (sbi,SBI_IS_DIRTY ); +stat_inc_cp_call_count (sbi,TOTAL_CALL ); err =f2fs_write_checkpoint (sbi, &cpc);if (err) {update_fs_metadata (sbi, secs);
fs/f2fs/recovery.c +1 -0
@@ -924,6 +924,7 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)struct cp_control cpc = { .reason =CP_RECOVERY , }; +stat_inc_cp_call_count (sbi,TOTAL_CALL ); err =f2fs_write_checkpoint (sbi, &cpc); } }
fs/f2fs/segment.c +2 -1
@@ -513,8 +513,8 @@ void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi, bool from_bg)mutex_unlock (&sbi->flush_lock); } +stat_inc_cp_call_count (sbi,BACKGROUND );f2fs_sync_fs (sbi->sb,1 ); -stat_inc_bg_cp_count (sbi->stat_info); } static int __submit_flush_wait(struct f2fs_sb_info *sbi,
@@ -3231,6 +3231,7 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range) goto out;f2fs_down_write (&sbi->gc_lock); +stat_inc_cp_call_count (sbi,TOTAL_CALL ); err =f2fs_write_checkpoint (sbi, &cpc);f2fs_up_write (&sbi->gc_lock);if (err)
fs/f2fs/super.c +7 -1
@@ -1601,6 +1601,7 @@ static void f2fs_put_super(struct super_block *sb)struct cp_control cpc = { .reason =CP_UMOUNT , }; +stat_inc_cp_call_count (sbi,TOTAL_CALL ); err =f2fs_write_checkpoint (sbi, &cpc); }
@@ -1610,6 +1611,7 @@ static void f2fs_put_super(struct super_block *sb)struct cp_control cpc = { .reason =CP_UMOUNT |CP_TRIMMED , }; +stat_inc_cp_call_count (sbi,TOTAL_CALL ); err =f2fs_write_checkpoint (sbi, &cpc); }
@@ -1706,8 +1708,10 @@ int f2fs_sync_fs(struct super_block *sb, int sync)if (unlikely (is_sbi_flag_set (sbi,SBI_POR_DOING )))return -EAGAIN ; -if (sync) +if (sync) { +stat_inc_cp_call_count (sbi,TOTAL_CALL ); err =f2fs_issue_checkpoint (sbi); + }return err; }
@@ -2232,6 +2236,7 @@ static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi)f2fs_down_write (&sbi->gc_lock); cpc.reason =CP_PAUSE ;set_sbi_flag (sbi,SBI_CP_DISABLED ); +stat_inc_cp_call_count (sbi,TOTAL_CALL ); err =f2fs_write_checkpoint (sbi, &cpc);if (err) goto out_unlock;
@@ -4868,6 +4873,7 @@ static void kill_f2fs_super(struct super_block *sb)struct cp_control cpc = { .reason =CP_UMOUNT , }; +stat_inc_cp_call_count (sbi,TOTAL_CALL );f2fs_write_checkpoint (sbi, &cpc); }
fs/f2fs/sysfs.c +12 -2
@@ -356,6 +356,16 @@ static ssize_t f2fs_sbi_show(struct f2fs_attr *a,if (!strcmp (a->attr.name,"revoked_atomic_block" ))return sysfs_emit (buf,"%llu\n" , sbi->revoked_atomic_block); +#ifdef CONFIG_F2FS_STAT_FS +if (!strcmp (a->attr.name,"cp_foreground_calls" )) +return sysfs_emit (buf,"%d\n" , +atomic_read (&sbi->cp_call_count[TOTAL_CALL ]) - +atomic_read (&sbi->cp_call_count[BACKGROUND ])); +if (!strcmp (a->attr.name,"cp_background_calls" )) +return sysfs_emit (buf,"%d\n" , +atomic_read (&sbi->cp_call_count[BACKGROUND ])); +#endif + ui = (unsigned int *)(ptr + a->offset);return sysfs_emit (buf,"%u\n" , *ui);
@@ -972,8 +982,8 @@ F2FS_SBI_GENERAL_RO_ATTR(unusable_blocks_per_sec);/* STAT_INFO ATTR */ #ifdef CONFIG_F2FS_STAT_FS -STAT_INFO_RO_ATTR (cp_foreground_calls, cp_count); -STAT_INFO_RO_ATTR (cp_background_calls, bg_cp_count); +STAT_INFO_RO_ATTR (cp_foreground_calls, cp_call_count[FOREGROUND ]); +STAT_INFO_RO_ATTR (cp_background_calls, cp_call_count[BACKGROUND ]);STAT_INFO_RO_ATTR (gc_foreground_calls, gc_call_count[FOREGROUND ]);STAT_INFO_RO_ATTR (gc_background_calls, gc_call_count[BACKGROUND ]);#endif
Signature · 1 line
2.40.1
This series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 6 lines · On Tue, 8 Aug 2023 08:59:48 +0800 you wrote:
As reported, status debugfs entry shows inconsistent GC stats as below:
GC calls: 6008 (BG: 6161)
- data segments : 3053 (BG: 3053)
- node segments : 2955 (BG: 2955)
Quoted 7 lines
Total GC calls is larger than BGGC calls, the reason is:
- f2fs_stat_info.call_count accounts total migrated section count byf2fs_gc()
- f2fs_stat_info.bg_gc accounts total call times off2fs_gc()from backgroundgc_thread[...]
Here is the summary with links:
- [f2fs-dev,1/2] f2fs: fix to account gc stats correctly
https://git.kernel.org/jaegeuk/f2fs/c/9bf1dcbdfdc8 - [f2fs-dev,2/2] f2fs: fix to account cp stats correctly https://git.kernel.org/jaegeuk/f2fs/c/eb61c2cca2eb
You are awesome, thank you!
Signature · 10 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel