Skip to contentSkip to conversation

btrfs: zoned: calculate max_extent_size properly on non-zoned setup

PATCH In review Christoph Hellwig 4 participants 4 messages Dec 13, 2024 – Jan 6, 2025 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: zoned: calculate max_extent_size properly on non-zoned setup

Since commit 559218d43ec9 ("block: pre-calculate max_zone_append_sectors"), queue_limits's max_zone_append_sectors is default to be 0 and it is only updated when there is a zoned device. So, we have lim->max_zone_append_sectors = 0 when there is no zoned device in the filesystem.

That leads to fs_info->max_zone_append_size and thus fs_info->max_extent_size to be 0, which is wrong and can for example lead to a divide by zero in count_max_extents().

Fix this by only capping fs_info->max_extent_size to fs_info->max_zone_append_size when it is non-zero.

Based on a patch from Naohiro Aota <[email protected]>, from which much of this commit message is stolen as well.

Fixes 559218d43ec9 ("block: pre-calculate max_zone_append_sectors")
---
 fs/btrfs/zoned.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/btrfs/zoned.c +3 -2
index 11ed523e528e..27f4472fb559 100644
@@ -748,8 +748,9 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)
 		     (u64)lim->max_segments << PAGE_SHIFT),
 		fs_info->sectorsize);
 	fs_info->fs_devices->chunk_alloc_policy = BTRFS_CHUNK_ALLOC_ZONED;
-	if (fs_info->max_zone_append_size < fs_info->max_extent_size)
-		fs_info->max_extent_size = fs_info->max_zone_append_size;
+
+	fs_info->max_extent_size = min_not_zero(fs_info->max_extent_size,
+			fs_info->max_zone_append_size);
 
 	/*
 	 * Check mount options here, because we might change fs_info->zoned
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#2 lore raw
In reply to Christoph Hellwig
Quoted 16 lines · Christoph Hellwig

Since commit 559218d43ec9 ("block: pre-calculate max_zone_append_sectors"), queue_limits's max_zone_append_sectors is default to be 0 and it is only updated when there is a zoned device. So, we have lim->max_zone_append_sectors = 0 when there is no zoned device in the filesystem.

That leads to fs_info->max_zone_append_size and thus fs_info->max_extent_size to be 0, which is wrong and can for example lead to a divide by zero in count_max_extents().

Fix this by only capping fs_info->max_extent_size to fs_info->max_zone_append_size when it is non-zero.

Based on a patch from Naohiro Aota <[email protected]>, from which much of this commit message is stolen as well.

Quoted 7 lines
Fixes 559218d43ec9 ("block: pre-calculate max_zone_append_sectors")
---
 fs/btrfs/zoned.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
#3 lore raw
In reply to Christoph Hellwig
Quoted 13 lines · Christoph Hellwig

Since commit 559218d43ec9 ("block: pre-calculate max_zone_append_sectors"), queue_limits's max_zone_append_sectors is default to be 0 and it is only updated when there is a zoned device. So, we have lim->max_zone_append_sectors = 0 when there is no zoned device in the filesystem.

That leads to fs_info->max_zone_append_size and thus fs_info->max_extent_size to be 0, which is wrong and can for example lead to a divide by zero in count_max_extents().

Fix this by only capping fs_info->max_extent_size to fs_info->max_zone_append_size when it is non-zero.

Quoted 7 lines

Based on a patch from Naohiro Aota <[email protected]>, from which much of this commit message is stolen as well.

Fixes 559218d43ec9 ("block: pre-calculate max_zone_append_sectors")

Added to for-next, thanks.