| Message ID | 61771fe28bda89abcdb55b2a00be05eb82d2216e.1604065695.git.naohiro.aota@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: zoned block device support | expand |
On 10/30/20 9:51 AM, Naohiro Aota wrote: > We cannot use zone append for writing metadata, because the B-tree nodes > have references to each other using the logical address. Without knowing > the address in advance, we cannot construct the tree in the first place. > So we need to serialize write IOs for metadata. > > We cannot add a mutex around allocation and submission because metadata > blocks are allocated in an earlier stage to build up B-trees. > > Add a zoned_meta_io_lock and hold it during metadata IO submission in > btree_write_cache_pages() to serialize IOs. Furthermore, this add a > per-block group metadata IO submission pointer "meta_write_pointer" to > ensure sequential writing, which can be caused when writing back blocks in > an unfinished transaction. > > Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com> > --- > fs/btrfs/block-group.h | 1 + > fs/btrfs/ctree.h | 1 + > fs/btrfs/disk-io.c | 1 + > fs/btrfs/extent_io.c | 27 ++++++++++++++++++++++- > fs/btrfs/zoned.c | 50 ++++++++++++++++++++++++++++++++++++++++++ > fs/btrfs/zoned.h | 31 ++++++++++++++++++++++++++ > 6 files changed, 110 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h > index 401e9bcefaec..b2a8a3beceac 100644 > --- a/fs/btrfs/block-group.h > +++ b/fs/btrfs/block-group.h > @@ -190,6 +190,7 @@ struct btrfs_block_group { > */ > u64 alloc_offset; > u64 zone_unusable; > + u64 meta_write_pointer; > }; > > static inline u64 btrfs_block_group_end(struct btrfs_block_group *block_group) > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index 383c83a1f5b5..736f679f1310 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -955,6 +955,7 @@ struct btrfs_fs_info { > }; > /* max size to emit ZONE_APPEND write command */ > u64 max_zone_append_size; > + struct mutex zoned_meta_io_lock; > > #ifdef CONFIG_BTRFS_FS_REF_VERIFY > spinlock_t ref_verify_lock; > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index 778716e223ff..f02b121d8213 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -2652,6 +2652,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info) > mutex_init(&fs_info->delete_unused_bgs_mutex); > mutex_init(&fs_info->reloc_mutex); > mutex_init(&fs_info->delalloc_root_mutex); > + mutex_init(&fs_info->zoned_meta_io_lock); > seqlock_init(&fs_info->profiles_lock); > > INIT_LIST_HEAD(&fs_info->dirty_cowonly_roots); > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index 3f49febafc69..3cce444d5dbb 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -25,6 +25,7 @@ > #include "backref.h" > #include "disk-io.h" > #include "zoned.h" > +#include "block-group.h" > > static struct kmem_cache *extent_state_cache; > static struct kmem_cache *extent_buffer_cache; > @@ -4001,6 +4002,7 @@ int btree_write_cache_pages(struct address_space *mapping, > struct writeback_control *wbc) > { > struct extent_buffer *eb, *prev_eb = NULL; > + struct btrfs_block_group *cache = NULL; > struct extent_page_data epd = { > .bio = NULL, > .extent_locked = 0, > @@ -4035,6 +4037,7 @@ int btree_write_cache_pages(struct address_space *mapping, > tag = PAGECACHE_TAG_TOWRITE; > else > tag = PAGECACHE_TAG_DIRTY; > + btrfs_zoned_meta_io_lock(fs_info); > retry: > if (wbc->sync_mode == WB_SYNC_ALL) > tag_pages_for_writeback(mapping, index, end); > @@ -4077,12 +4080,30 @@ int btree_write_cache_pages(struct address_space *mapping, > if (!ret) > continue; > > + if (!btrfs_check_meta_write_pointer(fs_info, eb, > + &cache)) { > + /* > + * If for_sync, this hole will be filled with > + * trasnsaction commit. > + */ > + if (wbc->sync_mode == WB_SYNC_ALL && > + !wbc->for_sync) > + ret = -EAGAIN; > + else > + ret = 0; > + done = 1; > + free_extent_buffer(eb); > + break; > + } > + > prev_eb = eb; > ret = lock_extent_buffer_for_io(eb, &epd); > if (!ret) { > + btrfs_revert_meta_write_pointer(cache, eb); > free_extent_buffer(eb); > continue; > } else if (ret < 0) { > + btrfs_revert_meta_write_pointer(cache, eb); > done = 1; > free_extent_buffer(eb); > break; > @@ -4115,10 +4136,12 @@ int btree_write_cache_pages(struct address_space *mapping, > index = 0; > goto retry; > } > + if (cache) > + btrfs_put_block_group(cache); > ASSERT(ret <= 0); > if (ret < 0) { > end_write_bio(&epd, ret); > - return ret; > + goto out; > } > /* > * If something went wrong, don't allow any metadata write bio to be > @@ -4153,6 +4176,8 @@ int btree_write_cache_pages(struct address_space *mapping, > ret = -EROFS; > end_write_bio(&epd, ret); > } > +out: > + btrfs_zoned_meta_io_unlock(fs_info); > return ret; > } > > diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c > index 50393d560c9a..15bc7d451348 100644 > --- a/fs/btrfs/zoned.c > +++ b/fs/btrfs/zoned.c > @@ -989,6 +989,9 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache) > ret = -EIO; > } > > + if (!ret) > + cache->meta_write_pointer = cache->alloc_offset + cache->start; > + > kfree(alloc_offsets); > free_extent_map(em); > > @@ -1120,3 +1123,50 @@ void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered) > kfree(logical); > bdput(bdev); > } > + > +bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, > + struct extent_buffer *eb, > + struct btrfs_block_group **cache_ret) > +{ > + struct btrfs_block_group *cache; > + > + if (!btrfs_is_zoned(fs_info)) > + return true; > + > + cache = *cache_ret; > + > + if (cache && (eb->start < cache->start || > + cache->start + cache->length <= eb->start)) { > + btrfs_put_block_group(cache); > + cache = NULL; > + *cache_ret = NULL; > + } > + > + if (!cache) > + cache = btrfs_lookup_block_group(fs_info, eb->start); > + > + if (cache) { > + *cache_ret = cache; Don't set this here, set it after the if statement. > + > + if (cache->meta_write_pointer != eb->start) { > + btrfs_put_block_group(cache); > + cache = NULL; > + *cache_ret = NULL; And delete these two lines. Then you can add Reviewed-by: Josef Bacik <josef@toxicpanda.com> Thanks, Josef
diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h index 401e9bcefaec..b2a8a3beceac 100644 --- a/fs/btrfs/block-group.h +++ b/fs/btrfs/block-group.h @@ -190,6 +190,7 @@ struct btrfs_block_group { */ u64 alloc_offset; u64 zone_unusable; + u64 meta_write_pointer; }; static inline u64 btrfs_block_group_end(struct btrfs_block_group *block_group) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 383c83a1f5b5..736f679f1310 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -955,6 +955,7 @@ struct btrfs_fs_info { }; /* max size to emit ZONE_APPEND write command */ u64 max_zone_append_size; + struct mutex zoned_meta_io_lock; #ifdef CONFIG_BTRFS_FS_REF_VERIFY spinlock_t ref_verify_lock; diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 778716e223ff..f02b121d8213 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2652,6 +2652,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info) mutex_init(&fs_info->delete_unused_bgs_mutex); mutex_init(&fs_info->reloc_mutex); mutex_init(&fs_info->delalloc_root_mutex); + mutex_init(&fs_info->zoned_meta_io_lock); seqlock_init(&fs_info->profiles_lock); INIT_LIST_HEAD(&fs_info->dirty_cowonly_roots); diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 3f49febafc69..3cce444d5dbb 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -25,6 +25,7 @@ #include "backref.h" #include "disk-io.h" #include "zoned.h" +#include "block-group.h" static struct kmem_cache *extent_state_cache; static struct kmem_cache *extent_buffer_cache; @@ -4001,6 +4002,7 @@ int btree_write_cache_pages(struct address_space *mapping, struct writeback_control *wbc) { struct extent_buffer *eb, *prev_eb = NULL; + struct btrfs_block_group *cache = NULL; struct extent_page_data epd = { .bio = NULL, .extent_locked = 0, @@ -4035,6 +4037,7 @@ int btree_write_cache_pages(struct address_space *mapping, tag = PAGECACHE_TAG_TOWRITE; else tag = PAGECACHE_TAG_DIRTY; + btrfs_zoned_meta_io_lock(fs_info); retry: if (wbc->sync_mode == WB_SYNC_ALL) tag_pages_for_writeback(mapping, index, end); @@ -4077,12 +4080,30 @@ int btree_write_cache_pages(struct address_space *mapping, if (!ret) continue; + if (!btrfs_check_meta_write_pointer(fs_info, eb, + &cache)) { + /* + * If for_sync, this hole will be filled with + * trasnsaction commit. + */ + if (wbc->sync_mode == WB_SYNC_ALL && + !wbc->for_sync) + ret = -EAGAIN; + else + ret = 0; + done = 1; + free_extent_buffer(eb); + break; + } + prev_eb = eb; ret = lock_extent_buffer_for_io(eb, &epd); if (!ret) { + btrfs_revert_meta_write_pointer(cache, eb); free_extent_buffer(eb); continue; } else if (ret < 0) { + btrfs_revert_meta_write_pointer(cache, eb); done = 1; free_extent_buffer(eb); break; @@ -4115,10 +4136,12 @@ int btree_write_cache_pages(struct address_space *mapping, index = 0; goto retry; } + if (cache) + btrfs_put_block_group(cache); ASSERT(ret <= 0); if (ret < 0) { end_write_bio(&epd, ret); - return ret; + goto out; } /* * If something went wrong, don't allow any metadata write bio to be @@ -4153,6 +4176,8 @@ int btree_write_cache_pages(struct address_space *mapping, ret = -EROFS; end_write_bio(&epd, ret); } +out: + btrfs_zoned_meta_io_unlock(fs_info); return ret; } diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index 50393d560c9a..15bc7d451348 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -989,6 +989,9 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache) ret = -EIO; } + if (!ret) + cache->meta_write_pointer = cache->alloc_offset + cache->start; + kfree(alloc_offsets); free_extent_map(em); @@ -1120,3 +1123,50 @@ void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered) kfree(logical); bdput(bdev); } + +bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, + struct extent_buffer *eb, + struct btrfs_block_group **cache_ret) +{ + struct btrfs_block_group *cache; + + if (!btrfs_is_zoned(fs_info)) + return true; + + cache = *cache_ret; + + if (cache && (eb->start < cache->start || + cache->start + cache->length <= eb->start)) { + btrfs_put_block_group(cache); + cache = NULL; + *cache_ret = NULL; + } + + if (!cache) + cache = btrfs_lookup_block_group(fs_info, eb->start); + + if (cache) { + *cache_ret = cache; + + if (cache->meta_write_pointer != eb->start) { + btrfs_put_block_group(cache); + cache = NULL; + *cache_ret = NULL; + return false; + } + + cache->meta_write_pointer = eb->start + eb->len; + } + + return true; +} + +void btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache, + struct extent_buffer *eb) +{ + if (!btrfs_is_zoned(eb->fs_info) || !cache) + return; + + ASSERT(cache->meta_write_pointer == eb->start + eb->len); + cache->meta_write_pointer = eb->start; +} diff --git a/fs/btrfs/zoned.h b/fs/btrfs/zoned.h index d3ed4d7dae2b..262b248a9085 100644 --- a/fs/btrfs/zoned.h +++ b/fs/btrfs/zoned.h @@ -47,6 +47,11 @@ void btrfs_free_redirty_list(struct btrfs_transaction *trans); void btrfs_record_physical_zoned(struct inode *inode, u64 file_offset, struct bio *bio); void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered); +bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, + struct extent_buffer *eb, + struct btrfs_block_group **cache_ret); +void btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache, + struct extent_buffer *eb); #else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos, struct blk_zone *zone) @@ -122,6 +127,18 @@ static inline void btrfs_record_physical_zoned(struct inode *inode, } static inline void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered) { } +static inline bool +btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, + struct extent_buffer *eb, + struct btrfs_block_group **cache_ret) +{ + return true; +} +static inline void +btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache, + struct extent_buffer *eb) +{ +} #endif static inline bool btrfs_dev_is_sequential(struct btrfs_device *device, u64 pos) @@ -224,4 +241,18 @@ static inline bool btrfs_can_zone_reset(struct btrfs_device *device, return true; } +static inline void btrfs_zoned_meta_io_lock(struct btrfs_fs_info *fs_info) +{ + if (!btrfs_is_zoned(fs_info)) + return; + mutex_lock(&fs_info->zoned_meta_io_lock); +} + +static inline void btrfs_zoned_meta_io_unlock(struct btrfs_fs_info *fs_info) +{ + if (!btrfs_is_zoned(fs_info)) + return; + mutex_unlock(&fs_info->zoned_meta_io_lock); +} + #endif
We cannot use zone append for writing metadata, because the B-tree nodes have references to each other using the logical address. Without knowing the address in advance, we cannot construct the tree in the first place. So we need to serialize write IOs for metadata. We cannot add a mutex around allocation and submission because metadata blocks are allocated in an earlier stage to build up B-trees. Add a zoned_meta_io_lock and hold it during metadata IO submission in btree_write_cache_pages() to serialize IOs. Furthermore, this add a per-block group metadata IO submission pointer "meta_write_pointer" to ensure sequential writing, which can be caused when writing back blocks in an unfinished transaction. Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com> --- fs/btrfs/block-group.h | 1 + fs/btrfs/ctree.h | 1 + fs/btrfs/disk-io.c | 1 + fs/btrfs/extent_io.c | 27 ++++++++++++++++++++++- fs/btrfs/zoned.c | 50 ++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 31 ++++++++++++++++++++++++++ 6 files changed, 110 insertions(+), 1 deletion(-)