btrfs: move btrfs_bio allocation to volumes.c

volumes.c is the place that implements the storage layer using the
btrfs_bio structure, so move the bio_set and allocation helpers there
as well.

To make up for the new initialization boilerplate, merge the two
init/exit helpers in extent_io.c into a single one.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Tested-by: Nikolay Borisov <nborisov@suse.com>
Tested-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index 53ae849d0248100df33bdb12c69d258063410af6..ec2f8b8e6faa769cebf677f5f47c0fb4d1e6f243 100644 (file)
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -96,9 +96,6 @@ struct extent_state {
 #endif
 };
 
-int __init extent_state_cache_init(void);
-void __cold extent_state_cache_exit(void);
-
 void extent_io_tree_init(struct btrfs_fs_info *fs_info,
                         struct extent_io_tree *tree, unsigned int owner,
                         void *private_data);

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index b876147e25a9bc4be2aa961b5332086b98000d06..85569c0e1def0f4f3a145a56a06fea010e5a08ac 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -33,7 +33,6 @@
 
 static struct kmem_cache *extent_state_cache;
 static struct kmem_cache *extent_buffer_cache;
-static struct bio_set btrfs_bioset;
 
 static inline bool extent_state_in_tree(const struct extent_state *state)
 {
@@ -232,41 +231,23 @@ static void submit_write_bio(struct extent_page_data *epd, int ret)
        }
 }
 
-int __init extent_state_cache_init(void)
+int __init extent_io_init(void)
 {
        extent_state_cache = kmem_cache_create("btrfs_extent_state",
                        sizeof(struct extent_state), 0,
                        SLAB_MEM_SPREAD, NULL);
        if (!extent_state_cache)
                return -ENOMEM;
-       return 0;
-}
 
-int __init extent_io_init(void)
-{
        extent_buffer_cache = kmem_cache_create("btrfs_extent_buffer",
                        sizeof(struct extent_buffer), 0,
                        SLAB_MEM_SPREAD, NULL);
-       if (!extent_buffer_cache)
+       if (!extent_buffer_cache) {
+               kmem_cache_destroy(extent_state_cache);
                return -ENOMEM;
-
-       if (bioset_init(&btrfs_bioset, BIO_POOL_SIZE,
-                       offsetof(struct btrfs_bio, bio),
-                       BIOSET_NEED_BVECS))
-               goto free_buffer_cache;
+       }
 
        return 0;
-
-free_buffer_cache:
-       kmem_cache_destroy(extent_buffer_cache);
-       extent_buffer_cache = NULL;
-       return -ENOMEM;
-}
-
-void __cold extent_state_cache_exit(void)
-{
-       btrfs_extent_state_leak_debug_check();
-       kmem_cache_destroy(extent_state_cache);
 }
 
 void __cold extent_io_exit(void)
@@ -277,7 +258,8 @@ void __cold extent_io_exit(void)
         */
        rcu_barrier();
        kmem_cache_destroy(extent_buffer_cache);
-       bioset_exit(&btrfs_bioset);
+       btrfs_extent_state_leak_debug_check();
+       kmem_cache_destroy(extent_state_cache);
 }
 
 /*
@@ -3153,50 +3135,6 @@ int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array)
        return 0;
 }
 
-/*
- * Initialize the members up to but not including 'bio'. Use after allocating a
- * new bio by bio_alloc_bioset as it does not initialize the bytes outside of
- * 'bio' because use of __GFP_ZERO is not supported.
- */
-static inline void btrfs_bio_init(struct btrfs_bio *bbio)
-{
-       memset(bbio, 0, offsetof(struct btrfs_bio, bio));
-}
-
-/*
- * Allocate a btrfs_io_bio, with @nr_iovecs as maximum number of iovecs.
- *
- * The bio allocation is backed by bioset and does not fail.
- */
-struct bio *btrfs_bio_alloc(unsigned int nr_iovecs)
-{
-       struct bio *bio;
-
-       ASSERT(0 < nr_iovecs && nr_iovecs <= BIO_MAX_VECS);
-       bio = bio_alloc_bioset(NULL, nr_iovecs, 0, GFP_NOFS, &btrfs_bioset);
-       btrfs_bio_init(btrfs_bio(bio));
-       return bio;
-}
-
-struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size)
-{
-       struct bio *bio;
-       struct btrfs_bio *bbio;
-
-       ASSERT(offset <= UINT_MAX && size <= UINT_MAX);
-
-       /* this will never fail when it's backed by a bioset */
-       bio = bio_alloc_clone(orig->bi_bdev, orig, GFP_NOFS, &btrfs_bioset);
-       ASSERT(bio);
-
-       bbio = btrfs_bio(bio);
-       btrfs_bio_init(bbio);
-
-       bio_trim(bio, offset >> 9, size >> 9);
-       bbio->iter = bio->bi_iter;
-       return bio;
-}
-
 /**
  * Attempt to add a page to bio
  *

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 4bc72a87b9a99ce768f18f24d4b5ee0380590831..69a86ae6fd5087a4ec2c70dc54976604f6296efb 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -60,7 +60,6 @@ enum {
 struct btrfs_bio;
 struct btrfs_root;
 struct btrfs_inode;
-struct btrfs_io_bio;
 struct btrfs_fs_info;
 struct io_failure_record;
 struct extent_io_tree;
@@ -242,8 +241,6 @@ void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
                                  u32 bits_to_clear, unsigned long page_ops);
 
 int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array);
-struct bio *btrfs_bio_alloc(unsigned int nr_iovecs);
-struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size);
 
 void end_extent_writepage(struct page *page, int err, u64 start, u64 end);
 int btrfs_repair_eb_io_failure(const struct extent_buffer *eb, int mirror_num);

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index f1c6ca59299e605f1d77234d4c16546e861636a9..01dd3c9d713e1d0d8004ca9c6b22d9bbc56efd83 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2669,13 +2669,13 @@ static int __init init_btrfs_fs(void)
        if (err)
                goto free_cachep;
 
-       err = extent_state_cache_init();
+       err = btrfs_bioset_init();
        if (err)
                goto free_extent_io;
 
        err = extent_map_init();
        if (err)
-               goto free_extent_state_cache;
+               goto free_bioset;
 
        err = ordered_data_init();
        if (err)
@@ -2727,8 +2727,8 @@ free_ordered_data:
        ordered_data_exit();
 free_extent_map:
        extent_map_exit();
-free_extent_state_cache:
-       extent_state_cache_exit();
+free_bioset:
+       btrfs_bioset_exit();
 free_extent_io:
        extent_io_exit();
 free_cachep:
@@ -2749,7 +2749,7 @@ static void __exit exit_btrfs_fs(void)
        btrfs_prelim_ref_exit();
        ordered_data_exit();
        extent_map_exit();
-       extent_state_cache_exit();
+       btrfs_bioset_exit();
        extent_io_exit();
        btrfs_interface_exit();
        unregister_filesystem(&btrfs_fs_type);

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index fb195a0a87da2c56fc3b6f2388a8e36094040f39..7c8a44d3dadc993bb400222bb06899ed0d626ec4 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -34,6 +34,8 @@
 #include "discard.h"
 #include "zoned.h"
 
+static struct bio_set btrfs_bioset;
+
 #define BTRFS_BLOCK_GROUP_STRIPE_MASK  (BTRFS_BLOCK_GROUP_RAID0 | \
                                         BTRFS_BLOCK_GROUP_RAID10 | \
                                         BTRFS_BLOCK_GROUP_RAID56_MASK)
@@ -6612,6 +6614,48 @@ int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
        return __btrfs_map_block(fs_info, op, logical, length, bioc_ret, 0, 1);
 }
 
+/*
+ * Initialize a btrfs_bio structure.  This skips the embedded bio itself as it
+ * is already initialized by the block layer.
+ */
+static inline void btrfs_bio_init(struct btrfs_bio *bbio)
+{
+       memset(bbio, 0, offsetof(struct btrfs_bio, bio));
+}
+
+/*
+ * Allocate a btrfs_bio structure.  The btrfs_bio is the main I/O container for
+ * btrfs, and is used for all I/O submitted through btrfs_submit_bio.
+ *
+ * Just like the underlying bio_alloc_bioset it will not fail as it is backed by
+ * a mempool.
+ */
+struct bio *btrfs_bio_alloc(unsigned int nr_vecs)
+{
+       struct bio *bio;
+
+       bio = bio_alloc_bioset(NULL, nr_vecs, 0, GFP_NOFS, &btrfs_bioset);
+       btrfs_bio_init(btrfs_bio(bio));
+       return bio;
+}
+
+struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size)
+{
+       struct bio *bio;
+       struct btrfs_bio *bbio;
+
+       ASSERT(offset <= UINT_MAX && size <= UINT_MAX);
+
+       bio = bio_alloc_clone(orig->bi_bdev, orig, GFP_NOFS, &btrfs_bioset);
+       bbio = btrfs_bio(bio);
+       btrfs_bio_init(bbio);
+
+       bio_trim(bio, offset >> 9, size >> 9);
+       bbio->iter = bio->bi_iter;
+       return bio;
+
+}
+
 static struct workqueue_struct *btrfs_end_io_wq(struct btrfs_io_context *bioc)
 {
        if (bioc->orig_bio->bi_opf & REQ_META)
@@ -8289,3 +8333,17 @@ bool btrfs_repair_one_zone(struct btrfs_fs_info *fs_info, u64 logical)
 
        return true;
 }
+
+int __init btrfs_bioset_init(void)
+{
+       if (bioset_init(&btrfs_bioset, BIO_POOL_SIZE,
+                       offsetof(struct btrfs_bio, bio),
+                       BIOSET_NEED_BVECS))
+               return -ENOMEM;
+       return 0;
+}
+
+void __cold btrfs_bioset_exit(void)
+{
+       bioset_exit(&btrfs_bioset);
+}

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 5639961b3626f76772eee1c5574f362a21c5e29d..e1a74598947fb0ddf456e5484bdf559e4b58514f 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -393,6 +393,12 @@ static inline struct btrfs_bio *btrfs_bio(struct bio *bio)
        return container_of(bio, struct btrfs_bio, bio);
 }
 
+int __init btrfs_bioset_init(void);
+void __cold btrfs_bioset_exit(void);
+
+struct bio *btrfs_bio_alloc(unsigned int nr_vecs);
+struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size);
+
 static inline void btrfs_bio_free_csum(struct btrfs_bio *bbio)
 {
        if (bbio->csum != bbio->csum_inline) {