From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28253C4332F for ; Tue, 29 Nov 2022 02:51:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234785AbiK2CvR (ORCPT ); Mon, 28 Nov 2022 21:51:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235262AbiK2CvM (ORCPT ); Mon, 28 Nov 2022 21:51:12 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FB6749B46 for ; Mon, 28 Nov 2022 18:51:11 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BE80BB81112 for ; Tue, 29 Nov 2022 02:51:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 483E1C433C1; Tue, 29 Nov 2022 02:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669690268; bh=mQ0x4vPtpBDJ2b5m/W5k73dGLFBmDRafnyzqKaXDU/M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=oKSFKFRAT2NoRGHvVvOXftlL+prdVD8tqpN91hef0VcBt+Zu4Th+QuLtGgR8jqgUu 0i3Uh4QlN9RX1XJkigw156XFKkSvOjRxhxPoU7WW5T4P23ZwdTDXGZZJtpEqnZnSmb kuwC9BsQcfADb/QgicIYBdLCdtQFpt6AvLtUnSeguVk3kKmZdcX02dAcZdSFtiNfGa +Pwc1vWn0V9idBVDNBdAkEWi3OXrwW0S18wCUNzGop1Wi5ld0CFPfQ1hphYoQB62UL 6CraIu/B89ct/xO5Vo9H07BwcKgkfYz1u32Do9qilnJ5p67qHjU4v9H7rLUzjRRGHk y2yfZESg+BmeQ== Date: Mon, 28 Nov 2022 18:51:06 -0800 From: Jaegeuk Kim To: qixiaoyu1 Cc: Chao Yu , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, qixiaoyu1 , xiongping1 Subject: Re: [PATCH 1/5] f2fs: record total data blocks allocated since mount Message-ID: References: <20221128085859.5295-1-qixiaoyu1@xiaomi.com> <20221128085859.5295-2-qixiaoyu1@xiaomi.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221128085859.5295-2-qixiaoyu1@xiaomi.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/28, qixiaoyu1 wrote: > From: xiongping1 > > Signed-off-by: xiongping1 > Signed-off-by: qixiaoyu1 > --- > 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. > + */ > +#include > +#include > + > +#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