This is a note to let you know that I've just added the patch titled
btrfs: convert count_max_extents() to use fs_info->max_extent_size
to the 5.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
btrfs-convert-count_max_extents-to-use-fs_info-max_extent_size.patch
and it can be found in the queue-5.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7d7672bc5d1038c745716c397d892d21e29de71c Mon Sep 17 00:00:00 2001
From: Naohiro Aota <naohiro.aota@xxxxxxx>
Date: Sat, 9 Jul 2022 08:18:41 +0900
Subject: btrfs: convert count_max_extents() to use fs_info->max_extent_size
From: Naohiro Aota <naohiro.aota@xxxxxxx>
commit 7d7672bc5d1038c745716c397d892d21e29de71c upstream.
If count_max_extents() uses BTRFS_MAX_EXTENT_SIZE to calculate the number
of extents needed, btrfs release the metadata reservation too much on its
way to write out the data.
Now that BTRFS_MAX_EXTENT_SIZE is replaced with fs_info->max_extent_size,
convert count_max_extents() to use it instead, and fix the calculation of
the metadata reservation.
CC: stable@xxxxxxxxxxxxxxx # 5.12+
Fixes: d8e3fb106f39 ("btrfs: zoned: use ZONE_APPEND write for zoned mode")
Signed-off-by: Naohiro Aota <naohiro.aota@xxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/btrfs/ctree.h | 21 +++++++++++++--------
fs/btrfs/delalloc-space.c | 6 +++---
fs/btrfs/inode.c | 16 ++++++++--------
3 files changed, 24 insertions(+), 19 deletions(-)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -107,14 +107,6 @@ struct btrfs_ioctl_encoded_io_args;
#define BTRFS_STAT_CURR 0
#define BTRFS_STAT_PREV 1
-/*
- * Count how many BTRFS_MAX_EXTENT_SIZE cover the @size
- */
-static inline u32 count_max_extents(u64 size)
-{
- return div_u64(size + BTRFS_MAX_EXTENT_SIZE - 1, BTRFS_MAX_EXTENT_SIZE);
-}
-
static inline unsigned long btrfs_chunk_item_size(int num_stripes)
{
BUG_ON(num_stripes == 0);
@@ -3945,6 +3937,19 @@ static inline bool btrfs_is_zoned(const
return fs_info->zoned != 0;
}
+/*
+ * Count how many fs_info->max_extent_size cover the @size
+ */
+static inline u32 count_max_extents(struct btrfs_fs_info *fs_info, u64 size)
+{
+#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
+ if (!fs_info)
+ return div_u64(size + BTRFS_MAX_EXTENT_SIZE - 1, BTRFS_MAX_EXTENT_SIZE);
+#endif
+
+ return div_u64(size + fs_info->max_extent_size - 1, fs_info->max_extent_size);
+}
+
static inline bool btrfs_is_data_reloc_root(const struct btrfs_root *root)
{
return root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID;
--- a/fs/btrfs/delalloc-space.c
+++ b/fs/btrfs/delalloc-space.c
@@ -273,7 +273,7 @@ static void calc_inode_reservations(stru
u64 num_bytes, u64 disk_num_bytes,
u64 *meta_reserve, u64 *qgroup_reserve)
{
- u64 nr_extents = count_max_extents(num_bytes);
+ u64 nr_extents = count_max_extents(fs_info, num_bytes);
u64 csum_leaves = btrfs_csum_bytes_to_leaves(fs_info, disk_num_bytes);
u64 inode_update = btrfs_calc_metadata_size(fs_info, 1);
@@ -349,7 +349,7 @@ int btrfs_delalloc_reserve_metadata(stru
* needs to free the reservation we just made.
*/
spin_lock(&inode->lock);
- nr_extents = count_max_extents(num_bytes);
+ nr_extents = count_max_extents(fs_info, num_bytes);
btrfs_mod_outstanding_extents(inode, nr_extents);
inode->csum_bytes += disk_num_bytes;
btrfs_calculate_inode_block_rsv_size(fs_info, inode);
@@ -412,7 +412,7 @@ void btrfs_delalloc_release_extents(stru
unsigned num_extents;
spin_lock(&inode->lock);
- num_extents = count_max_extents(num_bytes);
+ num_extents = count_max_extents(fs_info, num_bytes);
btrfs_mod_outstanding_extents(inode, -num_extents);
btrfs_calculate_inode_block_rsv_size(fs_info, inode);
spin_unlock(&inode->lock);
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2159,10 +2159,10 @@ void btrfs_split_delalloc_extent(struct
* applies here, just in reverse.
*/
new_size = orig->end - split + 1;
- num_extents = count_max_extents(new_size);
+ num_extents = count_max_extents(fs_info, new_size);
new_size = split - orig->start;
- num_extents += count_max_extents(new_size);
- if (count_max_extents(size) >= num_extents)
+ num_extents += count_max_extents(fs_info, new_size);
+ if (count_max_extents(fs_info, size) >= num_extents)
return;
}
@@ -2219,10 +2219,10 @@ void btrfs_merge_delalloc_extent(struct
* this case.
*/
old_size = other->end - other->start + 1;
- num_extents = count_max_extents(old_size);
+ num_extents = count_max_extents(fs_info, old_size);
old_size = new->end - new->start + 1;
- num_extents += count_max_extents(old_size);
- if (count_max_extents(new_size) >= num_extents)
+ num_extents += count_max_extents(fs_info, old_size);
+ if (count_max_extents(fs_info, new_size) >= num_extents)
return;
spin_lock(&BTRFS_I(inode)->lock);
@@ -2301,7 +2301,7 @@ void btrfs_set_delalloc_extent(struct in
if (!(state->state & EXTENT_DELALLOC) && (*bits & EXTENT_DELALLOC)) {
struct btrfs_root *root = BTRFS_I(inode)->root;
u64 len = state->end + 1 - state->start;
- u32 num_extents = count_max_extents(len);
+ u32 num_extents = count_max_extents(fs_info, len);
bool do_list = !btrfs_is_free_space_inode(BTRFS_I(inode));
spin_lock(&BTRFS_I(inode)->lock);
@@ -2343,7 +2343,7 @@ void btrfs_clear_delalloc_extent(struct
struct btrfs_inode *inode = BTRFS_I(vfs_inode);
struct btrfs_fs_info *fs_info = btrfs_sb(vfs_inode->i_sb);
u64 len = state->end + 1 - state->start;
- u32 num_extents = count_max_extents(len);
+ u32 num_extents = count_max_extents(fs_info, len);
if ((state->state & EXTENT_DEFRAG) && (*bits & EXTENT_DEFRAG)) {
spin_lock(&inode->lock);
Patches currently in stable-queue which might be from naohiro.aota@xxxxxxx are
queue-5.18/btrfs-fix-error-handling-of-fallback-uncompress-writ.patch
queue-5.18/block-add-bdev_max_segments-helper.patch
queue-5.18/btrfs-replace-btrfs_max_extent_size-with-fs_info-max.patch
queue-5.18/btrfs-zoned-introduce-space_info-active_total_bytes.patch
queue-5.18/btrfs-zoned-disable-metadata-overcommit-for-zoned.patch
queue-5.18/btrfs-let-can_allocate_chunk-return-error.patch
queue-5.18/btrfs-ensure-pages-are-unlocked-on-cow_file_range-fa.patch
queue-5.18/btrfs-zoned-activate-metadata-block-group-on-flush_s.patch
queue-5.18/btrfs-zoned-write-out-partially-allocated-region.patch
queue-5.18/btrfs-zoned-finish-least-available-block-group-on-da.patch
queue-5.18/btrfs-zoned-introduce-btrfs_zoned_bg_is_full.patch
queue-5.18/btrfs-convert-count_max_extents-to-use-fs_info-max_extent_size.patch
queue-5.18/btrfs-zoned-revive-max_zone_append_bytes.patch
queue-5.18/btrfs-zoned-wait-until-zone-is-finished-when-allocat.patch
queue-5.18/btrfs-zoned-activate-necessary-block-group.patch
