All of lore.kernel.org
 help / color / mirror / Atom feed
* [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-21  9:20 ` Chao Yu
  0 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-02-21  9:20 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-kernel, linux-f2fs-devel

Just cleanup, no functional change.

Signed-off-by: Chao Yu <chao@kernel.org>
---
 fs/f2fs/debug.c   |  7 +++----
 fs/f2fs/f2fs.h    | 14 ++++++++------
 fs/f2fs/gc.c      | 10 +++++-----
 fs/f2fs/gc.h      |  4 ++--
 fs/f2fs/segment.c | 12 ++++++------
 fs/f2fs/segment.h |  8 ++++----
 fs/f2fs/super.c   | 16 ++++++++--------
 fs/f2fs/sysfs.c   |  4 ++--
 8 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 6617195bd27e..12893477f2e4 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
 	si->cur_ckpt_time = sbi->cprc_info.cur_time;
 	si->peak_ckpt_time = sbi->cprc_info.peak_time;
 	spin_unlock(&sbi->cprc_info.stat_lock);
-	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
+	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
 	si->rsvd_segs = reserved_segments(sbi);
 	si->overp_segs = overprovision_segments(sbi);
 	si->valid_count = valid_user_blocks(sbi);
@@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
 	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
 	si->io_skip_bggc = sbi->io_skip_bggc;
 	si->other_skip_bggc = sbi->other_skip_bggc;
-	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
+	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
 		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
 		/ 2;
-	si->util_valid = (int)(written_block_count(sbi) >>
-						sbi->log_blocks_per_seg)
+	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
 		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
 		/ 2;
 	si->util_invalid = 50 - si->util_free - si->util_valid;
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index dad2774ca72f..8a6fd4352a0e 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
 };
 
 /* Definitions to access f2fs_sb_info */
-#define BLKS_PER_SEG(sbi)					\
-	((sbi)->blocks_per_seg)
-#define BLKS_PER_SEC(sbi)					\
-	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
-#define SEGS_PER_SEC(sbi)					\
-	((sbi)->segs_per_sec)
+#define SEGS_TO_BLKS(sbi, segs)					\
+		((segs) << (sbi)->log_blocks_per_seg)
+#define BLKS_TO_SEGS(sbi, blks)					\
+		((blks) >> (sbi)->log_blocks_per_seg)
+
+#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
+#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
+#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
 
 __printf(3, 4)
 void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 3ff126316d42..6d160d50e14e 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
 
 	/* LFS */
 	if (p->gc_mode == GC_GREEDY)
-		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
+		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
 	else if (p->gc_mode == GC_CB)
 		return UINT_MAX;
 	else if (p->gc_mode == GC_AT)
@@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
 	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
 	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
 
-	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
+	u = BLKS_TO_SEGS(sbi, vblocks * 100);
 
 	/* Handle if the system time has changed by the user */
 	if (mtime < sit_i->min_mtime)
@@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
 	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
 	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
 	raw_sb->block_count = cpu_to_le64(block_count +
-			(long long)(segs << sbi->log_blocks_per_seg));
+			(long long)SEGS_TO_BLKS(sbi, segs));
 	if (f2fs_is_multi_device(sbi)) {
 		int last_dev = sbi->s_ndevs - 1;
 		int dev_segs =
@@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
 static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
 {
 	int segs = secs * SEGS_PER_SEC(sbi);
-	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
+	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
 	long long user_block_count =
 				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
 
@@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
 		int last_dev = sbi->s_ndevs - 1;
 		__u64 last_segs = FDEV(last_dev).total_segments;
 
-		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
+		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
 								old_block_count)
 			return -EINVAL;
 	}
diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
index e4a75aa4160f..6a2419ddc7c6 100644
--- a/fs/f2fs/gc.h
+++ b/fs/f2fs/gc.h
@@ -70,7 +70,7 @@ struct victim_entry {
 
 static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
 {
-	return free_segments(sbi) << sbi->log_blocks_per_seg;
+	return SEGS_TO_BLKS(sbi, free_segments(sbi));
 }
 
 static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
@@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
 	block_t free_blks, ovp_blks;
 
 	free_blks = free_segs_blk_count(sbi);
-	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
+	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
 
 	if (free_blks < ovp_blks)
 		return 0;
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 56927b097e30..d0209ea77dd2 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
 	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
 	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
 	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
-	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
-				sbi->log_blocks_per_seg;
+	unsigned int threshold =
+		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
 	unsigned int global_threshold = threshold * 3 / 2;
 
 	if (dents >= threshold || qdata >= threshold ||
@@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
 {
 	int ovp_hole_segs =
 		(overprovision_segments(sbi) - reserved_segments(sbi));
-	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
+	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
 	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
 	block_t holes[2] = {0, 0};	/* DATA and NODE */
 	block_t unusable;
@@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
 		if (!f2fs_sb_has_blkzoned(sbi) &&
 		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
 			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
-				(end - start) << sbi->log_blocks_per_seg);
+				SEGS_TO_BLKS(sbi, end - start));
 			continue;
 		}
 next:
@@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	atomic_set(&dcc->queued_discard, 0);
 	atomic_set(&dcc->discard_cmd_cnt, 0);
 	dcc->nr_discards = 0;
-	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
+	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
 	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
 	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
 	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
@@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
 #endif
 
 	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
-	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
+	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
 	sit_i->written_valid_blocks = 0;
 	sit_i->bitmap_size = sit_bitmap_size;
 	sit_i->dirty_sentries = 0;
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 9fe5ec619456..e72b02b67087 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
 #define TOTAL_SEGS(sbi)							\
 	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
 		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
-#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
+#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
 
 #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
 #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
 					(sbi)->log_blocks_per_seg))
 
 #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
-	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
+	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
 
 #define NEXT_FREE_BLKADDR(sbi, curseg)					\
 	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
 
 #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
 #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
-	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
+	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
 #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
 	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
 
@@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
 	if (type == DATA)
 		return BLKS_PER_SEG(sbi);
 	else if (type == NODE)
-		return 8 * BLKS_PER_SEG(sbi);
+		return SEGS_TO_BLKS(sbi, 8);
 	else if (type == META)
 		return 8 * BIO_MAX_VECS;
 	else
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9976f2b0393c..bb056700b459 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
 	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
 	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
 	sbi->total_sections = le32_to_cpu(raw_super->section_count);
-	sbi->total_node_count =
-		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
-		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
+	sbi->total_node_count = SEGS_TO_BLKS(sbi,
+			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
+			NAT_ENTRY_PER_BLOCK));
 	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
 	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
 	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
@@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
 			if (i == 0) {
 				FDEV(i).start_blk = 0;
 				FDEV(i).end_blk = FDEV(i).start_blk +
-				    (FDEV(i).total_segments <<
-				    sbi->log_blocks_per_seg) - 1 +
-				    le32_to_cpu(raw_super->segment0_blkaddr);
+					SEGS_TO_BLKS(sbi,
+					FDEV(i).total_segments) - 1 +
+					le32_to_cpu(raw_super->segment0_blkaddr);
 			} else {
 				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
 				FDEV(i).end_blk = FDEV(i).start_blk +
-					(FDEV(i).total_segments <<
-					sbi->log_blocks_per_seg) - 1;
+						SEGS_TO_BLKS(sbi,
+						FDEV(i).total_segments) - 1;
 				FDEV(i).bdev_handle = bdev_open_by_path(
 					FDEV(i).path, mode, sbi->sb, NULL);
 			}
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 2689cc9c3bf8..ceac3bfc5e2c 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
 		spin_lock(&sbi->stat_lock);
 		if (t > (unsigned long)(sbi->user_block_count -
 				F2FS_OPTION(sbi).root_reserved_blocks -
-				(SM_I(sbi)->additional_reserved_segments <<
-					sbi->log_blocks_per_seg))) {
+				SEGS_TO_BLKS(sbi,
+				SM_I(sbi)->additional_reserved_segments))) {
 			spin_unlock(&sbi->stat_lock);
 			return -EINVAL;
 		}
-- 
2.40.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply related	[flat|nested] 22+ messages in thread
* [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-21  9:20 ` Chao Yu
  0 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-02-21  9:20 UTC (permalink / raw)
  To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, Chao Yu

Just cleanup, no functional change.

Signed-off-by: Chao Yu <chao@kernel.org>
---
 fs/f2fs/debug.c   |  7 +++----
 fs/f2fs/f2fs.h    | 14 ++++++++------
 fs/f2fs/gc.c      | 10 +++++-----
 fs/f2fs/gc.h      |  4 ++--
 fs/f2fs/segment.c | 12 ++++++------
 fs/f2fs/segment.h |  8 ++++----
 fs/f2fs/super.c   | 16 ++++++++--------
 fs/f2fs/sysfs.c   |  4 ++--
 8 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 6617195bd27e..12893477f2e4 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
 	si->cur_ckpt_time = sbi->cprc_info.cur_time;
 	si->peak_ckpt_time = sbi->cprc_info.peak_time;
 	spin_unlock(&sbi->cprc_info.stat_lock);
-	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
+	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
 	si->rsvd_segs = reserved_segments(sbi);
 	si->overp_segs = overprovision_segments(sbi);
 	si->valid_count = valid_user_blocks(sbi);
@@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
 	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
 	si->io_skip_bggc = sbi->io_skip_bggc;
 	si->other_skip_bggc = sbi->other_skip_bggc;
-	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
+	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
 		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
 		/ 2;
-	si->util_valid = (int)(written_block_count(sbi) >>
-						sbi->log_blocks_per_seg)
+	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
 		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
 		/ 2;
 	si->util_invalid = 50 - si->util_free - si->util_valid;
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index dad2774ca72f..8a6fd4352a0e 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
 };
 
 /* Definitions to access f2fs_sb_info */
-#define BLKS_PER_SEG(sbi)					\
-	((sbi)->blocks_per_seg)
-#define BLKS_PER_SEC(sbi)					\
-	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
-#define SEGS_PER_SEC(sbi)					\
-	((sbi)->segs_per_sec)
+#define SEGS_TO_BLKS(sbi, segs)					\
+		((segs) << (sbi)->log_blocks_per_seg)
+#define BLKS_TO_SEGS(sbi, blks)					\
+		((blks) >> (sbi)->log_blocks_per_seg)
+
+#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
+#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
+#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
 
 __printf(3, 4)
 void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 3ff126316d42..6d160d50e14e 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
 
 	/* LFS */
 	if (p->gc_mode == GC_GREEDY)
-		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
+		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
 	else if (p->gc_mode == GC_CB)
 		return UINT_MAX;
 	else if (p->gc_mode == GC_AT)
@@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
 	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
 	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
 
-	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
+	u = BLKS_TO_SEGS(sbi, vblocks * 100);
 
 	/* Handle if the system time has changed by the user */
 	if (mtime < sit_i->min_mtime)
@@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
 	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
 	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
 	raw_sb->block_count = cpu_to_le64(block_count +
-			(long long)(segs << sbi->log_blocks_per_seg));
+			(long long)SEGS_TO_BLKS(sbi, segs));
 	if (f2fs_is_multi_device(sbi)) {
 		int last_dev = sbi->s_ndevs - 1;
 		int dev_segs =
@@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
 static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
 {
 	int segs = secs * SEGS_PER_SEC(sbi);
-	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
+	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
 	long long user_block_count =
 				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
 
@@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
 		int last_dev = sbi->s_ndevs - 1;
 		__u64 last_segs = FDEV(last_dev).total_segments;
 
-		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
+		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
 								old_block_count)
 			return -EINVAL;
 	}
diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
index e4a75aa4160f..6a2419ddc7c6 100644
--- a/fs/f2fs/gc.h
+++ b/fs/f2fs/gc.h
@@ -70,7 +70,7 @@ struct victim_entry {
 
 static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
 {
-	return free_segments(sbi) << sbi->log_blocks_per_seg;
+	return SEGS_TO_BLKS(sbi, free_segments(sbi));
 }
 
 static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
@@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
 	block_t free_blks, ovp_blks;
 
 	free_blks = free_segs_blk_count(sbi);
-	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
+	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
 
 	if (free_blks < ovp_blks)
 		return 0;
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 56927b097e30..d0209ea77dd2 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
 	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
 	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
 	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
-	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
-				sbi->log_blocks_per_seg;
+	unsigned int threshold =
+		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
 	unsigned int global_threshold = threshold * 3 / 2;
 
 	if (dents >= threshold || qdata >= threshold ||
@@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
 {
 	int ovp_hole_segs =
 		(overprovision_segments(sbi) - reserved_segments(sbi));
-	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
+	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
 	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
 	block_t holes[2] = {0, 0};	/* DATA and NODE */
 	block_t unusable;
@@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
 		if (!f2fs_sb_has_blkzoned(sbi) &&
 		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
 			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
-				(end - start) << sbi->log_blocks_per_seg);
+				SEGS_TO_BLKS(sbi, end - start));
 			continue;
 		}
 next:
@@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	atomic_set(&dcc->queued_discard, 0);
 	atomic_set(&dcc->discard_cmd_cnt, 0);
 	dcc->nr_discards = 0;
-	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
+	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
 	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
 	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
 	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
@@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
 #endif
 
 	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
-	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
+	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
 	sit_i->written_valid_blocks = 0;
 	sit_i->bitmap_size = sit_bitmap_size;
 	sit_i->dirty_sentries = 0;
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 9fe5ec619456..e72b02b67087 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
 #define TOTAL_SEGS(sbi)							\
 	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
 		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
-#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
+#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
 
 #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
 #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
 					(sbi)->log_blocks_per_seg))
 
 #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
-	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
+	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
 
 #define NEXT_FREE_BLKADDR(sbi, curseg)					\
 	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
 
 #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
 #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
-	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
+	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
 #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
 	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
 
@@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
 	if (type == DATA)
 		return BLKS_PER_SEG(sbi);
 	else if (type == NODE)
-		return 8 * BLKS_PER_SEG(sbi);
+		return SEGS_TO_BLKS(sbi, 8);
 	else if (type == META)
 		return 8 * BIO_MAX_VECS;
 	else
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9976f2b0393c..bb056700b459 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
 	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
 	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
 	sbi->total_sections = le32_to_cpu(raw_super->section_count);
-	sbi->total_node_count =
-		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
-		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
+	sbi->total_node_count = SEGS_TO_BLKS(sbi,
+			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
+			NAT_ENTRY_PER_BLOCK));
 	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
 	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
 	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
@@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
 			if (i == 0) {
 				FDEV(i).start_blk = 0;
 				FDEV(i).end_blk = FDEV(i).start_blk +
-				    (FDEV(i).total_segments <<
-				    sbi->log_blocks_per_seg) - 1 +
-				    le32_to_cpu(raw_super->segment0_blkaddr);
+					SEGS_TO_BLKS(sbi,
+					FDEV(i).total_segments) - 1 +
+					le32_to_cpu(raw_super->segment0_blkaddr);
 			} else {
 				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
 				FDEV(i).end_blk = FDEV(i).start_blk +
-					(FDEV(i).total_segments <<
-					sbi->log_blocks_per_seg) - 1;
+						SEGS_TO_BLKS(sbi,
+						FDEV(i).total_segments) - 1;
 				FDEV(i).bdev_handle = bdev_open_by_path(
 					FDEV(i).path, mode, sbi->sb, NULL);
 			}
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 2689cc9c3bf8..ceac3bfc5e2c 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
 		spin_lock(&sbi->stat_lock);
 		if (t > (unsigned long)(sbi->user_block_count -
 				F2FS_OPTION(sbi).root_reserved_blocks -
-				(SM_I(sbi)->additional_reserved_segments <<
-					sbi->log_blocks_per_seg))) {
+				SEGS_TO_BLKS(sbi,
+				SM_I(sbi)->additional_reserved_segments))) {
 			spin_unlock(&sbi->stat_lock);
 			return -EINVAL;
 		}
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-02-21  9:20 ` Chao Yu
@ 2024-02-23 18:17   ` Jaegeuk Kim
  -1 siblings, 0 replies; 22+ messages in thread
From: Jaegeuk Kim @ 2024-02-23 18:17 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel

Chao,

I applied the below as well in order to keep zone capacity back.

--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -101,11 +101,10 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
        NULL_SEGNO : GET_L2R_SEGNO(FREE_I(sbi),                 \
                GET_SEGNO_FROM_SEG0(sbi, blk_addr)))
 #define CAP_BLKS_PER_SEC(sbi)                                  \
-       (SEGS_PER_SEC(sbi) * BLKS_PER_SEG(sbi) -                \
-        (sbi)->unusable_blocks_per_sec)
+       (BLKS_PER_SEC(sbi) - (sbi)->unusable_blocks_per_sec)
 #define CAP_SEGS_PER_SEC(sbi)                                  \
-       (SEGS_PER_SEC(sbi) - ((sbi)->unusable_blocks_per_sec >> \
-       (sbi)->log_blocks_per_seg))
+       (SEGS_PER_SEC(sbi) -                                    \
+       BLKS_TO_SEGS(sbi, (sbi)->unusable_blocks_per_sec)
 #define GET_SEC_FROM_SEG(sbi, segno)                           \
        (((segno) == -1) ? -1 : (segno) / SEGS_PER_SEC(sbi))
 #define GET_SEG_FROM_SEC(sbi, secno)                           \


On 02/21, Chao Yu wrote:
> Just cleanup, no functional change.
> 
> Signed-off-by: Chao Yu <chao@kernel.org>
> ---
>  fs/f2fs/debug.c   |  7 +++----
>  fs/f2fs/f2fs.h    | 14 ++++++++------
>  fs/f2fs/gc.c      | 10 +++++-----
>  fs/f2fs/gc.h      |  4 ++--
>  fs/f2fs/segment.c | 12 ++++++------
>  fs/f2fs/segment.h |  8 ++++----
>  fs/f2fs/super.c   | 16 ++++++++--------
>  fs/f2fs/sysfs.c   |  4 ++--
>  8 files changed, 38 insertions(+), 37 deletions(-)
> 
> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> index 6617195bd27e..12893477f2e4 100644
> --- a/fs/f2fs/debug.c
> +++ b/fs/f2fs/debug.c
> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>  	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>  	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>  	spin_unlock(&sbi->cprc_info.stat_lock);
> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>  	si->rsvd_segs = reserved_segments(sbi);
>  	si->overp_segs = overprovision_segments(sbi);
>  	si->valid_count = valid_user_blocks(sbi);
> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>  	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>  	si->io_skip_bggc = sbi->io_skip_bggc;
>  	si->other_skip_bggc = sbi->other_skip_bggc;
> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>  		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>  		/ 2;
> -	si->util_valid = (int)(written_block_count(sbi) >>
> -						sbi->log_blocks_per_seg)
> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>  		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>  		/ 2;
>  	si->util_invalid = 50 - si->util_free - si->util_valid;
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index dad2774ca72f..8a6fd4352a0e 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>  };
>  
>  /* Definitions to access f2fs_sb_info */
> -#define BLKS_PER_SEG(sbi)					\
> -	((sbi)->blocks_per_seg)
> -#define BLKS_PER_SEC(sbi)					\
> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
> -#define SEGS_PER_SEC(sbi)					\
> -	((sbi)->segs_per_sec)
> +#define SEGS_TO_BLKS(sbi, segs)					\
> +		((segs) << (sbi)->log_blocks_per_seg)
> +#define BLKS_TO_SEGS(sbi, blks)					\
> +		((blks) >> (sbi)->log_blocks_per_seg)
> +
> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>  
>  __printf(3, 4)
>  void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> index 3ff126316d42..6d160d50e14e 100644
> --- a/fs/f2fs/gc.c
> +++ b/fs/f2fs/gc.c
> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>  
>  	/* LFS */
>  	if (p->gc_mode == GC_GREEDY)
> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>  	else if (p->gc_mode == GC_CB)
>  		return UINT_MAX;
>  	else if (p->gc_mode == GC_AT)
> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>  	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>  	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>  
> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>  
>  	/* Handle if the system time has changed by the user */
>  	if (mtime < sit_i->min_mtime)
> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>  	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>  	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>  	raw_sb->block_count = cpu_to_le64(block_count +
> -			(long long)(segs << sbi->log_blocks_per_seg));
> +			(long long)SEGS_TO_BLKS(sbi, segs));
>  	if (f2fs_is_multi_device(sbi)) {
>  		int last_dev = sbi->s_ndevs - 1;
>  		int dev_segs =
> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>  static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>  {
>  	int segs = secs * SEGS_PER_SEC(sbi);
> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>  	long long user_block_count =
>  				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>  
> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>  		int last_dev = sbi->s_ndevs - 1;
>  		__u64 last_segs = FDEV(last_dev).total_segments;
>  
> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>  								old_block_count)
>  			return -EINVAL;
>  	}
> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
> index e4a75aa4160f..6a2419ddc7c6 100644
> --- a/fs/f2fs/gc.h
> +++ b/fs/f2fs/gc.h
> @@ -70,7 +70,7 @@ struct victim_entry {
>  
>  static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>  {
> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>  }
>  
>  static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>  	block_t free_blks, ovp_blks;
>  
>  	free_blks = free_segs_blk_count(sbi);
> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>  
>  	if (free_blks < ovp_blks)
>  		return 0;
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 56927b097e30..d0209ea77dd2 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>  	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>  	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>  	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
> -				sbi->log_blocks_per_seg;
> +	unsigned int threshold =
> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>  	unsigned int global_threshold = threshold * 3 / 2;
>  
>  	if (dents >= threshold || qdata >= threshold ||
> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>  {
>  	int ovp_hole_segs =
>  		(overprovision_segments(sbi) - reserved_segments(sbi));
> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>  	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>  	block_t holes[2] = {0, 0};	/* DATA and NODE */
>  	block_t unusable;
> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>  		if (!f2fs_sb_has_blkzoned(sbi) &&
>  		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>  			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
> -				(end - start) << sbi->log_blocks_per_seg);
> +				SEGS_TO_BLKS(sbi, end - start));
>  			continue;
>  		}
>  next:
> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>  	atomic_set(&dcc->queued_discard, 0);
>  	atomic_set(&dcc->discard_cmd_cnt, 0);
>  	dcc->nr_discards = 0;
> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>  	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>  	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>  	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>  #endif
>  
>  	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>  	sit_i->written_valid_blocks = 0;
>  	sit_i->bitmap_size = sit_bitmap_size;
>  	sit_i->dirty_sentries = 0;
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index 9fe5ec619456..e72b02b67087 100644
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>  #define TOTAL_SEGS(sbi)							\
>  	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>  		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>  
>  #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>  #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>  					(sbi)->log_blocks_per_seg))
>  
>  #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>  
>  #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>  	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>  
>  #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>  #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>  #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>  	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>  
> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>  	if (type == DATA)
>  		return BLKS_PER_SEG(sbi);
>  	else if (type == NODE)
> -		return 8 * BLKS_PER_SEG(sbi);
> +		return SEGS_TO_BLKS(sbi, 8);
>  	else if (type == META)
>  		return 8 * BIO_MAX_VECS;
>  	else
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 9976f2b0393c..bb056700b459 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>  	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>  	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>  	sbi->total_sections = le32_to_cpu(raw_super->section_count);
> -	sbi->total_node_count =
> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> +			NAT_ENTRY_PER_BLOCK));
>  	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>  	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>  	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>  			if (i == 0) {
>  				FDEV(i).start_blk = 0;
>  				FDEV(i).end_blk = FDEV(i).start_blk +
> -				    (FDEV(i).total_segments <<
> -				    sbi->log_blocks_per_seg) - 1 +
> -				    le32_to_cpu(raw_super->segment0_blkaddr);
> +					SEGS_TO_BLKS(sbi,
> +					FDEV(i).total_segments) - 1 +
> +					le32_to_cpu(raw_super->segment0_blkaddr);
>  			} else {
>  				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>  				FDEV(i).end_blk = FDEV(i).start_blk +
> -					(FDEV(i).total_segments <<
> -					sbi->log_blocks_per_seg) - 1;
> +						SEGS_TO_BLKS(sbi,
> +						FDEV(i).total_segments) - 1;
>  				FDEV(i).bdev_handle = bdev_open_by_path(
>  					FDEV(i).path, mode, sbi->sb, NULL);
>  			}
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index 2689cc9c3bf8..ceac3bfc5e2c 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>  		spin_lock(&sbi->stat_lock);
>  		if (t > (unsigned long)(sbi->user_block_count -
>  				F2FS_OPTION(sbi).root_reserved_blocks -
> -				(SM_I(sbi)->additional_reserved_segments <<
> -					sbi->log_blocks_per_seg))) {
> +				SEGS_TO_BLKS(sbi,
> +				SM_I(sbi)->additional_reserved_segments))) {
>  			spin_unlock(&sbi->stat_lock);
>  			return -EINVAL;
>  		}
> -- 
> 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-23 18:17   ` Jaegeuk Kim
  0 siblings, 0 replies; 22+ messages in thread
From: Jaegeuk Kim @ 2024-02-23 18:17 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-kernel, linux-f2fs-devel

Chao,

I applied the below as well in order to keep zone capacity back.

--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -101,11 +101,10 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
        NULL_SEGNO : GET_L2R_SEGNO(FREE_I(sbi),                 \
                GET_SEGNO_FROM_SEG0(sbi, blk_addr)))
 #define CAP_BLKS_PER_SEC(sbi)                                  \
-       (SEGS_PER_SEC(sbi) * BLKS_PER_SEG(sbi) -                \
-        (sbi)->unusable_blocks_per_sec)
+       (BLKS_PER_SEC(sbi) - (sbi)->unusable_blocks_per_sec)
 #define CAP_SEGS_PER_SEC(sbi)                                  \
-       (SEGS_PER_SEC(sbi) - ((sbi)->unusable_blocks_per_sec >> \
-       (sbi)->log_blocks_per_seg))
+       (SEGS_PER_SEC(sbi) -                                    \
+       BLKS_TO_SEGS(sbi, (sbi)->unusable_blocks_per_sec)
 #define GET_SEC_FROM_SEG(sbi, segno)                           \
        (((segno) == -1) ? -1 : (segno) / SEGS_PER_SEC(sbi))
 #define GET_SEG_FROM_SEC(sbi, secno)                           \


On 02/21, Chao Yu wrote:
> Just cleanup, no functional change.
> 
> Signed-off-by: Chao Yu <chao@kernel.org>
> ---
>  fs/f2fs/debug.c   |  7 +++----
>  fs/f2fs/f2fs.h    | 14 ++++++++------
>  fs/f2fs/gc.c      | 10 +++++-----
>  fs/f2fs/gc.h      |  4 ++--
>  fs/f2fs/segment.c | 12 ++++++------
>  fs/f2fs/segment.h |  8 ++++----
>  fs/f2fs/super.c   | 16 ++++++++--------
>  fs/f2fs/sysfs.c   |  4 ++--
>  8 files changed, 38 insertions(+), 37 deletions(-)
> 
> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> index 6617195bd27e..12893477f2e4 100644
> --- a/fs/f2fs/debug.c
> +++ b/fs/f2fs/debug.c
> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>  	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>  	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>  	spin_unlock(&sbi->cprc_info.stat_lock);
> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>  	si->rsvd_segs = reserved_segments(sbi);
>  	si->overp_segs = overprovision_segments(sbi);
>  	si->valid_count = valid_user_blocks(sbi);
> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>  	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>  	si->io_skip_bggc = sbi->io_skip_bggc;
>  	si->other_skip_bggc = sbi->other_skip_bggc;
> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>  		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>  		/ 2;
> -	si->util_valid = (int)(written_block_count(sbi) >>
> -						sbi->log_blocks_per_seg)
> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>  		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>  		/ 2;
>  	si->util_invalid = 50 - si->util_free - si->util_valid;
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index dad2774ca72f..8a6fd4352a0e 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>  };
>  
>  /* Definitions to access f2fs_sb_info */
> -#define BLKS_PER_SEG(sbi)					\
> -	((sbi)->blocks_per_seg)
> -#define BLKS_PER_SEC(sbi)					\
> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
> -#define SEGS_PER_SEC(sbi)					\
> -	((sbi)->segs_per_sec)
> +#define SEGS_TO_BLKS(sbi, segs)					\
> +		((segs) << (sbi)->log_blocks_per_seg)
> +#define BLKS_TO_SEGS(sbi, blks)					\
> +		((blks) >> (sbi)->log_blocks_per_seg)
> +
> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>  
>  __printf(3, 4)
>  void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> index 3ff126316d42..6d160d50e14e 100644
> --- a/fs/f2fs/gc.c
> +++ b/fs/f2fs/gc.c
> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>  
>  	/* LFS */
>  	if (p->gc_mode == GC_GREEDY)
> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>  	else if (p->gc_mode == GC_CB)
>  		return UINT_MAX;
>  	else if (p->gc_mode == GC_AT)
> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>  	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>  	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>  
> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>  
>  	/* Handle if the system time has changed by the user */
>  	if (mtime < sit_i->min_mtime)
> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>  	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>  	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>  	raw_sb->block_count = cpu_to_le64(block_count +
> -			(long long)(segs << sbi->log_blocks_per_seg));
> +			(long long)SEGS_TO_BLKS(sbi, segs));
>  	if (f2fs_is_multi_device(sbi)) {
>  		int last_dev = sbi->s_ndevs - 1;
>  		int dev_segs =
> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>  static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>  {
>  	int segs = secs * SEGS_PER_SEC(sbi);
> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>  	long long user_block_count =
>  				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>  
> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>  		int last_dev = sbi->s_ndevs - 1;
>  		__u64 last_segs = FDEV(last_dev).total_segments;
>  
> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>  								old_block_count)
>  			return -EINVAL;
>  	}
> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
> index e4a75aa4160f..6a2419ddc7c6 100644
> --- a/fs/f2fs/gc.h
> +++ b/fs/f2fs/gc.h
> @@ -70,7 +70,7 @@ struct victim_entry {
>  
>  static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>  {
> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>  }
>  
>  static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>  	block_t free_blks, ovp_blks;
>  
>  	free_blks = free_segs_blk_count(sbi);
> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>  
>  	if (free_blks < ovp_blks)
>  		return 0;
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 56927b097e30..d0209ea77dd2 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>  	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>  	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>  	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
> -				sbi->log_blocks_per_seg;
> +	unsigned int threshold =
> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>  	unsigned int global_threshold = threshold * 3 / 2;
>  
>  	if (dents >= threshold || qdata >= threshold ||
> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>  {
>  	int ovp_hole_segs =
>  		(overprovision_segments(sbi) - reserved_segments(sbi));
> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>  	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>  	block_t holes[2] = {0, 0};	/* DATA and NODE */
>  	block_t unusable;
> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>  		if (!f2fs_sb_has_blkzoned(sbi) &&
>  		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>  			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
> -				(end - start) << sbi->log_blocks_per_seg);
> +				SEGS_TO_BLKS(sbi, end - start));
>  			continue;
>  		}
>  next:
> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>  	atomic_set(&dcc->queued_discard, 0);
>  	atomic_set(&dcc->discard_cmd_cnt, 0);
>  	dcc->nr_discards = 0;
> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>  	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>  	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>  	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>  #endif
>  
>  	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>  	sit_i->written_valid_blocks = 0;
>  	sit_i->bitmap_size = sit_bitmap_size;
>  	sit_i->dirty_sentries = 0;
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index 9fe5ec619456..e72b02b67087 100644
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>  #define TOTAL_SEGS(sbi)							\
>  	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>  		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>  
>  #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>  #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>  					(sbi)->log_blocks_per_seg))
>  
>  #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>  
>  #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>  	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>  
>  #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>  #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>  #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>  	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>  
> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>  	if (type == DATA)
>  		return BLKS_PER_SEG(sbi);
>  	else if (type == NODE)
> -		return 8 * BLKS_PER_SEG(sbi);
> +		return SEGS_TO_BLKS(sbi, 8);
>  	else if (type == META)
>  		return 8 * BIO_MAX_VECS;
>  	else
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 9976f2b0393c..bb056700b459 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>  	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>  	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>  	sbi->total_sections = le32_to_cpu(raw_super->section_count);
> -	sbi->total_node_count =
> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> +			NAT_ENTRY_PER_BLOCK));
>  	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>  	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>  	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>  			if (i == 0) {
>  				FDEV(i).start_blk = 0;
>  				FDEV(i).end_blk = FDEV(i).start_blk +
> -				    (FDEV(i).total_segments <<
> -				    sbi->log_blocks_per_seg) - 1 +
> -				    le32_to_cpu(raw_super->segment0_blkaddr);
> +					SEGS_TO_BLKS(sbi,
> +					FDEV(i).total_segments) - 1 +
> +					le32_to_cpu(raw_super->segment0_blkaddr);
>  			} else {
>  				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>  				FDEV(i).end_blk = FDEV(i).start_blk +
> -					(FDEV(i).total_segments <<
> -					sbi->log_blocks_per_seg) - 1;
> +						SEGS_TO_BLKS(sbi,
> +						FDEV(i).total_segments) - 1;
>  				FDEV(i).bdev_handle = bdev_open_by_path(
>  					FDEV(i).path, mode, sbi->sb, NULL);
>  			}
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index 2689cc9c3bf8..ceac3bfc5e2c 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>  		spin_lock(&sbi->stat_lock);
>  		if (t > (unsigned long)(sbi->user_block_count -
>  				F2FS_OPTION(sbi).root_reserved_blocks -
> -				(SM_I(sbi)->additional_reserved_segments <<
> -					sbi->log_blocks_per_seg))) {
> +				SEGS_TO_BLKS(sbi,
> +				SM_I(sbi)->additional_reserved_segments))) {
>  			spin_unlock(&sbi->stat_lock);
>  			return -EINVAL;
>  		}
> -- 
> 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-02-23 18:17   ` [f2fs-dev] " Jaegeuk Kim
@ 2024-02-25  6:29     ` Chao Yu
  -1 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-02-25  6:29 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-f2fs-devel, linux-kernel

On 2024/2/24 2:17, Jaegeuk Kim wrote:
> Chao,
> 
> I applied the below as well in order to keep zone capacity back.

Jaegeuk, copied, thanks.

Thanks,

> 
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -101,11 +101,10 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>          NULL_SEGNO : GET_L2R_SEGNO(FREE_I(sbi),                 \
>                  GET_SEGNO_FROM_SEG0(sbi, blk_addr)))
>   #define CAP_BLKS_PER_SEC(sbi)                                  \
> -       (SEGS_PER_SEC(sbi) * BLKS_PER_SEG(sbi) -                \
> -        (sbi)->unusable_blocks_per_sec)
> +       (BLKS_PER_SEC(sbi) - (sbi)->unusable_blocks_per_sec)
>   #define CAP_SEGS_PER_SEC(sbi)                                  \
> -       (SEGS_PER_SEC(sbi) - ((sbi)->unusable_blocks_per_sec >> \
> -       (sbi)->log_blocks_per_seg))
> +       (SEGS_PER_SEC(sbi) -                                    \
> +       BLKS_TO_SEGS(sbi, (sbi)->unusable_blocks_per_sec)
>   #define GET_SEC_FROM_SEG(sbi, segno)                           \
>          (((segno) == -1) ? -1 : (segno) / SEGS_PER_SEC(sbi))
>   #define GET_SEG_FROM_SEC(sbi, secno)                           \
> 
> 
> On 02/21, Chao Yu wrote:
>> Just cleanup, no functional change.
>>
>> Signed-off-by: Chao Yu <chao@kernel.org>
>> ---
>>   fs/f2fs/debug.c   |  7 +++----
>>   fs/f2fs/f2fs.h    | 14 ++++++++------
>>   fs/f2fs/gc.c      | 10 +++++-----
>>   fs/f2fs/gc.h      |  4 ++--
>>   fs/f2fs/segment.c | 12 ++++++------
>>   fs/f2fs/segment.h |  8 ++++----
>>   fs/f2fs/super.c   | 16 ++++++++--------
>>   fs/f2fs/sysfs.c   |  4 ++--
>>   8 files changed, 38 insertions(+), 37 deletions(-)
>>
>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>> index 6617195bd27e..12893477f2e4 100644
>> --- a/fs/f2fs/debug.c
>> +++ b/fs/f2fs/debug.c
>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>   	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>   	spin_unlock(&sbi->cprc_info.stat_lock);
>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>   	si->rsvd_segs = reserved_segments(sbi);
>>   	si->overp_segs = overprovision_segments(sbi);
>>   	si->valid_count = valid_user_blocks(sbi);
>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>   	si->io_skip_bggc = sbi->io_skip_bggc;
>>   	si->other_skip_bggc = sbi->other_skip_bggc;
>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>> -	si->util_valid = (int)(written_block_count(sbi) >>
>> -						sbi->log_blocks_per_seg)
>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>>   	si->util_invalid = 50 - si->util_free - si->util_valid;
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>> index dad2774ca72f..8a6fd4352a0e 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>   };
>>   
>>   /* Definitions to access f2fs_sb_info */
>> -#define BLKS_PER_SEG(sbi)					\
>> -	((sbi)->blocks_per_seg)
>> -#define BLKS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>> -#define SEGS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec)
>> +#define SEGS_TO_BLKS(sbi, segs)					\
>> +		((segs) << (sbi)->log_blocks_per_seg)
>> +#define BLKS_TO_SEGS(sbi, blks)					\
>> +		((blks) >> (sbi)->log_blocks_per_seg)
>> +
>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>   
>>   __printf(3, 4)
>>   void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>> index 3ff126316d42..6d160d50e14e 100644
>> --- a/fs/f2fs/gc.c
>> +++ b/fs/f2fs/gc.c
>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>   
>>   	/* LFS */
>>   	if (p->gc_mode == GC_GREEDY)
>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>   	else if (p->gc_mode == GC_CB)
>>   		return UINT_MAX;
>>   	else if (p->gc_mode == GC_AT)
>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>   	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>   	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>   
>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>   
>>   	/* Handle if the system time has changed by the user */
>>   	if (mtime < sit_i->min_mtime)
>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>   	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>   	raw_sb->block_count = cpu_to_le64(block_count +
>> -			(long long)(segs << sbi->log_blocks_per_seg));
>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>   	if (f2fs_is_multi_device(sbi)) {
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		int dev_segs =
>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>   {
>>   	int segs = secs * SEGS_PER_SEC(sbi);
>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>   	long long user_block_count =
>>   				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>   
>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		__u64 last_segs = FDEV(last_dev).total_segments;
>>   
>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>   								old_block_count)
>>   			return -EINVAL;
>>   	}
>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>> index e4a75aa4160f..6a2419ddc7c6 100644
>> --- a/fs/f2fs/gc.h
>> +++ b/fs/f2fs/gc.h
>> @@ -70,7 +70,7 @@ struct victim_entry {
>>   
>>   static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>   {
>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>   }
>>   
>>   static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>   	block_t free_blks, ovp_blks;
>>   
>>   	free_blks = free_segs_blk_count(sbi);
>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>   
>>   	if (free_blks < ovp_blks)
>>   		return 0;
>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>> index 56927b097e30..d0209ea77dd2 100644
>> --- a/fs/f2fs/segment.c
>> +++ b/fs/f2fs/segment.c
>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>   	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>   	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>   	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>> -				sbi->log_blocks_per_seg;
>> +	unsigned int threshold =
>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>   	unsigned int global_threshold = threshold * 3 / 2;
>>   
>>   	if (dents >= threshold || qdata >= threshold ||
>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>   {
>>   	int ovp_hole_segs =
>>   		(overprovision_segments(sbi) - reserved_segments(sbi));
>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>   	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>   	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>   	block_t unusable;
>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>   		if (!f2fs_sb_has_blkzoned(sbi) &&
>>   		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>   			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>> -				(end - start) << sbi->log_blocks_per_seg);
>> +				SEGS_TO_BLKS(sbi, end - start));
>>   			continue;
>>   		}
>>   next:
>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>   	atomic_set(&dcc->queued_discard, 0);
>>   	atomic_set(&dcc->discard_cmd_cnt, 0);
>>   	dcc->nr_discards = 0;
>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>   	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>   	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>   	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>   #endif
>>   
>>   	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>   	sit_i->written_valid_blocks = 0;
>>   	sit_i->bitmap_size = sit_bitmap_size;
>>   	sit_i->dirty_sentries = 0;
>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>> index 9fe5ec619456..e72b02b67087 100644
>> --- a/fs/f2fs/segment.h
>> +++ b/fs/f2fs/segment.h
>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>   #define TOTAL_SEGS(sbi)							\
>>   	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>   		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>   
>>   #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>   #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>   					(sbi)->log_blocks_per_seg))
>>   
>>   #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>   
>>   #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>   	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>   
>>   #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>   #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>   #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>   	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>   
>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>   	if (type == DATA)
>>   		return BLKS_PER_SEG(sbi);
>>   	else if (type == NODE)
>> -		return 8 * BLKS_PER_SEG(sbi);
>> +		return SEGS_TO_BLKS(sbi, 8);
>>   	else if (type == META)
>>   		return 8 * BIO_MAX_VECS;
>>   	else
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index 9976f2b0393c..bb056700b459 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>   	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>   	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>   	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>> -	sbi->total_node_count =
>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> +			NAT_ENTRY_PER_BLOCK));
>>   	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>   	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>   	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>   			if (i == 0) {
>>   				FDEV(i).start_blk = 0;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -				    (FDEV(i).total_segments <<
>> -				    sbi->log_blocks_per_seg) - 1 +
>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>> +					SEGS_TO_BLKS(sbi,
>> +					FDEV(i).total_segments) - 1 +
>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>   			} else {
>>   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -					(FDEV(i).total_segments <<
>> -					sbi->log_blocks_per_seg) - 1;
>> +						SEGS_TO_BLKS(sbi,
>> +						FDEV(i).total_segments) - 1;
>>   				FDEV(i).bdev_handle = bdev_open_by_path(
>>   					FDEV(i).path, mode, sbi->sb, NULL);
>>   			}
>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>> --- a/fs/f2fs/sysfs.c
>> +++ b/fs/f2fs/sysfs.c
>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>   		spin_lock(&sbi->stat_lock);
>>   		if (t > (unsigned long)(sbi->user_block_count -
>>   				F2FS_OPTION(sbi).root_reserved_blocks -
>> -				(SM_I(sbi)->additional_reserved_segments <<
>> -					sbi->log_blocks_per_seg))) {
>> +				SEGS_TO_BLKS(sbi,
>> +				SM_I(sbi)->additional_reserved_segments))) {
>>   			spin_unlock(&sbi->stat_lock);
>>   			return -EINVAL;
>>   		}
>> -- 
>> 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-25  6:29     ` Chao Yu
  0 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-02-25  6:29 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel

On 2024/2/24 2:17, Jaegeuk Kim wrote:
> Chao,
> 
> I applied the below as well in order to keep zone capacity back.

Jaegeuk, copied, thanks.

Thanks,

> 
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -101,11 +101,10 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>          NULL_SEGNO : GET_L2R_SEGNO(FREE_I(sbi),                 \
>                  GET_SEGNO_FROM_SEG0(sbi, blk_addr)))
>   #define CAP_BLKS_PER_SEC(sbi)                                  \
> -       (SEGS_PER_SEC(sbi) * BLKS_PER_SEG(sbi) -                \
> -        (sbi)->unusable_blocks_per_sec)
> +       (BLKS_PER_SEC(sbi) - (sbi)->unusable_blocks_per_sec)
>   #define CAP_SEGS_PER_SEC(sbi)                                  \
> -       (SEGS_PER_SEC(sbi) - ((sbi)->unusable_blocks_per_sec >> \
> -       (sbi)->log_blocks_per_seg))
> +       (SEGS_PER_SEC(sbi) -                                    \
> +       BLKS_TO_SEGS(sbi, (sbi)->unusable_blocks_per_sec)
>   #define GET_SEC_FROM_SEG(sbi, segno)                           \
>          (((segno) == -1) ? -1 : (segno) / SEGS_PER_SEC(sbi))
>   #define GET_SEG_FROM_SEC(sbi, secno)                           \
> 
> 
> On 02/21, Chao Yu wrote:
>> Just cleanup, no functional change.
>>
>> Signed-off-by: Chao Yu <chao@kernel.org>
>> ---
>>   fs/f2fs/debug.c   |  7 +++----
>>   fs/f2fs/f2fs.h    | 14 ++++++++------
>>   fs/f2fs/gc.c      | 10 +++++-----
>>   fs/f2fs/gc.h      |  4 ++--
>>   fs/f2fs/segment.c | 12 ++++++------
>>   fs/f2fs/segment.h |  8 ++++----
>>   fs/f2fs/super.c   | 16 ++++++++--------
>>   fs/f2fs/sysfs.c   |  4 ++--
>>   8 files changed, 38 insertions(+), 37 deletions(-)
>>
>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>> index 6617195bd27e..12893477f2e4 100644
>> --- a/fs/f2fs/debug.c
>> +++ b/fs/f2fs/debug.c
>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>   	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>   	spin_unlock(&sbi->cprc_info.stat_lock);
>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>   	si->rsvd_segs = reserved_segments(sbi);
>>   	si->overp_segs = overprovision_segments(sbi);
>>   	si->valid_count = valid_user_blocks(sbi);
>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>   	si->io_skip_bggc = sbi->io_skip_bggc;
>>   	si->other_skip_bggc = sbi->other_skip_bggc;
>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>> -	si->util_valid = (int)(written_block_count(sbi) >>
>> -						sbi->log_blocks_per_seg)
>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>>   	si->util_invalid = 50 - si->util_free - si->util_valid;
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>> index dad2774ca72f..8a6fd4352a0e 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>   };
>>   
>>   /* Definitions to access f2fs_sb_info */
>> -#define BLKS_PER_SEG(sbi)					\
>> -	((sbi)->blocks_per_seg)
>> -#define BLKS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>> -#define SEGS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec)
>> +#define SEGS_TO_BLKS(sbi, segs)					\
>> +		((segs) << (sbi)->log_blocks_per_seg)
>> +#define BLKS_TO_SEGS(sbi, blks)					\
>> +		((blks) >> (sbi)->log_blocks_per_seg)
>> +
>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>   
>>   __printf(3, 4)
>>   void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>> index 3ff126316d42..6d160d50e14e 100644
>> --- a/fs/f2fs/gc.c
>> +++ b/fs/f2fs/gc.c
>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>   
>>   	/* LFS */
>>   	if (p->gc_mode == GC_GREEDY)
>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>   	else if (p->gc_mode == GC_CB)
>>   		return UINT_MAX;
>>   	else if (p->gc_mode == GC_AT)
>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>   	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>   	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>   
>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>   
>>   	/* Handle if the system time has changed by the user */
>>   	if (mtime < sit_i->min_mtime)
>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>   	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>   	raw_sb->block_count = cpu_to_le64(block_count +
>> -			(long long)(segs << sbi->log_blocks_per_seg));
>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>   	if (f2fs_is_multi_device(sbi)) {
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		int dev_segs =
>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>   {
>>   	int segs = secs * SEGS_PER_SEC(sbi);
>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>   	long long user_block_count =
>>   				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>   
>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		__u64 last_segs = FDEV(last_dev).total_segments;
>>   
>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>   								old_block_count)
>>   			return -EINVAL;
>>   	}
>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>> index e4a75aa4160f..6a2419ddc7c6 100644
>> --- a/fs/f2fs/gc.h
>> +++ b/fs/f2fs/gc.h
>> @@ -70,7 +70,7 @@ struct victim_entry {
>>   
>>   static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>   {
>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>   }
>>   
>>   static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>   	block_t free_blks, ovp_blks;
>>   
>>   	free_blks = free_segs_blk_count(sbi);
>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>   
>>   	if (free_blks < ovp_blks)
>>   		return 0;
>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>> index 56927b097e30..d0209ea77dd2 100644
>> --- a/fs/f2fs/segment.c
>> +++ b/fs/f2fs/segment.c
>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>   	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>   	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>   	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>> -				sbi->log_blocks_per_seg;
>> +	unsigned int threshold =
>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>   	unsigned int global_threshold = threshold * 3 / 2;
>>   
>>   	if (dents >= threshold || qdata >= threshold ||
>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>   {
>>   	int ovp_hole_segs =
>>   		(overprovision_segments(sbi) - reserved_segments(sbi));
>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>   	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>   	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>   	block_t unusable;
>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>   		if (!f2fs_sb_has_blkzoned(sbi) &&
>>   		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>   			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>> -				(end - start) << sbi->log_blocks_per_seg);
>> +				SEGS_TO_BLKS(sbi, end - start));
>>   			continue;
>>   		}
>>   next:
>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>   	atomic_set(&dcc->queued_discard, 0);
>>   	atomic_set(&dcc->discard_cmd_cnt, 0);
>>   	dcc->nr_discards = 0;
>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>   	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>   	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>   	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>   #endif
>>   
>>   	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>   	sit_i->written_valid_blocks = 0;
>>   	sit_i->bitmap_size = sit_bitmap_size;
>>   	sit_i->dirty_sentries = 0;
>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>> index 9fe5ec619456..e72b02b67087 100644
>> --- a/fs/f2fs/segment.h
>> +++ b/fs/f2fs/segment.h
>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>   #define TOTAL_SEGS(sbi)							\
>>   	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>   		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>   
>>   #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>   #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>   					(sbi)->log_blocks_per_seg))
>>   
>>   #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>   
>>   #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>   	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>   
>>   #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>   #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>   #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>   	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>   
>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>   	if (type == DATA)
>>   		return BLKS_PER_SEG(sbi);
>>   	else if (type == NODE)
>> -		return 8 * BLKS_PER_SEG(sbi);
>> +		return SEGS_TO_BLKS(sbi, 8);
>>   	else if (type == META)
>>   		return 8 * BIO_MAX_VECS;
>>   	else
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index 9976f2b0393c..bb056700b459 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>   	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>   	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>   	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>> -	sbi->total_node_count =
>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> +			NAT_ENTRY_PER_BLOCK));
>>   	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>   	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>   	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>   			if (i == 0) {
>>   				FDEV(i).start_blk = 0;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -				    (FDEV(i).total_segments <<
>> -				    sbi->log_blocks_per_seg) - 1 +
>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>> +					SEGS_TO_BLKS(sbi,
>> +					FDEV(i).total_segments) - 1 +
>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>   			} else {
>>   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -					(FDEV(i).total_segments <<
>> -					sbi->log_blocks_per_seg) - 1;
>> +						SEGS_TO_BLKS(sbi,
>> +						FDEV(i).total_segments) - 1;
>>   				FDEV(i).bdev_handle = bdev_open_by_path(
>>   					FDEV(i).path, mode, sbi->sb, NULL);
>>   			}
>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>> --- a/fs/f2fs/sysfs.c
>> +++ b/fs/f2fs/sysfs.c
>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>   		spin_lock(&sbi->stat_lock);
>>   		if (t > (unsigned long)(sbi->user_block_count -
>>   				F2FS_OPTION(sbi).root_reserved_blocks -
>> -				(SM_I(sbi)->additional_reserved_segments <<
>> -					sbi->log_blocks_per_seg))) {
>> +				SEGS_TO_BLKS(sbi,
>> +				SM_I(sbi)->additional_reserved_segments))) {
>>   			spin_unlock(&sbi->stat_lock);
>>   			return -EINVAL;
>>   		}
>> -- 
>> 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-02-21  9:20 ` Chao Yu
@ 2024-02-27 17:47   ` Jaegeuk Kim
  -1 siblings, 0 replies; 22+ messages in thread
From: Jaegeuk Kim @ 2024-02-27 17:47 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel

On 02/21, Chao Yu wrote:
> Just cleanup, no functional change.
> 
> Signed-off-by: Chao Yu <chao@kernel.org>
> ---
>  fs/f2fs/debug.c   |  7 +++----
>  fs/f2fs/f2fs.h    | 14 ++++++++------
>  fs/f2fs/gc.c      | 10 +++++-----
>  fs/f2fs/gc.h      |  4 ++--
>  fs/f2fs/segment.c | 12 ++++++------
>  fs/f2fs/segment.h |  8 ++++----
>  fs/f2fs/super.c   | 16 ++++++++--------
>  fs/f2fs/sysfs.c   |  4 ++--
>  8 files changed, 38 insertions(+), 37 deletions(-)
> 
> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> index 6617195bd27e..12893477f2e4 100644
> --- a/fs/f2fs/debug.c
> +++ b/fs/f2fs/debug.c
> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>  	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>  	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>  	spin_unlock(&sbi->cprc_info.stat_lock);
> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>  	si->rsvd_segs = reserved_segments(sbi);
>  	si->overp_segs = overprovision_segments(sbi);
>  	si->valid_count = valid_user_blocks(sbi);
> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>  	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>  	si->io_skip_bggc = sbi->io_skip_bggc;
>  	si->other_skip_bggc = sbi->other_skip_bggc;
> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>  		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>  		/ 2;
> -	si->util_valid = (int)(written_block_count(sbi) >>
> -						sbi->log_blocks_per_seg)
> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>  		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>  		/ 2;
>  	si->util_invalid = 50 - si->util_free - si->util_valid;
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index dad2774ca72f..8a6fd4352a0e 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>  };
>  
>  /* Definitions to access f2fs_sb_info */
> -#define BLKS_PER_SEG(sbi)					\
> -	((sbi)->blocks_per_seg)
> -#define BLKS_PER_SEC(sbi)					\
> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
> -#define SEGS_PER_SEC(sbi)					\
> -	((sbi)->segs_per_sec)
> +#define SEGS_TO_BLKS(sbi, segs)					\
> +		((segs) << (sbi)->log_blocks_per_seg)


I also applied this.

 /* Definitions to access f2fs_sb_info */
 #define SEGS_TO_BLKS(sbi, segs)                                        \
-               ((segs) << (sbi)->log_blocks_per_seg)
+               (((long long)segs) << (sbi)->log_blocks_per_seg)
 #define BLKS_TO_SEGS(sbi, blks)                                        \
                ((blks) >> (sbi)->log_blocks_per_seg)

> +#define BLKS_TO_SEGS(sbi, blks)					\
> +		((blks) >> (sbi)->log_blocks_per_seg)
> +
> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>  
>  __printf(3, 4)
>  void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> index 3ff126316d42..6d160d50e14e 100644
> --- a/fs/f2fs/gc.c
> +++ b/fs/f2fs/gc.c
> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>  
>  	/* LFS */
>  	if (p->gc_mode == GC_GREEDY)
> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>  	else if (p->gc_mode == GC_CB)
>  		return UINT_MAX;
>  	else if (p->gc_mode == GC_AT)
> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>  	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>  	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>  
> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>  
>  	/* Handle if the system time has changed by the user */
>  	if (mtime < sit_i->min_mtime)
> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>  	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>  	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>  	raw_sb->block_count = cpu_to_le64(block_count +
> -			(long long)(segs << sbi->log_blocks_per_seg));
> +			(long long)SEGS_TO_BLKS(sbi, segs));
>  	if (f2fs_is_multi_device(sbi)) {
>  		int last_dev = sbi->s_ndevs - 1;
>  		int dev_segs =
> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>  static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>  {
>  	int segs = secs * SEGS_PER_SEC(sbi);
> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>  	long long user_block_count =
>  				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>  
> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>  		int last_dev = sbi->s_ndevs - 1;
>  		__u64 last_segs = FDEV(last_dev).total_segments;
>  
> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>  								old_block_count)
>  			return -EINVAL;
>  	}
> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
> index e4a75aa4160f..6a2419ddc7c6 100644
> --- a/fs/f2fs/gc.h
> +++ b/fs/f2fs/gc.h
> @@ -70,7 +70,7 @@ struct victim_entry {
>  
>  static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>  {
> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>  }
>  
>  static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>  	block_t free_blks, ovp_blks;
>  
>  	free_blks = free_segs_blk_count(sbi);
> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>  
>  	if (free_blks < ovp_blks)
>  		return 0;
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 56927b097e30..d0209ea77dd2 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>  	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>  	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>  	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
> -				sbi->log_blocks_per_seg;
> +	unsigned int threshold =
> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>  	unsigned int global_threshold = threshold * 3 / 2;
>  
>  	if (dents >= threshold || qdata >= threshold ||
> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>  {
>  	int ovp_hole_segs =
>  		(overprovision_segments(sbi) - reserved_segments(sbi));
> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>  	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>  	block_t holes[2] = {0, 0};	/* DATA and NODE */
>  	block_t unusable;
> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>  		if (!f2fs_sb_has_blkzoned(sbi) &&
>  		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>  			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
> -				(end - start) << sbi->log_blocks_per_seg);
> +				SEGS_TO_BLKS(sbi, end - start));
>  			continue;
>  		}
>  next:
> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>  	atomic_set(&dcc->queued_discard, 0);
>  	atomic_set(&dcc->discard_cmd_cnt, 0);
>  	dcc->nr_discards = 0;
> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>  	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>  	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>  	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>  #endif
>  
>  	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>  	sit_i->written_valid_blocks = 0;
>  	sit_i->bitmap_size = sit_bitmap_size;
>  	sit_i->dirty_sentries = 0;
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index 9fe5ec619456..e72b02b67087 100644
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>  #define TOTAL_SEGS(sbi)							\
>  	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>  		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>  
>  #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>  #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>  					(sbi)->log_blocks_per_seg))
>  
>  #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>  
>  #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>  	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>  
>  #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>  #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>  #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>  	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>  
> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>  	if (type == DATA)
>  		return BLKS_PER_SEG(sbi);
>  	else if (type == NODE)
> -		return 8 * BLKS_PER_SEG(sbi);
> +		return SEGS_TO_BLKS(sbi, 8);
>  	else if (type == META)
>  		return 8 * BIO_MAX_VECS;
>  	else
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 9976f2b0393c..bb056700b459 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>  	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>  	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>  	sbi->total_sections = le32_to_cpu(raw_super->section_count);
> -	sbi->total_node_count =
> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> +			NAT_ENTRY_PER_BLOCK));
>  	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>  	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>  	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>  			if (i == 0) {
>  				FDEV(i).start_blk = 0;
>  				FDEV(i).end_blk = FDEV(i).start_blk +
> -				    (FDEV(i).total_segments <<
> -				    sbi->log_blocks_per_seg) - 1 +
> -				    le32_to_cpu(raw_super->segment0_blkaddr);
> +					SEGS_TO_BLKS(sbi,
> +					FDEV(i).total_segments) - 1 +
> +					le32_to_cpu(raw_super->segment0_blkaddr);
>  			} else {
>  				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>  				FDEV(i).end_blk = FDEV(i).start_blk +
> -					(FDEV(i).total_segments <<
> -					sbi->log_blocks_per_seg) - 1;
> +						SEGS_TO_BLKS(sbi,
> +						FDEV(i).total_segments) - 1;
>  				FDEV(i).bdev_handle = bdev_open_by_path(
>  					FDEV(i).path, mode, sbi->sb, NULL);
>  			}
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index 2689cc9c3bf8..ceac3bfc5e2c 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>  		spin_lock(&sbi->stat_lock);
>  		if (t > (unsigned long)(sbi->user_block_count -
>  				F2FS_OPTION(sbi).root_reserved_blocks -
> -				(SM_I(sbi)->additional_reserved_segments <<
> -					sbi->log_blocks_per_seg))) {
> +				SEGS_TO_BLKS(sbi,
> +				SM_I(sbi)->additional_reserved_segments))) {
>  			spin_unlock(&sbi->stat_lock);
>  			return -EINVAL;
>  		}
> -- 
> 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-27 17:47   ` Jaegeuk Kim
  0 siblings, 0 replies; 22+ messages in thread
From: Jaegeuk Kim @ 2024-02-27 17:47 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-kernel, linux-f2fs-devel

On 02/21, Chao Yu wrote:
> Just cleanup, no functional change.
> 
> Signed-off-by: Chao Yu <chao@kernel.org>
> ---
>  fs/f2fs/debug.c   |  7 +++----
>  fs/f2fs/f2fs.h    | 14 ++++++++------
>  fs/f2fs/gc.c      | 10 +++++-----
>  fs/f2fs/gc.h      |  4 ++--
>  fs/f2fs/segment.c | 12 ++++++------
>  fs/f2fs/segment.h |  8 ++++----
>  fs/f2fs/super.c   | 16 ++++++++--------
>  fs/f2fs/sysfs.c   |  4 ++--
>  8 files changed, 38 insertions(+), 37 deletions(-)
> 
> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> index 6617195bd27e..12893477f2e4 100644
> --- a/fs/f2fs/debug.c
> +++ b/fs/f2fs/debug.c
> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>  	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>  	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>  	spin_unlock(&sbi->cprc_info.stat_lock);
> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>  	si->rsvd_segs = reserved_segments(sbi);
>  	si->overp_segs = overprovision_segments(sbi);
>  	si->valid_count = valid_user_blocks(sbi);
> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>  	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>  	si->io_skip_bggc = sbi->io_skip_bggc;
>  	si->other_skip_bggc = sbi->other_skip_bggc;
> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>  		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>  		/ 2;
> -	si->util_valid = (int)(written_block_count(sbi) >>
> -						sbi->log_blocks_per_seg)
> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>  		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>  		/ 2;
>  	si->util_invalid = 50 - si->util_free - si->util_valid;
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index dad2774ca72f..8a6fd4352a0e 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>  };
>  
>  /* Definitions to access f2fs_sb_info */
> -#define BLKS_PER_SEG(sbi)					\
> -	((sbi)->blocks_per_seg)
> -#define BLKS_PER_SEC(sbi)					\
> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
> -#define SEGS_PER_SEC(sbi)					\
> -	((sbi)->segs_per_sec)
> +#define SEGS_TO_BLKS(sbi, segs)					\
> +		((segs) << (sbi)->log_blocks_per_seg)


I also applied this.

 /* Definitions to access f2fs_sb_info */
 #define SEGS_TO_BLKS(sbi, segs)                                        \
-               ((segs) << (sbi)->log_blocks_per_seg)
+               (((long long)segs) << (sbi)->log_blocks_per_seg)
 #define BLKS_TO_SEGS(sbi, blks)                                        \
                ((blks) >> (sbi)->log_blocks_per_seg)

> +#define BLKS_TO_SEGS(sbi, blks)					\
> +		((blks) >> (sbi)->log_blocks_per_seg)
> +
> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>  
>  __printf(3, 4)
>  void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> index 3ff126316d42..6d160d50e14e 100644
> --- a/fs/f2fs/gc.c
> +++ b/fs/f2fs/gc.c
> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>  
>  	/* LFS */
>  	if (p->gc_mode == GC_GREEDY)
> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>  	else if (p->gc_mode == GC_CB)
>  		return UINT_MAX;
>  	else if (p->gc_mode == GC_AT)
> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>  	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>  	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>  
> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>  
>  	/* Handle if the system time has changed by the user */
>  	if (mtime < sit_i->min_mtime)
> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>  	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>  	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>  	raw_sb->block_count = cpu_to_le64(block_count +
> -			(long long)(segs << sbi->log_blocks_per_seg));
> +			(long long)SEGS_TO_BLKS(sbi, segs));
>  	if (f2fs_is_multi_device(sbi)) {
>  		int last_dev = sbi->s_ndevs - 1;
>  		int dev_segs =
> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>  static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>  {
>  	int segs = secs * SEGS_PER_SEC(sbi);
> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>  	long long user_block_count =
>  				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>  
> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>  		int last_dev = sbi->s_ndevs - 1;
>  		__u64 last_segs = FDEV(last_dev).total_segments;
>  
> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>  								old_block_count)
>  			return -EINVAL;
>  	}
> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
> index e4a75aa4160f..6a2419ddc7c6 100644
> --- a/fs/f2fs/gc.h
> +++ b/fs/f2fs/gc.h
> @@ -70,7 +70,7 @@ struct victim_entry {
>  
>  static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>  {
> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>  }
>  
>  static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>  	block_t free_blks, ovp_blks;
>  
>  	free_blks = free_segs_blk_count(sbi);
> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>  
>  	if (free_blks < ovp_blks)
>  		return 0;
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 56927b097e30..d0209ea77dd2 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>  	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>  	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>  	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
> -				sbi->log_blocks_per_seg;
> +	unsigned int threshold =
> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>  	unsigned int global_threshold = threshold * 3 / 2;
>  
>  	if (dents >= threshold || qdata >= threshold ||
> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>  {
>  	int ovp_hole_segs =
>  		(overprovision_segments(sbi) - reserved_segments(sbi));
> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>  	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>  	block_t holes[2] = {0, 0};	/* DATA and NODE */
>  	block_t unusable;
> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>  		if (!f2fs_sb_has_blkzoned(sbi) &&
>  		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>  			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
> -				(end - start) << sbi->log_blocks_per_seg);
> +				SEGS_TO_BLKS(sbi, end - start));
>  			continue;
>  		}
>  next:
> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>  	atomic_set(&dcc->queued_discard, 0);
>  	atomic_set(&dcc->discard_cmd_cnt, 0);
>  	dcc->nr_discards = 0;
> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>  	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>  	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>  	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>  #endif
>  
>  	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>  	sit_i->written_valid_blocks = 0;
>  	sit_i->bitmap_size = sit_bitmap_size;
>  	sit_i->dirty_sentries = 0;
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index 9fe5ec619456..e72b02b67087 100644
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>  #define TOTAL_SEGS(sbi)							\
>  	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>  		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>  
>  #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>  #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>  					(sbi)->log_blocks_per_seg))
>  
>  #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>  
>  #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>  	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>  
>  #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>  #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>  #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>  	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>  
> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>  	if (type == DATA)
>  		return BLKS_PER_SEG(sbi);
>  	else if (type == NODE)
> -		return 8 * BLKS_PER_SEG(sbi);
> +		return SEGS_TO_BLKS(sbi, 8);
>  	else if (type == META)
>  		return 8 * BIO_MAX_VECS;
>  	else
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 9976f2b0393c..bb056700b459 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>  	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>  	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>  	sbi->total_sections = le32_to_cpu(raw_super->section_count);
> -	sbi->total_node_count =
> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> +			NAT_ENTRY_PER_BLOCK));
>  	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>  	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>  	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>  			if (i == 0) {
>  				FDEV(i).start_blk = 0;
>  				FDEV(i).end_blk = FDEV(i).start_blk +
> -				    (FDEV(i).total_segments <<
> -				    sbi->log_blocks_per_seg) - 1 +
> -				    le32_to_cpu(raw_super->segment0_blkaddr);
> +					SEGS_TO_BLKS(sbi,
> +					FDEV(i).total_segments) - 1 +
> +					le32_to_cpu(raw_super->segment0_blkaddr);
>  			} else {
>  				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>  				FDEV(i).end_blk = FDEV(i).start_blk +
> -					(FDEV(i).total_segments <<
> -					sbi->log_blocks_per_seg) - 1;
> +						SEGS_TO_BLKS(sbi,
> +						FDEV(i).total_segments) - 1;
>  				FDEV(i).bdev_handle = bdev_open_by_path(
>  					FDEV(i).path, mode, sbi->sb, NULL);
>  			}
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index 2689cc9c3bf8..ceac3bfc5e2c 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>  		spin_lock(&sbi->stat_lock);
>  		if (t > (unsigned long)(sbi->user_block_count -
>  				F2FS_OPTION(sbi).root_reserved_blocks -
> -				(SM_I(sbi)->additional_reserved_segments <<
> -					sbi->log_blocks_per_seg))) {
> +				SEGS_TO_BLKS(sbi,
> +				SM_I(sbi)->additional_reserved_segments))) {
>  			spin_unlock(&sbi->stat_lock);
>  			return -EINVAL;
>  		}
> -- 
> 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-02-27 17:47   ` [f2fs-dev] " Jaegeuk Kim
@ 2024-02-28  1:22     ` Chao Yu
  -1 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-02-28  1:22 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-f2fs-devel, linux-kernel

On 2024/2/28 1:47, Jaegeuk Kim wrote:
> On 02/21, Chao Yu wrote:
>> Just cleanup, no functional change.
>>
>> Signed-off-by: Chao Yu <chao@kernel.org>
>> ---
>>   fs/f2fs/debug.c   |  7 +++----
>>   fs/f2fs/f2fs.h    | 14 ++++++++------
>>   fs/f2fs/gc.c      | 10 +++++-----
>>   fs/f2fs/gc.h      |  4 ++--
>>   fs/f2fs/segment.c | 12 ++++++------
>>   fs/f2fs/segment.h |  8 ++++----
>>   fs/f2fs/super.c   | 16 ++++++++--------
>>   fs/f2fs/sysfs.c   |  4 ++--
>>   8 files changed, 38 insertions(+), 37 deletions(-)
>>
>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>> index 6617195bd27e..12893477f2e4 100644
>> --- a/fs/f2fs/debug.c
>> +++ b/fs/f2fs/debug.c
>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>   	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>   	spin_unlock(&sbi->cprc_info.stat_lock);
>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>   	si->rsvd_segs = reserved_segments(sbi);
>>   	si->overp_segs = overprovision_segments(sbi);
>>   	si->valid_count = valid_user_blocks(sbi);
>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>   	si->io_skip_bggc = sbi->io_skip_bggc;
>>   	si->other_skip_bggc = sbi->other_skip_bggc;
>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>> -	si->util_valid = (int)(written_block_count(sbi) >>
>> -						sbi->log_blocks_per_seg)
>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>>   	si->util_invalid = 50 - si->util_free - si->util_valid;
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>> index dad2774ca72f..8a6fd4352a0e 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>   };
>>   
>>   /* Definitions to access f2fs_sb_info */
>> -#define BLKS_PER_SEG(sbi)					\
>> -	((sbi)->blocks_per_seg)
>> -#define BLKS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>> -#define SEGS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec)
>> +#define SEGS_TO_BLKS(sbi, segs)					\
>> +		((segs) << (sbi)->log_blocks_per_seg)
> 
> 
> I also applied this.
> 
>   /* Definitions to access f2fs_sb_info */
>   #define SEGS_TO_BLKS(sbi, segs)                                        \
> -               ((segs) << (sbi)->log_blocks_per_seg)
> +               (((long long)segs) << (sbi)->log_blocks_per_seg)
>   #define BLKS_TO_SEGS(sbi, blks)                                        \
>                  ((blks) >> (sbi)->log_blocks_per_seg)

Thank you, looks fine.

Thanks,

> 
>> +#define BLKS_TO_SEGS(sbi, blks)					\
>> +		((blks) >> (sbi)->log_blocks_per_seg)
>> +
>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>   
>>   __printf(3, 4)
>>   void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>> index 3ff126316d42..6d160d50e14e 100644
>> --- a/fs/f2fs/gc.c
>> +++ b/fs/f2fs/gc.c
>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>   
>>   	/* LFS */
>>   	if (p->gc_mode == GC_GREEDY)
>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>   	else if (p->gc_mode == GC_CB)
>>   		return UINT_MAX;
>>   	else if (p->gc_mode == GC_AT)
>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>   	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>   	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>   
>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>   
>>   	/* Handle if the system time has changed by the user */
>>   	if (mtime < sit_i->min_mtime)
>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>   	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>   	raw_sb->block_count = cpu_to_le64(block_count +
>> -			(long long)(segs << sbi->log_blocks_per_seg));
>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>   	if (f2fs_is_multi_device(sbi)) {
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		int dev_segs =
>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>   {
>>   	int segs = secs * SEGS_PER_SEC(sbi);
>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>   	long long user_block_count =
>>   				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>   
>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		__u64 last_segs = FDEV(last_dev).total_segments;
>>   
>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>   								old_block_count)
>>   			return -EINVAL;
>>   	}
>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>> index e4a75aa4160f..6a2419ddc7c6 100644
>> --- a/fs/f2fs/gc.h
>> +++ b/fs/f2fs/gc.h
>> @@ -70,7 +70,7 @@ struct victim_entry {
>>   
>>   static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>   {
>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>   }
>>   
>>   static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>   	block_t free_blks, ovp_blks;
>>   
>>   	free_blks = free_segs_blk_count(sbi);
>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>   
>>   	if (free_blks < ovp_blks)
>>   		return 0;
>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>> index 56927b097e30..d0209ea77dd2 100644
>> --- a/fs/f2fs/segment.c
>> +++ b/fs/f2fs/segment.c
>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>   	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>   	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>   	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>> -				sbi->log_blocks_per_seg;
>> +	unsigned int threshold =
>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>   	unsigned int global_threshold = threshold * 3 / 2;
>>   
>>   	if (dents >= threshold || qdata >= threshold ||
>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>   {
>>   	int ovp_hole_segs =
>>   		(overprovision_segments(sbi) - reserved_segments(sbi));
>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>   	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>   	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>   	block_t unusable;
>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>   		if (!f2fs_sb_has_blkzoned(sbi) &&
>>   		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>   			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>> -				(end - start) << sbi->log_blocks_per_seg);
>> +				SEGS_TO_BLKS(sbi, end - start));
>>   			continue;
>>   		}
>>   next:
>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>   	atomic_set(&dcc->queued_discard, 0);
>>   	atomic_set(&dcc->discard_cmd_cnt, 0);
>>   	dcc->nr_discards = 0;
>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>   	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>   	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>   	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>   #endif
>>   
>>   	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>   	sit_i->written_valid_blocks = 0;
>>   	sit_i->bitmap_size = sit_bitmap_size;
>>   	sit_i->dirty_sentries = 0;
>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>> index 9fe5ec619456..e72b02b67087 100644
>> --- a/fs/f2fs/segment.h
>> +++ b/fs/f2fs/segment.h
>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>   #define TOTAL_SEGS(sbi)							\
>>   	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>   		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>   
>>   #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>   #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>   					(sbi)->log_blocks_per_seg))
>>   
>>   #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>   
>>   #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>   	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>   
>>   #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>   #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>   #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>   	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>   
>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>   	if (type == DATA)
>>   		return BLKS_PER_SEG(sbi);
>>   	else if (type == NODE)
>> -		return 8 * BLKS_PER_SEG(sbi);
>> +		return SEGS_TO_BLKS(sbi, 8);
>>   	else if (type == META)
>>   		return 8 * BIO_MAX_VECS;
>>   	else
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index 9976f2b0393c..bb056700b459 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>   	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>   	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>   	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>> -	sbi->total_node_count =
>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> +			NAT_ENTRY_PER_BLOCK));
>>   	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>   	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>   	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>   			if (i == 0) {
>>   				FDEV(i).start_blk = 0;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -				    (FDEV(i).total_segments <<
>> -				    sbi->log_blocks_per_seg) - 1 +
>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>> +					SEGS_TO_BLKS(sbi,
>> +					FDEV(i).total_segments) - 1 +
>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>   			} else {
>>   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -					(FDEV(i).total_segments <<
>> -					sbi->log_blocks_per_seg) - 1;
>> +						SEGS_TO_BLKS(sbi,
>> +						FDEV(i).total_segments) - 1;
>>   				FDEV(i).bdev_handle = bdev_open_by_path(
>>   					FDEV(i).path, mode, sbi->sb, NULL);
>>   			}
>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>> --- a/fs/f2fs/sysfs.c
>> +++ b/fs/f2fs/sysfs.c
>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>   		spin_lock(&sbi->stat_lock);
>>   		if (t > (unsigned long)(sbi->user_block_count -
>>   				F2FS_OPTION(sbi).root_reserved_blocks -
>> -				(SM_I(sbi)->additional_reserved_segments <<
>> -					sbi->log_blocks_per_seg))) {
>> +				SEGS_TO_BLKS(sbi,
>> +				SM_I(sbi)->additional_reserved_segments))) {
>>   			spin_unlock(&sbi->stat_lock);
>>   			return -EINVAL;
>>   		}
>> -- 
>> 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-28  1:22     ` Chao Yu
  0 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-02-28  1:22 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel

On 2024/2/28 1:47, Jaegeuk Kim wrote:
> On 02/21, Chao Yu wrote:
>> Just cleanup, no functional change.
>>
>> Signed-off-by: Chao Yu <chao@kernel.org>
>> ---
>>   fs/f2fs/debug.c   |  7 +++----
>>   fs/f2fs/f2fs.h    | 14 ++++++++------
>>   fs/f2fs/gc.c      | 10 +++++-----
>>   fs/f2fs/gc.h      |  4 ++--
>>   fs/f2fs/segment.c | 12 ++++++------
>>   fs/f2fs/segment.h |  8 ++++----
>>   fs/f2fs/super.c   | 16 ++++++++--------
>>   fs/f2fs/sysfs.c   |  4 ++--
>>   8 files changed, 38 insertions(+), 37 deletions(-)
>>
>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>> index 6617195bd27e..12893477f2e4 100644
>> --- a/fs/f2fs/debug.c
>> +++ b/fs/f2fs/debug.c
>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>   	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>   	spin_unlock(&sbi->cprc_info.stat_lock);
>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>   	si->rsvd_segs = reserved_segments(sbi);
>>   	si->overp_segs = overprovision_segments(sbi);
>>   	si->valid_count = valid_user_blocks(sbi);
>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>   	si->io_skip_bggc = sbi->io_skip_bggc;
>>   	si->other_skip_bggc = sbi->other_skip_bggc;
>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>> -	si->util_valid = (int)(written_block_count(sbi) >>
>> -						sbi->log_blocks_per_seg)
>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>>   	si->util_invalid = 50 - si->util_free - si->util_valid;
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>> index dad2774ca72f..8a6fd4352a0e 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>   };
>>   
>>   /* Definitions to access f2fs_sb_info */
>> -#define BLKS_PER_SEG(sbi)					\
>> -	((sbi)->blocks_per_seg)
>> -#define BLKS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>> -#define SEGS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec)
>> +#define SEGS_TO_BLKS(sbi, segs)					\
>> +		((segs) << (sbi)->log_blocks_per_seg)
> 
> 
> I also applied this.
> 
>   /* Definitions to access f2fs_sb_info */
>   #define SEGS_TO_BLKS(sbi, segs)                                        \
> -               ((segs) << (sbi)->log_blocks_per_seg)
> +               (((long long)segs) << (sbi)->log_blocks_per_seg)
>   #define BLKS_TO_SEGS(sbi, blks)                                        \
>                  ((blks) >> (sbi)->log_blocks_per_seg)

Thank you, looks fine.

Thanks,

> 
>> +#define BLKS_TO_SEGS(sbi, blks)					\
>> +		((blks) >> (sbi)->log_blocks_per_seg)
>> +
>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>   
>>   __printf(3, 4)
>>   void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>> index 3ff126316d42..6d160d50e14e 100644
>> --- a/fs/f2fs/gc.c
>> +++ b/fs/f2fs/gc.c
>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>   
>>   	/* LFS */
>>   	if (p->gc_mode == GC_GREEDY)
>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>   	else if (p->gc_mode == GC_CB)
>>   		return UINT_MAX;
>>   	else if (p->gc_mode == GC_AT)
>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>   	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>   	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>   
>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>   
>>   	/* Handle if the system time has changed by the user */
>>   	if (mtime < sit_i->min_mtime)
>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>   	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>   	raw_sb->block_count = cpu_to_le64(block_count +
>> -			(long long)(segs << sbi->log_blocks_per_seg));
>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>   	if (f2fs_is_multi_device(sbi)) {
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		int dev_segs =
>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>   {
>>   	int segs = secs * SEGS_PER_SEC(sbi);
>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>   	long long user_block_count =
>>   				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>   
>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		__u64 last_segs = FDEV(last_dev).total_segments;
>>   
>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>   								old_block_count)
>>   			return -EINVAL;
>>   	}
>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>> index e4a75aa4160f..6a2419ddc7c6 100644
>> --- a/fs/f2fs/gc.h
>> +++ b/fs/f2fs/gc.h
>> @@ -70,7 +70,7 @@ struct victim_entry {
>>   
>>   static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>   {
>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>   }
>>   
>>   static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>   	block_t free_blks, ovp_blks;
>>   
>>   	free_blks = free_segs_blk_count(sbi);
>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>   
>>   	if (free_blks < ovp_blks)
>>   		return 0;
>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>> index 56927b097e30..d0209ea77dd2 100644
>> --- a/fs/f2fs/segment.c
>> +++ b/fs/f2fs/segment.c
>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>   	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>   	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>   	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>> -				sbi->log_blocks_per_seg;
>> +	unsigned int threshold =
>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>   	unsigned int global_threshold = threshold * 3 / 2;
>>   
>>   	if (dents >= threshold || qdata >= threshold ||
>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>   {
>>   	int ovp_hole_segs =
>>   		(overprovision_segments(sbi) - reserved_segments(sbi));
>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>   	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>   	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>   	block_t unusable;
>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>   		if (!f2fs_sb_has_blkzoned(sbi) &&
>>   		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>   			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>> -				(end - start) << sbi->log_blocks_per_seg);
>> +				SEGS_TO_BLKS(sbi, end - start));
>>   			continue;
>>   		}
>>   next:
>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>   	atomic_set(&dcc->queued_discard, 0);
>>   	atomic_set(&dcc->discard_cmd_cnt, 0);
>>   	dcc->nr_discards = 0;
>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>   	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>   	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>   	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>   #endif
>>   
>>   	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>   	sit_i->written_valid_blocks = 0;
>>   	sit_i->bitmap_size = sit_bitmap_size;
>>   	sit_i->dirty_sentries = 0;
>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>> index 9fe5ec619456..e72b02b67087 100644
>> --- a/fs/f2fs/segment.h
>> +++ b/fs/f2fs/segment.h
>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>   #define TOTAL_SEGS(sbi)							\
>>   	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>   		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>   
>>   #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>   #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>   					(sbi)->log_blocks_per_seg))
>>   
>>   #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>   
>>   #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>   	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>   
>>   #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>   #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>   #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>   	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>   
>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>   	if (type == DATA)
>>   		return BLKS_PER_SEG(sbi);
>>   	else if (type == NODE)
>> -		return 8 * BLKS_PER_SEG(sbi);
>> +		return SEGS_TO_BLKS(sbi, 8);
>>   	else if (type == META)
>>   		return 8 * BIO_MAX_VECS;
>>   	else
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index 9976f2b0393c..bb056700b459 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>   	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>   	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>   	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>> -	sbi->total_node_count =
>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> +			NAT_ENTRY_PER_BLOCK));
>>   	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>   	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>   	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>   			if (i == 0) {
>>   				FDEV(i).start_blk = 0;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -				    (FDEV(i).total_segments <<
>> -				    sbi->log_blocks_per_seg) - 1 +
>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>> +					SEGS_TO_BLKS(sbi,
>> +					FDEV(i).total_segments) - 1 +
>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>   			} else {
>>   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -					(FDEV(i).total_segments <<
>> -					sbi->log_blocks_per_seg) - 1;
>> +						SEGS_TO_BLKS(sbi,
>> +						FDEV(i).total_segments) - 1;
>>   				FDEV(i).bdev_handle = bdev_open_by_path(
>>   					FDEV(i).path, mode, sbi->sb, NULL);
>>   			}
>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>> --- a/fs/f2fs/sysfs.c
>> +++ b/fs/f2fs/sysfs.c
>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>   		spin_lock(&sbi->stat_lock);
>>   		if (t > (unsigned long)(sbi->user_block_count -
>>   				F2FS_OPTION(sbi).root_reserved_blocks -
>> -				(SM_I(sbi)->additional_reserved_segments <<
>> -					sbi->log_blocks_per_seg))) {
>> +				SEGS_TO_BLKS(sbi,
>> +				SM_I(sbi)->additional_reserved_segments))) {
>>   			spin_unlock(&sbi->stat_lock);
>>   			return -EINVAL;
>>   		}
>> -- 
>> 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-02-21  9:20 ` Chao Yu
@ 2024-02-29  8:56   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2024-02-29  8:56 UTC (permalink / raw)
  To: Chao Yu; +Cc: jaegeuk, linux-f2fs-devel, linux-kernel

Hi Chao,

On Wed, Feb 21, 2024 at 10:20 AM Chao Yu <chao@kernel.org> wrote:
> Just cleanup, no functional change.
>
> Signed-off-by: Chao Yu <chao@kernel.org>

Thanks for your patch, which is now commit 5fa6a97d27842dab ("f2fs:
introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup") in next-20240229.

noreply@ellerman.id.au reports several build failures on m68k.
http://kisskb.ellerman.id.au/kisskb/head/f303a3e2bcfba900efb5aee55236d17030e9f882/

E.g. m68k defconfig + CONFIG_F2FS_FS=y:

m68k-linux-gnu-ld: fs/f2fs/file.o: in function
`has_not_enough_free_secs.constprop.0':
file.c:(.text+0x19ee): undefined reference to `__moddi3'
m68k-linux-gnu-ld: file.c:(.text+0x1a22): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/file.o: in function `f2fs_ioc_defragment':
file.c:(.text+0x205a): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/inode.o: in function `f2fs_write_inode':
inode.c:(.text+0x1692): undefined reference to `__moddi3'
m68k-linux-gnu-ld: inode.c:(.text+0x16c0): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/namei.o: in function `f2fs_is_checkpoint_ready':
namei.c:(.text+0xa64): undefined reference to `__moddi3'
m68k-linux-gnu-ld: namei.c:(.text+0xa98): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/gc.o: in function
`has_not_enough_free_secs.constprop.0':
gc.c:(.text+0xe28): undefined reference to `__moddi3'
m68k-linux-gnu-ld: gc.c:(.text+0xe5c): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/gc.o: in function `f2fs_gc':
gc.c:(.text+0x2f2c): undefined reference to `__divdi3'
m68k-linux-gnu-ld: gc.c:(.text+0x2f58): undefined reference to `__divdi3'
m68k-linux-gnu-ld: gc.c:(.text+0x2f66): undefined reference to `__moddi3'
m68k-linux-gnu-ld: gc.c:(.text+0x2f96): undefined reference to `__moddi3'
m68k-linux-gnu-ld: fs/f2fs/data.o: in function
`has_not_enough_free_secs.constprop.0':
data.c:(.text+0xde8): undefined reference to `__moddi3'
m68k-linux-gnu-ld: data.c:(.text+0xe1c): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/segment.o: in function
`has_not_enough_free_secs.constprop.0':
segment.c:(.text+0x16ee): undefined reference to `__moddi3'
m68k-linux-gnu-ld: segment.c:(.text+0x1722): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/xattr.o: in function `f2fs_setxattr':
xattr.c:(.text+0xf5e): undefined reference to `__moddi3'
m68k-linux-gnu-ld: xattr.c:(.text+0xf8c): undefined reference to `__divdi3'

Other 32-bit architectures are affected, too, e.g. arm/shmobile_defconfig
+ CONFIG_F2FS_FS=y:

arm-linux-gnueabihf-ld: fs/f2fs/file.o: in function
`has_not_enough_free_secs.constprop.0':
file.c:(.text+0x1d40): undefined reference to `__aeabi_ldivmod'
arm-linux-gnueabihf-ld: file.c:(.text+0x1d5c): undefined reference to
`__aeabi_ldivmod'
arm-linux-gnueabihf-ld: fs/f2fs/file.o: in function `f2fs_defragment_range':
file.c:(.text+0x2018): undefined reference to `__aeabi_ldivmod'
arm-linux-gnueabihf-ld: fs/f2fs/inode.o: in function `f2fs_write_inode':
inode.c:(.text+0x19d4): undefined reference to `__aeabi_ldivmod'
arm-linux-gnueabihf-ld: inode.c:(.text+0x19f0): undefined reference to
`__aeabi_ldivmod'
arm-linux-gnueabihf-ld: fs/f2fs/namei.o:namei.c:(.text+0x12bc): more
undefined references to `__aeabi_ldivmod' follow

Manually reverting 5fa6a97d27842dab fixes the issue.

64-bit divisions (iff needed at all) must not be open-coded, but use
the helpers from <linux/math64.h> instead.

Gr{oetje,eeting}s,

                        Geert


--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-29  8:56   ` Geert Uytterhoeven
  0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2024-02-29  8:56 UTC (permalink / raw)
  To: Chao Yu; +Cc: jaegeuk, linux-kernel, linux-f2fs-devel

Hi Chao,

On Wed, Feb 21, 2024 at 10:20 AM Chao Yu <chao@kernel.org> wrote:
> Just cleanup, no functional change.
>
> Signed-off-by: Chao Yu <chao@kernel.org>

Thanks for your patch, which is now commit 5fa6a97d27842dab ("f2fs:
introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup") in next-20240229.

noreply@ellerman.id.au reports several build failures on m68k.
http://kisskb.ellerman.id.au/kisskb/head/f303a3e2bcfba900efb5aee55236d17030e9f882/

E.g. m68k defconfig + CONFIG_F2FS_FS=y:

m68k-linux-gnu-ld: fs/f2fs/file.o: in function
`has_not_enough_free_secs.constprop.0':
file.c:(.text+0x19ee): undefined reference to `__moddi3'
m68k-linux-gnu-ld: file.c:(.text+0x1a22): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/file.o: in function `f2fs_ioc_defragment':
file.c:(.text+0x205a): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/inode.o: in function `f2fs_write_inode':
inode.c:(.text+0x1692): undefined reference to `__moddi3'
m68k-linux-gnu-ld: inode.c:(.text+0x16c0): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/namei.o: in function `f2fs_is_checkpoint_ready':
namei.c:(.text+0xa64): undefined reference to `__moddi3'
m68k-linux-gnu-ld: namei.c:(.text+0xa98): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/gc.o: in function
`has_not_enough_free_secs.constprop.0':
gc.c:(.text+0xe28): undefined reference to `__moddi3'
m68k-linux-gnu-ld: gc.c:(.text+0xe5c): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/gc.o: in function `f2fs_gc':
gc.c:(.text+0x2f2c): undefined reference to `__divdi3'
m68k-linux-gnu-ld: gc.c:(.text+0x2f58): undefined reference to `__divdi3'
m68k-linux-gnu-ld: gc.c:(.text+0x2f66): undefined reference to `__moddi3'
m68k-linux-gnu-ld: gc.c:(.text+0x2f96): undefined reference to `__moddi3'
m68k-linux-gnu-ld: fs/f2fs/data.o: in function
`has_not_enough_free_secs.constprop.0':
data.c:(.text+0xde8): undefined reference to `__moddi3'
m68k-linux-gnu-ld: data.c:(.text+0xe1c): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/segment.o: in function
`has_not_enough_free_secs.constprop.0':
segment.c:(.text+0x16ee): undefined reference to `__moddi3'
m68k-linux-gnu-ld: segment.c:(.text+0x1722): undefined reference to `__divdi3'
m68k-linux-gnu-ld: fs/f2fs/xattr.o: in function `f2fs_setxattr':
xattr.c:(.text+0xf5e): undefined reference to `__moddi3'
m68k-linux-gnu-ld: xattr.c:(.text+0xf8c): undefined reference to `__divdi3'

Other 32-bit architectures are affected, too, e.g. arm/shmobile_defconfig
+ CONFIG_F2FS_FS=y:

arm-linux-gnueabihf-ld: fs/f2fs/file.o: in function
`has_not_enough_free_secs.constprop.0':
file.c:(.text+0x1d40): undefined reference to `__aeabi_ldivmod'
arm-linux-gnueabihf-ld: file.c:(.text+0x1d5c): undefined reference to
`__aeabi_ldivmod'
arm-linux-gnueabihf-ld: fs/f2fs/file.o: in function `f2fs_defragment_range':
file.c:(.text+0x2018): undefined reference to `__aeabi_ldivmod'
arm-linux-gnueabihf-ld: fs/f2fs/inode.o: in function `f2fs_write_inode':
inode.c:(.text+0x19d4): undefined reference to `__aeabi_ldivmod'
arm-linux-gnueabihf-ld: inode.c:(.text+0x19f0): undefined reference to
`__aeabi_ldivmod'
arm-linux-gnueabihf-ld: fs/f2fs/namei.o:namei.c:(.text+0x12bc): more
undefined references to `__aeabi_ldivmod' follow

Manually reverting 5fa6a97d27842dab fixes the issue.

64-bit divisions (iff needed at all) must not be open-coded, but use
the helpers from <linux/math64.h> instead.

Gr{oetje,eeting}s,

                        Geert


--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-02-27 17:47   ` [f2fs-dev] " Jaegeuk Kim
@ 2024-02-29  9:40     ` Chao Yu
  -1 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-02-29  9:40 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-f2fs-devel, linux-kernel

On 2024/2/28 1:47, Jaegeuk Kim wrote:
> On 02/21, Chao Yu wrote:
>> Just cleanup, no functional change.
>>
>> Signed-off-by: Chao Yu <chao@kernel.org>
>> ---
>>   fs/f2fs/debug.c   |  7 +++----
>>   fs/f2fs/f2fs.h    | 14 ++++++++------
>>   fs/f2fs/gc.c      | 10 +++++-----
>>   fs/f2fs/gc.h      |  4 ++--
>>   fs/f2fs/segment.c | 12 ++++++------
>>   fs/f2fs/segment.h |  8 ++++----
>>   fs/f2fs/super.c   | 16 ++++++++--------
>>   fs/f2fs/sysfs.c   |  4 ++--
>>   8 files changed, 38 insertions(+), 37 deletions(-)
>>
>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>> index 6617195bd27e..12893477f2e4 100644
>> --- a/fs/f2fs/debug.c
>> +++ b/fs/f2fs/debug.c
>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>   	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>   	spin_unlock(&sbi->cprc_info.stat_lock);
>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>   	si->rsvd_segs = reserved_segments(sbi);
>>   	si->overp_segs = overprovision_segments(sbi);
>>   	si->valid_count = valid_user_blocks(sbi);
>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>   	si->io_skip_bggc = sbi->io_skip_bggc;
>>   	si->other_skip_bggc = sbi->other_skip_bggc;
>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>> -	si->util_valid = (int)(written_block_count(sbi) >>
>> -						sbi->log_blocks_per_seg)
>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>>   	si->util_invalid = 50 - si->util_free - si->util_valid;
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>> index dad2774ca72f..8a6fd4352a0e 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>   };
>>   
>>   /* Definitions to access f2fs_sb_info */
>> -#define BLKS_PER_SEG(sbi)					\
>> -	((sbi)->blocks_per_seg)
>> -#define BLKS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>> -#define SEGS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec)
>> +#define SEGS_TO_BLKS(sbi, segs)					\
>> +		((segs) << (sbi)->log_blocks_per_seg)
> 
> 
> I also applied this.
> 
>   /* Definitions to access f2fs_sb_info */
>   #define SEGS_TO_BLKS(sbi, segs)                                        \
> -               ((segs) << (sbi)->log_blocks_per_seg)
> +               (((long long)segs) << (sbi)->log_blocks_per_seg)

Jaegeuk,

This may cause compile failure reported as below, can we revert this?

https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t

Thanks,

>   #define BLKS_TO_SEGS(sbi, blks)                                        \
>                  ((blks) >> (sbi)->log_blocks_per_seg)
> 
>> +#define BLKS_TO_SEGS(sbi, blks)					\
>> +		((blks) >> (sbi)->log_blocks_per_seg)
>> +
>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>   
>>   __printf(3, 4)
>>   void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>> index 3ff126316d42..6d160d50e14e 100644
>> --- a/fs/f2fs/gc.c
>> +++ b/fs/f2fs/gc.c
>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>   
>>   	/* LFS */
>>   	if (p->gc_mode == GC_GREEDY)
>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>   	else if (p->gc_mode == GC_CB)
>>   		return UINT_MAX;
>>   	else if (p->gc_mode == GC_AT)
>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>   	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>   	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>   
>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>   
>>   	/* Handle if the system time has changed by the user */
>>   	if (mtime < sit_i->min_mtime)
>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>   	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>   	raw_sb->block_count = cpu_to_le64(block_count +
>> -			(long long)(segs << sbi->log_blocks_per_seg));
>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>   	if (f2fs_is_multi_device(sbi)) {
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		int dev_segs =
>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>   {
>>   	int segs = secs * SEGS_PER_SEC(sbi);
>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>   	long long user_block_count =
>>   				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>   
>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		__u64 last_segs = FDEV(last_dev).total_segments;
>>   
>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>   								old_block_count)
>>   			return -EINVAL;
>>   	}
>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>> index e4a75aa4160f..6a2419ddc7c6 100644
>> --- a/fs/f2fs/gc.h
>> +++ b/fs/f2fs/gc.h
>> @@ -70,7 +70,7 @@ struct victim_entry {
>>   
>>   static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>   {
>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>   }
>>   
>>   static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>   	block_t free_blks, ovp_blks;
>>   
>>   	free_blks = free_segs_blk_count(sbi);
>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>   
>>   	if (free_blks < ovp_blks)
>>   		return 0;
>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>> index 56927b097e30..d0209ea77dd2 100644
>> --- a/fs/f2fs/segment.c
>> +++ b/fs/f2fs/segment.c
>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>   	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>   	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>   	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>> -				sbi->log_blocks_per_seg;
>> +	unsigned int threshold =
>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>   	unsigned int global_threshold = threshold * 3 / 2;
>>   
>>   	if (dents >= threshold || qdata >= threshold ||
>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>   {
>>   	int ovp_hole_segs =
>>   		(overprovision_segments(sbi) - reserved_segments(sbi));
>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>   	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>   	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>   	block_t unusable;
>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>   		if (!f2fs_sb_has_blkzoned(sbi) &&
>>   		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>   			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>> -				(end - start) << sbi->log_blocks_per_seg);
>> +				SEGS_TO_BLKS(sbi, end - start));
>>   			continue;
>>   		}
>>   next:
>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>   	atomic_set(&dcc->queued_discard, 0);
>>   	atomic_set(&dcc->discard_cmd_cnt, 0);
>>   	dcc->nr_discards = 0;
>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>   	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>   	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>   	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>   #endif
>>   
>>   	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>   	sit_i->written_valid_blocks = 0;
>>   	sit_i->bitmap_size = sit_bitmap_size;
>>   	sit_i->dirty_sentries = 0;
>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>> index 9fe5ec619456..e72b02b67087 100644
>> --- a/fs/f2fs/segment.h
>> +++ b/fs/f2fs/segment.h
>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>   #define TOTAL_SEGS(sbi)							\
>>   	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>   		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>   
>>   #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>   #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>   					(sbi)->log_blocks_per_seg))
>>   
>>   #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>   
>>   #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>   	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>   
>>   #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>   #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>   #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>   	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>   
>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>   	if (type == DATA)
>>   		return BLKS_PER_SEG(sbi);
>>   	else if (type == NODE)
>> -		return 8 * BLKS_PER_SEG(sbi);
>> +		return SEGS_TO_BLKS(sbi, 8);
>>   	else if (type == META)
>>   		return 8 * BIO_MAX_VECS;
>>   	else
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index 9976f2b0393c..bb056700b459 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>   	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>   	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>   	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>> -	sbi->total_node_count =
>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> +			NAT_ENTRY_PER_BLOCK));
>>   	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>   	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>   	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>   			if (i == 0) {
>>   				FDEV(i).start_blk = 0;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -				    (FDEV(i).total_segments <<
>> -				    sbi->log_blocks_per_seg) - 1 +
>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>> +					SEGS_TO_BLKS(sbi,
>> +					FDEV(i).total_segments) - 1 +
>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>   			} else {
>>   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -					(FDEV(i).total_segments <<
>> -					sbi->log_blocks_per_seg) - 1;
>> +						SEGS_TO_BLKS(sbi,
>> +						FDEV(i).total_segments) - 1;
>>   				FDEV(i).bdev_handle = bdev_open_by_path(
>>   					FDEV(i).path, mode, sbi->sb, NULL);
>>   			}
>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>> --- a/fs/f2fs/sysfs.c
>> +++ b/fs/f2fs/sysfs.c
>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>   		spin_lock(&sbi->stat_lock);
>>   		if (t > (unsigned long)(sbi->user_block_count -
>>   				F2FS_OPTION(sbi).root_reserved_blocks -
>> -				(SM_I(sbi)->additional_reserved_segments <<
>> -					sbi->log_blocks_per_seg))) {
>> +				SEGS_TO_BLKS(sbi,
>> +				SM_I(sbi)->additional_reserved_segments))) {
>>   			spin_unlock(&sbi->stat_lock);
>>   			return -EINVAL;
>>   		}
>> -- 
>> 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-29  9:40     ` Chao Yu
  0 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-02-29  9:40 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel

On 2024/2/28 1:47, Jaegeuk Kim wrote:
> On 02/21, Chao Yu wrote:
>> Just cleanup, no functional change.
>>
>> Signed-off-by: Chao Yu <chao@kernel.org>
>> ---
>>   fs/f2fs/debug.c   |  7 +++----
>>   fs/f2fs/f2fs.h    | 14 ++++++++------
>>   fs/f2fs/gc.c      | 10 +++++-----
>>   fs/f2fs/gc.h      |  4 ++--
>>   fs/f2fs/segment.c | 12 ++++++------
>>   fs/f2fs/segment.h |  8 ++++----
>>   fs/f2fs/super.c   | 16 ++++++++--------
>>   fs/f2fs/sysfs.c   |  4 ++--
>>   8 files changed, 38 insertions(+), 37 deletions(-)
>>
>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>> index 6617195bd27e..12893477f2e4 100644
>> --- a/fs/f2fs/debug.c
>> +++ b/fs/f2fs/debug.c
>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>   	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>   	spin_unlock(&sbi->cprc_info.stat_lock);
>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>   	si->rsvd_segs = reserved_segments(sbi);
>>   	si->overp_segs = overprovision_segments(sbi);
>>   	si->valid_count = valid_user_blocks(sbi);
>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>   	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>   	si->io_skip_bggc = sbi->io_skip_bggc;
>>   	si->other_skip_bggc = sbi->other_skip_bggc;
>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>> -	si->util_valid = (int)(written_block_count(sbi) >>
>> -						sbi->log_blocks_per_seg)
>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>   		/ 2;
>>   	si->util_invalid = 50 - si->util_free - si->util_valid;
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>> index dad2774ca72f..8a6fd4352a0e 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>   };
>>   
>>   /* Definitions to access f2fs_sb_info */
>> -#define BLKS_PER_SEG(sbi)					\
>> -	((sbi)->blocks_per_seg)
>> -#define BLKS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>> -#define SEGS_PER_SEC(sbi)					\
>> -	((sbi)->segs_per_sec)
>> +#define SEGS_TO_BLKS(sbi, segs)					\
>> +		((segs) << (sbi)->log_blocks_per_seg)
> 
> 
> I also applied this.
> 
>   /* Definitions to access f2fs_sb_info */
>   #define SEGS_TO_BLKS(sbi, segs)                                        \
> -               ((segs) << (sbi)->log_blocks_per_seg)
> +               (((long long)segs) << (sbi)->log_blocks_per_seg)

Jaegeuk,

This may cause compile failure reported as below, can we revert this?

https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t

Thanks,

>   #define BLKS_TO_SEGS(sbi, blks)                                        \
>                  ((blks) >> (sbi)->log_blocks_per_seg)
> 
>> +#define BLKS_TO_SEGS(sbi, blks)					\
>> +		((blks) >> (sbi)->log_blocks_per_seg)
>> +
>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>   
>>   __printf(3, 4)
>>   void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>> index 3ff126316d42..6d160d50e14e 100644
>> --- a/fs/f2fs/gc.c
>> +++ b/fs/f2fs/gc.c
>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>   
>>   	/* LFS */
>>   	if (p->gc_mode == GC_GREEDY)
>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>   	else if (p->gc_mode == GC_CB)
>>   		return UINT_MAX;
>>   	else if (p->gc_mode == GC_AT)
>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>   	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>   	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>   
>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>   
>>   	/* Handle if the system time has changed by the user */
>>   	if (mtime < sit_i->min_mtime)
>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>   	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>   	raw_sb->block_count = cpu_to_le64(block_count +
>> -			(long long)(segs << sbi->log_blocks_per_seg));
>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>   	if (f2fs_is_multi_device(sbi)) {
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		int dev_segs =
>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>   static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>   {
>>   	int segs = secs * SEGS_PER_SEC(sbi);
>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>   	long long user_block_count =
>>   				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>   
>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>   		int last_dev = sbi->s_ndevs - 1;
>>   		__u64 last_segs = FDEV(last_dev).total_segments;
>>   
>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>   								old_block_count)
>>   			return -EINVAL;
>>   	}
>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>> index e4a75aa4160f..6a2419ddc7c6 100644
>> --- a/fs/f2fs/gc.h
>> +++ b/fs/f2fs/gc.h
>> @@ -70,7 +70,7 @@ struct victim_entry {
>>   
>>   static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>   {
>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>   }
>>   
>>   static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>   	block_t free_blks, ovp_blks;
>>   
>>   	free_blks = free_segs_blk_count(sbi);
>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>   
>>   	if (free_blks < ovp_blks)
>>   		return 0;
>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>> index 56927b097e30..d0209ea77dd2 100644
>> --- a/fs/f2fs/segment.c
>> +++ b/fs/f2fs/segment.c
>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>   	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>   	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>   	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>> -				sbi->log_blocks_per_seg;
>> +	unsigned int threshold =
>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>   	unsigned int global_threshold = threshold * 3 / 2;
>>   
>>   	if (dents >= threshold || qdata >= threshold ||
>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>   {
>>   	int ovp_hole_segs =
>>   		(overprovision_segments(sbi) - reserved_segments(sbi));
>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>   	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>   	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>   	block_t unusable;
>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>   		if (!f2fs_sb_has_blkzoned(sbi) &&
>>   		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>   			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>> -				(end - start) << sbi->log_blocks_per_seg);
>> +				SEGS_TO_BLKS(sbi, end - start));
>>   			continue;
>>   		}
>>   next:
>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>   	atomic_set(&dcc->queued_discard, 0);
>>   	atomic_set(&dcc->discard_cmd_cnt, 0);
>>   	dcc->nr_discards = 0;
>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>   	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>   	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>   	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>   #endif
>>   
>>   	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>   	sit_i->written_valid_blocks = 0;
>>   	sit_i->bitmap_size = sit_bitmap_size;
>>   	sit_i->dirty_sentries = 0;
>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>> index 9fe5ec619456..e72b02b67087 100644
>> --- a/fs/f2fs/segment.h
>> +++ b/fs/f2fs/segment.h
>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>   #define TOTAL_SEGS(sbi)							\
>>   	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>   		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>   
>>   #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>   #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>   					(sbi)->log_blocks_per_seg))
>>   
>>   #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>   
>>   #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>   	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>   
>>   #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>   #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>   #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>   	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>   
>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>   	if (type == DATA)
>>   		return BLKS_PER_SEG(sbi);
>>   	else if (type == NODE)
>> -		return 8 * BLKS_PER_SEG(sbi);
>> +		return SEGS_TO_BLKS(sbi, 8);
>>   	else if (type == META)
>>   		return 8 * BIO_MAX_VECS;
>>   	else
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index 9976f2b0393c..bb056700b459 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>   	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>   	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>   	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>> -	sbi->total_node_count =
>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>> +			NAT_ENTRY_PER_BLOCK));
>>   	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>   	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>   	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>   			if (i == 0) {
>>   				FDEV(i).start_blk = 0;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -				    (FDEV(i).total_segments <<
>> -				    sbi->log_blocks_per_seg) - 1 +
>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>> +					SEGS_TO_BLKS(sbi,
>> +					FDEV(i).total_segments) - 1 +
>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>   			} else {
>>   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>   				FDEV(i).end_blk = FDEV(i).start_blk +
>> -					(FDEV(i).total_segments <<
>> -					sbi->log_blocks_per_seg) - 1;
>> +						SEGS_TO_BLKS(sbi,
>> +						FDEV(i).total_segments) - 1;
>>   				FDEV(i).bdev_handle = bdev_open_by_path(
>>   					FDEV(i).path, mode, sbi->sb, NULL);
>>   			}
>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>> --- a/fs/f2fs/sysfs.c
>> +++ b/fs/f2fs/sysfs.c
>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>   		spin_lock(&sbi->stat_lock);
>>   		if (t > (unsigned long)(sbi->user_block_count -
>>   				F2FS_OPTION(sbi).root_reserved_blocks -
>> -				(SM_I(sbi)->additional_reserved_segments <<
>> -					sbi->log_blocks_per_seg))) {
>> +				SEGS_TO_BLKS(sbi,
>> +				SM_I(sbi)->additional_reserved_segments))) {
>>   			spin_unlock(&sbi->stat_lock);
>>   			return -EINVAL;
>>   		}
>> -- 
>> 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-02-29  9:40     ` [f2fs-dev] " Chao Yu
@ 2024-02-29 16:35       ` Jaegeuk Kim
  -1 siblings, 0 replies; 22+ messages in thread
From: Jaegeuk Kim @ 2024-02-29 16:35 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel

On 02/29, Chao Yu wrote:
> On 2024/2/28 1:47, Jaegeuk Kim wrote:
> > On 02/21, Chao Yu wrote:
> > > Just cleanup, no functional change.
> > > 
> > > Signed-off-by: Chao Yu <chao@kernel.org>
> > > ---
> > >   fs/f2fs/debug.c   |  7 +++----
> > >   fs/f2fs/f2fs.h    | 14 ++++++++------
> > >   fs/f2fs/gc.c      | 10 +++++-----
> > >   fs/f2fs/gc.h      |  4 ++--
> > >   fs/f2fs/segment.c | 12 ++++++------
> > >   fs/f2fs/segment.h |  8 ++++----
> > >   fs/f2fs/super.c   | 16 ++++++++--------
> > >   fs/f2fs/sysfs.c   |  4 ++--
> > >   8 files changed, 38 insertions(+), 37 deletions(-)
> > > 
> > > diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> > > index 6617195bd27e..12893477f2e4 100644
> > > --- a/fs/f2fs/debug.c
> > > +++ b/fs/f2fs/debug.c
> > > @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> > >   	si->cur_ckpt_time = sbi->cprc_info.cur_time;
> > >   	si->peak_ckpt_time = sbi->cprc_info.peak_time;
> > >   	spin_unlock(&sbi->cprc_info.stat_lock);
> > > -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
> > > +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
> > >   	si->rsvd_segs = reserved_segments(sbi);
> > >   	si->overp_segs = overprovision_segments(sbi);
> > >   	si->valid_count = valid_user_blocks(sbi);
> > > @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> > >   	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
> > >   	si->io_skip_bggc = sbi->io_skip_bggc;
> > >   	si->other_skip_bggc = sbi->other_skip_bggc;
> > > -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
> > > +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
> > >   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
> > >   		/ 2;
> > > -	si->util_valid = (int)(written_block_count(sbi) >>
> > > -						sbi->log_blocks_per_seg)
> > > +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
> > >   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
> > >   		/ 2;
> > >   	si->util_invalid = 50 - si->util_free - si->util_valid;
> > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> > > index dad2774ca72f..8a6fd4352a0e 100644
> > > --- a/fs/f2fs/f2fs.h
> > > +++ b/fs/f2fs/f2fs.h
> > > @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
> > >   };
> > >   /* Definitions to access f2fs_sb_info */
> > > -#define BLKS_PER_SEG(sbi)					\
> > > -	((sbi)->blocks_per_seg)
> > > -#define BLKS_PER_SEC(sbi)					\
> > > -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
> > > -#define SEGS_PER_SEC(sbi)					\
> > > -	((sbi)->segs_per_sec)
> > > +#define SEGS_TO_BLKS(sbi, segs)					\
> > > +		((segs) << (sbi)->log_blocks_per_seg)
> > 
> > 
> > I also applied this.
> > 
> >   /* Definitions to access f2fs_sb_info */
> >   #define SEGS_TO_BLKS(sbi, segs)                                        \
> > -               ((segs) << (sbi)->log_blocks_per_seg)
> > +               (((long long)segs) << (sbi)->log_blocks_per_seg)
> 
> Jaegeuk,
> 
> This may cause compile failure reported as below, can we revert this?
> 
> https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t

Yeah, it seems so. I removed it in -dev.

> 
> Thanks,
> 
> >   #define BLKS_TO_SEGS(sbi, blks)                                        \
> >                  ((blks) >> (sbi)->log_blocks_per_seg)
> > 
> > > +#define BLKS_TO_SEGS(sbi, blks)					\
> > > +		((blks) >> (sbi)->log_blocks_per_seg)
> > > +
> > > +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
> > > +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
> > > +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
> > >   __printf(3, 4)
> > >   void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
> > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> > > index 3ff126316d42..6d160d50e14e 100644
> > > --- a/fs/f2fs/gc.c
> > > +++ b/fs/f2fs/gc.c
> > > @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
> > >   	/* LFS */
> > >   	if (p->gc_mode == GC_GREEDY)
> > > -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
> > > +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
> > >   	else if (p->gc_mode == GC_CB)
> > >   		return UINT_MAX;
> > >   	else if (p->gc_mode == GC_AT)
> > > @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
> > >   	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
> > >   	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
> > > -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
> > > +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
> > >   	/* Handle if the system time has changed by the user */
> > >   	if (mtime < sit_i->min_mtime)
> > > @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
> > >   	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
> > >   	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
> > >   	raw_sb->block_count = cpu_to_le64(block_count +
> > > -			(long long)(segs << sbi->log_blocks_per_seg));
> > > +			(long long)SEGS_TO_BLKS(sbi, segs));
> > >   	if (f2fs_is_multi_device(sbi)) {
> > >   		int last_dev = sbi->s_ndevs - 1;
> > >   		int dev_segs =
> > > @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
> > >   static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
> > >   {
> > >   	int segs = secs * SEGS_PER_SEC(sbi);
> > > -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
> > > +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
> > >   	long long user_block_count =
> > >   				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
> > > @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
> > >   		int last_dev = sbi->s_ndevs - 1;
> > >   		__u64 last_segs = FDEV(last_dev).total_segments;
> > > -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
> > > +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
> > >   								old_block_count)
> > >   			return -EINVAL;
> > >   	}
> > > diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
> > > index e4a75aa4160f..6a2419ddc7c6 100644
> > > --- a/fs/f2fs/gc.h
> > > +++ b/fs/f2fs/gc.h
> > > @@ -70,7 +70,7 @@ struct victim_entry {
> > >   static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
> > >   {
> > > -	return free_segments(sbi) << sbi->log_blocks_per_seg;
> > > +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
> > >   }
> > >   static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> > > @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> > >   	block_t free_blks, ovp_blks;
> > >   	free_blks = free_segs_blk_count(sbi);
> > > -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
> > > +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
> > >   	if (free_blks < ovp_blks)
> > >   		return 0;
> > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> > > index 56927b097e30..d0209ea77dd2 100644
> > > --- a/fs/f2fs/segment.c
> > > +++ b/fs/f2fs/segment.c
> > > @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
> > >   	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
> > >   	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
> > >   	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
> > > -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
> > > -				sbi->log_blocks_per_seg;
> > > +	unsigned int threshold =
> > > +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
> > >   	unsigned int global_threshold = threshold * 3 / 2;
> > >   	if (dents >= threshold || qdata >= threshold ||
> > > @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
> > >   {
> > >   	int ovp_hole_segs =
> > >   		(overprovision_segments(sbi) - reserved_segments(sbi));
> > > -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
> > > +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
> > >   	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
> > >   	block_t holes[2] = {0, 0};	/* DATA and NODE */
> > >   	block_t unusable;
> > > @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
> > >   		if (!f2fs_sb_has_blkzoned(sbi) &&
> > >   		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
> > >   			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
> > > -				(end - start) << sbi->log_blocks_per_seg);
> > > +				SEGS_TO_BLKS(sbi, end - start));
> > >   			continue;
> > >   		}
> > >   next:
> > > @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
> > >   	atomic_set(&dcc->queued_discard, 0);
> > >   	atomic_set(&dcc->discard_cmd_cnt, 0);
> > >   	dcc->nr_discards = 0;
> > > -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> > > +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
> > >   	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
> > >   	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
> > >   	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
> > > @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
> > >   #endif
> > >   	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
> > > -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
> > > +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
> > >   	sit_i->written_valid_blocks = 0;
> > >   	sit_i->bitmap_size = sit_bitmap_size;
> > >   	sit_i->dirty_sentries = 0;
> > > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> > > index 9fe5ec619456..e72b02b67087 100644
> > > --- a/fs/f2fs/segment.h
> > > +++ b/fs/f2fs/segment.h
> > > @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
> > >   #define TOTAL_SEGS(sbi)							\
> > >   	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
> > >   		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
> > > -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
> > > +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
> > >   #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
> > >   #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
> > >   					(sbi)->log_blocks_per_seg))
> > >   #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
> > > -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
> > > +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
> > >   #define NEXT_FREE_BLKADDR(sbi, curseg)					\
> > >   	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
> > >   #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
> > >   #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
> > > -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
> > > +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
> > >   #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
> > >   	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
> > > @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
> > >   	if (type == DATA)
> > >   		return BLKS_PER_SEG(sbi);
> > >   	else if (type == NODE)
> > > -		return 8 * BLKS_PER_SEG(sbi);
> > > +		return SEGS_TO_BLKS(sbi, 8);
> > >   	else if (type == META)
> > >   		return 8 * BIO_MAX_VECS;
> > >   	else
> > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> > > index 9976f2b0393c..bb056700b459 100644
> > > --- a/fs/f2fs/super.c
> > > +++ b/fs/f2fs/super.c
> > > @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
> > >   	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
> > >   	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
> > >   	sbi->total_sections = le32_to_cpu(raw_super->section_count);
> > > -	sbi->total_node_count =
> > > -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> > > -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
> > > +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
> > > +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> > > +			NAT_ENTRY_PER_BLOCK));
> > >   	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
> > >   	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
> > >   	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
> > > @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
> > >   			if (i == 0) {
> > >   				FDEV(i).start_blk = 0;
> > >   				FDEV(i).end_blk = FDEV(i).start_blk +
> > > -				    (FDEV(i).total_segments <<
> > > -				    sbi->log_blocks_per_seg) - 1 +
> > > -				    le32_to_cpu(raw_super->segment0_blkaddr);
> > > +					SEGS_TO_BLKS(sbi,
> > > +					FDEV(i).total_segments) - 1 +
> > > +					le32_to_cpu(raw_super->segment0_blkaddr);
> > >   			} else {
> > >   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
> > >   				FDEV(i).end_blk = FDEV(i).start_blk +
> > > -					(FDEV(i).total_segments <<
> > > -					sbi->log_blocks_per_seg) - 1;
> > > +						SEGS_TO_BLKS(sbi,
> > > +						FDEV(i).total_segments) - 1;
> > >   				FDEV(i).bdev_handle = bdev_open_by_path(
> > >   					FDEV(i).path, mode, sbi->sb, NULL);
> > >   			}
> > > diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> > > index 2689cc9c3bf8..ceac3bfc5e2c 100644
> > > --- a/fs/f2fs/sysfs.c
> > > +++ b/fs/f2fs/sysfs.c
> > > @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
> > >   		spin_lock(&sbi->stat_lock);
> > >   		if (t > (unsigned long)(sbi->user_block_count -
> > >   				F2FS_OPTION(sbi).root_reserved_blocks -
> > > -				(SM_I(sbi)->additional_reserved_segments <<
> > > -					sbi->log_blocks_per_seg))) {
> > > +				SEGS_TO_BLKS(sbi,
> > > +				SM_I(sbi)->additional_reserved_segments))) {
> > >   			spin_unlock(&sbi->stat_lock);
> > >   			return -EINVAL;
> > >   		}
> > > -- 
> > > 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-02-29 16:35       ` Jaegeuk Kim
  0 siblings, 0 replies; 22+ messages in thread
From: Jaegeuk Kim @ 2024-02-29 16:35 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-kernel, linux-f2fs-devel

On 02/29, Chao Yu wrote:
> On 2024/2/28 1:47, Jaegeuk Kim wrote:
> > On 02/21, Chao Yu wrote:
> > > Just cleanup, no functional change.
> > > 
> > > Signed-off-by: Chao Yu <chao@kernel.org>
> > > ---
> > >   fs/f2fs/debug.c   |  7 +++----
> > >   fs/f2fs/f2fs.h    | 14 ++++++++------
> > >   fs/f2fs/gc.c      | 10 +++++-----
> > >   fs/f2fs/gc.h      |  4 ++--
> > >   fs/f2fs/segment.c | 12 ++++++------
> > >   fs/f2fs/segment.h |  8 ++++----
> > >   fs/f2fs/super.c   | 16 ++++++++--------
> > >   fs/f2fs/sysfs.c   |  4 ++--
> > >   8 files changed, 38 insertions(+), 37 deletions(-)
> > > 
> > > diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> > > index 6617195bd27e..12893477f2e4 100644
> > > --- a/fs/f2fs/debug.c
> > > +++ b/fs/f2fs/debug.c
> > > @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> > >   	si->cur_ckpt_time = sbi->cprc_info.cur_time;
> > >   	si->peak_ckpt_time = sbi->cprc_info.peak_time;
> > >   	spin_unlock(&sbi->cprc_info.stat_lock);
> > > -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
> > > +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
> > >   	si->rsvd_segs = reserved_segments(sbi);
> > >   	si->overp_segs = overprovision_segments(sbi);
> > >   	si->valid_count = valid_user_blocks(sbi);
> > > @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> > >   	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
> > >   	si->io_skip_bggc = sbi->io_skip_bggc;
> > >   	si->other_skip_bggc = sbi->other_skip_bggc;
> > > -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
> > > +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
> > >   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
> > >   		/ 2;
> > > -	si->util_valid = (int)(written_block_count(sbi) >>
> > > -						sbi->log_blocks_per_seg)
> > > +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
> > >   		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
> > >   		/ 2;
> > >   	si->util_invalid = 50 - si->util_free - si->util_valid;
> > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> > > index dad2774ca72f..8a6fd4352a0e 100644
> > > --- a/fs/f2fs/f2fs.h
> > > +++ b/fs/f2fs/f2fs.h
> > > @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
> > >   };
> > >   /* Definitions to access f2fs_sb_info */
> > > -#define BLKS_PER_SEG(sbi)					\
> > > -	((sbi)->blocks_per_seg)
> > > -#define BLKS_PER_SEC(sbi)					\
> > > -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
> > > -#define SEGS_PER_SEC(sbi)					\
> > > -	((sbi)->segs_per_sec)
> > > +#define SEGS_TO_BLKS(sbi, segs)					\
> > > +		((segs) << (sbi)->log_blocks_per_seg)
> > 
> > 
> > I also applied this.
> > 
> >   /* Definitions to access f2fs_sb_info */
> >   #define SEGS_TO_BLKS(sbi, segs)                                        \
> > -               ((segs) << (sbi)->log_blocks_per_seg)
> > +               (((long long)segs) << (sbi)->log_blocks_per_seg)
> 
> Jaegeuk,
> 
> This may cause compile failure reported as below, can we revert this?
> 
> https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t

Yeah, it seems so. I removed it in -dev.

> 
> Thanks,
> 
> >   #define BLKS_TO_SEGS(sbi, blks)                                        \
> >                  ((blks) >> (sbi)->log_blocks_per_seg)
> > 
> > > +#define BLKS_TO_SEGS(sbi, blks)					\
> > > +		((blks) >> (sbi)->log_blocks_per_seg)
> > > +
> > > +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
> > > +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
> > > +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
> > >   __printf(3, 4)
> > >   void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
> > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> > > index 3ff126316d42..6d160d50e14e 100644
> > > --- a/fs/f2fs/gc.c
> > > +++ b/fs/f2fs/gc.c
> > > @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
> > >   	/* LFS */
> > >   	if (p->gc_mode == GC_GREEDY)
> > > -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
> > > +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
> > >   	else if (p->gc_mode == GC_CB)
> > >   		return UINT_MAX;
> > >   	else if (p->gc_mode == GC_AT)
> > > @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
> > >   	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
> > >   	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
> > > -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
> > > +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
> > >   	/* Handle if the system time has changed by the user */
> > >   	if (mtime < sit_i->min_mtime)
> > > @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
> > >   	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
> > >   	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
> > >   	raw_sb->block_count = cpu_to_le64(block_count +
> > > -			(long long)(segs << sbi->log_blocks_per_seg));
> > > +			(long long)SEGS_TO_BLKS(sbi, segs));
> > >   	if (f2fs_is_multi_device(sbi)) {
> > >   		int last_dev = sbi->s_ndevs - 1;
> > >   		int dev_segs =
> > > @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
> > >   static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
> > >   {
> > >   	int segs = secs * SEGS_PER_SEC(sbi);
> > > -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
> > > +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
> > >   	long long user_block_count =
> > >   				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
> > > @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
> > >   		int last_dev = sbi->s_ndevs - 1;
> > >   		__u64 last_segs = FDEV(last_dev).total_segments;
> > > -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
> > > +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
> > >   								old_block_count)
> > >   			return -EINVAL;
> > >   	}
> > > diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
> > > index e4a75aa4160f..6a2419ddc7c6 100644
> > > --- a/fs/f2fs/gc.h
> > > +++ b/fs/f2fs/gc.h
> > > @@ -70,7 +70,7 @@ struct victim_entry {
> > >   static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
> > >   {
> > > -	return free_segments(sbi) << sbi->log_blocks_per_seg;
> > > +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
> > >   }
> > >   static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> > > @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> > >   	block_t free_blks, ovp_blks;
> > >   	free_blks = free_segs_blk_count(sbi);
> > > -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
> > > +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
> > >   	if (free_blks < ovp_blks)
> > >   		return 0;
> > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> > > index 56927b097e30..d0209ea77dd2 100644
> > > --- a/fs/f2fs/segment.c
> > > +++ b/fs/f2fs/segment.c
> > > @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
> > >   	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
> > >   	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
> > >   	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
> > > -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
> > > -				sbi->log_blocks_per_seg;
> > > +	unsigned int threshold =
> > > +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
> > >   	unsigned int global_threshold = threshold * 3 / 2;
> > >   	if (dents >= threshold || qdata >= threshold ||
> > > @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
> > >   {
> > >   	int ovp_hole_segs =
> > >   		(overprovision_segments(sbi) - reserved_segments(sbi));
> > > -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
> > > +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
> > >   	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
> > >   	block_t holes[2] = {0, 0};	/* DATA and NODE */
> > >   	block_t unusable;
> > > @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
> > >   		if (!f2fs_sb_has_blkzoned(sbi) &&
> > >   		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
> > >   			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
> > > -				(end - start) << sbi->log_blocks_per_seg);
> > > +				SEGS_TO_BLKS(sbi, end - start));
> > >   			continue;
> > >   		}
> > >   next:
> > > @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
> > >   	atomic_set(&dcc->queued_discard, 0);
> > >   	atomic_set(&dcc->discard_cmd_cnt, 0);
> > >   	dcc->nr_discards = 0;
> > > -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> > > +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
> > >   	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
> > >   	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
> > >   	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
> > > @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
> > >   #endif
> > >   	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
> > > -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
> > > +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
> > >   	sit_i->written_valid_blocks = 0;
> > >   	sit_i->bitmap_size = sit_bitmap_size;
> > >   	sit_i->dirty_sentries = 0;
> > > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> > > index 9fe5ec619456..e72b02b67087 100644
> > > --- a/fs/f2fs/segment.h
> > > +++ b/fs/f2fs/segment.h
> > > @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
> > >   #define TOTAL_SEGS(sbi)							\
> > >   	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
> > >   		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
> > > -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
> > > +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
> > >   #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
> > >   #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
> > >   					(sbi)->log_blocks_per_seg))
> > >   #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
> > > -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
> > > +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
> > >   #define NEXT_FREE_BLKADDR(sbi, curseg)					\
> > >   	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
> > >   #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
> > >   #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
> > > -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
> > > +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
> > >   #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
> > >   	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
> > > @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
> > >   	if (type == DATA)
> > >   		return BLKS_PER_SEG(sbi);
> > >   	else if (type == NODE)
> > > -		return 8 * BLKS_PER_SEG(sbi);
> > > +		return SEGS_TO_BLKS(sbi, 8);
> > >   	else if (type == META)
> > >   		return 8 * BIO_MAX_VECS;
> > >   	else
> > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> > > index 9976f2b0393c..bb056700b459 100644
> > > --- a/fs/f2fs/super.c
> > > +++ b/fs/f2fs/super.c
> > > @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
> > >   	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
> > >   	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
> > >   	sbi->total_sections = le32_to_cpu(raw_super->section_count);
> > > -	sbi->total_node_count =
> > > -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> > > -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
> > > +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
> > > +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> > > +			NAT_ENTRY_PER_BLOCK));
> > >   	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
> > >   	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
> > >   	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
> > > @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
> > >   			if (i == 0) {
> > >   				FDEV(i).start_blk = 0;
> > >   				FDEV(i).end_blk = FDEV(i).start_blk +
> > > -				    (FDEV(i).total_segments <<
> > > -				    sbi->log_blocks_per_seg) - 1 +
> > > -				    le32_to_cpu(raw_super->segment0_blkaddr);
> > > +					SEGS_TO_BLKS(sbi,
> > > +					FDEV(i).total_segments) - 1 +
> > > +					le32_to_cpu(raw_super->segment0_blkaddr);
> > >   			} else {
> > >   				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
> > >   				FDEV(i).end_blk = FDEV(i).start_blk +
> > > -					(FDEV(i).total_segments <<
> > > -					sbi->log_blocks_per_seg) - 1;
> > > +						SEGS_TO_BLKS(sbi,
> > > +						FDEV(i).total_segments) - 1;
> > >   				FDEV(i).bdev_handle = bdev_open_by_path(
> > >   					FDEV(i).path, mode, sbi->sb, NULL);
> > >   			}
> > > diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> > > index 2689cc9c3bf8..ceac3bfc5e2c 100644
> > > --- a/fs/f2fs/sysfs.c
> > > +++ b/fs/f2fs/sysfs.c
> > > @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
> > >   		spin_lock(&sbi->stat_lock);
> > >   		if (t > (unsigned long)(sbi->user_block_count -
> > >   				F2FS_OPTION(sbi).root_reserved_blocks -
> > > -				(SM_I(sbi)->additional_reserved_segments <<
> > > -					sbi->log_blocks_per_seg))) {
> > > +				SEGS_TO_BLKS(sbi,
> > > +				SM_I(sbi)->additional_reserved_segments))) {
> > >   			spin_unlock(&sbi->stat_lock);
> > >   			return -EINVAL;
> > >   		}
> > > -- 
> > > 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-02-29 16:35       ` [f2fs-dev] " Jaegeuk Kim
@ 2024-03-01  1:30         ` Chao Yu
  -1 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-03-01  1:30 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-f2fs-devel, linux-kernel

On 2024/3/1 0:35, Jaegeuk Kim wrote:
> On 02/29, Chao Yu wrote:
>> On 2024/2/28 1:47, Jaegeuk Kim wrote:
>>> On 02/21, Chao Yu wrote:
>>>> Just cleanup, no functional change.
>>>>
>>>> Signed-off-by: Chao Yu <chao@kernel.org>
>>>> ---
>>>>    fs/f2fs/debug.c   |  7 +++----
>>>>    fs/f2fs/f2fs.h    | 14 ++++++++------
>>>>    fs/f2fs/gc.c      | 10 +++++-----
>>>>    fs/f2fs/gc.h      |  4 ++--
>>>>    fs/f2fs/segment.c | 12 ++++++------
>>>>    fs/f2fs/segment.h |  8 ++++----
>>>>    fs/f2fs/super.c   | 16 ++++++++--------
>>>>    fs/f2fs/sysfs.c   |  4 ++--
>>>>    8 files changed, 38 insertions(+), 37 deletions(-)
>>>>
>>>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>>>> index 6617195bd27e..12893477f2e4 100644
>>>> --- a/fs/f2fs/debug.c
>>>> +++ b/fs/f2fs/debug.c
>>>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>>>    	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>>>    	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>>>    	spin_unlock(&sbi->cprc_info.stat_lock);
>>>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>>>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>>>    	si->rsvd_segs = reserved_segments(sbi);
>>>>    	si->overp_segs = overprovision_segments(sbi);
>>>>    	si->valid_count = valid_user_blocks(sbi);
>>>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>>>    	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>>>    	si->io_skip_bggc = sbi->io_skip_bggc;
>>>>    	si->other_skip_bggc = sbi->other_skip_bggc;
>>>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>>>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>>>    		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>>>    		/ 2;
>>>> -	si->util_valid = (int)(written_block_count(sbi) >>
>>>> -						sbi->log_blocks_per_seg)
>>>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>>>    		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>>>    		/ 2;
>>>>    	si->util_invalid = 50 - si->util_free - si->util_valid;
>>>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>>>> index dad2774ca72f..8a6fd4352a0e 100644
>>>> --- a/fs/f2fs/f2fs.h
>>>> +++ b/fs/f2fs/f2fs.h
>>>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>>>    };
>>>>    /* Definitions to access f2fs_sb_info */
>>>> -#define BLKS_PER_SEG(sbi)					\
>>>> -	((sbi)->blocks_per_seg)
>>>> -#define BLKS_PER_SEC(sbi)					\
>>>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>>>> -#define SEGS_PER_SEC(sbi)					\
>>>> -	((sbi)->segs_per_sec)
>>>> +#define SEGS_TO_BLKS(sbi, segs)					\
>>>> +		((segs) << (sbi)->log_blocks_per_seg)
>>>
>>>
>>> I also applied this.
>>>
>>>    /* Definitions to access f2fs_sb_info */
>>>    #define SEGS_TO_BLKS(sbi, segs)                                        \
>>> -               ((segs) << (sbi)->log_blocks_per_seg)
>>> +               (((long long)segs) << (sbi)->log_blocks_per_seg)
>>
>> Jaegeuk,
>>
>> This may cause compile failure reported as below, can we revert this?
>>
>> https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t
> 
> Yeah, it seems so. I removed it in -dev.

Oh, I meant reverting (((long long)segs) << (sbi)->log_blocks_per_seg),
this line can bring 64bits data into division statement, result in
compile failure.

Thanks,

> 
>>
>> Thanks,
>>
>>>    #define BLKS_TO_SEGS(sbi, blks)                                        \
>>>                   ((blks) >> (sbi)->log_blocks_per_seg)
>>>
>>>> +#define BLKS_TO_SEGS(sbi, blks)					\
>>>> +		((blks) >> (sbi)->log_blocks_per_seg)
>>>> +
>>>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>>>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>>>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>>>    __printf(3, 4)
>>>>    void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>>>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>>>> index 3ff126316d42..6d160d50e14e 100644
>>>> --- a/fs/f2fs/gc.c
>>>> +++ b/fs/f2fs/gc.c
>>>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>>>    	/* LFS */
>>>>    	if (p->gc_mode == GC_GREEDY)
>>>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>>>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>>>    	else if (p->gc_mode == GC_CB)
>>>>    		return UINT_MAX;
>>>>    	else if (p->gc_mode == GC_AT)
>>>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>>>    	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>>>    	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>>>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>>>    	/* Handle if the system time has changed by the user */
>>>>    	if (mtime < sit_i->min_mtime)
>>>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>    	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>>>    	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>>>    	raw_sb->block_count = cpu_to_le64(block_count +
>>>> -			(long long)(segs << sbi->log_blocks_per_seg));
>>>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>>>    	if (f2fs_is_multi_device(sbi)) {
>>>>    		int last_dev = sbi->s_ndevs - 1;
>>>>    		int dev_segs =
>>>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>    static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>    {
>>>>    	int segs = secs * SEGS_PER_SEC(sbi);
>>>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>>>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>>>    	long long user_block_count =
>>>>    				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>>>    		int last_dev = sbi->s_ndevs - 1;
>>>>    		__u64 last_segs = FDEV(last_dev).total_segments;
>>>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>>>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>>>    								old_block_count)
>>>>    			return -EINVAL;
>>>>    	}
>>>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>>>> index e4a75aa4160f..6a2419ddc7c6 100644
>>>> --- a/fs/f2fs/gc.h
>>>> +++ b/fs/f2fs/gc.h
>>>> @@ -70,7 +70,7 @@ struct victim_entry {
>>>>    static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>>>    {
>>>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>>>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>>>    }
>>>>    static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>>>    	block_t free_blks, ovp_blks;
>>>>    	free_blks = free_segs_blk_count(sbi);
>>>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>>>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>>>    	if (free_blks < ovp_blks)
>>>>    		return 0;
>>>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>>>> index 56927b097e30..d0209ea77dd2 100644
>>>> --- a/fs/f2fs/segment.c
>>>> +++ b/fs/f2fs/segment.c
>>>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>>>    	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>>>    	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>>>    	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>>>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>>>> -				sbi->log_blocks_per_seg;
>>>> +	unsigned int threshold =
>>>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>>>    	unsigned int global_threshold = threshold * 3 / 2;
>>>>    	if (dents >= threshold || qdata >= threshold ||
>>>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>>>    {
>>>>    	int ovp_hole_segs =
>>>>    		(overprovision_segments(sbi) - reserved_segments(sbi));
>>>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>>>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>>>    	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>>>    	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>>>    	block_t unusable;
>>>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>>>    		if (!f2fs_sb_has_blkzoned(sbi) &&
>>>>    		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>>>    			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>>>> -				(end - start) << sbi->log_blocks_per_seg);
>>>> +				SEGS_TO_BLKS(sbi, end - start));
>>>>    			continue;
>>>>    		}
>>>>    next:
>>>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>>>    	atomic_set(&dcc->queued_discard, 0);
>>>>    	atomic_set(&dcc->discard_cmd_cnt, 0);
>>>>    	dcc->nr_discards = 0;
>>>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>>>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>>>    	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>>>    	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>>>    	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>>>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>>>    #endif
>>>>    	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>>>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>>>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>>>    	sit_i->written_valid_blocks = 0;
>>>>    	sit_i->bitmap_size = sit_bitmap_size;
>>>>    	sit_i->dirty_sentries = 0;
>>>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>>>> index 9fe5ec619456..e72b02b67087 100644
>>>> --- a/fs/f2fs/segment.h
>>>> +++ b/fs/f2fs/segment.h
>>>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>>>    #define TOTAL_SEGS(sbi)							\
>>>>    	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>>>    		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>>>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>>>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>>>    #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>>>    #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>>>    					(sbi)->log_blocks_per_seg))
>>>>    #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>>>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>>>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>>>    #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>>>    	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>>>    #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>>>    #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>>>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>>>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>>>    #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>>>    	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>>>    	if (type == DATA)
>>>>    		return BLKS_PER_SEG(sbi);
>>>>    	else if (type == NODE)
>>>> -		return 8 * BLKS_PER_SEG(sbi);
>>>> +		return SEGS_TO_BLKS(sbi, 8);
>>>>    	else if (type == META)
>>>>    		return 8 * BIO_MAX_VECS;
>>>>    	else
>>>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>>>> index 9976f2b0393c..bb056700b459 100644
>>>> --- a/fs/f2fs/super.c
>>>> +++ b/fs/f2fs/super.c
>>>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>>>    	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>>>    	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>>>    	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>>>> -	sbi->total_node_count =
>>>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>>>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>>>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>>>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>>>> +			NAT_ENTRY_PER_BLOCK));
>>>>    	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>>>    	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>>>    	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>>>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>>>    			if (i == 0) {
>>>>    				FDEV(i).start_blk = 0;
>>>>    				FDEV(i).end_blk = FDEV(i).start_blk +
>>>> -				    (FDEV(i).total_segments <<
>>>> -				    sbi->log_blocks_per_seg) - 1 +
>>>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>>>> +					SEGS_TO_BLKS(sbi,
>>>> +					FDEV(i).total_segments) - 1 +
>>>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>>>    			} else {
>>>>    				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>>>    				FDEV(i).end_blk = FDEV(i).start_blk +
>>>> -					(FDEV(i).total_segments <<
>>>> -					sbi->log_blocks_per_seg) - 1;
>>>> +						SEGS_TO_BLKS(sbi,
>>>> +						FDEV(i).total_segments) - 1;
>>>>    				FDEV(i).bdev_handle = bdev_open_by_path(
>>>>    					FDEV(i).path, mode, sbi->sb, NULL);
>>>>    			}
>>>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>>>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>>>> --- a/fs/f2fs/sysfs.c
>>>> +++ b/fs/f2fs/sysfs.c
>>>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>>>    		spin_lock(&sbi->stat_lock);
>>>>    		if (t > (unsigned long)(sbi->user_block_count -
>>>>    				F2FS_OPTION(sbi).root_reserved_blocks -
>>>> -				(SM_I(sbi)->additional_reserved_segments <<
>>>> -					sbi->log_blocks_per_seg))) {
>>>> +				SEGS_TO_BLKS(sbi,
>>>> +				SM_I(sbi)->additional_reserved_segments))) {
>>>>    			spin_unlock(&sbi->stat_lock);
>>>>    			return -EINVAL;
>>>>    		}
>>>> -- 
>>>> 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-03-01  1:30         ` Chao Yu
  0 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-03-01  1:30 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel

On 2024/3/1 0:35, Jaegeuk Kim wrote:
> On 02/29, Chao Yu wrote:
>> On 2024/2/28 1:47, Jaegeuk Kim wrote:
>>> On 02/21, Chao Yu wrote:
>>>> Just cleanup, no functional change.
>>>>
>>>> Signed-off-by: Chao Yu <chao@kernel.org>
>>>> ---
>>>>    fs/f2fs/debug.c   |  7 +++----
>>>>    fs/f2fs/f2fs.h    | 14 ++++++++------
>>>>    fs/f2fs/gc.c      | 10 +++++-----
>>>>    fs/f2fs/gc.h      |  4 ++--
>>>>    fs/f2fs/segment.c | 12 ++++++------
>>>>    fs/f2fs/segment.h |  8 ++++----
>>>>    fs/f2fs/super.c   | 16 ++++++++--------
>>>>    fs/f2fs/sysfs.c   |  4 ++--
>>>>    8 files changed, 38 insertions(+), 37 deletions(-)
>>>>
>>>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>>>> index 6617195bd27e..12893477f2e4 100644
>>>> --- a/fs/f2fs/debug.c
>>>> +++ b/fs/f2fs/debug.c
>>>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>>>    	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>>>    	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>>>    	spin_unlock(&sbi->cprc_info.stat_lock);
>>>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>>>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>>>    	si->rsvd_segs = reserved_segments(sbi);
>>>>    	si->overp_segs = overprovision_segments(sbi);
>>>>    	si->valid_count = valid_user_blocks(sbi);
>>>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>>>    	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>>>    	si->io_skip_bggc = sbi->io_skip_bggc;
>>>>    	si->other_skip_bggc = sbi->other_skip_bggc;
>>>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>>>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>>>    		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>>>    		/ 2;
>>>> -	si->util_valid = (int)(written_block_count(sbi) >>
>>>> -						sbi->log_blocks_per_seg)
>>>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>>>    		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>>>    		/ 2;
>>>>    	si->util_invalid = 50 - si->util_free - si->util_valid;
>>>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>>>> index dad2774ca72f..8a6fd4352a0e 100644
>>>> --- a/fs/f2fs/f2fs.h
>>>> +++ b/fs/f2fs/f2fs.h
>>>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>>>    };
>>>>    /* Definitions to access f2fs_sb_info */
>>>> -#define BLKS_PER_SEG(sbi)					\
>>>> -	((sbi)->blocks_per_seg)
>>>> -#define BLKS_PER_SEC(sbi)					\
>>>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>>>> -#define SEGS_PER_SEC(sbi)					\
>>>> -	((sbi)->segs_per_sec)
>>>> +#define SEGS_TO_BLKS(sbi, segs)					\
>>>> +		((segs) << (sbi)->log_blocks_per_seg)
>>>
>>>
>>> I also applied this.
>>>
>>>    /* Definitions to access f2fs_sb_info */
>>>    #define SEGS_TO_BLKS(sbi, segs)                                        \
>>> -               ((segs) << (sbi)->log_blocks_per_seg)
>>> +               (((long long)segs) << (sbi)->log_blocks_per_seg)
>>
>> Jaegeuk,
>>
>> This may cause compile failure reported as below, can we revert this?
>>
>> https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t
> 
> Yeah, it seems so. I removed it in -dev.

Oh, I meant reverting (((long long)segs) << (sbi)->log_blocks_per_seg),
this line can bring 64bits data into division statement, result in
compile failure.

Thanks,

> 
>>
>> Thanks,
>>
>>>    #define BLKS_TO_SEGS(sbi, blks)                                        \
>>>                   ((blks) >> (sbi)->log_blocks_per_seg)
>>>
>>>> +#define BLKS_TO_SEGS(sbi, blks)					\
>>>> +		((blks) >> (sbi)->log_blocks_per_seg)
>>>> +
>>>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>>>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>>>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>>>    __printf(3, 4)
>>>>    void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>>>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>>>> index 3ff126316d42..6d160d50e14e 100644
>>>> --- a/fs/f2fs/gc.c
>>>> +++ b/fs/f2fs/gc.c
>>>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>>>    	/* LFS */
>>>>    	if (p->gc_mode == GC_GREEDY)
>>>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>>>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>>>    	else if (p->gc_mode == GC_CB)
>>>>    		return UINT_MAX;
>>>>    	else if (p->gc_mode == GC_AT)
>>>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>>>    	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>>>    	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>>>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>>>    	/* Handle if the system time has changed by the user */
>>>>    	if (mtime < sit_i->min_mtime)
>>>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>    	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>>>    	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>>>    	raw_sb->block_count = cpu_to_le64(block_count +
>>>> -			(long long)(segs << sbi->log_blocks_per_seg));
>>>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>>>    	if (f2fs_is_multi_device(sbi)) {
>>>>    		int last_dev = sbi->s_ndevs - 1;
>>>>    		int dev_segs =
>>>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>    static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>    {
>>>>    	int segs = secs * SEGS_PER_SEC(sbi);
>>>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>>>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>>>    	long long user_block_count =
>>>>    				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>>>    		int last_dev = sbi->s_ndevs - 1;
>>>>    		__u64 last_segs = FDEV(last_dev).total_segments;
>>>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>>>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>>>    								old_block_count)
>>>>    			return -EINVAL;
>>>>    	}
>>>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>>>> index e4a75aa4160f..6a2419ddc7c6 100644
>>>> --- a/fs/f2fs/gc.h
>>>> +++ b/fs/f2fs/gc.h
>>>> @@ -70,7 +70,7 @@ struct victim_entry {
>>>>    static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>>>    {
>>>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>>>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>>>    }
>>>>    static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>>>    	block_t free_blks, ovp_blks;
>>>>    	free_blks = free_segs_blk_count(sbi);
>>>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>>>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>>>    	if (free_blks < ovp_blks)
>>>>    		return 0;
>>>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>>>> index 56927b097e30..d0209ea77dd2 100644
>>>> --- a/fs/f2fs/segment.c
>>>> +++ b/fs/f2fs/segment.c
>>>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>>>    	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>>>    	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>>>    	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>>>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>>>> -				sbi->log_blocks_per_seg;
>>>> +	unsigned int threshold =
>>>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>>>    	unsigned int global_threshold = threshold * 3 / 2;
>>>>    	if (dents >= threshold || qdata >= threshold ||
>>>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>>>    {
>>>>    	int ovp_hole_segs =
>>>>    		(overprovision_segments(sbi) - reserved_segments(sbi));
>>>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>>>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>>>    	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>>>    	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>>>    	block_t unusable;
>>>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>>>    		if (!f2fs_sb_has_blkzoned(sbi) &&
>>>>    		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>>>    			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>>>> -				(end - start) << sbi->log_blocks_per_seg);
>>>> +				SEGS_TO_BLKS(sbi, end - start));
>>>>    			continue;
>>>>    		}
>>>>    next:
>>>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>>>    	atomic_set(&dcc->queued_discard, 0);
>>>>    	atomic_set(&dcc->discard_cmd_cnt, 0);
>>>>    	dcc->nr_discards = 0;
>>>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>>>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>>>    	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>>>    	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>>>    	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>>>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>>>    #endif
>>>>    	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>>>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>>>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>>>    	sit_i->written_valid_blocks = 0;
>>>>    	sit_i->bitmap_size = sit_bitmap_size;
>>>>    	sit_i->dirty_sentries = 0;
>>>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>>>> index 9fe5ec619456..e72b02b67087 100644
>>>> --- a/fs/f2fs/segment.h
>>>> +++ b/fs/f2fs/segment.h
>>>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>>>    #define TOTAL_SEGS(sbi)							\
>>>>    	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>>>    		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>>>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>>>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>>>    #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>>>    #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>>>    					(sbi)->log_blocks_per_seg))
>>>>    #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>>>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>>>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>>>    #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>>>    	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>>>    #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>>>    #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>>>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>>>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>>>    #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>>>    	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>>>    	if (type == DATA)
>>>>    		return BLKS_PER_SEG(sbi);
>>>>    	else if (type == NODE)
>>>> -		return 8 * BLKS_PER_SEG(sbi);
>>>> +		return SEGS_TO_BLKS(sbi, 8);
>>>>    	else if (type == META)
>>>>    		return 8 * BIO_MAX_VECS;
>>>>    	else
>>>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>>>> index 9976f2b0393c..bb056700b459 100644
>>>> --- a/fs/f2fs/super.c
>>>> +++ b/fs/f2fs/super.c
>>>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>>>    	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>>>    	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>>>    	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>>>> -	sbi->total_node_count =
>>>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>>>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>>>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>>>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>>>> +			NAT_ENTRY_PER_BLOCK));
>>>>    	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>>>    	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>>>    	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>>>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>>>    			if (i == 0) {
>>>>    				FDEV(i).start_blk = 0;
>>>>    				FDEV(i).end_blk = FDEV(i).start_blk +
>>>> -				    (FDEV(i).total_segments <<
>>>> -				    sbi->log_blocks_per_seg) - 1 +
>>>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>>>> +					SEGS_TO_BLKS(sbi,
>>>> +					FDEV(i).total_segments) - 1 +
>>>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>>>    			} else {
>>>>    				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>>>    				FDEV(i).end_blk = FDEV(i).start_blk +
>>>> -					(FDEV(i).total_segments <<
>>>> -					sbi->log_blocks_per_seg) - 1;
>>>> +						SEGS_TO_BLKS(sbi,
>>>> +						FDEV(i).total_segments) - 1;
>>>>    				FDEV(i).bdev_handle = bdev_open_by_path(
>>>>    					FDEV(i).path, mode, sbi->sb, NULL);
>>>>    			}
>>>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>>>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>>>> --- a/fs/f2fs/sysfs.c
>>>> +++ b/fs/f2fs/sysfs.c
>>>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>>>    		spin_lock(&sbi->stat_lock);
>>>>    		if (t > (unsigned long)(sbi->user_block_count -
>>>>    				F2FS_OPTION(sbi).root_reserved_blocks -
>>>> -				(SM_I(sbi)->additional_reserved_segments <<
>>>> -					sbi->log_blocks_per_seg))) {
>>>> +				SEGS_TO_BLKS(sbi,
>>>> +				SM_I(sbi)->additional_reserved_segments))) {
>>>>    			spin_unlock(&sbi->stat_lock);
>>>>    			return -EINVAL;
>>>>    		}
>>>> -- 
>>>> 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-03-01  1:30         ` [f2fs-dev] " Chao Yu
@ 2024-03-01  1:57           ` Jaegeuk Kim
  -1 siblings, 0 replies; 22+ messages in thread
From: Jaegeuk Kim @ 2024-03-01  1:57 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel

On 03/01, Chao Yu wrote:
> On 2024/3/1 0:35, Jaegeuk Kim wrote:
> > On 02/29, Chao Yu wrote:
> > > On 2024/2/28 1:47, Jaegeuk Kim wrote:
> > > > On 02/21, Chao Yu wrote:
> > > > > Just cleanup, no functional change.
> > > > > 
> > > > > Signed-off-by: Chao Yu <chao@kernel.org>
> > > > > ---
> > > > >    fs/f2fs/debug.c   |  7 +++----
> > > > >    fs/f2fs/f2fs.h    | 14 ++++++++------
> > > > >    fs/f2fs/gc.c      | 10 +++++-----
> > > > >    fs/f2fs/gc.h      |  4 ++--
> > > > >    fs/f2fs/segment.c | 12 ++++++------
> > > > >    fs/f2fs/segment.h |  8 ++++----
> > > > >    fs/f2fs/super.c   | 16 ++++++++--------
> > > > >    fs/f2fs/sysfs.c   |  4 ++--
> > > > >    8 files changed, 38 insertions(+), 37 deletions(-)
> > > > > 
> > > > > diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> > > > > index 6617195bd27e..12893477f2e4 100644
> > > > > --- a/fs/f2fs/debug.c
> > > > > +++ b/fs/f2fs/debug.c
> > > > > @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> > > > >    	si->cur_ckpt_time = sbi->cprc_info.cur_time;
> > > > >    	si->peak_ckpt_time = sbi->cprc_info.peak_time;
> > > > >    	spin_unlock(&sbi->cprc_info.stat_lock);
> > > > > -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
> > > > > +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
> > > > >    	si->rsvd_segs = reserved_segments(sbi);
> > > > >    	si->overp_segs = overprovision_segments(sbi);
> > > > >    	si->valid_count = valid_user_blocks(sbi);
> > > > > @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> > > > >    	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
> > > > >    	si->io_skip_bggc = sbi->io_skip_bggc;
> > > > >    	si->other_skip_bggc = sbi->other_skip_bggc;
> > > > > -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
> > > > > +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
> > > > >    		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
> > > > >    		/ 2;
> > > > > -	si->util_valid = (int)(written_block_count(sbi) >>
> > > > > -						sbi->log_blocks_per_seg)
> > > > > +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
> > > > >    		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
> > > > >    		/ 2;
> > > > >    	si->util_invalid = 50 - si->util_free - si->util_valid;
> > > > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> > > > > index dad2774ca72f..8a6fd4352a0e 100644
> > > > > --- a/fs/f2fs/f2fs.h
> > > > > +++ b/fs/f2fs/f2fs.h
> > > > > @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
> > > > >    };
> > > > >    /* Definitions to access f2fs_sb_info */
> > > > > -#define BLKS_PER_SEG(sbi)					\
> > > > > -	((sbi)->blocks_per_seg)
> > > > > -#define BLKS_PER_SEC(sbi)					\
> > > > > -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
> > > > > -#define SEGS_PER_SEC(sbi)					\
> > > > > -	((sbi)->segs_per_sec)
> > > > > +#define SEGS_TO_BLKS(sbi, segs)					\
> > > > > +		((segs) << (sbi)->log_blocks_per_seg)
> > > > 
> > > > 
> > > > I also applied this.
> > > > 
> > > >    /* Definitions to access f2fs_sb_info */
> > > >    #define SEGS_TO_BLKS(sbi, segs)                                        \
> > > > -               ((segs) << (sbi)->log_blocks_per_seg)
> > > > +               (((long long)segs) << (sbi)->log_blocks_per_seg)
> > > 
> > > Jaegeuk,
> > > 
> > > This may cause compile failure reported as below, can we revert this?
> > > 
> > > https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t
> > 
> > Yeah, it seems so. I removed it in -dev.
> 
> Oh, I meant reverting (((long long)segs) << (sbi)->log_blocks_per_seg),
> this line can bring 64bits data into division statement, result in
> compile failure.

Time to resend the patch to address previous casting issue as well? :)

> 
> Thanks,
> 
> > 
> > > 
> > > Thanks,
> > > 
> > > >    #define BLKS_TO_SEGS(sbi, blks)                                        \
> > > >                   ((blks) >> (sbi)->log_blocks_per_seg)
> > > > 
> > > > > +#define BLKS_TO_SEGS(sbi, blks)					\
> > > > > +		((blks) >> (sbi)->log_blocks_per_seg)
> > > > > +
> > > > > +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
> > > > > +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
> > > > > +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
> > > > >    __printf(3, 4)
> > > > >    void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
> > > > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> > > > > index 3ff126316d42..6d160d50e14e 100644
> > > > > --- a/fs/f2fs/gc.c
> > > > > +++ b/fs/f2fs/gc.c
> > > > > @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
> > > > >    	/* LFS */
> > > > >    	if (p->gc_mode == GC_GREEDY)
> > > > > -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
> > > > > +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
> > > > >    	else if (p->gc_mode == GC_CB)
> > > > >    		return UINT_MAX;
> > > > >    	else if (p->gc_mode == GC_AT)
> > > > > @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
> > > > >    	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
> > > > >    	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
> > > > > -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
> > > > > +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
> > > > >    	/* Handle if the system time has changed by the user */
> > > > >    	if (mtime < sit_i->min_mtime)
> > > > > @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
> > > > >    	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
> > > > >    	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
> > > > >    	raw_sb->block_count = cpu_to_le64(block_count +
> > > > > -			(long long)(segs << sbi->log_blocks_per_seg));
> > > > > +			(long long)SEGS_TO_BLKS(sbi, segs));
> > > > >    	if (f2fs_is_multi_device(sbi)) {
> > > > >    		int last_dev = sbi->s_ndevs - 1;
> > > > >    		int dev_segs =
> > > > > @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
> > > > >    static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
> > > > >    {
> > > > >    	int segs = secs * SEGS_PER_SEC(sbi);
> > > > > -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
> > > > > +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
> > > > >    	long long user_block_count =
> > > > >    				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
> > > > > @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
> > > > >    		int last_dev = sbi->s_ndevs - 1;
> > > > >    		__u64 last_segs = FDEV(last_dev).total_segments;
> > > > > -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
> > > > > +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
> > > > >    								old_block_count)
> > > > >    			return -EINVAL;
> > > > >    	}
> > > > > diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
> > > > > index e4a75aa4160f..6a2419ddc7c6 100644
> > > > > --- a/fs/f2fs/gc.h
> > > > > +++ b/fs/f2fs/gc.h
> > > > > @@ -70,7 +70,7 @@ struct victim_entry {
> > > > >    static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
> > > > >    {
> > > > > -	return free_segments(sbi) << sbi->log_blocks_per_seg;
> > > > > +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
> > > > >    }
> > > > >    static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> > > > > @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> > > > >    	block_t free_blks, ovp_blks;
> > > > >    	free_blks = free_segs_blk_count(sbi);
> > > > > -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
> > > > > +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
> > > > >    	if (free_blks < ovp_blks)
> > > > >    		return 0;
> > > > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> > > > > index 56927b097e30..d0209ea77dd2 100644
> > > > > --- a/fs/f2fs/segment.c
> > > > > +++ b/fs/f2fs/segment.c
> > > > > @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
> > > > >    	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
> > > > >    	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
> > > > >    	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
> > > > > -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
> > > > > -				sbi->log_blocks_per_seg;
> > > > > +	unsigned int threshold =
> > > > > +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
> > > > >    	unsigned int global_threshold = threshold * 3 / 2;
> > > > >    	if (dents >= threshold || qdata >= threshold ||
> > > > > @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
> > > > >    {
> > > > >    	int ovp_hole_segs =
> > > > >    		(overprovision_segments(sbi) - reserved_segments(sbi));
> > > > > -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
> > > > > +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
> > > > >    	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
> > > > >    	block_t holes[2] = {0, 0};	/* DATA and NODE */
> > > > >    	block_t unusable;
> > > > > @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
> > > > >    		if (!f2fs_sb_has_blkzoned(sbi) &&
> > > > >    		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
> > > > >    			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
> > > > > -				(end - start) << sbi->log_blocks_per_seg);
> > > > > +				SEGS_TO_BLKS(sbi, end - start));
> > > > >    			continue;
> > > > >    		}
> > > > >    next:
> > > > > @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
> > > > >    	atomic_set(&dcc->queued_discard, 0);
> > > > >    	atomic_set(&dcc->discard_cmd_cnt, 0);
> > > > >    	dcc->nr_discards = 0;
> > > > > -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> > > > > +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
> > > > >    	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
> > > > >    	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
> > > > >    	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
> > > > > @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
> > > > >    #endif
> > > > >    	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
> > > > > -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
> > > > > +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
> > > > >    	sit_i->written_valid_blocks = 0;
> > > > >    	sit_i->bitmap_size = sit_bitmap_size;
> > > > >    	sit_i->dirty_sentries = 0;
> > > > > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> > > > > index 9fe5ec619456..e72b02b67087 100644
> > > > > --- a/fs/f2fs/segment.h
> > > > > +++ b/fs/f2fs/segment.h
> > > > > @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
> > > > >    #define TOTAL_SEGS(sbi)							\
> > > > >    	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
> > > > >    		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
> > > > > -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
> > > > > +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
> > > > >    #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
> > > > >    #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
> > > > >    					(sbi)->log_blocks_per_seg))
> > > > >    #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
> > > > > -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
> > > > > +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
> > > > >    #define NEXT_FREE_BLKADDR(sbi, curseg)					\
> > > > >    	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
> > > > >    #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
> > > > >    #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
> > > > > -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
> > > > > +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
> > > > >    #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
> > > > >    	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
> > > > > @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
> > > > >    	if (type == DATA)
> > > > >    		return BLKS_PER_SEG(sbi);
> > > > >    	else if (type == NODE)
> > > > > -		return 8 * BLKS_PER_SEG(sbi);
> > > > > +		return SEGS_TO_BLKS(sbi, 8);
> > > > >    	else if (type == META)
> > > > >    		return 8 * BIO_MAX_VECS;
> > > > >    	else
> > > > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> > > > > index 9976f2b0393c..bb056700b459 100644
> > > > > --- a/fs/f2fs/super.c
> > > > > +++ b/fs/f2fs/super.c
> > > > > @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
> > > > >    	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
> > > > >    	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
> > > > >    	sbi->total_sections = le32_to_cpu(raw_super->section_count);
> > > > > -	sbi->total_node_count =
> > > > > -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> > > > > -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
> > > > > +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
> > > > > +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> > > > > +			NAT_ENTRY_PER_BLOCK));
> > > > >    	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
> > > > >    	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
> > > > >    	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
> > > > > @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
> > > > >    			if (i == 0) {
> > > > >    				FDEV(i).start_blk = 0;
> > > > >    				FDEV(i).end_blk = FDEV(i).start_blk +
> > > > > -				    (FDEV(i).total_segments <<
> > > > > -				    sbi->log_blocks_per_seg) - 1 +
> > > > > -				    le32_to_cpu(raw_super->segment0_blkaddr);
> > > > > +					SEGS_TO_BLKS(sbi,
> > > > > +					FDEV(i).total_segments) - 1 +
> > > > > +					le32_to_cpu(raw_super->segment0_blkaddr);
> > > > >    			} else {
> > > > >    				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
> > > > >    				FDEV(i).end_blk = FDEV(i).start_blk +
> > > > > -					(FDEV(i).total_segments <<
> > > > > -					sbi->log_blocks_per_seg) - 1;
> > > > > +						SEGS_TO_BLKS(sbi,
> > > > > +						FDEV(i).total_segments) - 1;
> > > > >    				FDEV(i).bdev_handle = bdev_open_by_path(
> > > > >    					FDEV(i).path, mode, sbi->sb, NULL);
> > > > >    			}
> > > > > diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> > > > > index 2689cc9c3bf8..ceac3bfc5e2c 100644
> > > > > --- a/fs/f2fs/sysfs.c
> > > > > +++ b/fs/f2fs/sysfs.c
> > > > > @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
> > > > >    		spin_lock(&sbi->stat_lock);
> > > > >    		if (t > (unsigned long)(sbi->user_block_count -
> > > > >    				F2FS_OPTION(sbi).root_reserved_blocks -
> > > > > -				(SM_I(sbi)->additional_reserved_segments <<
> > > > > -					sbi->log_blocks_per_seg))) {
> > > > > +				SEGS_TO_BLKS(sbi,
> > > > > +				SM_I(sbi)->additional_reserved_segments))) {
> > > > >    			spin_unlock(&sbi->stat_lock);
> > > > >    			return -EINVAL;
> > > > >    		}
> > > > > -- 
> > > > > 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-03-01  1:57           ` Jaegeuk Kim
  0 siblings, 0 replies; 22+ messages in thread
From: Jaegeuk Kim @ 2024-03-01  1:57 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-kernel, linux-f2fs-devel

On 03/01, Chao Yu wrote:
> On 2024/3/1 0:35, Jaegeuk Kim wrote:
> > On 02/29, Chao Yu wrote:
> > > On 2024/2/28 1:47, Jaegeuk Kim wrote:
> > > > On 02/21, Chao Yu wrote:
> > > > > Just cleanup, no functional change.
> > > > > 
> > > > > Signed-off-by: Chao Yu <chao@kernel.org>
> > > > > ---
> > > > >    fs/f2fs/debug.c   |  7 +++----
> > > > >    fs/f2fs/f2fs.h    | 14 ++++++++------
> > > > >    fs/f2fs/gc.c      | 10 +++++-----
> > > > >    fs/f2fs/gc.h      |  4 ++--
> > > > >    fs/f2fs/segment.c | 12 ++++++------
> > > > >    fs/f2fs/segment.h |  8 ++++----
> > > > >    fs/f2fs/super.c   | 16 ++++++++--------
> > > > >    fs/f2fs/sysfs.c   |  4 ++--
> > > > >    8 files changed, 38 insertions(+), 37 deletions(-)
> > > > > 
> > > > > diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> > > > > index 6617195bd27e..12893477f2e4 100644
> > > > > --- a/fs/f2fs/debug.c
> > > > > +++ b/fs/f2fs/debug.c
> > > > > @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> > > > >    	si->cur_ckpt_time = sbi->cprc_info.cur_time;
> > > > >    	si->peak_ckpt_time = sbi->cprc_info.peak_time;
> > > > >    	spin_unlock(&sbi->cprc_info.stat_lock);
> > > > > -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
> > > > > +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
> > > > >    	si->rsvd_segs = reserved_segments(sbi);
> > > > >    	si->overp_segs = overprovision_segments(sbi);
> > > > >    	si->valid_count = valid_user_blocks(sbi);
> > > > > @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> > > > >    	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
> > > > >    	si->io_skip_bggc = sbi->io_skip_bggc;
> > > > >    	si->other_skip_bggc = sbi->other_skip_bggc;
> > > > > -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
> > > > > +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
> > > > >    		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
> > > > >    		/ 2;
> > > > > -	si->util_valid = (int)(written_block_count(sbi) >>
> > > > > -						sbi->log_blocks_per_seg)
> > > > > +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
> > > > >    		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
> > > > >    		/ 2;
> > > > >    	si->util_invalid = 50 - si->util_free - si->util_valid;
> > > > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> > > > > index dad2774ca72f..8a6fd4352a0e 100644
> > > > > --- a/fs/f2fs/f2fs.h
> > > > > +++ b/fs/f2fs/f2fs.h
> > > > > @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
> > > > >    };
> > > > >    /* Definitions to access f2fs_sb_info */
> > > > > -#define BLKS_PER_SEG(sbi)					\
> > > > > -	((sbi)->blocks_per_seg)
> > > > > -#define BLKS_PER_SEC(sbi)					\
> > > > > -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
> > > > > -#define SEGS_PER_SEC(sbi)					\
> > > > > -	((sbi)->segs_per_sec)
> > > > > +#define SEGS_TO_BLKS(sbi, segs)					\
> > > > > +		((segs) << (sbi)->log_blocks_per_seg)
> > > > 
> > > > 
> > > > I also applied this.
> > > > 
> > > >    /* Definitions to access f2fs_sb_info */
> > > >    #define SEGS_TO_BLKS(sbi, segs)                                        \
> > > > -               ((segs) << (sbi)->log_blocks_per_seg)
> > > > +               (((long long)segs) << (sbi)->log_blocks_per_seg)
> > > 
> > > Jaegeuk,
> > > 
> > > This may cause compile failure reported as below, can we revert this?
> > > 
> > > https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t
> > 
> > Yeah, it seems so. I removed it in -dev.
> 
> Oh, I meant reverting (((long long)segs) << (sbi)->log_blocks_per_seg),
> this line can bring 64bits data into division statement, result in
> compile failure.

Time to resend the patch to address previous casting issue as well? :)

> 
> Thanks,
> 
> > 
> > > 
> > > Thanks,
> > > 
> > > >    #define BLKS_TO_SEGS(sbi, blks)                                        \
> > > >                   ((blks) >> (sbi)->log_blocks_per_seg)
> > > > 
> > > > > +#define BLKS_TO_SEGS(sbi, blks)					\
> > > > > +		((blks) >> (sbi)->log_blocks_per_seg)
> > > > > +
> > > > > +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
> > > > > +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
> > > > > +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
> > > > >    __printf(3, 4)
> > > > >    void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
> > > > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> > > > > index 3ff126316d42..6d160d50e14e 100644
> > > > > --- a/fs/f2fs/gc.c
> > > > > +++ b/fs/f2fs/gc.c
> > > > > @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
> > > > >    	/* LFS */
> > > > >    	if (p->gc_mode == GC_GREEDY)
> > > > > -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
> > > > > +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
> > > > >    	else if (p->gc_mode == GC_CB)
> > > > >    		return UINT_MAX;
> > > > >    	else if (p->gc_mode == GC_AT)
> > > > > @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
> > > > >    	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
> > > > >    	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
> > > > > -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
> > > > > +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
> > > > >    	/* Handle if the system time has changed by the user */
> > > > >    	if (mtime < sit_i->min_mtime)
> > > > > @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
> > > > >    	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
> > > > >    	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
> > > > >    	raw_sb->block_count = cpu_to_le64(block_count +
> > > > > -			(long long)(segs << sbi->log_blocks_per_seg));
> > > > > +			(long long)SEGS_TO_BLKS(sbi, segs));
> > > > >    	if (f2fs_is_multi_device(sbi)) {
> > > > >    		int last_dev = sbi->s_ndevs - 1;
> > > > >    		int dev_segs =
> > > > > @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
> > > > >    static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
> > > > >    {
> > > > >    	int segs = secs * SEGS_PER_SEC(sbi);
> > > > > -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
> > > > > +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
> > > > >    	long long user_block_count =
> > > > >    				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
> > > > > @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
> > > > >    		int last_dev = sbi->s_ndevs - 1;
> > > > >    		__u64 last_segs = FDEV(last_dev).total_segments;
> > > > > -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
> > > > > +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
> > > > >    								old_block_count)
> > > > >    			return -EINVAL;
> > > > >    	}
> > > > > diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
> > > > > index e4a75aa4160f..6a2419ddc7c6 100644
> > > > > --- a/fs/f2fs/gc.h
> > > > > +++ b/fs/f2fs/gc.h
> > > > > @@ -70,7 +70,7 @@ struct victim_entry {
> > > > >    static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
> > > > >    {
> > > > > -	return free_segments(sbi) << sbi->log_blocks_per_seg;
> > > > > +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
> > > > >    }
> > > > >    static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> > > > > @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
> > > > >    	block_t free_blks, ovp_blks;
> > > > >    	free_blks = free_segs_blk_count(sbi);
> > > > > -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
> > > > > +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
> > > > >    	if (free_blks < ovp_blks)
> > > > >    		return 0;
> > > > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> > > > > index 56927b097e30..d0209ea77dd2 100644
> > > > > --- a/fs/f2fs/segment.c
> > > > > +++ b/fs/f2fs/segment.c
> > > > > @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
> > > > >    	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
> > > > >    	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
> > > > >    	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
> > > > > -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
> > > > > -				sbi->log_blocks_per_seg;
> > > > > +	unsigned int threshold =
> > > > > +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
> > > > >    	unsigned int global_threshold = threshold * 3 / 2;
> > > > >    	if (dents >= threshold || qdata >= threshold ||
> > > > > @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
> > > > >    {
> > > > >    	int ovp_hole_segs =
> > > > >    		(overprovision_segments(sbi) - reserved_segments(sbi));
> > > > > -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
> > > > > +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
> > > > >    	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
> > > > >    	block_t holes[2] = {0, 0};	/* DATA and NODE */
> > > > >    	block_t unusable;
> > > > > @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
> > > > >    		if (!f2fs_sb_has_blkzoned(sbi) &&
> > > > >    		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
> > > > >    			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
> > > > > -				(end - start) << sbi->log_blocks_per_seg);
> > > > > +				SEGS_TO_BLKS(sbi, end - start));
> > > > >    			continue;
> > > > >    		}
> > > > >    next:
> > > > > @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
> > > > >    	atomic_set(&dcc->queued_discard, 0);
> > > > >    	atomic_set(&dcc->discard_cmd_cnt, 0);
> > > > >    	dcc->nr_discards = 0;
> > > > > -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> > > > > +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
> > > > >    	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
> > > > >    	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
> > > > >    	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
> > > > > @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
> > > > >    #endif
> > > > >    	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
> > > > > -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
> > > > > +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
> > > > >    	sit_i->written_valid_blocks = 0;
> > > > >    	sit_i->bitmap_size = sit_bitmap_size;
> > > > >    	sit_i->dirty_sentries = 0;
> > > > > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> > > > > index 9fe5ec619456..e72b02b67087 100644
> > > > > --- a/fs/f2fs/segment.h
> > > > > +++ b/fs/f2fs/segment.h
> > > > > @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
> > > > >    #define TOTAL_SEGS(sbi)							\
> > > > >    	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
> > > > >    		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
> > > > > -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
> > > > > +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
> > > > >    #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
> > > > >    #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
> > > > >    					(sbi)->log_blocks_per_seg))
> > > > >    #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
> > > > > -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
> > > > > +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
> > > > >    #define NEXT_FREE_BLKADDR(sbi, curseg)					\
> > > > >    	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
> > > > >    #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
> > > > >    #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
> > > > > -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
> > > > > +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
> > > > >    #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
> > > > >    	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
> > > > > @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
> > > > >    	if (type == DATA)
> > > > >    		return BLKS_PER_SEG(sbi);
> > > > >    	else if (type == NODE)
> > > > > -		return 8 * BLKS_PER_SEG(sbi);
> > > > > +		return SEGS_TO_BLKS(sbi, 8);
> > > > >    	else if (type == META)
> > > > >    		return 8 * BIO_MAX_VECS;
> > > > >    	else
> > > > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> > > > > index 9976f2b0393c..bb056700b459 100644
> > > > > --- a/fs/f2fs/super.c
> > > > > +++ b/fs/f2fs/super.c
> > > > > @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
> > > > >    	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
> > > > >    	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
> > > > >    	sbi->total_sections = le32_to_cpu(raw_super->section_count);
> > > > > -	sbi->total_node_count =
> > > > > -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> > > > > -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
> > > > > +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
> > > > > +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
> > > > > +			NAT_ENTRY_PER_BLOCK));
> > > > >    	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
> > > > >    	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
> > > > >    	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
> > > > > @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
> > > > >    			if (i == 0) {
> > > > >    				FDEV(i).start_blk = 0;
> > > > >    				FDEV(i).end_blk = FDEV(i).start_blk +
> > > > > -				    (FDEV(i).total_segments <<
> > > > > -				    sbi->log_blocks_per_seg) - 1 +
> > > > > -				    le32_to_cpu(raw_super->segment0_blkaddr);
> > > > > +					SEGS_TO_BLKS(sbi,
> > > > > +					FDEV(i).total_segments) - 1 +
> > > > > +					le32_to_cpu(raw_super->segment0_blkaddr);
> > > > >    			} else {
> > > > >    				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
> > > > >    				FDEV(i).end_blk = FDEV(i).start_blk +
> > > > > -					(FDEV(i).total_segments <<
> > > > > -					sbi->log_blocks_per_seg) - 1;
> > > > > +						SEGS_TO_BLKS(sbi,
> > > > > +						FDEV(i).total_segments) - 1;
> > > > >    				FDEV(i).bdev_handle = bdev_open_by_path(
> > > > >    					FDEV(i).path, mode, sbi->sb, NULL);
> > > > >    			}
> > > > > diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> > > > > index 2689cc9c3bf8..ceac3bfc5e2c 100644
> > > > > --- a/fs/f2fs/sysfs.c
> > > > > +++ b/fs/f2fs/sysfs.c
> > > > > @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
> > > > >    		spin_lock(&sbi->stat_lock);
> > > > >    		if (t > (unsigned long)(sbi->user_block_count -
> > > > >    				F2FS_OPTION(sbi).root_reserved_blocks -
> > > > > -				(SM_I(sbi)->additional_reserved_segments <<
> > > > > -					sbi->log_blocks_per_seg))) {
> > > > > +				SEGS_TO_BLKS(sbi,
> > > > > +				SM_I(sbi)->additional_reserved_segments))) {
> > > > >    			spin_unlock(&sbi->stat_lock);
> > > > >    			return -EINVAL;
> > > > >    		}
> > > > > -- 
> > > > > 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
  2024-03-01  1:57           ` [f2fs-dev] " Jaegeuk Kim
@ 2024-03-01  2:04             ` Chao Yu
  -1 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-03-01  2:04 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-f2fs-devel, linux-kernel

On 2024/3/1 9:57, Jaegeuk Kim wrote:
> On 03/01, Chao Yu wrote:
>> On 2024/3/1 0:35, Jaegeuk Kim wrote:
>>> On 02/29, Chao Yu wrote:
>>>> On 2024/2/28 1:47, Jaegeuk Kim wrote:
>>>>> On 02/21, Chao Yu wrote:
>>>>>> Just cleanup, no functional change.
>>>>>>
>>>>>> Signed-off-by: Chao Yu <chao@kernel.org>
>>>>>> ---
>>>>>>     fs/f2fs/debug.c   |  7 +++----
>>>>>>     fs/f2fs/f2fs.h    | 14 ++++++++------
>>>>>>     fs/f2fs/gc.c      | 10 +++++-----
>>>>>>     fs/f2fs/gc.h      |  4 ++--
>>>>>>     fs/f2fs/segment.c | 12 ++++++------
>>>>>>     fs/f2fs/segment.h |  8 ++++----
>>>>>>     fs/f2fs/super.c   | 16 ++++++++--------
>>>>>>     fs/f2fs/sysfs.c   |  4 ++--
>>>>>>     8 files changed, 38 insertions(+), 37 deletions(-)
>>>>>>
>>>>>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>>>>>> index 6617195bd27e..12893477f2e4 100644
>>>>>> --- a/fs/f2fs/debug.c
>>>>>> +++ b/fs/f2fs/debug.c
>>>>>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>>>>>     	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>>>>>     	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>>>>>     	spin_unlock(&sbi->cprc_info.stat_lock);
>>>>>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>>>>>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>>>>>     	si->rsvd_segs = reserved_segments(sbi);
>>>>>>     	si->overp_segs = overprovision_segments(sbi);
>>>>>>     	si->valid_count = valid_user_blocks(sbi);
>>>>>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>>>>>     	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>>>>>     	si->io_skip_bggc = sbi->io_skip_bggc;
>>>>>>     	si->other_skip_bggc = sbi->other_skip_bggc;
>>>>>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>>>>>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>>>>>     		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>>>>>     		/ 2;
>>>>>> -	si->util_valid = (int)(written_block_count(sbi) >>
>>>>>> -						sbi->log_blocks_per_seg)
>>>>>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>>>>>     		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>>>>>     		/ 2;
>>>>>>     	si->util_invalid = 50 - si->util_free - si->util_valid;
>>>>>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>>>>>> index dad2774ca72f..8a6fd4352a0e 100644
>>>>>> --- a/fs/f2fs/f2fs.h
>>>>>> +++ b/fs/f2fs/f2fs.h
>>>>>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>>>>>     };
>>>>>>     /* Definitions to access f2fs_sb_info */
>>>>>> -#define BLKS_PER_SEG(sbi)					\
>>>>>> -	((sbi)->blocks_per_seg)
>>>>>> -#define BLKS_PER_SEC(sbi)					\
>>>>>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>>>>>> -#define SEGS_PER_SEC(sbi)					\
>>>>>> -	((sbi)->segs_per_sec)
>>>>>> +#define SEGS_TO_BLKS(sbi, segs)					\
>>>>>> +		((segs) << (sbi)->log_blocks_per_seg)
>>>>>
>>>>>
>>>>> I also applied this.
>>>>>
>>>>>     /* Definitions to access f2fs_sb_info */
>>>>>     #define SEGS_TO_BLKS(sbi, segs)                                        \
>>>>> -               ((segs) << (sbi)->log_blocks_per_seg)
>>>>> +               (((long long)segs) << (sbi)->log_blocks_per_seg)
>>>>
>>>> Jaegeuk,
>>>>
>>>> This may cause compile failure reported as below, can we revert this?
>>>>
>>>> https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t
>>>
>>> Yeah, it seems so. I removed it in -dev.
>>
>> Oh, I meant reverting (((long long)segs) << (sbi)->log_blocks_per_seg),
>> this line can bring 64bits data into division statement, result in
>> compile failure.
> 
> Time to resend the patch to address previous casting issue as well? :)

Sure, I can resend the patch.

However, there will be no overflow issues in this calculation
((segs) << (sbi)->log_blocks_per_seg), right? because we do not
support 64-bits addressing, so the calculation result should be a
32-bits value.

Thanks,

> 
>>
>> Thanks,
>>
>>>
>>>>
>>>> Thanks,
>>>>
>>>>>     #define BLKS_TO_SEGS(sbi, blks)                                        \
>>>>>                    ((blks) >> (sbi)->log_blocks_per_seg)
>>>>>
>>>>>> +#define BLKS_TO_SEGS(sbi, blks)					\
>>>>>> +		((blks) >> (sbi)->log_blocks_per_seg)
>>>>>> +
>>>>>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>>>>>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>>>>>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>>>>>     __printf(3, 4)
>>>>>>     void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>>>>>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>>>>>> index 3ff126316d42..6d160d50e14e 100644
>>>>>> --- a/fs/f2fs/gc.c
>>>>>> +++ b/fs/f2fs/gc.c
>>>>>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>>>>>     	/* LFS */
>>>>>>     	if (p->gc_mode == GC_GREEDY)
>>>>>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>>>>>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>>>>>     	else if (p->gc_mode == GC_CB)
>>>>>>     		return UINT_MAX;
>>>>>>     	else if (p->gc_mode == GC_AT)
>>>>>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>>>>>     	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>>>>>     	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>>>>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>>>>>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>>>>>     	/* Handle if the system time has changed by the user */
>>>>>>     	if (mtime < sit_i->min_mtime)
>>>>>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>>>     	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>>>>>     	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>>>>>     	raw_sb->block_count = cpu_to_le64(block_count +
>>>>>> -			(long long)(segs << sbi->log_blocks_per_seg));
>>>>>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>>>>>     	if (f2fs_is_multi_device(sbi)) {
>>>>>>     		int last_dev = sbi->s_ndevs - 1;
>>>>>>     		int dev_segs =
>>>>>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>>>     static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>>>     {
>>>>>>     	int segs = secs * SEGS_PER_SEC(sbi);
>>>>>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>>>>>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>>>>>     	long long user_block_count =
>>>>>>     				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>>>>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>>>>>     		int last_dev = sbi->s_ndevs - 1;
>>>>>>     		__u64 last_segs = FDEV(last_dev).total_segments;
>>>>>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>>>>>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>>>>>     								old_block_count)
>>>>>>     			return -EINVAL;
>>>>>>     	}
>>>>>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>>>>>> index e4a75aa4160f..6a2419ddc7c6 100644
>>>>>> --- a/fs/f2fs/gc.h
>>>>>> +++ b/fs/f2fs/gc.h
>>>>>> @@ -70,7 +70,7 @@ struct victim_entry {
>>>>>>     static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>>>>>     {
>>>>>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>>>>>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>>>>>     }
>>>>>>     static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>>>>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>>>>>     	block_t free_blks, ovp_blks;
>>>>>>     	free_blks = free_segs_blk_count(sbi);
>>>>>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>>>>>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>>>>>     	if (free_blks < ovp_blks)
>>>>>>     		return 0;
>>>>>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>>>>>> index 56927b097e30..d0209ea77dd2 100644
>>>>>> --- a/fs/f2fs/segment.c
>>>>>> +++ b/fs/f2fs/segment.c
>>>>>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>>>>>     	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>>>>>     	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>>>>>     	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>>>>>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>>>>>> -				sbi->log_blocks_per_seg;
>>>>>> +	unsigned int threshold =
>>>>>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>>>>>     	unsigned int global_threshold = threshold * 3 / 2;
>>>>>>     	if (dents >= threshold || qdata >= threshold ||
>>>>>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>>>>>     {
>>>>>>     	int ovp_hole_segs =
>>>>>>     		(overprovision_segments(sbi) - reserved_segments(sbi));
>>>>>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>>>>>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>>>>>     	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>>>>>     	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>>>>>     	block_t unusable;
>>>>>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>>>>>     		if (!f2fs_sb_has_blkzoned(sbi) &&
>>>>>>     		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>>>>>     			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>>>>>> -				(end - start) << sbi->log_blocks_per_seg);
>>>>>> +				SEGS_TO_BLKS(sbi, end - start));
>>>>>>     			continue;
>>>>>>     		}
>>>>>>     next:
>>>>>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>>>>>     	atomic_set(&dcc->queued_discard, 0);
>>>>>>     	atomic_set(&dcc->discard_cmd_cnt, 0);
>>>>>>     	dcc->nr_discards = 0;
>>>>>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>>>>>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>>>>>     	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>>>>>     	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>>>>>     	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>>>>>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>>>>>     #endif
>>>>>>     	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>>>>>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>>>>>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>>>>>     	sit_i->written_valid_blocks = 0;
>>>>>>     	sit_i->bitmap_size = sit_bitmap_size;
>>>>>>     	sit_i->dirty_sentries = 0;
>>>>>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>>>>>> index 9fe5ec619456..e72b02b67087 100644
>>>>>> --- a/fs/f2fs/segment.h
>>>>>> +++ b/fs/f2fs/segment.h
>>>>>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>>>>>     #define TOTAL_SEGS(sbi)							\
>>>>>>     	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>>>>>     		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>>>>>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>>>>>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>>>>>     #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>>>>>     #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>>>>>     					(sbi)->log_blocks_per_seg))
>>>>>>     #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>>>>>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>>>>>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>>>>>     #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>>>>>     	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>>>>>     #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>>>>>     #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>>>>>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>>>>>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>>>>>     #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>>>>>     	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>>>>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>>>>>     	if (type == DATA)
>>>>>>     		return BLKS_PER_SEG(sbi);
>>>>>>     	else if (type == NODE)
>>>>>> -		return 8 * BLKS_PER_SEG(sbi);
>>>>>> +		return SEGS_TO_BLKS(sbi, 8);
>>>>>>     	else if (type == META)
>>>>>>     		return 8 * BIO_MAX_VECS;
>>>>>>     	else
>>>>>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>>>>>> index 9976f2b0393c..bb056700b459 100644
>>>>>> --- a/fs/f2fs/super.c
>>>>>> +++ b/fs/f2fs/super.c
>>>>>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>>>>>     	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>>>>>     	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>>>>>     	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>>>>>> -	sbi->total_node_count =
>>>>>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>>>>>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>>>>>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>>>>>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>>>>>> +			NAT_ENTRY_PER_BLOCK));
>>>>>>     	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>>>>>     	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>>>>>     	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>>>>>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>>>>>     			if (i == 0) {
>>>>>>     				FDEV(i).start_blk = 0;
>>>>>>     				FDEV(i).end_blk = FDEV(i).start_blk +
>>>>>> -				    (FDEV(i).total_segments <<
>>>>>> -				    sbi->log_blocks_per_seg) - 1 +
>>>>>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>>>>>> +					SEGS_TO_BLKS(sbi,
>>>>>> +					FDEV(i).total_segments) - 1 +
>>>>>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>>>>>     			} else {
>>>>>>     				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>>>>>     				FDEV(i).end_blk = FDEV(i).start_blk +
>>>>>> -					(FDEV(i).total_segments <<
>>>>>> -					sbi->log_blocks_per_seg) - 1;
>>>>>> +						SEGS_TO_BLKS(sbi,
>>>>>> +						FDEV(i).total_segments) - 1;
>>>>>>     				FDEV(i).bdev_handle = bdev_open_by_path(
>>>>>>     					FDEV(i).path, mode, sbi->sb, NULL);
>>>>>>     			}
>>>>>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>>>>>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>>>>>> --- a/fs/f2fs/sysfs.c
>>>>>> +++ b/fs/f2fs/sysfs.c
>>>>>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>>>>>     		spin_lock(&sbi->stat_lock);
>>>>>>     		if (t > (unsigned long)(sbi->user_block_count -
>>>>>>     				F2FS_OPTION(sbi).root_reserved_blocks -
>>>>>> -				(SM_I(sbi)->additional_reserved_segments <<
>>>>>> -					sbi->log_blocks_per_seg))) {
>>>>>> +				SEGS_TO_BLKS(sbi,
>>>>>> +				SM_I(sbi)->additional_reserved_segments))) {
>>>>>>     			spin_unlock(&sbi->stat_lock);
>>>>>>     			return -EINVAL;
>>>>>>     		}
>>>>>> -- 
>>>>>> 2.40.1

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup
@ 2024-03-01  2:04             ` Chao Yu
  0 siblings, 0 replies; 22+ messages in thread
From: Chao Yu @ 2024-03-01  2:04 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel

On 2024/3/1 9:57, Jaegeuk Kim wrote:
> On 03/01, Chao Yu wrote:
>> On 2024/3/1 0:35, Jaegeuk Kim wrote:
>>> On 02/29, Chao Yu wrote:
>>>> On 2024/2/28 1:47, Jaegeuk Kim wrote:
>>>>> On 02/21, Chao Yu wrote:
>>>>>> Just cleanup, no functional change.
>>>>>>
>>>>>> Signed-off-by: Chao Yu <chao@kernel.org>
>>>>>> ---
>>>>>>     fs/f2fs/debug.c   |  7 +++----
>>>>>>     fs/f2fs/f2fs.h    | 14 ++++++++------
>>>>>>     fs/f2fs/gc.c      | 10 +++++-----
>>>>>>     fs/f2fs/gc.h      |  4 ++--
>>>>>>     fs/f2fs/segment.c | 12 ++++++------
>>>>>>     fs/f2fs/segment.h |  8 ++++----
>>>>>>     fs/f2fs/super.c   | 16 ++++++++--------
>>>>>>     fs/f2fs/sysfs.c   |  4 ++--
>>>>>>     8 files changed, 38 insertions(+), 37 deletions(-)
>>>>>>
>>>>>> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
>>>>>> index 6617195bd27e..12893477f2e4 100644
>>>>>> --- a/fs/f2fs/debug.c
>>>>>> +++ b/fs/f2fs/debug.c
>>>>>> @@ -134,7 +134,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>>>>>     	si->cur_ckpt_time = sbi->cprc_info.cur_time;
>>>>>>     	si->peak_ckpt_time = sbi->cprc_info.peak_time;
>>>>>>     	spin_unlock(&sbi->cprc_info.stat_lock);
>>>>>> -	si->total_count = (int)sbi->user_block_count / BLKS_PER_SEG(sbi);
>>>>>> +	si->total_count = BLKS_TO_SEGS(sbi, (int)sbi->user_block_count);
>>>>>>     	si->rsvd_segs = reserved_segments(sbi);
>>>>>>     	si->overp_segs = overprovision_segments(sbi);
>>>>>>     	si->valid_count = valid_user_blocks(sbi);
>>>>>> @@ -175,11 +175,10 @@ static void update_general_status(struct f2fs_sb_info *sbi)
>>>>>>     	si->alloc_nids = NM_I(sbi)->nid_cnt[PREALLOC_NID];
>>>>>>     	si->io_skip_bggc = sbi->io_skip_bggc;
>>>>>>     	si->other_skip_bggc = sbi->other_skip_bggc;
>>>>>> -	si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
>>>>>> +	si->util_free = (int)(BLKS_TO_SEGS(sbi, free_user_blocks(sbi)))
>>>>>>     		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>>>>>     		/ 2;
>>>>>> -	si->util_valid = (int)(written_block_count(sbi) >>
>>>>>> -						sbi->log_blocks_per_seg)
>>>>>> +	si->util_valid = (int)(BLKS_TO_SEGS(sbi, written_block_count(sbi)))
>>>>>>     		* 100 / (int)(sbi->user_block_count >> sbi->log_blocks_per_seg)
>>>>>>     		/ 2;
>>>>>>     	si->util_invalid = 50 - si->util_free - si->util_valid;
>>>>>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>>>>>> index dad2774ca72f..8a6fd4352a0e 100644
>>>>>> --- a/fs/f2fs/f2fs.h
>>>>>> +++ b/fs/f2fs/f2fs.h
>>>>>> @@ -1813,12 +1813,14 @@ struct f2fs_sb_info {
>>>>>>     };
>>>>>>     /* Definitions to access f2fs_sb_info */
>>>>>> -#define BLKS_PER_SEG(sbi)					\
>>>>>> -	((sbi)->blocks_per_seg)
>>>>>> -#define BLKS_PER_SEC(sbi)					\
>>>>>> -	((sbi)->segs_per_sec << (sbi)->log_blocks_per_seg)
>>>>>> -#define SEGS_PER_SEC(sbi)					\
>>>>>> -	((sbi)->segs_per_sec)
>>>>>> +#define SEGS_TO_BLKS(sbi, segs)					\
>>>>>> +		((segs) << (sbi)->log_blocks_per_seg)
>>>>>
>>>>>
>>>>> I also applied this.
>>>>>
>>>>>     /* Definitions to access f2fs_sb_info */
>>>>>     #define SEGS_TO_BLKS(sbi, segs)                                        \
>>>>> -               ((segs) << (sbi)->log_blocks_per_seg)
>>>>> +               (((long long)segs) << (sbi)->log_blocks_per_seg)
>>>>
>>>> Jaegeuk,
>>>>
>>>> This may cause compile failure reported as below, can we revert this?
>>>>
>>>> https://lore.kernel.org/linux-f2fs-devel/CAMuHMdXRuiV8PEe6azKYLp+z_Sa8CbL8849bzu59J1_XXtyk1g@mail.gmail.com/T/#t
>>>
>>> Yeah, it seems so. I removed it in -dev.
>>
>> Oh, I meant reverting (((long long)segs) << (sbi)->log_blocks_per_seg),
>> this line can bring 64bits data into division statement, result in
>> compile failure.
> 
> Time to resend the patch to address previous casting issue as well? :)

Sure, I can resend the patch.

However, there will be no overflow issues in this calculation
((segs) << (sbi)->log_blocks_per_seg), right? because we do not
support 64-bits addressing, so the calculation result should be a
32-bits value.

Thanks,

> 
>>
>> Thanks,
>>
>>>
>>>>
>>>> Thanks,
>>>>
>>>>>     #define BLKS_TO_SEGS(sbi, blks)                                        \
>>>>>                    ((blks) >> (sbi)->log_blocks_per_seg)
>>>>>
>>>>>> +#define BLKS_TO_SEGS(sbi, blks)					\
>>>>>> +		((blks) >> (sbi)->log_blocks_per_seg)
>>>>>> +
>>>>>> +#define BLKS_PER_SEG(sbi)	((sbi)->blocks_per_seg)
>>>>>> +#define BLKS_PER_SEC(sbi)	(SEGS_TO_BLKS(sbi, (sbi)->segs_per_sec))
>>>>>> +#define SEGS_PER_SEC(sbi)	((sbi)->segs_per_sec)
>>>>>>     __printf(3, 4)
>>>>>>     void f2fs_printk(struct f2fs_sb_info *sbi, bool limit_rate, const char *fmt, ...);
>>>>>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
>>>>>> index 3ff126316d42..6d160d50e14e 100644
>>>>>> --- a/fs/f2fs/gc.c
>>>>>> +++ b/fs/f2fs/gc.c
>>>>>> @@ -301,7 +301,7 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi,
>>>>>>     	/* LFS */
>>>>>>     	if (p->gc_mode == GC_GREEDY)
>>>>>> -		return 2 * BLKS_PER_SEG(sbi) * p->ofs_unit;
>>>>>> +		return SEGS_TO_BLKS(sbi, 2 * p->ofs_unit);
>>>>>>     	else if (p->gc_mode == GC_CB)
>>>>>>     		return UINT_MAX;
>>>>>>     	else if (p->gc_mode == GC_AT)
>>>>>> @@ -347,7 +347,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
>>>>>>     	mtime = div_u64(mtime, SEGS_PER_SEC(sbi));
>>>>>>     	vblocks = div_u64(vblocks, SEGS_PER_SEC(sbi));
>>>>>> -	u = (vblocks * 100) >> sbi->log_blocks_per_seg;
>>>>>> +	u = BLKS_TO_SEGS(sbi, vblocks * 100);
>>>>>>     	/* Handle if the system time has changed by the user */
>>>>>>     	if (mtime < sit_i->min_mtime)
>>>>>> @@ -2060,7 +2060,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>>>     	raw_sb->segment_count = cpu_to_le32(segment_count + segs);
>>>>>>     	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
>>>>>>     	raw_sb->block_count = cpu_to_le64(block_count +
>>>>>> -			(long long)(segs << sbi->log_blocks_per_seg));
>>>>>> +			(long long)SEGS_TO_BLKS(sbi, segs));
>>>>>>     	if (f2fs_is_multi_device(sbi)) {
>>>>>>     		int last_dev = sbi->s_ndevs - 1;
>>>>>>     		int dev_segs =
>>>>>> @@ -2076,7 +2076,7 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>>>     static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
>>>>>>     {
>>>>>>     	int segs = secs * SEGS_PER_SEC(sbi);
>>>>>> -	long long blks = (long long)(segs << sbi->log_blocks_per_seg);
>>>>>> +	long long blks = (long long)SEGS_TO_BLKS(sbi, segs);
>>>>>>     	long long user_block_count =
>>>>>>     				le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
>>>>>> @@ -2118,7 +2118,7 @@ int f2fs_resize_fs(struct file *filp, __u64 block_count)
>>>>>>     		int last_dev = sbi->s_ndevs - 1;
>>>>>>     		__u64 last_segs = FDEV(last_dev).total_segments;
>>>>>> -		if (block_count + (last_segs << sbi->log_blocks_per_seg) <=
>>>>>> +		if (block_count + SEGS_TO_BLKS(sbi, last_segs) <=
>>>>>>     								old_block_count)
>>>>>>     			return -EINVAL;
>>>>>>     	}
>>>>>> diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
>>>>>> index e4a75aa4160f..6a2419ddc7c6 100644
>>>>>> --- a/fs/f2fs/gc.h
>>>>>> +++ b/fs/f2fs/gc.h
>>>>>> @@ -70,7 +70,7 @@ struct victim_entry {
>>>>>>     static inline block_t free_segs_blk_count(struct f2fs_sb_info *sbi)
>>>>>>     {
>>>>>> -	return free_segments(sbi) << sbi->log_blocks_per_seg;
>>>>>> +	return SEGS_TO_BLKS(sbi, free_segments(sbi));
>>>>>>     }
>>>>>>     static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>>>>> @@ -78,7 +78,7 @@ static inline block_t free_user_blocks(struct f2fs_sb_info *sbi)
>>>>>>     	block_t free_blks, ovp_blks;
>>>>>>     	free_blks = free_segs_blk_count(sbi);
>>>>>> -	ovp_blks = overprovision_segments(sbi) << sbi->log_blocks_per_seg;
>>>>>> +	ovp_blks = SEGS_TO_BLKS(sbi, overprovision_segments(sbi));
>>>>>>     	if (free_blks < ovp_blks)
>>>>>>     		return 0;
>>>>>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>>>>>> index 56927b097e30..d0209ea77dd2 100644
>>>>>> --- a/fs/f2fs/segment.c
>>>>>> +++ b/fs/f2fs/segment.c
>>>>>> @@ -448,8 +448,8 @@ static inline bool excess_dirty_threshold(struct f2fs_sb_info *sbi)
>>>>>>     	unsigned int nodes = get_pages(sbi, F2FS_DIRTY_NODES);
>>>>>>     	unsigned int meta = get_pages(sbi, F2FS_DIRTY_META);
>>>>>>     	unsigned int imeta = get_pages(sbi, F2FS_DIRTY_IMETA);
>>>>>> -	unsigned int threshold = (factor * DEFAULT_DIRTY_THRESHOLD) <<
>>>>>> -				sbi->log_blocks_per_seg;
>>>>>> +	unsigned int threshold =
>>>>>> +		SEGS_TO_BLKS(sbi, (factor * DEFAULT_DIRTY_THRESHOLD));
>>>>>>     	unsigned int global_threshold = threshold * 3 / 2;
>>>>>>     	if (dents >= threshold || qdata >= threshold ||
>>>>>> @@ -870,7 +870,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi)
>>>>>>     {
>>>>>>     	int ovp_hole_segs =
>>>>>>     		(overprovision_segments(sbi) - reserved_segments(sbi));
>>>>>> -	block_t ovp_holes = ovp_hole_segs << sbi->log_blocks_per_seg;
>>>>>> +	block_t ovp_holes = SEGS_TO_BLKS(sbi, ovp_hole_segs);
>>>>>>     	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
>>>>>>     	block_t holes[2] = {0, 0};	/* DATA and NODE */
>>>>>>     	block_t unusable;
>>>>>> @@ -2178,7 +2178,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
>>>>>>     		if (!f2fs_sb_has_blkzoned(sbi) &&
>>>>>>     		    (!f2fs_lfs_mode(sbi) || !__is_large_section(sbi))) {
>>>>>>     			f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
>>>>>> -				(end - start) << sbi->log_blocks_per_seg);
>>>>>> +				SEGS_TO_BLKS(sbi, end - start));
>>>>>>     			continue;
>>>>>>     		}
>>>>>>     next:
>>>>>> @@ -2289,7 +2289,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
>>>>>>     	atomic_set(&dcc->queued_discard, 0);
>>>>>>     	atomic_set(&dcc->discard_cmd_cnt, 0);
>>>>>>     	dcc->nr_discards = 0;
>>>>>> -	dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
>>>>>> +	dcc->max_discards = SEGS_TO_BLKS(sbi, MAIN_SEGS(sbi));
>>>>>>     	dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
>>>>>>     	dcc->min_discard_issue_time = DEF_MIN_DISCARD_ISSUE_TIME;
>>>>>>     	dcc->mid_discard_issue_time = DEF_MID_DISCARD_ISSUE_TIME;
>>>>>> @@ -4469,7 +4469,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
>>>>>>     #endif
>>>>>>     	sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
>>>>>> -	sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
>>>>>> +	sit_i->sit_blocks = SEGS_TO_BLKS(sbi, sit_segs);
>>>>>>     	sit_i->written_valid_blocks = 0;
>>>>>>     	sit_i->bitmap_size = sit_bitmap_size;
>>>>>>     	sit_i->dirty_sentries = 0;
>>>>>> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
>>>>>> index 9fe5ec619456..e72b02b67087 100644
>>>>>> --- a/fs/f2fs/segment.h
>>>>>> +++ b/fs/f2fs/segment.h
>>>>>> @@ -77,21 +77,21 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,
>>>>>>     #define TOTAL_SEGS(sbi)							\
>>>>>>     	(SM_I(sbi) ? SM_I(sbi)->segment_count : 				\
>>>>>>     		le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count))
>>>>>> -#define TOTAL_BLKS(sbi)	(TOTAL_SEGS(sbi) << (sbi)->log_blocks_per_seg)
>>>>>> +#define TOTAL_BLKS(sbi)	(SEGS_TO_BLKS(sbi, TOTAL_SEGS(sbi)))
>>>>>>     #define MAX_BLKADDR(sbi)	(SEG0_BLKADDR(sbi) + TOTAL_BLKS(sbi))
>>>>>>     #define SEGMENT_SIZE(sbi)	(1ULL << ((sbi)->log_blocksize +	\
>>>>>>     					(sbi)->log_blocks_per_seg))
>>>>>>     #define START_BLOCK(sbi, segno)	(SEG0_BLKADDR(sbi) +			\
>>>>>> -	 (GET_R2L_SEGNO(FREE_I(sbi), segno) << (sbi)->log_blocks_per_seg))
>>>>>> +	 (SEGS_TO_BLKS(sbi, GET_R2L_SEGNO(FREE_I(sbi), segno))))
>>>>>>     #define NEXT_FREE_BLKADDR(sbi, curseg)					\
>>>>>>     	(START_BLOCK(sbi, (curseg)->segno) + (curseg)->next_blkoff)
>>>>>>     #define GET_SEGOFF_FROM_SEG0(sbi, blk_addr)	((blk_addr) - SEG0_BLKADDR(sbi))
>>>>>>     #define GET_SEGNO_FROM_SEG0(sbi, blk_addr)				\
>>>>>> -	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) >> (sbi)->log_blocks_per_seg)
>>>>>> +	(BLKS_TO_SEGS(sbi, GET_SEGOFF_FROM_SEG0(sbi, blk_addr)))
>>>>>>     #define GET_BLKOFF_FROM_SEG0(sbi, blk_addr)				\
>>>>>>     	(GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (BLKS_PER_SEG(sbi) - 1))
>>>>>> @@ -891,7 +891,7 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
>>>>>>     	if (type == DATA)
>>>>>>     		return BLKS_PER_SEG(sbi);
>>>>>>     	else if (type == NODE)
>>>>>> -		return 8 * BLKS_PER_SEG(sbi);
>>>>>> +		return SEGS_TO_BLKS(sbi, 8);
>>>>>>     	else if (type == META)
>>>>>>     		return 8 * BIO_MAX_VECS;
>>>>>>     	else
>>>>>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>>>>>> index 9976f2b0393c..bb056700b459 100644
>>>>>> --- a/fs/f2fs/super.c
>>>>>> +++ b/fs/f2fs/super.c
>>>>>> @@ -3763,9 +3763,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>>>>>>     	sbi->segs_per_sec = le32_to_cpu(raw_super->segs_per_sec);
>>>>>>     	sbi->secs_per_zone = le32_to_cpu(raw_super->secs_per_zone);
>>>>>>     	sbi->total_sections = le32_to_cpu(raw_super->section_count);
>>>>>> -	sbi->total_node_count =
>>>>>> -		((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>>>>>> -		NAT_ENTRY_PER_BLOCK) << sbi->log_blocks_per_seg;
>>>>>> +	sbi->total_node_count = SEGS_TO_BLKS(sbi,
>>>>>> +			((le32_to_cpu(raw_super->segment_count_nat) / 2) *
>>>>>> +			NAT_ENTRY_PER_BLOCK));
>>>>>>     	F2FS_ROOT_INO(sbi) = le32_to_cpu(raw_super->root_ino);
>>>>>>     	F2FS_NODE_INO(sbi) = le32_to_cpu(raw_super->node_ino);
>>>>>>     	F2FS_META_INO(sbi) = le32_to_cpu(raw_super->meta_ino);
>>>>>> @@ -4199,14 +4199,14 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
>>>>>>     			if (i == 0) {
>>>>>>     				FDEV(i).start_blk = 0;
>>>>>>     				FDEV(i).end_blk = FDEV(i).start_blk +
>>>>>> -				    (FDEV(i).total_segments <<
>>>>>> -				    sbi->log_blocks_per_seg) - 1 +
>>>>>> -				    le32_to_cpu(raw_super->segment0_blkaddr);
>>>>>> +					SEGS_TO_BLKS(sbi,
>>>>>> +					FDEV(i).total_segments) - 1 +
>>>>>> +					le32_to_cpu(raw_super->segment0_blkaddr);
>>>>>>     			} else {
>>>>>>     				FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
>>>>>>     				FDEV(i).end_blk = FDEV(i).start_blk +
>>>>>> -					(FDEV(i).total_segments <<
>>>>>> -					sbi->log_blocks_per_seg) - 1;
>>>>>> +						SEGS_TO_BLKS(sbi,
>>>>>> +						FDEV(i).total_segments) - 1;
>>>>>>     				FDEV(i).bdev_handle = bdev_open_by_path(
>>>>>>     					FDEV(i).path, mode, sbi->sb, NULL);
>>>>>>     			}
>>>>>> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
>>>>>> index 2689cc9c3bf8..ceac3bfc5e2c 100644
>>>>>> --- a/fs/f2fs/sysfs.c
>>>>>> +++ b/fs/f2fs/sysfs.c
>>>>>> @@ -493,8 +493,8 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
>>>>>>     		spin_lock(&sbi->stat_lock);
>>>>>>     		if (t > (unsigned long)(sbi->user_block_count -
>>>>>>     				F2FS_OPTION(sbi).root_reserved_blocks -
>>>>>> -				(SM_I(sbi)->additional_reserved_segments <<
>>>>>> -					sbi->log_blocks_per_seg))) {
>>>>>> +				SEGS_TO_BLKS(sbi,
>>>>>> +				SM_I(sbi)->additional_reserved_segments))) {
>>>>>>     			spin_unlock(&sbi->stat_lock);
>>>>>>     			return -EINVAL;
>>>>>>     		}
>>>>>> -- 
>>>>>> 2.40.1


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 22+ messages in thread
end of thread, other threads:[~2024-03-01  2:04 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-21  9:20 [f2fs-dev] [PATCH] f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup Chao Yu
2024-02-21  9:20 ` Chao Yu
2024-02-23 18:17 ` Jaegeuk Kim
2024-02-23 18:17   ` [f2fs-dev] " Jaegeuk Kim
2024-02-25  6:29   ` Chao Yu
2024-02-25  6:29     ` [f2fs-dev] " Chao Yu
2024-02-27 17:47 ` Jaegeuk Kim
2024-02-27 17:47   ` [f2fs-dev] " Jaegeuk Kim
2024-02-28  1:22   ` Chao Yu
2024-02-28  1:22     ` [f2fs-dev] " Chao Yu
2024-02-29  9:40   ` Chao Yu
2024-02-29  9:40     ` [f2fs-dev] " Chao Yu
2024-02-29 16:35     ` Jaegeuk Kim
2024-02-29 16:35       ` [f2fs-dev] " Jaegeuk Kim
2024-03-01  1:30       ` Chao Yu
2024-03-01  1:30         ` [f2fs-dev] " Chao Yu
2024-03-01  1:57         ` Jaegeuk Kim
2024-03-01  1:57           ` [f2fs-dev] " Jaegeuk Kim
2024-03-01  2:04           ` Chao Yu
2024-03-01  2:04             ` [f2fs-dev] " Chao Yu
2024-02-29  8:56 ` Geert Uytterhoeven
2024-02-29  8:56   ` [f2fs-dev] " Geert Uytterhoeven

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.