Skip to contentSkip to conversation

f2fs: fix incomplete block usage in compact SSA summaries

PATCH Applied Daeho Jeong 3 participants 3 messages Jan 26 – Jan 30 F2FS file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 f2fs: fix incomplete block usage in compact SSA summaries

From: Daeho Jeong <[email protected]>

In a previous commit, a bug was introduced where compact SSA summaries failed to utilize the entire block space in non-4KB block size configurations, leading to inefficient space management.

This patch fixes the calculation logic to ensure that compact SSA summaries can fully occupy the block regardless of the block size.

Fixes e48e16f3e37f ("f2fs: support non-4KB block size without packed_ssa feature")
---
 fs/f2fs/segment.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
fs/f2fs/segment.c +4 -4
index 00870a8fe387..6a97fe76712b 100644
@@ -2674,12 +2674,12 @@ int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra)
 			valid_sum_count += f2fs_curseg_valid_blocks(sbi, i);
 	}
 
-	sum_in_page = (sbi->sum_blocksize - 2 * sbi->sum_journal_size -
+	sum_in_page = (sbi->blocksize - 2 * sbi->sum_journal_size -
 			SUM_FOOTER_SIZE) / SUMMARY_SIZE;
 	if (valid_sum_count <= sum_in_page)
 		return 1;
 	else if ((valid_sum_count - sum_in_page) <=
-		(sbi->sum_blocksize - SUM_FOOTER_SIZE) / SUMMARY_SIZE)
+		(sbi->blocksize - SUM_FOOTER_SIZE) / SUMMARY_SIZE)
 		return 2;
 	return 3;
 }
@@ -4324,7 +4324,7 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi)
 			s = (struct f2fs_summary *)(kaddr + offset);
 			sum_entries(seg_i->sum_blk)[j] = *s;
 			offset += SUMMARY_SIZE;
-			if (offset + SUMMARY_SIZE <= sbi->sum_blocksize -
+			if (offset + SUMMARY_SIZE <= sbi->blocksize -
 						SUM_FOOTER_SIZE)
 				continue;
 
@@ -4497,7 +4497,7 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)
 			*summary = sum_entries(seg_i->sum_blk)[j];
 			written_size += SUMMARY_SIZE;
 
-			if (written_size + SUMMARY_SIZE <= PAGE_SIZE -
+			if (written_size + SUMMARY_SIZE <= sbi->blocksize -
 							SUM_FOOTER_SIZE)
 				continue;
 
Signature · 1 line
2.52.0.457.g6b5491de43-goog
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

In a previous commit, a bug was introduced where compact SSA summaries failed to utilize the entire block space in non-4KB block size configurations, leading to inefficient space management.

Quoted 6 lines

This patch fixes the calculation logic to ensure that compact SSA summaries can fully occupy the block regardless of the block size.

Fixes e48e16f3e37f ("f2fs: support non-4KB block size without packed_ssa feature")

Thanks,

#2 lore raw
In reply to Daeho Jeong
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:

Hello:

This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:

Quoted 10 lines · On Mon, 26 Jan 2026 14:28:01 -0800 you wrote:

From: Daeho Jeong <[email protected]>

In a previous commit, a bug was introduced where compact SSA summaries failed to utilize the entire block space in non-4KB block size configurations, leading to inefficient space management.

This patch fixes the calculation logic to ensure that compact SSA summaries can fully occupy the block regardless of the block size.

[...]

Here is the summary with links:
- [f2fs-dev] f2fs: fix incomplete block usage in compact SSA summaries

    https://git.kernel.org/jaegeuk/f2fs/c/91b76f1059b6

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html