From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: linux-xfs@vger.kernel.org, hsiangkao@aol.com, david@fromorbit.com
Subject: Re: [PATCH 1/1] xfs: check free AG space when making per-AG reservations
Date: Mon, 24 May 2021 06:42:34 -0400 [thread overview]
Message-ID: <YKuDGt2/Hj/eEHGX@bfoster> (raw)
In-Reply-To: <162181809311.203030.14398379924057321012.stgit@locust>
On Sun, May 23, 2021 at 06:01:33PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> The new online shrink code exposed a gap in the per-AG reservation
> code, which is that we only return ENOSPC to callers if the entire fs
> doesn't have enough free blocks. Except for debugging mode, the
> reservation init code doesn't ever check that there's enough free space
> in that AG to cover the reservation.
>
> Not having enough space is not considered an immediate fatal error that
> requires filesystem offlining because (a) it's shouldn't be possible to
> wind up in that state through normal file operations and (b) even if
> one did, freeing data blocks would recover the situation.
>
> However, online shrink now needs to know if shrinking would not leave
> enough space so that it can abort the shrink operation. Hence we need
> to promote this assertion into an actual error return.
>
> Observed by running xfs/168 with a 1k block size, though in theory this
> could happen with any configuration.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_ag_resv.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_ag_resv.c b/fs/xfs/libxfs/xfs_ag_resv.c
> index e32a1833d523..bbfea8022a3b 100644
> --- a/fs/xfs/libxfs/xfs_ag_resv.c
> +++ b/fs/xfs/libxfs/xfs_ag_resv.c
> @@ -325,10 +325,22 @@ xfs_ag_resv_init(
> error2 = xfs_alloc_pagf_init(mp, tp, pag->pag_agno, 0);
> if (error2)
> return error2;
> - ASSERT(xfs_perag_resv(pag, XFS_AG_RESV_METADATA)->ar_reserved +
> - xfs_perag_resv(pag, XFS_AG_RESV_RMAPBT)->ar_reserved <=
> - pag->pagf_freeblks + pag->pagf_flcount);
> +
> + /*
> + * If there isn't enough space in the AG to satisfy the
> + * reservation, let the caller know that there wasn't enough
> + * space. Callers are responsible for deciding what to do
> + * next, since (in theory) we can stumble along with
> + * insufficient reservation if data blocks are being freed to
> + * replenish the AG's free space.
> + */
> + if (!error &&
> + xfs_perag_resv(pag, XFS_AG_RESV_METADATA)->ar_reserved +
> + xfs_perag_resv(pag, XFS_AG_RESV_RMAPBT)->ar_reserved >
> + pag->pagf_freeblks + pag->pagf_flcount)
> + error = -ENOSPC;
> }
> +
> return error;
> }
>
>
next prev parent reply other threads:[~2021-05-24 10:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 1:01 [PATCHSET 0/1] xfs: fixes for online shrink Darrick J. Wong
2021-05-24 1:01 ` [PATCH 1/1] xfs: check free AG space when making per-AG reservations Darrick J. Wong
2021-05-24 10:42 ` Brian Foster [this message]
2021-05-24 13:06 ` Carlos Maiolino
2021-05-24 15:09 ` Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YKuDGt2/Hj/eEHGX@bfoster \
--to=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hsiangkao@aol.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox