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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C0D0C7618E for ; Fri, 21 Apr 2023 02:32:38 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1ppgZh-0005MD-UP; Fri, 21 Apr 2023 02:32:37 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1ppgZg-0005M7-N4 for linux-f2fs-devel@lists.sourceforge.net; Fri, 21 Apr 2023 02:32:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bkk3gwf4EJrg8jtI8nCbK4LiLKKBIFShg+Bk1jRxtnI=; b=JPvQ3Rog1F0m3k96tc1ZPTj2xy EmkmFjS1I62gxqSP7RBbFEiN+dEePGMNHC5JjtitxXFwaHGVg/s2zCCdVC1uondIk0mVgEnUCBdoC 5Qn5XdZYg064sHuWqpHz7O91sXxZuHijP9W2H89y9M5JG73k50j61gjFYIbKd95Qo0dY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=bkk3gwf4EJrg8jtI8nCbK4LiLKKBIFShg+Bk1jRxtnI=; b=mj3RVJdhHZOmOFAOhMia0muB+1 bq6R8UvHIld8SqkqoRX4tnpmr+JcQMQKfTWeQaTSZ3wyglTpXi68oMpLwkycNFz/sNeT7BeldMN3d VrepevwvmUByXBHGBLlJBddZzc4aEEuWuWnKWkt96oEJR98a4lkrtxAp4ACUCThKUYC8=; Received: from dfw.source.kernel.org ([139.178.84.217]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1ppgZe-0006Mo-QU for linux-f2fs-devel@lists.sourceforge.net; Fri, 21 Apr 2023 02:32:35 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 64D0064D1E; Fri, 21 Apr 2023 02:32:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C86DC433D2; Fri, 21 Apr 2023 02:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682044348; bh=HEG4UZZ00eL/X9g2cqzfCI9QxG2kcg5ncPgftIMiFTw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Sv2MkPWQyIZenWeYgGpsaaPWlZaq0zFBgBO06WLqjaNjjA1WAmxxQJd8Ymk5IVmbp P87uVnsTrjZ/9NyGZupRO7ytEBTQHsySgOhEbBs9uu21tzhBrN/Lbx6VHXfqrjUYiC DwH1aQYjHzADRkjkp7WOrtMZVQohStTx5freuDqxoeQQdIu0gn6zijEOAxf0rktHh+ btR03YZ2k7DQCFSsjHp0Z7WRkdcuneJdZ3NtDn3XUajZk/RlaKuFNQWZgyClp66MX2 bmSpTqLIxp4DAuA0UiOBbFr6KefOj/T3sbQvTnjJb4gZE8hlKa0GDAhD5qvNgPlF5h 9miMO5jl83+jQ== Message-ID: <90db4ad9-e7e8-1fa2-acbd-919fb9bbf7f3@kernel.org> Date: Fri, 21 Apr 2023 10:32:25 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Content-Language: en-US To: Yangtao Li , Jaegeuk Kim References: <20230415152944.51393-1-frank.li@vivo.com> From: Chao Yu In-Reply-To: <20230415152944.51393-1-frank.li@vivo.com> X-Headers-End: 1ppgZe-0006Mo-QU Subject: Re: [f2fs-dev] [PATCH v2] f2fs: refactor struct f2fs_attr macro X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, kernel test robot , linux-f2fs-devel@lists.sourceforge.net Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2023/4/15 23:29, Yangtao Li wrote: > This patch provides a large number of variants of F2FS_RW_ATTR > and F2FS_RO_ATTR macros, reducing the number of parameters required > to initialize the f2fs_attr structure. > > Reported-by: kernel test robot > Link: https://lore.kernel.org/oe-kbuild-all/202304152234.wjaY3IYm-lkp@intel.com/ > Signed-off-by: Yangtao Li > --- > v2: > -fix compile error > fs/f2fs/sysfs.c | 237 +++++++++++++++++++++++++++++------------------- > 1 file changed, 146 insertions(+), 91 deletions(-) > > diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c > index 8ea05340bad9..1fb38b222684 100644 > --- a/fs/f2fs/sysfs.c > +++ b/fs/f2fs/sysfs.c > @@ -842,68 +842,157 @@ static struct f2fs_attr f2fs_attr_##_name = { \ > #define F2FS_GENERAL_RO_ATTR(name) \ > static struct f2fs_attr f2fs_attr_##name = __ATTR(name, 0444, name##_show, NULL) > > -#define F2FS_STAT_ATTR(_struct_type, _struct_name, _name, _elname) \ > -static struct f2fs_attr f2fs_attr_##_name = { \ > - .attr = {.name = __stringify(_name), .mode = 0444 }, \ > - .show = f2fs_sbi_show, \ > - .struct_type = _struct_type, \ > - .offset = offsetof(struct _struct_name, _elname), \ > -} > +#define STAT_INFO_RO_ATTR(name, elname) \ > + F2FS_RO_ATTR(STAT_INFO, f2fs_stat_info, name, elname) \ > + > +#define GC_THREAD_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, name, elname) \ > + > +#define SM_INFO_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, name, elname) \ > + > +#define SM_INFO_GENERAL_RW_ATTR(elname) \ > + SM_INFO_RW_ATTR(elname, elname) \ > + > +#define DCC_INFO_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, name, elname) \ > + > +#define DCC_INFO_GENERAL_RW_ATTR(elname) \ > + DCC_INFO_RW_ATTR(elname, elname) \ > + > +#define NM_INFO_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, name, elname) \ > + > +#define NM_INFO_GENERAL_RW_ATTR(elname) \ > + NM_INFO_RW_ATTR(elname, elname) \ > + > +#define F2FS_SBI_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, name, elname) \ > + > +#define F2FS_SBI_GENERAL_RW_ATTR(elname) \ > + F2FS_SBI_RW_ATTR(elname, elname) \ > + > +#define F2FS_SBI_GENERAL_RO_ATTR(elname) \ > + F2FS_RO_ATTR(F2FS_SBI, f2fs_sb_info, elname, elname) \ > + > +#define FAULT_INFO_RATE_GENERAL_RW_ATTR(elname) \ > + F2FS_RW_ATTR(FAULT_INFO_RATE, f2fs_fault_info, elname, elname) \ > + > +#define FAULT_INFO_TYPE_GENERAL_RW_ATTR(elname) \ > + F2FS_RW_ATTR(FAULT_INFO_TYPE, f2fs_fault_info, elname, elname) \ > + > +#define RESERVED_BLOCKS_GENERAL_RW_ATTR(elname) \ > + F2FS_RW_ATTR(RESERVED_BLOCKS, f2fs_sb_info, elname, elname) \ > + > +#define CPRC_INFO_GENERAL_RW_ATTR(elname) \ > + F2FS_RW_ATTR(CPRC_INFO, ckpt_req_control, elname, elname) \ > + > +#define ATGC_INFO_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(ATGC_INFO, atgc_management, name, elname) \ > > -F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_urgent_sleep_time, > - urgent_sleep_time); > -F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_min_sleep_time, min_sleep_time); > -F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_max_sleep_time, max_sleep_time); > -F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_no_gc_sleep_time, no_gc_sleep_time); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_idle, gc_mode); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_urgent, gc_mode); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, reclaim_segments, rec_prefree_segments); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_small_discards, max_discards); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_discard_request, max_discard_request); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, min_discard_issue_time, min_discard_issue_time); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, mid_discard_issue_time, mid_discard_issue_time); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_discard_issue_time, max_discard_issue_time); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_io_aware_gran, discard_io_aware_gran); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_urgent_util, discard_urgent_util); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_granularity, discard_granularity); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_ordered_discard, max_ordered_discard); > -F2FS_RW_ATTR(RESERVED_BLOCKS, f2fs_sb_info, reserved_blocks, reserved_blocks); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, ipu_policy, ipu_policy); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_ipu_util, min_ipu_util); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_fsync_blocks, min_fsync_blocks); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_seq_blocks, min_seq_blocks); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_hot_blocks, min_hot_blocks); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_ssr_sections, min_ssr_sections); > -F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, ram_thresh, ram_thresh); > -F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, ra_nid_pages, ra_nid_pages); > -F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, dirty_nats_ratio, dirty_nats_ratio); > -F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, max_roll_forward_node_blocks, max_rf_node_blocks); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, max_victim_search, max_victim_search); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, migration_granularity, migration_granularity); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, dir_level, dir_level); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, cp_interval, interval_time[CP_TIME]); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, idle_interval, interval_time[REQ_TIME]); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, discard_idle_interval, > - interval_time[DISCARD_TIME]); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_idle_interval, interval_time[GC_TIME]); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, > - umount_discard_timeout, interval_time[UMOUNT_DISCARD_TIMEOUT]); > +/* GC_THREAD ATTR */ > +GC_THREAD_RW_ATTR(gc_urgent_sleep_time, urgent_sleep_time); > +GC_THREAD_RW_ATTR(gc_min_sleep_time, min_sleep_time); > +GC_THREAD_RW_ATTR(gc_max_sleep_time, max_sleep_time); > +GC_THREAD_RW_ATTR(gc_no_gc_sleep_time, no_gc_sleep_time); > + > +/* SM_INFO ATTR */ > +SM_INFO_RW_ATTR(reclaim_segments, rec_prefree_segments); > +SM_INFO_GENERAL_RW_ATTR(ipu_policy); > +SM_INFO_GENERAL_RW_ATTR(min_ipu_util); > +SM_INFO_GENERAL_RW_ATTR(min_fsync_blocks); > +SM_INFO_GENERAL_RW_ATTR(min_seq_blocks); > +SM_INFO_GENERAL_RW_ATTR(min_hot_blocks); > +SM_INFO_GENERAL_RW_ATTR(min_ssr_sections); > + > +/* DCC_INFO ATTR */ > +DCC_INFO_RW_ATTR(max_small_discards, max_discards); > +DCC_INFO_GENERAL_RW_ATTR(max_discard_request); > +DCC_INFO_GENERAL_RW_ATTR(min_discard_issue_time); > +DCC_INFO_GENERAL_RW_ATTR(mid_discard_issue_time); > +DCC_INFO_GENERAL_RW_ATTR(max_discard_issue_time); > +DCC_INFO_GENERAL_RW_ATTR(discard_io_aware_gran); > +DCC_INFO_GENERAL_RW_ATTR(discard_urgent_util); > +DCC_INFO_GENERAL_RW_ATTR(discard_granularity); > +DCC_INFO_GENERAL_RW_ATTR(max_ordered_discard); > + > +/* NM_INFO ATTR */ > +NM_INFO_RW_ATTR(max_roll_forward_node_blocks, max_rf_node_blocks); > +NM_INFO_GENERAL_RW_ATTR(ram_thresh); > +NM_INFO_GENERAL_RW_ATTR(ra_nid_pages); > +NM_INFO_GENERAL_RW_ATTR(dirty_nats_ratio); > + > +/* F2FS_SBI ATTR */ > +F2FS_RW_ATTR(F2FS_SBI, f2fs_super_block, extension_list, extension_list); > +F2FS_SBI_RW_ATTR(gc_idle, gc_mode); > +F2FS_SBI_RW_ATTR(gc_urgent, gc_mode); > +F2FS_SBI_RW_ATTR(cp_interval, interval_time[CP_TIME]); > +F2FS_SBI_RW_ATTR(idle_interval, interval_time[REQ_TIME]); > +F2FS_SBI_RW_ATTR(discard_idle_interval, interval_time[DISCARD_TIME]); > +F2FS_SBI_RW_ATTR(gc_idle_interval, interval_time[GC_TIME]); > +F2FS_SBI_RW_ATTR(umount_discard_timeout, interval_time[UMOUNT_DISCARD_TIMEOUT]); > +F2FS_SBI_RW_ATTR(gc_pin_file_thresh, gc_pin_file_threshold); > +F2FS_SBI_RW_ATTR(gc_reclaimed_segments, gc_reclaimed_segs); > +F2FS_SBI_GENERAL_RW_ATTR(max_victim_search); > +F2FS_SBI_GENERAL_RW_ATTR(migration_granularity); > +F2FS_SBI_GENERAL_RW_ATTR(dir_level); > #ifdef CONFIG_F2FS_IOSTAT > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, iostat_enable, iostat_enable); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, iostat_period_ms, iostat_period_ms); > +F2FS_SBI_GENERAL_RW_ATTR(iostat_enable); > +F2FS_SBI_GENERAL_RW_ATTR(iostat_period_ms); > #endif > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, readdir_ra, readdir_ra); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, max_io_bytes, max_io_bytes); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_pin_file_thresh, gc_pin_file_threshold); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_super_block, extension_list, extension_list); > +F2FS_SBI_GENERAL_RW_ATTR(readdir_ra); > +F2FS_SBI_GENERAL_RW_ATTR(max_io_bytes); > +F2FS_SBI_GENERAL_RW_ATTR(data_io_flag); > +F2FS_SBI_GENERAL_RW_ATTR(node_io_flag); > +F2FS_SBI_GENERAL_RW_ATTR(gc_remaining_trials); > +F2FS_SBI_GENERAL_RW_ATTR(seq_file_ra_mul); > +F2FS_SBI_GENERAL_RW_ATTR(gc_segment_mode); > +F2FS_SBI_GENERAL_RW_ATTR(max_fragment_chunk); > +F2FS_SBI_GENERAL_RW_ATTR(max_fragment_hole); > +#ifdef CONFIG_F2FS_FS_COMPRESSION > +F2FS_SBI_GENERAL_RW_ATTR(compr_written_block); > +F2FS_SBI_GENERAL_RW_ATTR(compr_saved_block); > +F2FS_SBI_GENERAL_RW_ATTR(compr_new_inode); > +F2FS_SBI_GENERAL_RW_ATTR(compress_percent); > +F2FS_SBI_GENERAL_RW_ATTR(compress_watermark); > +#endif > +F2FS_SBI_GENERAL_RW_ATTR(peak_atomic_write); > +F2FS_SBI_GENERAL_RW_ATTR(committed_atomic_block); > +F2FS_SBI_GENERAL_RW_ATTR(revoked_atomic_block); relocate below entry here. F2FS_SBI_GENERAL_RO_ATTR(current_atomic_write); It needs to keep original comment for age extent cache entries. /* For block age extent cache */ Thanks, > +F2FS_SBI_GENERAL_RW_ATTR(hot_data_age_threshold); > +F2FS_SBI_GENERAL_RW_ATTR(warm_data_age_threshold); > +F2FS_SBI_GENERAL_RW_ATTR(last_age_weight); > +F2FS_SBI_GENERAL_RO_ATTR(current_atomic_write); > +#ifdef CONFIG_BLK_DEV_ZONED > +F2FS_SBI_GENERAL_RO_ATTR(unusable_blocks_per_sec); > +#endif > + > +/* 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(gc_foreground_calls, call_count); > +STAT_INFO_RO_ATTR(gc_background_calls, bg_gc); > +#endif > + > +/* FAULT_INFO ATTR */ > #ifdef CONFIG_F2FS_FAULT_INJECTION > -F2FS_RW_ATTR(FAULT_INFO_RATE, f2fs_fault_info, inject_rate, inject_rate); > -F2FS_RW_ATTR(FAULT_INFO_TYPE, f2fs_fault_info, inject_type, inject_type); > +FAULT_INFO_RATE_GENERAL_RW_ATTR(inject_rate); > +FAULT_INFO_TYPE_GENERAL_RW_ATTR(inject_type); > #endif > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, data_io_flag, data_io_flag); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, node_io_flag, node_io_flag); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_remaining_trials, gc_remaining_trials); > -F2FS_RW_ATTR(CPRC_INFO, ckpt_req_control, ckpt_thread_ioprio, ckpt_thread_ioprio); > + > +/* RESERVED_BLOCKS ATTR */ > +RESERVED_BLOCKS_GENERAL_RW_ATTR(reserved_blocks); > + > +/* CPRC_INFO ATTR */ > +CPRC_INFO_GENERAL_RW_ATTR(ckpt_thread_ioprio); > + > +/* ATGC_INFO ATTR */ > +ATGC_INFO_RW_ATTR(atgc_candidate_ratio, candidate_ratio); > +ATGC_INFO_RW_ATTR(atgc_candidate_count, max_candidate_count); > +ATGC_INFO_RW_ATTR(atgc_age_weight, age_weight); > +ATGC_INFO_RW_ATTR(atgc_age_threshold, age_threshold); > + > F2FS_GENERAL_RO_ATTR(dirty_segments); > F2FS_GENERAL_RO_ATTR(free_segments); > F2FS_GENERAL_RO_ATTR(ovp_segments); > @@ -917,10 +1006,6 @@ F2FS_GENERAL_RO_ATTR(main_blkaddr); > F2FS_GENERAL_RO_ATTR(pending_discard); > F2FS_GENERAL_RO_ATTR(gc_mode); > #ifdef CONFIG_F2FS_STAT_FS > -F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, cp_foreground_calls, cp_count); > -F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, cp_background_calls, bg_cp_count); > -F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, gc_foreground_calls, call_count); > -F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, gc_background_calls, bg_gc); > F2FS_GENERAL_RO_ATTR(moved_blocks_background); > F2FS_GENERAL_RO_ATTR(moved_blocks_foreground); > F2FS_GENERAL_RO_ATTR(avg_vblocks); > @@ -935,8 +1020,6 @@ F2FS_FEATURE_RO_ATTR(encrypted_casefold); > #endif /* CONFIG_FS_ENCRYPTION */ > #ifdef CONFIG_BLK_DEV_ZONED > F2FS_FEATURE_RO_ATTR(block_zoned); > -F2FS_RO_ATTR(F2FS_SBI, f2fs_sb_info, unusable_blocks_per_sec, > - unusable_blocks_per_sec); > #endif > F2FS_FEATURE_RO_ATTR(atomic_write); > F2FS_FEATURE_RO_ATTR(extra_attr); > @@ -956,37 +1039,9 @@ F2FS_FEATURE_RO_ATTR(casefold); > F2FS_FEATURE_RO_ATTR(readonly); > #ifdef CONFIG_F2FS_FS_COMPRESSION > F2FS_FEATURE_RO_ATTR(compression); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compr_written_block, compr_written_block); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compr_saved_block, compr_saved_block); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compr_new_inode, compr_new_inode); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compress_percent, compress_percent); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compress_watermark, compress_watermark); > #endif > F2FS_FEATURE_RO_ATTR(pin_file); > > -/* For ATGC */ > -F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_candidate_ratio, candidate_ratio); > -F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_candidate_count, max_candidate_count); > -F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_age_weight, age_weight); > -F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_age_threshold, age_threshold); > - > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, seq_file_ra_mul, seq_file_ra_mul); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_segment_mode, gc_segment_mode); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_reclaimed_segments, gc_reclaimed_segs); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, max_fragment_chunk, max_fragment_chunk); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, max_fragment_hole, max_fragment_hole); > - > -/* For atomic write */ > -F2FS_RO_ATTR(F2FS_SBI, f2fs_sb_info, current_atomic_write, current_atomic_write); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, peak_atomic_write, peak_atomic_write); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, committed_atomic_block, committed_atomic_block); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, revoked_atomic_block, revoked_atomic_block); > - > -/* For block age extent cache */ > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, hot_data_age_threshold, hot_data_age_threshold); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, warm_data_age_threshold, warm_data_age_threshold); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, last_age_weight, last_age_weight); > - > #define ATTR_LIST(name) (&f2fs_attr_##name.attr) > static struct attribute *f2fs_attrs[] = { > ATTR_LIST(gc_urgent_sleep_time), _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel 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 3EDB6C77B73 for ; Fri, 21 Apr 2023 02:32:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233536AbjDUCcj (ORCPT ); Thu, 20 Apr 2023 22:32:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233298AbjDUCcf (ORCPT ); Thu, 20 Apr 2023 22:32:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D84DD4C24 for ; Thu, 20 Apr 2023 19:32:29 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 6307864D1D for ; Fri, 21 Apr 2023 02:32:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C86DC433D2; Fri, 21 Apr 2023 02:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682044348; bh=HEG4UZZ00eL/X9g2cqzfCI9QxG2kcg5ncPgftIMiFTw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Sv2MkPWQyIZenWeYgGpsaaPWlZaq0zFBgBO06WLqjaNjjA1WAmxxQJd8Ymk5IVmbp P87uVnsTrjZ/9NyGZupRO7ytEBTQHsySgOhEbBs9uu21tzhBrN/Lbx6VHXfqrjUYiC DwH1aQYjHzADRkjkp7WOrtMZVQohStTx5freuDqxoeQQdIu0gn6zijEOAxf0rktHh+ btR03YZ2k7DQCFSsjHp0Z7WRkdcuneJdZ3NtDn3XUajZk/RlaKuFNQWZgyClp66MX2 bmSpTqLIxp4DAuA0UiOBbFr6KefOj/T3sbQvTnjJb4gZE8hlKa0GDAhD5qvNgPlF5h 9miMO5jl83+jQ== Message-ID: <90db4ad9-e7e8-1fa2-acbd-919fb9bbf7f3@kernel.org> Date: Fri, 21 Apr 2023 10:32:25 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [PATCH v2] f2fs: refactor struct f2fs_attr macro Content-Language: en-US To: Yangtao Li , Jaegeuk Kim Cc: kernel test robot , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org References: <20230415152944.51393-1-frank.li@vivo.com> From: Chao Yu In-Reply-To: <20230415152944.51393-1-frank.li@vivo.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023/4/15 23:29, Yangtao Li wrote: > This patch provides a large number of variants of F2FS_RW_ATTR > and F2FS_RO_ATTR macros, reducing the number of parameters required > to initialize the f2fs_attr structure. > > Reported-by: kernel test robot > Link: https://lore.kernel.org/oe-kbuild-all/202304152234.wjaY3IYm-lkp@intel.com/ > Signed-off-by: Yangtao Li > --- > v2: > -fix compile error > fs/f2fs/sysfs.c | 237 +++++++++++++++++++++++++++++------------------- > 1 file changed, 146 insertions(+), 91 deletions(-) > > diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c > index 8ea05340bad9..1fb38b222684 100644 > --- a/fs/f2fs/sysfs.c > +++ b/fs/f2fs/sysfs.c > @@ -842,68 +842,157 @@ static struct f2fs_attr f2fs_attr_##_name = { \ > #define F2FS_GENERAL_RO_ATTR(name) \ > static struct f2fs_attr f2fs_attr_##name = __ATTR(name, 0444, name##_show, NULL) > > -#define F2FS_STAT_ATTR(_struct_type, _struct_name, _name, _elname) \ > -static struct f2fs_attr f2fs_attr_##_name = { \ > - .attr = {.name = __stringify(_name), .mode = 0444 }, \ > - .show = f2fs_sbi_show, \ > - .struct_type = _struct_type, \ > - .offset = offsetof(struct _struct_name, _elname), \ > -} > +#define STAT_INFO_RO_ATTR(name, elname) \ > + F2FS_RO_ATTR(STAT_INFO, f2fs_stat_info, name, elname) \ > + > +#define GC_THREAD_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, name, elname) \ > + > +#define SM_INFO_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, name, elname) \ > + > +#define SM_INFO_GENERAL_RW_ATTR(elname) \ > + SM_INFO_RW_ATTR(elname, elname) \ > + > +#define DCC_INFO_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, name, elname) \ > + > +#define DCC_INFO_GENERAL_RW_ATTR(elname) \ > + DCC_INFO_RW_ATTR(elname, elname) \ > + > +#define NM_INFO_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, name, elname) \ > + > +#define NM_INFO_GENERAL_RW_ATTR(elname) \ > + NM_INFO_RW_ATTR(elname, elname) \ > + > +#define F2FS_SBI_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, name, elname) \ > + > +#define F2FS_SBI_GENERAL_RW_ATTR(elname) \ > + F2FS_SBI_RW_ATTR(elname, elname) \ > + > +#define F2FS_SBI_GENERAL_RO_ATTR(elname) \ > + F2FS_RO_ATTR(F2FS_SBI, f2fs_sb_info, elname, elname) \ > + > +#define FAULT_INFO_RATE_GENERAL_RW_ATTR(elname) \ > + F2FS_RW_ATTR(FAULT_INFO_RATE, f2fs_fault_info, elname, elname) \ > + > +#define FAULT_INFO_TYPE_GENERAL_RW_ATTR(elname) \ > + F2FS_RW_ATTR(FAULT_INFO_TYPE, f2fs_fault_info, elname, elname) \ > + > +#define RESERVED_BLOCKS_GENERAL_RW_ATTR(elname) \ > + F2FS_RW_ATTR(RESERVED_BLOCKS, f2fs_sb_info, elname, elname) \ > + > +#define CPRC_INFO_GENERAL_RW_ATTR(elname) \ > + F2FS_RW_ATTR(CPRC_INFO, ckpt_req_control, elname, elname) \ > + > +#define ATGC_INFO_RW_ATTR(name, elname) \ > + F2FS_RW_ATTR(ATGC_INFO, atgc_management, name, elname) \ > > -F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_urgent_sleep_time, > - urgent_sleep_time); > -F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_min_sleep_time, min_sleep_time); > -F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_max_sleep_time, max_sleep_time); > -F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_no_gc_sleep_time, no_gc_sleep_time); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_idle, gc_mode); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_urgent, gc_mode); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, reclaim_segments, rec_prefree_segments); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_small_discards, max_discards); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_discard_request, max_discard_request); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, min_discard_issue_time, min_discard_issue_time); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, mid_discard_issue_time, mid_discard_issue_time); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_discard_issue_time, max_discard_issue_time); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_io_aware_gran, discard_io_aware_gran); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_urgent_util, discard_urgent_util); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_granularity, discard_granularity); > -F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_ordered_discard, max_ordered_discard); > -F2FS_RW_ATTR(RESERVED_BLOCKS, f2fs_sb_info, reserved_blocks, reserved_blocks); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, ipu_policy, ipu_policy); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_ipu_util, min_ipu_util); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_fsync_blocks, min_fsync_blocks); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_seq_blocks, min_seq_blocks); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_hot_blocks, min_hot_blocks); > -F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_ssr_sections, min_ssr_sections); > -F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, ram_thresh, ram_thresh); > -F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, ra_nid_pages, ra_nid_pages); > -F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, dirty_nats_ratio, dirty_nats_ratio); > -F2FS_RW_ATTR(NM_INFO, f2fs_nm_info, max_roll_forward_node_blocks, max_rf_node_blocks); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, max_victim_search, max_victim_search); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, migration_granularity, migration_granularity); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, dir_level, dir_level); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, cp_interval, interval_time[CP_TIME]); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, idle_interval, interval_time[REQ_TIME]); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, discard_idle_interval, > - interval_time[DISCARD_TIME]); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_idle_interval, interval_time[GC_TIME]); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, > - umount_discard_timeout, interval_time[UMOUNT_DISCARD_TIMEOUT]); > +/* GC_THREAD ATTR */ > +GC_THREAD_RW_ATTR(gc_urgent_sleep_time, urgent_sleep_time); > +GC_THREAD_RW_ATTR(gc_min_sleep_time, min_sleep_time); > +GC_THREAD_RW_ATTR(gc_max_sleep_time, max_sleep_time); > +GC_THREAD_RW_ATTR(gc_no_gc_sleep_time, no_gc_sleep_time); > + > +/* SM_INFO ATTR */ > +SM_INFO_RW_ATTR(reclaim_segments, rec_prefree_segments); > +SM_INFO_GENERAL_RW_ATTR(ipu_policy); > +SM_INFO_GENERAL_RW_ATTR(min_ipu_util); > +SM_INFO_GENERAL_RW_ATTR(min_fsync_blocks); > +SM_INFO_GENERAL_RW_ATTR(min_seq_blocks); > +SM_INFO_GENERAL_RW_ATTR(min_hot_blocks); > +SM_INFO_GENERAL_RW_ATTR(min_ssr_sections); > + > +/* DCC_INFO ATTR */ > +DCC_INFO_RW_ATTR(max_small_discards, max_discards); > +DCC_INFO_GENERAL_RW_ATTR(max_discard_request); > +DCC_INFO_GENERAL_RW_ATTR(min_discard_issue_time); > +DCC_INFO_GENERAL_RW_ATTR(mid_discard_issue_time); > +DCC_INFO_GENERAL_RW_ATTR(max_discard_issue_time); > +DCC_INFO_GENERAL_RW_ATTR(discard_io_aware_gran); > +DCC_INFO_GENERAL_RW_ATTR(discard_urgent_util); > +DCC_INFO_GENERAL_RW_ATTR(discard_granularity); > +DCC_INFO_GENERAL_RW_ATTR(max_ordered_discard); > + > +/* NM_INFO ATTR */ > +NM_INFO_RW_ATTR(max_roll_forward_node_blocks, max_rf_node_blocks); > +NM_INFO_GENERAL_RW_ATTR(ram_thresh); > +NM_INFO_GENERAL_RW_ATTR(ra_nid_pages); > +NM_INFO_GENERAL_RW_ATTR(dirty_nats_ratio); > + > +/* F2FS_SBI ATTR */ > +F2FS_RW_ATTR(F2FS_SBI, f2fs_super_block, extension_list, extension_list); > +F2FS_SBI_RW_ATTR(gc_idle, gc_mode); > +F2FS_SBI_RW_ATTR(gc_urgent, gc_mode); > +F2FS_SBI_RW_ATTR(cp_interval, interval_time[CP_TIME]); > +F2FS_SBI_RW_ATTR(idle_interval, interval_time[REQ_TIME]); > +F2FS_SBI_RW_ATTR(discard_idle_interval, interval_time[DISCARD_TIME]); > +F2FS_SBI_RW_ATTR(gc_idle_interval, interval_time[GC_TIME]); > +F2FS_SBI_RW_ATTR(umount_discard_timeout, interval_time[UMOUNT_DISCARD_TIMEOUT]); > +F2FS_SBI_RW_ATTR(gc_pin_file_thresh, gc_pin_file_threshold); > +F2FS_SBI_RW_ATTR(gc_reclaimed_segments, gc_reclaimed_segs); > +F2FS_SBI_GENERAL_RW_ATTR(max_victim_search); > +F2FS_SBI_GENERAL_RW_ATTR(migration_granularity); > +F2FS_SBI_GENERAL_RW_ATTR(dir_level); > #ifdef CONFIG_F2FS_IOSTAT > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, iostat_enable, iostat_enable); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, iostat_period_ms, iostat_period_ms); > +F2FS_SBI_GENERAL_RW_ATTR(iostat_enable); > +F2FS_SBI_GENERAL_RW_ATTR(iostat_period_ms); > #endif > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, readdir_ra, readdir_ra); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, max_io_bytes, max_io_bytes); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_pin_file_thresh, gc_pin_file_threshold); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_super_block, extension_list, extension_list); > +F2FS_SBI_GENERAL_RW_ATTR(readdir_ra); > +F2FS_SBI_GENERAL_RW_ATTR(max_io_bytes); > +F2FS_SBI_GENERAL_RW_ATTR(data_io_flag); > +F2FS_SBI_GENERAL_RW_ATTR(node_io_flag); > +F2FS_SBI_GENERAL_RW_ATTR(gc_remaining_trials); > +F2FS_SBI_GENERAL_RW_ATTR(seq_file_ra_mul); > +F2FS_SBI_GENERAL_RW_ATTR(gc_segment_mode); > +F2FS_SBI_GENERAL_RW_ATTR(max_fragment_chunk); > +F2FS_SBI_GENERAL_RW_ATTR(max_fragment_hole); > +#ifdef CONFIG_F2FS_FS_COMPRESSION > +F2FS_SBI_GENERAL_RW_ATTR(compr_written_block); > +F2FS_SBI_GENERAL_RW_ATTR(compr_saved_block); > +F2FS_SBI_GENERAL_RW_ATTR(compr_new_inode); > +F2FS_SBI_GENERAL_RW_ATTR(compress_percent); > +F2FS_SBI_GENERAL_RW_ATTR(compress_watermark); > +#endif > +F2FS_SBI_GENERAL_RW_ATTR(peak_atomic_write); > +F2FS_SBI_GENERAL_RW_ATTR(committed_atomic_block); > +F2FS_SBI_GENERAL_RW_ATTR(revoked_atomic_block); relocate below entry here. F2FS_SBI_GENERAL_RO_ATTR(current_atomic_write); It needs to keep original comment for age extent cache entries. /* For block age extent cache */ Thanks, > +F2FS_SBI_GENERAL_RW_ATTR(hot_data_age_threshold); > +F2FS_SBI_GENERAL_RW_ATTR(warm_data_age_threshold); > +F2FS_SBI_GENERAL_RW_ATTR(last_age_weight); > +F2FS_SBI_GENERAL_RO_ATTR(current_atomic_write); > +#ifdef CONFIG_BLK_DEV_ZONED > +F2FS_SBI_GENERAL_RO_ATTR(unusable_blocks_per_sec); > +#endif > + > +/* 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(gc_foreground_calls, call_count); > +STAT_INFO_RO_ATTR(gc_background_calls, bg_gc); > +#endif > + > +/* FAULT_INFO ATTR */ > #ifdef CONFIG_F2FS_FAULT_INJECTION > -F2FS_RW_ATTR(FAULT_INFO_RATE, f2fs_fault_info, inject_rate, inject_rate); > -F2FS_RW_ATTR(FAULT_INFO_TYPE, f2fs_fault_info, inject_type, inject_type); > +FAULT_INFO_RATE_GENERAL_RW_ATTR(inject_rate); > +FAULT_INFO_TYPE_GENERAL_RW_ATTR(inject_type); > #endif > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, data_io_flag, data_io_flag); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, node_io_flag, node_io_flag); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_remaining_trials, gc_remaining_trials); > -F2FS_RW_ATTR(CPRC_INFO, ckpt_req_control, ckpt_thread_ioprio, ckpt_thread_ioprio); > + > +/* RESERVED_BLOCKS ATTR */ > +RESERVED_BLOCKS_GENERAL_RW_ATTR(reserved_blocks); > + > +/* CPRC_INFO ATTR */ > +CPRC_INFO_GENERAL_RW_ATTR(ckpt_thread_ioprio); > + > +/* ATGC_INFO ATTR */ > +ATGC_INFO_RW_ATTR(atgc_candidate_ratio, candidate_ratio); > +ATGC_INFO_RW_ATTR(atgc_candidate_count, max_candidate_count); > +ATGC_INFO_RW_ATTR(atgc_age_weight, age_weight); > +ATGC_INFO_RW_ATTR(atgc_age_threshold, age_threshold); > + > F2FS_GENERAL_RO_ATTR(dirty_segments); > F2FS_GENERAL_RO_ATTR(free_segments); > F2FS_GENERAL_RO_ATTR(ovp_segments); > @@ -917,10 +1006,6 @@ F2FS_GENERAL_RO_ATTR(main_blkaddr); > F2FS_GENERAL_RO_ATTR(pending_discard); > F2FS_GENERAL_RO_ATTR(gc_mode); > #ifdef CONFIG_F2FS_STAT_FS > -F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, cp_foreground_calls, cp_count); > -F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, cp_background_calls, bg_cp_count); > -F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, gc_foreground_calls, call_count); > -F2FS_STAT_ATTR(STAT_INFO, f2fs_stat_info, gc_background_calls, bg_gc); > F2FS_GENERAL_RO_ATTR(moved_blocks_background); > F2FS_GENERAL_RO_ATTR(moved_blocks_foreground); > F2FS_GENERAL_RO_ATTR(avg_vblocks); > @@ -935,8 +1020,6 @@ F2FS_FEATURE_RO_ATTR(encrypted_casefold); > #endif /* CONFIG_FS_ENCRYPTION */ > #ifdef CONFIG_BLK_DEV_ZONED > F2FS_FEATURE_RO_ATTR(block_zoned); > -F2FS_RO_ATTR(F2FS_SBI, f2fs_sb_info, unusable_blocks_per_sec, > - unusable_blocks_per_sec); > #endif > F2FS_FEATURE_RO_ATTR(atomic_write); > F2FS_FEATURE_RO_ATTR(extra_attr); > @@ -956,37 +1039,9 @@ F2FS_FEATURE_RO_ATTR(casefold); > F2FS_FEATURE_RO_ATTR(readonly); > #ifdef CONFIG_F2FS_FS_COMPRESSION > F2FS_FEATURE_RO_ATTR(compression); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compr_written_block, compr_written_block); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compr_saved_block, compr_saved_block); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compr_new_inode, compr_new_inode); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compress_percent, compress_percent); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compress_watermark, compress_watermark); > #endif > F2FS_FEATURE_RO_ATTR(pin_file); > > -/* For ATGC */ > -F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_candidate_ratio, candidate_ratio); > -F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_candidate_count, max_candidate_count); > -F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_age_weight, age_weight); > -F2FS_RW_ATTR(ATGC_INFO, atgc_management, atgc_age_threshold, age_threshold); > - > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, seq_file_ra_mul, seq_file_ra_mul); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_segment_mode, gc_segment_mode); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_reclaimed_segments, gc_reclaimed_segs); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, max_fragment_chunk, max_fragment_chunk); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, max_fragment_hole, max_fragment_hole); > - > -/* For atomic write */ > -F2FS_RO_ATTR(F2FS_SBI, f2fs_sb_info, current_atomic_write, current_atomic_write); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, peak_atomic_write, peak_atomic_write); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, committed_atomic_block, committed_atomic_block); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, revoked_atomic_block, revoked_atomic_block); > - > -/* For block age extent cache */ > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, hot_data_age_threshold, hot_data_age_threshold); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, warm_data_age_threshold, warm_data_age_threshold); > -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, last_age_weight, last_age_weight); > - > #define ATTR_LIST(name) (&f2fs_attr_##name.attr) > static struct attribute *f2fs_attrs[] = { > ATTR_LIST(gc_urgent_sleep_time),