f2fs: refactor struct f2fs_attr macro
PATCH v4 1/1 f2fs: refactor struct f2fs_attr macro
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.
---
v4:
- add FAULT_INFO_GENERAL_RW_ATTR(type, elname)
- remove redundant '\'
fs/f2fs/sysfs.c | 240 ++++++++++++++++++++++++++++++------------------ 1 file changed, 149 insertions(+), 91 deletions(-)
fs/f2fs/sysfs.c +149 -91
@@ -842,68 +842,160 @@ 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), \ -} +#ifdef CONFIG_F2FS_STAT_FS +#define STAT_INFO_RO_ATTR (name, elname) \ + F2FS_RO_ATTR(STAT_INFO, f2fs_stat_info, name, elname) +#endif -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 ]); -#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); +#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) + +#ifdef CONFIG_F2FS_FAULT_INJECTION +#define FAULT_INFO_GENERAL_RW_ATTR (type, elname) \ + F2FS_RW_ATTR(type, f2fs_fault_info, elname, elname)#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); + +#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) + +/* 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_SBI_GENERAL_RW_ATTR (iostat_enable); +F2FS_SBI_GENERAL_RW_ATTR (iostat_period_ms); +#endif +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 +/* atomic write */ +F2FS_SBI_GENERAL_RO_ATTR (current_atomic_write); +F2FS_SBI_GENERAL_RW_ATTR (peak_atomic_write); +F2FS_SBI_GENERAL_RW_ATTR (committed_atomic_block); +F2FS_SBI_GENERAL_RW_ATTR (revoked_atomic_block); +/* block age extent cache */ +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); +#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_GENERAL_RW_ATTR (FAULT_INFO_RATE , inject_rate); +FAULT_INFO_GENERAL_RW_ATTR (FAULT_INFO_TYPE , 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 +1009,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 +1023,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 +1042,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),
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
ping......
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 7 lines · Yangtao Li
This patch provides a large number of variants of
F2FS_RW_ATTRandF2FS_RO_ATTRmacros, reducing the number of parameters required to initialize thef2fs_attrstructure.
Thanks,
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 9 lines · On Sat, 6 May 2023 23:16:03 +0800 you wrote:
This patch provides a large number of variants of
F2FS_RW_ATTRandF2FS_RO_ATTRmacros, reducing the number of parameters required to initialize thef2fs_attrstructure.Reported-by kernel test robot <[email protected]>Signed-off-by Yangtao Li <[email protected]>[...]
Here is the summary with links:
- [f2fs-dev,v4] f2fs: refactor struct f2fs_attr macro
https://git.kernel.org/jaegeuk/f2fs/c/6201c478dedc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html