btrfs: zoned: refine extent allocator hint selection

[ Upstream commit 0d703963d297964451783e1a0688ebdf74cd6151 ]

The hint block group selection in the extent allocator is wrong in the
first place, as it can select the dedicated data relocation block group for
the normal data allocation.

Since we separated the normal data space_info and the data relocation
space_info, we can easily identify a block group is for data relocation or
not. Do not choose it for the normal data allocation.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index bb3602059906de0c807d6e7b606fea24a0db76b8..7bab2512468d52c353fb53125a2cb23a38de9314 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4299,7 +4299,8 @@ static int prepare_allocation_clustered(struct btrfs_fs_info *fs_info,
 }
 
 static int prepare_allocation_zoned(struct btrfs_fs_info *fs_info,
-                                   struct find_free_extent_ctl *ffe_ctl)
+                                   struct find_free_extent_ctl *ffe_ctl,
+                                   struct btrfs_space_info *space_info)
 {
        if (ffe_ctl->for_treelog) {
                spin_lock(&fs_info->treelog_bg_lock);
@@ -4323,6 +4324,7 @@ static int prepare_allocation_zoned(struct btrfs_fs_info *fs_info,
                        u64 avail = block_group->zone_capacity - block_group->alloc_offset;
 
                        if (block_group_bits(block_group, ffe_ctl->flags) &&
+                           block_group->space_info == space_info &&
                            avail >= ffe_ctl->num_bytes) {
                                ffe_ctl->hint_byte = block_group->start;
                                break;
@@ -4344,7 +4346,7 @@ static int prepare_allocation(struct btrfs_fs_info *fs_info,
                return prepare_allocation_clustered(fs_info, ffe_ctl,
                                                    space_info, ins);
        case BTRFS_EXTENT_ALLOC_ZONED:
-               return prepare_allocation_zoned(fs_info, ffe_ctl);
+               return prepare_allocation_zoned(fs_info, ffe_ctl, space_info);
        default:
                BUG();
        }