As same as in data IO path, we must serialize write IOs for metadata. We
cannot add mutex around allocation and submit because metadata blocks are
allocated in an earlier stage to build up B-trees.
Thus, this commit add hmzoned_meta_io_lock and hold it during metadata IO
submission in btree_write_cache_pages() to serialize IOs. Furthermore, this
commit add per-block group metadata IO submission pointer
"meta_write_pointer" to ensure sequential writing, which can be caused when
writing back blocks in a not finished transaction.
Signed-off-by: Naohiro Aota <naohiro.aota@xxxxxxx>
---
fs/btrfs/block-group.h | 1 +
fs/btrfs/ctree.h | 2 ++
fs/btrfs/disk-io.c | 1 +
fs/btrfs/extent_io.c | 27 +++++++++++++++++++++-
fs/btrfs/hmzoned.c | 52 ++++++++++++++++++++++++++++++++++++++++++
fs/btrfs/hmzoned.h | 27 ++++++++++++++++++++++
6 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h
index 57c8d6f4b3d1..8827869f1744 100644
--- a/fs/btrfs/block-group.h
+++ b/fs/btrfs/block-group.h
@@ -166,6 +166,7 @@ struct btrfs_block_group {
*/
u64 alloc_offset;
struct mutex zone_io_lock;
+ u64 meta_write_pointer;
};
#ifdef CONFIG_BTRFS_DEBUG
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 44517802b9e5..18d2d0581e68 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -905,6 +905,8 @@ struct btrfs_fs_info {
spinlock_t ref_verify_lock;
struct rb_root block_tree;
#endif
+
+ struct mutex hmzoned_meta_io_lock;
};
static inline struct btrfs_fs_info *btrfs_sb(struct super_block *sb)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index fbbc313f9f46..4abadd9317d1 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2707,6 +2707,7 @@ int __cold open_ctree(struct super_block *sb,
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->hmzoned_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 6e25c8790ef4..24f7b05e1f4c 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3921,7 +3921,9 @@ int btree_write_cache_pages(struct address_space *mapping,
struct writeback_control *wbc)
{
struct extent_io_tree *tree = &BTRFS_I(mapping->host)->io_tree;
+ struct btrfs_fs_info *fs_info = tree->fs_info;
struct extent_buffer *eb, *prev_eb = NULL;
+ struct btrfs_block_group *cache = NULL;
struct extent_page_data epd = {
.bio = NULL,
.tree = tree,
@@ -3951,6 +3953,7 @@ int btree_write_cache_pages(struct address_space *mapping,
tag = PAGECACHE_TAG_TOWRITE;
else
tag = PAGECACHE_TAG_DIRTY;
+ btrfs_hmzoned_meta_io_lock(fs_info);
retry:
if (wbc->sync_mode == WB_SYNC_ALL)
tag_pages_for_writeback(mapping, index, end);
@@ -3994,12 +3997,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;
@@ -4032,12 +4053,16 @@ 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;
}
ret = flush_write_bio(&epd);
+out:
+ btrfs_hmzoned_meta_io_unlock(fs_info);
return ret;
}
diff --git a/fs/btrfs/hmzoned.c b/fs/btrfs/hmzoned.c
index 0c0ee9a46009..1aa4c9d1032e 100644
--- a/fs/btrfs/hmzoned.c
+++ b/fs/btrfs/hmzoned.c
@@ -1069,6 +1069,9 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache)
}
}
+ if (!ret)
+ cache->meta_write_pointer = cache->alloc_offset + cache->start;
+
kfree(alloc_offsets);
free_extent_map(em);
@@ -1171,3 +1174,52 @@ void btrfs_free_redirty_list(struct btrfs_transaction *trans)
}
spin_unlock(&trans->releasing_ebs_lock);
}
+
+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_fs_incompat(fs_info, HMZONED))
+ 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_fs_incompat(eb->fs_info, HMZONED) || !cache)
+ return;
+
+ ASSERT(cache->meta_write_pointer == eb->start + eb->len);
+ cache->meta_write_pointer = eb->start;
+}
diff --git a/fs/btrfs/hmzoned.h b/fs/btrfs/hmzoned.h
index f6682ead575b..54f1affa6919 100644
--- a/fs/btrfs/hmzoned.h
+++ b/fs/btrfs/hmzoned.h
@@ -50,6 +50,11 @@ void btrfs_redirty_list_add(struct btrfs_transaction *trans,
struct extent_buffer *eb);
void btrfs_free_redirty_list(struct btrfs_transaction *trans);
void btrfs_hmzoned_data_io_unlock_at(struct inode *inode, u64 start, u64 len);
+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)
@@ -120,6 +125,14 @@ static inline void btrfs_redirty_list_add(struct btrfs_transaction *trans,
static inline void btrfs_free_redirty_list(struct btrfs_transaction *trans) { }
static inline void btrfs_hmzoned_data_io_unlock_at(struct inode *inode,
u64 start, u64 len) { }
+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)
@@ -254,4 +267,18 @@ static inline void btrfs_hmzoned_data_io_unlock_logical(
btrfs_put_block_group(cache);
}
+static inline void btrfs_hmzoned_meta_io_lock(struct btrfs_fs_info *fs_info)
+{
+ if (!btrfs_fs_incompat(fs_info, HMZONED))
+ return;
+ mutex_lock(&fs_info->hmzoned_meta_io_lock);
+}
+
+static inline void btrfs_hmzoned_meta_io_unlock(struct btrfs_fs_info *fs_info)
+{
+ if (!btrfs_fs_incompat(fs_info, HMZONED))
+ return;
+ mutex_unlock(&fs_info->hmzoned_meta_io_lock);
+}
+
#endif
--
2.24.0
