btrfs: zoned: introduce physical_map to btrfs_block_group

We will use a block group's physical location to track active zones and
finish fully written zones in the following commits. Since the zone
activation is done in the extent allocation context which already holding
the tree locks, we can't query the chunk tree for the physical locations.
So, copy the location info into a block group and use it for activation.

Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index e9295e3c2cb3a92ed7adbbac5966d54b6ed85ed2..4f8f04ed911e0f485842189d14fd2072c1102208 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -144,6 +144,7 @@ void btrfs_put_block_group(struct btrfs_block_group *cache)
                 */
                WARN_ON(!RB_EMPTY_ROOT(&cache->full_stripe_locks_root.root));
                kfree(cache->free_space_ctl);
+               kfree(cache->physical_map);
                kfree(cache);
        }
 }

diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h
index 2db40a0055129a3dc501d95a6c164e7ce0366373..265db2c316d3da8e320a4bc1817866627cfec64b 100644 (file)
--- a/fs/btrfs/block-group.h
+++ b/fs/btrfs/block-group.h
@@ -204,6 +204,7 @@ struct btrfs_block_group {
        u64 zone_unusable;
        u64 zone_capacity;
        u64 meta_write_pointer;
+       struct map_lookup *physical_map;
 };
 
 static inline u64 btrfs_block_group_end(struct btrfs_block_group *block_group)

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index 2ccdc6e1f7937fac7544acf7d576cfd87937e229..4c89ac02843ebe744485a6cab46f447ba4ebcea1 100644 (file)
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1158,10 +1158,18 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)
 
        map = em->map_lookup;
 
+       cache->physical_map = kmalloc(map_lookup_size(map->num_stripes), GFP_NOFS);
+       if (!cache->physical_map) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       memcpy(cache->physical_map, map, map_lookup_size(map->num_stripes));
+
        alloc_offsets = kcalloc(map->num_stripes, sizeof(*alloc_offsets), GFP_NOFS);
        if (!alloc_offsets) {
-               free_extent_map(em);
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto out;
        }
 
        caps = kcalloc(map->num_stripes, sizeof(*caps), GFP_NOFS);
@@ -1344,6 +1352,10 @@ out:
        if (!ret)
                cache->meta_write_pointer = cache->alloc_offset + cache->start;
 
+       if (ret) {
+               kfree(cache->physical_map);
+               cache->physical_map = NULL;
+       }
        kfree(caps);
        kfree(alloc_offsets);
        free_extent_map(em);