btrfs: break up extent_io.c a little bit
v2 cover btrfs: break up extent_io.c a little bit
v1->v2:
- renamed find_delalloc_range to btrfs_find_delalloc_range for now.
-- Original email --
Currently extent_io.c includes all of the extent-io-tree code, the extent buffer code, the code to do IO on extent buffers and data extents, as well as a bunch of other random stuff. The random stuff just needs to be cleaned up, and is probably too invasive for this point in the development cycle. Instead I simply tackled moving the big obvious things out into their own files. I will follow up with cleanups for the rest of the stuff, but those can probably wait until the next cycle as they are going to be slightly more risky. As usual I didn't try to change anything, I simply moved code around. Any time I needed to make actual changes to functions I made a separate patch for that work, so for example breaking up the init/exit functions for extent-io-tree. Everything else is purely cut and paste into new files. The diffstat is as follows
fs/btrfs/Makefile | 3 +- fs/btrfs/ctree.h | 3 +- fs/btrfs/disk-io.h | 2 + fs/btrfs/extent-buffer.c | 1266 ++++++++ fs/btrfs/extent-buffer.h | 152 + fs/btrfs/extent-io-tree.c | 1955 ++++++++++++ fs/btrfs/extent-io-tree.h | 248 ++ fs/btrfs/extent_io.c | 7555 +++++++++++++-------------------------------- fs/btrfs/extent_io.h | 372 +-- fs/btrfs/super.c | 16 +- 10 files changed, 5843 insertions(+), 5729 deletions(-)
Thanks,
Josef
PATCH v2 1/9 btrfs: separate out the extent leak code
We check both extent buffer and extent state leaks in the same function, separate these two functions out so we can move them around.
--- fs/btrfs/extent_io.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
fs/btrfs/extent_io.c +17 -11
@@ -60,7 +60,19 @@ void btrfs_leak_debug_del(struct list_head *entry) }static inline -void btrfs_leak_debug_check (void ) +void btrfs_extent_buffer_leak_debug_check () +{ +while (!list_empty (&buffers)) { + eb = list_entry(buffers.next, struct extent_buffer, leak_list); +pr_err ("BTRFS: buffer leak start %llu len %lu refs %d bflags %lu\n" , + eb->start, eb->len,atomic_read (&eb->refs), eb->bflags); +list_del (&eb->leak_list); +kmem_cache_free (extent_buffer_cache, eb); + } +} + +static inline +void btrfs_extent_state_leak_debug_check (void ) {struct extent_state *state;struct extent_buffer *eb;
@@ -74,14 +86,6 @@ void btrfs_leak_debug_check(void)list_del (&state->leak_list);kmem_cache_free (extent_state_cache, state); } - -while (!list_empty (&buffers)) { - eb = list_entry(buffers.next, struct extent_buffer, leak_list); -pr_err ("BTRFS: buffer leak start %llu len %lu refs %d bflags %lu\n" , - eb->start, eb->len,atomic_read (&eb->refs), eb->bflags); -list_del (&eb->leak_list); -kmem_cache_free (extent_buffer_cache, eb); - } }#define btrfs_debug_check_extent_io_range (tree, start, end) \
@@ -105,7 +109,8 @@ static inline void __btrfs_debug_check_extent_io_range(const char *caller,#else #define btrfs_leak_debug_add (new, head) do {} while (0)#define btrfs_leak_debug_del (entry) do {} while (0) -#define btrfs_leak_debug_check () do {} while (0) +#define btrfs_extent_buffer_leak_debug_check () do {} while (0) +#define btrfs_extent_state_leak_debug_check () do {} while (0)#define btrfs_debug_check_extent_io_range (c, s, e) do {} while (0)#endif
@@ -235,7 +240,8 @@ int __init extent_io_init(void)void __cold extent_io_exit (void ) { -btrfs_leak_debug_check (); +btrfs_extent_buffer_leak_debug_check (); +btrfs_extent_state_leak_debug_check ();/* * Make sure all delayed rcu free are flushed before we
Signature · 1 line
2.21.0
PATCH v2 2/9 btrfs: separate out the extent io init function
In reply to Josef BacikWe are moving extent_io_tree into it's on file, so separate out the extent_state init stuff from extent_io_tree_init().
--- fs/btrfs/extent_io.c | 18 +++++++++++------- fs/btrfs/extent_io.h | 2 ++ fs/btrfs/super.c | 9 ++++++++- 3 files changed, 21 insertions(+), 8 deletions(-)
fs/btrfs/extent_io.c +11 -7
@@ -201,19 +201,23 @@ static int __must_check flush_write_bio(struct extent_page_data *epd)return ret; } -int __init extent_io_init (void ) +int __init extent_state_cache_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) - goto free_state_cache; +return -ENOMEM ; if (bioset_init(&btrfs_bioset, BIO_POOL_SIZE, offsetof(struct btrfs_io_bio, bio),
@@ -231,24 +235,24 @@ int __init extent_io_init(void) free_buffer_cache:kmem_cache_destroy (extent_buffer_cache); extent_buffer_cache =NULL ; +return -ENOMEM ; +} -free_state_cache: +void __cold extent_state_cache_exit (void ) +{ +btrfs_extent_state_leak_debug_check ();kmem_cache_destroy (extent_state_cache); - extent_state_cache =NULL ; -return -ENOMEM ; }void __cold extent_io_exit (void ) {btrfs_extent_buffer_leak_debug_check (); -btrfs_extent_state_leak_debug_check ();/* * Make sure all delayed rcu free are flushed before we * destroy caches. */ rcu_barrier (); -kmem_cache_destroy (extent_state_cache);kmem_cache_destroy (extent_buffer_cache);bioset_exit (&btrfs_bioset); }
fs/btrfs/extent_io.h +2 -0
@@ -556,4 +556,6 @@ bool find_lock_delalloc_range(struct inode *inode,struct extent_buffer *alloc_test_extent_buffer (struct btrfs_fs_info *fs_info,u64 start); +int __init extent_state_cache_init (void ); +void __cold extent_state_cache_exit (void );#endif
fs/btrfs/super.c +8 -1
@@ -2360,10 +2360,14 @@ static int __init init_btrfs_fs(void)if (err) goto free_cachep; - err =extent_map_init (); + err =extent_state_cache_init ();if (err) goto free_extent_io; + err =extent_map_init (); +if (err) + goto free_extent_state_cache; + err =ordered_data_init ();if (err) goto free_extent_map;
@@ -2422,6 +2426,8 @@ static int __init init_btrfs_fs(void)ordered_data_exit (); free_extent_map:extent_map_exit (); +free_extent_state_cache: +extent_state_cache_exit (); free_extent_io:extent_io_exit (); free_cachep:
@@ -2442,6 +2448,7 @@ static void __exit exit_btrfs_fs(void)btrfs_prelim_ref_exit ();ordered_data_exit ();extent_map_exit (); +extent_state_cache_exit ();extent_io_exit ();btrfs_interface_exit ();btrfs_end_io_wq_exit ();
Signature · 1 line
2.21.0
PATCH v2 3/9 btrfs: move extent_io_tree defs to their own header
In reply to Josef Bacikextent_io.c/h are huge, encompassing a bunch of different things. The extent_io_tree code can live on its own, so separate this out.
--- fs/btrfs/ctree.h | 1 + fs/btrfs/extent-io-tree.h | 227 ++++++++++++++++++++++++++++++++++++++ fs/btrfs/extent_io.c | 1 + fs/btrfs/extent_io.h | 217 +----------------------------------- 4 files changed, 230 insertions(+), 216 deletions(-) create mode 100644 fs/btrfs/extent-io-tree.h
fs/btrfs/ctree.h +1 -0
@@ -28,6 +28,7 @@#include <linux/dynamic_debug.h> #include <linux/refcount.h> #include <linux/crc32c.h> +#include "extent-io-tree.h" #include "extent_io.h" #include "extent_map.h" #include "async-thread.h"
fs/btrfs/extent-io-tree.h new file +227 -0
227 lines not on this page · raw message
fs/btrfs/extent_io.c +1 -0
@@ -14,6 +14,7 @@#include <linux/prefetch.h> #include <linux/cleancache.h> #include "extent_io.h" +#include "extent-io-tree.h" #include "extent_map.h" #include "ctree.h" #include "btrfs_inode.h"
fs/btrfs/extent_io.h +1 -216
254 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 4/9 btrfs: export find_delalloc_range
In reply to Josef BacikThis utilizes internal stuff to the extent_io_tree, so we need to export it before we move it.
--- fs/btrfs/extent-io-tree.h | 3 +++ fs/btrfs/extent_io.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-)
fs/btrfs/extent-io-tree.h +3 -0
@@ -223,5 +223,8 @@ void find_first_clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 *start_ret, u64 *end_ret, unsigned bits);int extent_invalidatepage (struct extent_io_tree *tree,struct page *page,unsigned long offset); +bool btrfs_find_delalloc_range (struct extent_io_tree *tree,u64 *start, +u64 *end,u64 max_bytes, +struct extent_state **cached_state);#endif /* BTRFS_EXTENT_IO_TREE_H */
fs/btrfs/extent_io.c +5 -5
@@ -1687,9 +1687,9 @@ void find_first_clear_extent_bit(struct extent_io_tree *tree, u64 start,* * true is returned if we find something, false if nothing was in the tree */ -static noinline bool find_delalloc_range(struct extent_io_tree *tree, -u64 *start,u64 *end,u64 max_bytes, -struct extent_state **cached_state) +bool btrfs_find_delalloc_range (struct extent_io_tree *tree,u64 *start, +u64 *end,u64 max_bytes, +struct extent_state **cached_state) {struct rb_node *node;struct extent_state *state;
@@ -1807,8 +1807,8 @@ noinline_for_stack bool find_lock_delalloc_range(struct inode *inode,/* step one, find a bunch of delalloc bytes starting at start */ delalloc_start = *start; delalloc_end =0 ; - found =find_delalloc_range (tree, &delalloc_start, &delalloc_end, - max_bytes, &cached_state); + found =btrfs_find_delalloc_range (tree, &delalloc_start, &delalloc_end, + max_bytes, &cached_state);if (!found || delalloc_end <= *start) { *start = delalloc_start; *end = delalloc_end;
Signature · 1 line
2.21.0
PATCH v2 5/9 btrfs: move the failrec tree stuff into extent-io-tree.h
In reply to Josef BacikThis needs to be cleaned up in the future, but for now it belongs to the extent-io-tree stuff since it uses the internal tree search code. Needed to export get_state_failrec and set_state_failrec as well since we're not going to move the actual IO part of the failrec stuff out at this point.
--- fs/btrfs/extent-io-tree.h | 18 ++++++++++++++++++ fs/btrfs/extent_io.c | 8 ++++---- fs/btrfs/extent_io.h | 11 ----------- 3 files changed, 22 insertions(+), 15 deletions(-)
fs/btrfs/extent-io-tree.h +18 -0
@@ -4,6 +4,7 @@#define BTRFS_EXTENT_IO_TREE_H struct extent_changeset ; +struct io_failure_record ;/* bits for the extent state */ #define EXTENT_DIRTY (1U << 0)
@@ -227,4 +228,21 @@ bool btrfs_find_delalloc_range(struct extent_io_tree *tree, u64 *start, u64 *end, u64 max_bytes, struct extent_state **cached_state); +/* This should be reworked in the future and put elsewhere. */ +int get_state_failrec (struct extent_io_tree *tree,u64 start, +struct io_failure_record **failrec); +int set_state_failrec (struct extent_io_tree *tree,u64 start, +struct io_failure_record *failrec); +void btrfs_free_io_failure_record (struct btrfs_inode *inode,u64 start, +u64 end); +int btrfs_get_io_failure_record (struct inode *inode,u64 start,u64 end, +struct io_failure_record **failrec_ret); +int free_io_failure (struct extent_io_tree *failure_tree, +struct extent_io_tree *io_tree, +struct io_failure_record *rec); +int clean_io_failure (struct btrfs_fs_info *fs_info, +struct extent_io_tree *failure_tree, +struct extent_io_tree *io_tree,u64 start, +struct page *page,u64 ino,unsigned int pg_offset); +#endif /* BTRFS_EXTENT_IO_TREE_H */
fs/btrfs/extent_io.c +4 -4
@@ -2025,8 +2025,8 @@ u64 count_range_bits(struct extent_io_tree *tree,* set the private field for a given byte offset in the tree. If there isn't * an extent_state there already, this does nothing. */ -static noinline int set_state_failrec(struct extent_io_tree *tree, u64 start, -struct io_failure_record *failrec) +int set_state_failrec (struct extent_io_tree *tree,u64 start, +struct io_failure_record *failrec) {struct rb_node *node;struct extent_state *state;
@@ -2053,8 +2053,8 @@ static noinline int set_state_failrec(struct extent_io_tree *tree, u64 start,return ret; } -static noinline int get_state_failrec(struct extent_io_tree *tree, u64 start, -struct io_failure_record **failrec) +int get_state_failrec (struct extent_io_tree *tree,u64 start, +struct io_failure_record **failrec) {struct rb_node *node;struct extent_state *state;
fs/btrfs/extent_io.h +0 -11
@@ -296,10 +296,6 @@ struct btrfs_inode;int repair_io_failure (struct btrfs_fs_info *fs_info,u64 ino,u64 start,u64 length,u64 logical,struct page *page,unsigned int pg_offset,int mirror_num); -int clean_io_failure (struct btrfs_fs_info *fs_info, -struct extent_io_tree *failure_tree, -struct extent_io_tree *io_tree,u64 start, -struct page *page,u64 ino,unsigned int pg_offset);void end_extent_writepage (struct page *page,int err,u64 start,u64 end);int btrfs_repair_eb_io_failure (struct extent_buffer *eb,int mirror_num);
@@ -323,19 +319,12 @@ struct io_failure_record { }; -void btrfs_free_io_failure_record (struct btrfs_inode *inode,u64 start, -u64 end); -int btrfs_get_io_failure_record (struct inode *inode,u64 start,u64 end, -struct io_failure_record **failrec_ret);bool btrfs_check_repairable (struct inode *inode,unsigned failed_bio_pages,struct io_failure_record *failrec,int fail_mirror);struct bio *btrfs_create_repair_bio (struct inode *inode,struct bio *failed_bio,struct io_failure_record *failrec,struct page *page,int pg_offset,int icsum,bio_end_io_t *endio_func,void *data); -int free_io_failure (struct extent_io_tree *failure_tree, -struct extent_io_tree *io_tree, -struct io_failure_record *rec);#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS bool find_lock_delalloc_range(struct inode *inode, struct page *locked_page, u64 *start,
Signature · 1 line
2.21.0
PATCH v2 7/9 btrfs: separate out the extent buffer init code
In reply to Josef BacikWe want to move this into it's own file, so separate out the init/exit code for setting up the extent_buffer cache.
--- fs/btrfs/extent_io.c | 36 +++++++++++++++++++----------------- fs/btrfs/extent_io.h | 2 ++ fs/btrfs/super.c | 9 ++++++++- 3 files changed, 29 insertions(+), 18 deletions(-)
fs/btrfs/extent_io.c +19 -17
@@ -135,32 +135,30 @@ static int __must_check flush_write_bio(struct extent_page_data *epd)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) -return -ENOMEM ; -if (bioset_init (&btrfs_bioset,BIO_POOL_SIZE , offsetof(struct btrfs_io_bio , bio),BIOSET_NEED_BVECS )) - goto free_buffer_cache; +return -ENOMEM ; -if (bioset_integrity_create (&btrfs_bioset,BIO_POOL_SIZE )) - goto free_bioset; +if (bioset_integrity_create (&btrfs_bioset,BIO_POOL_SIZE )) { +bioset_exit (&btrfs_bioset); +return -ENOMEM ; + }return 0 ; +} -free_bioset: -bioset_exit (&btrfs_bioset); - -free_buffer_cache: -kmem_cache_destroy (extent_buffer_cache); - extent_buffer_cache =NULL ; -return -ENOMEM ; +int __init extent_buffer_init (void ) +{ + extent_buffer_cache =kmem_cache_create ("btrfs_extent_buffer" , +sizeof (struct extent_buffer ),0 , +SLAB_MEM_SPREAD ,NULL ); +if (!extent_buffer_cache) +return -ENOMEM ; +return 0 ; } -void __cold extent_io_exit (void ) +void __cold extent_buffer_exit (void ) {btrfs_extent_buffer_leak_debug_check ();
@@ -170,6 +168,10 @@ void __cold extent_io_exit(void)*/ rcu_barrier ();kmem_cache_destroy (extent_buffer_cache); +} + +void __cold extent_io_exit (void ) +{bioset_exit (&btrfs_bioset); }
fs/btrfs/extent_io.h +2 -0
@@ -332,4 +332,6 @@ bool find_lock_delalloc_range(struct inode *inode,#endif struct extent_buffer *alloc_test_extent_buffer (struct btrfs_fs_info *fs_info,u64 start); +int __init extent_buffer_init (void ); +void __cold extent_buffer_exit (void );#endif
fs/btrfs/super.c +8 -1
@@ -2360,10 +2360,14 @@ static int __init init_btrfs_fs(void)if (err) goto free_cachep; - err =extent_state_cache_init (); + err =extent_buffer_init ();if (err) goto free_extent_io; + err =extent_state_cache_init (); +if (err) + goto free_extent_buffer; + err =extent_map_init ();if (err) goto free_extent_state_cache;
@@ -2428,6 +2432,8 @@ static int __init init_btrfs_fs(void)extent_map_exit (); free_extent_state_cache:extent_state_cache_exit (); +free_extent_buffer: +extent_buffer_exit (); free_extent_io:extent_io_exit (); free_cachep:
@@ -2449,6 +2455,7 @@ static void __exit exit_btrfs_fs(void)ordered_data_exit ();extent_map_exit ();extent_state_cache_exit (); +extent_buffer_exit ();extent_io_exit ();btrfs_interface_exit ();btrfs_end_io_wq_exit ();
Signature · 1 line
2.21.0
PATCH v2 8/9 btrfs: migrate the extent_buffer code out of extent-io.h
In reply to Josef BacikThere's two main things we do with extent buffers, we mess with the buffers themselves, and then we do IO on those buffers. Separate out the actual extent buffer manipulation code from extent_io since they are unrelated.
--- fs/btrfs/ctree.h | 2 +- fs/btrfs/disk-io.h | 2 + fs/btrfs/extent-buffer.h | 152 +++++++++++++++++++++++++++++++++++++++ fs/btrfs/extent_io.h | 148 +------------------------------------- 4 files changed, 157 insertions(+), 147 deletions(-) create mode 100644 fs/btrfs/extent-buffer.h
fs/btrfs/ctree.h +1 -1
@@ -29,7 +29,7 @@#include <linux/refcount.h> #include <linux/crc32c.h> #include "extent-io-tree.h" -#include "extent_io.h" +#include "extent-buffer.h" #include "extent_map.h" #include "async-thread.h" #include "block-rsv.h"
fs/btrfs/disk-io.h +2 -0
@@ -6,6 +6,8 @@#ifndef BTRFS_DISK_IO_H #define BTRFS_DISK_IO_H +#include "extent_io.h" +#define BTRFS_SUPER_INFO_OFFSET SZ_64K#define BTRFS_SUPER_INFO_SIZE 4096
fs/btrfs/extent-buffer.h new file +152 -0
152 lines not on this page · raw message
fs/btrfs/extent_io.h +2 -146
193 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 9/9 btrfs: move the extent-buffer code
In reply to Josef BacikThis moves the extent buffer code into its own file.
--- fs/btrfs/Makefile | 3 +- fs/btrfs/extent-buffer.c | 1266 ++++++++++++++++++++++++++++++++++++++ fs/btrfs/extent_io.c | 1255 ------------------------------------- 3 files changed, 1268 insertions(+), 1256 deletions(-) create mode 100644 fs/btrfs/extent-buffer.c
fs/btrfs/Makefile +2 -1
@@ -11,7 +11,8 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \ reada.o backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o \ uuid-tree.o props.o free-space-tree.o tree-checker.o space-info.o \ - block-rsv.o delalloc-space.o block-group.o extent-io-tree.o + block-rsv.o delalloc-space.o block-group.o extent-io-tree.o \ + extent-buffer.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o
fs/btrfs/extent-buffer.c new file +1266 -0
1,266 lines not on this page · raw message
fs/btrfs/extent_io.c +0 -1255
1,290 lines not on this page · raw message
Signature · 1 line
2.21.0