[PATCH] btrfs: align max_zone_append_size to the sector size

[PATCH] btrfs: align max_zone_append_size to the sector size

[Christoph Hellwig]

max_zone_append_size and thus the maximum extent size needs to be aligned
to the sector size, else a lot code becomes rather unhappy and various
alignment asserts trigger.

Fixes: 385ea2aea011 ("btrfs: replace BTRFS_MAX_EXTENT_SIZE with fs_info->max_extent_size")
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/btrfs/zoned.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 3b45b35aa945c..fbad2e489dc80 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -739,7 +739,8 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)
 	}
 
 	fs_info->zone_size = zone_size;
-	fs_info->max_zone_append_size = max_zone_append_size;
+	fs_info->max_zone_append_size =
+		ALIGN(max_zone_append_size, 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;
-- 
2.30.2

Re: [PATCH] btrfs: align max_zone_append_size to the sector size

[Johannes Thumshirn]

Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>

Re: [PATCH] btrfs: align max_zone_append_size to the sector size

[David Sterba]

On Thu, Jul 14, 2022 at 11:16:09AM +0200, Christoph Hellwig wrote:
> max_zone_append_size and thus the maximum extent size needs to be aligned
> to the sector size, else a lot code becomes rather unhappy and various
> alignment asserts trigger.
> 
> Fixes: 385ea2aea011 ("btrfs: replace BTRFS_MAX_EXTENT_SIZE with fs_info->max_extent_size")
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Folded to the patch, thanks.

Re: [PATCH] btrfs: align max_zone_append_size to the sector size

[Christoph Hellwig]

On Thu, Jul 14, 2022 at 02:52:47PM +0200, David Sterba wrote:
> > Fixes: 385ea2aea011 ("btrfs: replace BTRFS_MAX_EXTENT_SIZE with fs_info->max_extent_size")
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Folded to the patch, thanks.

Turns out this is still broken as I was misled by the fancy ALIGN
macro.  We need the incremental change below.  Do you want to fold
this in again or should I sent it as a separate patch:


diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 606cd4aab3902..fb335e87b2212 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -740,7 +740,7 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)
 
 	fs_info->zone_size = zone_size;
 	fs_info->max_zone_append_size =
-		ALIGN(max_zone_append_size, fs_info->sectorsize);
+		ALIGN_DOWN(max_zone_append_size, 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;

Re: [PATCH] btrfs: align max_zone_append_size to the sector size

[David Sterba]

On Mon, Jul 18, 2022 at 10:11:27AM +0200, Christoph Hellwig wrote:
> On Thu, Jul 14, 2022 at 02:52:47PM +0200, David Sterba wrote:
> > > Fixes: 385ea2aea011 ("btrfs: replace BTRFS_MAX_EXTENT_SIZE with fs_info->max_extent_size")
> > > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > 
> > Folded to the patch, thanks.
> 
> Turns out this is still broken as I was misled by the fancy ALIGN
> macro.  We need the incremental change below.  Do you want to fold
> this in again or should I sent it as a separate patch:

Folding small fixups is easier for me, no need to resend, thanks.