On Mon, Mar 14, 2022 at 11:08:47AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> xfs_reserve_blocks controls the size of the user-visible free space
> reserve pool. Given the difference between the current and requested
> pool sizes, it will try to reserve free space from fdblocks. However,
> the amount requested from fdblocks is also constrained by the amount of
> space that we think xfs_mod_fdblocks will give us. We'll keep trying to
> reserve space so long as xfs_mod_fdblocks returns ENOSPC.
>
> In commit fd43cf600cf6, we decided that xfs_mod_fdblocks should not hand
> out the "free space" used by the free space btrees, because some portion
> of the free space btrees hold in reserve space for future btree
> expansion. Unfortunately, xfs_reserve_blocks' estimation of the number
> of blocks that it could request from xfs_mod_fdblocks was not updated to
> include m_allocbt_blks, so if space is extremely low, the caller hangs.
>
> Fix this by including m_allocbt_blks in the estimation, and modify the
> loop so that it will not retry infinitely.
>
> Found by running xfs/306 (which formats a single-AG 20MB filesystem)
> with an fstests configuration that specifies a 1k blocksize and a
> specially crafted log size that will consume 7/8 of the space (17920
> blocks, specifically) in that AG.
>
> Cc: Brian Foster <bfoster@xxxxxxxxxx>
> Fixes: fd43cf600cf6 ("xfs: set aside allocation btree blocks from block reservation")
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
> fs/xfs/xfs_fsops.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
> index 33e26690a8c4..78b6982ea5b0 100644
> --- a/fs/xfs/xfs_fsops.c
> +++ b/fs/xfs/xfs_fsops.c
> @@ -379,6 +379,7 @@ xfs_reserve_blocks(
> int64_t fdblks_delta = 0;
> uint64_t request;
> int64_t free;
> + unsigned int tries;
> int error = 0;
>
> /* If inval is null, report current values and return */
> @@ -432,9 +433,16 @@ xfs_reserve_blocks(
> * perform a partial reservation if the request exceeds free space.
> */
> error = -ENOSPC;
> - do {
> - free = percpu_counter_sum(&mp->m_fdblocks) -
> - mp->m_alloc_set_aside;
> + for (tries = 0; tries < 30 && error == -ENOSPC; tries++) {
Any reason for the magic number of retries as opposed to perhaps just
not retrying at all? This seems a little odd when you think about it
given that the request is already intended to take available space into
account and modify the request from userspace. OTOH, another
consideration could be to retry some (really large?) number of times and
then bail out if we happen to iterate without an observable change in
free space (i.e., something is wrong), however I suppose that could be
racy as well. *shrug*
> + /*
> + * The reservation pool cannot take space that xfs_mod_fdblocks
> + * will not give us. This includes the per-AG set-aside space
> + * and free space btree blocks that are not available for
> + * allocation due to per-AG metadata reservations.
> + */
> + free = percpu_counter_sum(&mp->m_fdblocks);
> + free -= mp->m_alloc_set_aside;
> + free -= atomic64_read(&mp->m_allocbt_blks);
Seems reasonable. Do we want to consider ->m_allocbt_blks in other
places where ->m_alloc_set_aside is used (i.e. xfs_fs_statfs(), etc.)?
Not sure how much it matters for space reporting purposes, but if so, it
might also be worth reconsidering the usefulness of a static field and
initialization helper (i.e. xfs_alloc_set_aside()) if the majority of
uses involve a dynamic calculation (due to ->m_allocbt_blks).
Brian
> if (free <= 0)
> break;
>
> @@ -459,7 +467,7 @@ xfs_reserve_blocks(
> spin_unlock(&mp->m_sb_lock);
> error = xfs_mod_fdblocks(mp, -fdblks_delta, 0);
> spin_lock(&mp->m_sb_lock);
> - } while (error == -ENOSPC);
> + }
>
> /*
> * Update the reserve counters if blocks have been successfully
>
