Re: [f2fs-dev] [PATCH 1/5] f2fs: record total data blocks allocated since mount

[Jaegeuk Kim <jaegeuk@kernel.org>]

On 11/28, Jaegeuk Kim wrote:
> On 11/28, qixiaoyu1 wrote:
> > From: xiongping1 <xiongping1@xiaomi.com>
> > 
> > Signed-off-by: xiongping1 <xiongping1@xiaomi.com>
> > Signed-off-by: qixiaoyu1 <qixiaoyu1@xiaomi.com>
> > ---
> >  fs/f2fs/Kconfig     |  7 +++++++
> >  fs/f2fs/Makefile    |  1 +
> >  fs/f2fs/block_age.c | 28 ++++++++++++++++++++++++++++
> >  fs/f2fs/debug.c     |  7 +++++++
> >  fs/f2fs/f2fs.h      | 15 +++++++++++++++
> >  fs/f2fs/segment.c   |  4 ++++
> >  fs/f2fs/super.c     |  4 ++++
> >  7 files changed, 66 insertions(+)
> >  create mode 100644 fs/f2fs/block_age.c
> > 
> > diff --git a/fs/f2fs/Kconfig b/fs/f2fs/Kconfig
> > index 03ef087537c7..84915f9c6bc8 100644
> > --- a/fs/f2fs/Kconfig
> > +++ b/fs/f2fs/Kconfig
> > @@ -150,3 +150,10 @@ config F2FS_UNFAIR_RWSEM
> >  	help
> >  	  Use unfair rw_semaphore, if system configured IO priority by block
> >  	  cgroup.
> > +
> > +config F2FS_FS_DATA_SEPARATION
> > +	bool "F2FS hot/cold data separation feature"
> > +	depends on F2FS_FS
> > +	help
> > +	  Enable data blocks separation according to block update frequency.
> > +
> > diff --git a/fs/f2fs/Makefile b/fs/f2fs/Makefile
> > index 8a7322d229e4..70d8f0e23b46 100644
> > --- a/fs/f2fs/Makefile
> > +++ b/fs/f2fs/Makefile
> > @@ -10,3 +10,4 @@ f2fs-$(CONFIG_F2FS_FS_POSIX_ACL) += acl.o
> >  f2fs-$(CONFIG_FS_VERITY) += verity.o
> >  f2fs-$(CONFIG_F2FS_FS_COMPRESSION) += compress.o
> >  f2fs-$(CONFIG_F2FS_IOSTAT) += iostat.o
> > +f2fs-$(CONFIG_F2FS_FS_DATA_SEPARATION) += block_age.o
> > diff --git a/fs/f2fs/block_age.c b/fs/f2fs/block_age.c
> > new file mode 100644
> > index 000000000000..1e8711a03959
> > --- /dev/null
> > +++ b/fs/f2fs/block_age.c
> > @@ -0,0 +1,28 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * fs/f2fs/block_age.c
> > + *
> > + * Copyright (c) 2022 xiaomi Co., Ltd.
> > + *             http://www.xiaomi.com/
> 
> I don't think this is a right way, since it seems you copied lots of codes
> from extent_cache.c which has another copyrights.
> 
> I'm thinking to integrate your extent_cache code into the original path in
> order to keep the single code path for easy debugging. Stay tuned.

Hi,

Could you please check this patch series?

https://lore.kernel.org/linux-f2fs-devel/20221205185433.3479699-1-jaegeuk@kernel.org/T/#t


Thanks,

> 
> > + */
> > +#include <linux/fs.h>
> > +#include <linux/f2fs_fs.h>
> > +
> > +#include "f2fs.h"
> > +#include "segment.h"
> > +
> > +static inline void f2fs_inc_data_block_alloc(struct f2fs_sb_info *sbi)
> > +{
> > +	atomic64_inc(&sbi->total_data_alloc);
> > +}
> > +
> > +void f2fs_init_block_age_info(struct f2fs_sb_info *sbi)
> > +{
> > +	atomic64_set(&sbi->total_data_alloc, 0);
> > +}
> > +
> > +void f2fs_inc_block_alloc_count(struct f2fs_sb_info *sbi, int type)
> > +{
> > +	if (IS_DATASEG(type))
> > +		f2fs_inc_data_block_alloc(sbi);
> > +}
> > diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> > index a216dcdf6941..d24abdac20bb 100644
> > --- a/fs/f2fs/debug.c
> > +++ b/fs/f2fs/debug.c
> > @@ -81,6 +81,9 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> >  	si->ext_tree = atomic_read(&sbi->total_ext_tree);
> >  	si->zombie_tree = atomic_read(&sbi->total_zombie_tree);
> >  	si->ext_node = atomic_read(&sbi->total_ext_node);
> > +#ifdef CONFIG_F2FS_FS_DATA_SEPARATION
> > +	si->total_data_blocks_alloc = atomic64_read(&sbi->total_data_alloc);
> > +#endif
> >  	si->ndirty_node = get_pages(sbi, F2FS_DIRTY_NODES);
> >  	si->ndirty_dent = get_pages(sbi, F2FS_DIRTY_DENTS);
> >  	si->ndirty_meta = get_pages(sbi, F2FS_DIRTY_META);
> > @@ -373,6 +376,10 @@ static int stat_show(struct seq_file *s, void *v)
> >  			seq_printf(s, "Utilization: %u%% (%u valid blocks)\n",
> >  				si->utilization, si->valid_count);
> >  
> > +#ifdef CONFIG_F2FS_FS_DATA_SEPARATION
> > +		seq_printf(s, "  - Data Block Allocated: %llu\n",
> > +			   si->total_data_blocks_alloc);
> > +#endif
> >  		seq_printf(s, "  - Node: %u (Inode: %u, ",
> >  			   si->valid_node_count, si->valid_inode_count);
> >  		seq_printf(s, "Other: %u)\n  - Data: %u\n",
> > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> > index e6355a5683b7..686f09846de4 100644
> > --- a/fs/f2fs/f2fs.h
> > +++ b/fs/f2fs/f2fs.h
> > @@ -1807,6 +1807,10 @@ struct f2fs_sb_info {
> >  	u64 sectors_written_start;
> >  	u64 kbytes_written;
> >  
> > +#ifdef CONFIG_F2FS_FS_DATA_SEPARATION
> > +	atomic64_t total_data_alloc;
> > +#endif
> > +
> >  	/* Reference to checksum algorithm driver via cryptoapi */
> >  	struct crypto_shash *s_chksum_driver;
> >  
> > @@ -3858,6 +3862,9 @@ struct f2fs_stat_info {
> >  	int main_area_segs, main_area_sections, main_area_zones;
> >  	unsigned long long hit_largest, hit_cached, hit_rbtree;
> >  	unsigned long long hit_total, total_ext;
> > +#ifdef CONFIG_F2FS_FS_DATA_SEPARATION
> > +	unsigned long long total_data_blocks_alloc;
> > +#endif
> >  	int ext_tree, zombie_tree, ext_node;
> >  	int ndirty_node, ndirty_dent, ndirty_meta, ndirty_imeta;
> >  	int ndirty_data, ndirty_qdata;
> > @@ -4166,6 +4173,14 @@ void f2fs_init_extent_cache_info(struct f2fs_sb_info *sbi);
> >  int __init f2fs_create_extent_cache(void);
> >  void f2fs_destroy_extent_cache(void);
> >  
> > +#ifdef CONFIG_F2FS_FS_DATA_SEPARATION
> > +/*
> > + * block_age.c
> > + */
> > +void f2fs_init_block_age_info(struct f2fs_sb_info *sbi);
> > +void f2fs_inc_block_alloc_count(struct f2fs_sb_info *sbi, int type);
> > +#endif
> > +
> >  /*
> >   * sysfs.c
> >   */
> > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> > index acf3d3fa4363..0cf022fd3560 100644
> > --- a/fs/f2fs/segment.c
> > +++ b/fs/f2fs/segment.c
> > @@ -3280,6 +3280,10 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
> >  	locate_dirty_segment(sbi, GET_SEGNO(sbi, old_blkaddr));
> >  	locate_dirty_segment(sbi, GET_SEGNO(sbi, *new_blkaddr));
> >  
> > +#ifdef CONFIG_F2FS_FS_DATA_SEPARATION
> > +	f2fs_inc_block_alloc_count(sbi, type);
> > +#endif
> > +
> >  	up_write(&sit_i->sentry_lock);
> >  
> >  	if (page && IS_NODESEG(type)) {
> > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> > index 3834ead04620..bf799d92282a 100644
> > --- a/fs/f2fs/super.c
> > +++ b/fs/f2fs/super.c
> > @@ -4475,6 +4475,10 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
> >  
> >  	f2fs_join_shrinker(sbi);
> >  
> > +#ifdef CONFIG_F2FS_FS_DATA_SEPARATION
> > +	f2fs_init_block_age_info(sbi);
> > +#endif
> > +
> >  	f2fs_tuning_parameters(sbi);
> >  
> >  	f2fs_notice(sbi, "Mounted with checkpoint version = %llx",
> > -- 
> > 2.36.1
> 
> 
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel