From: Gao Xiang <hsiangkao@redhat.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: linux-xfs@vger.kernel.org, Brian Foster <bfoster@redhat.com>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>,
Eric Sandeen <sandeen@sandeen.net>
Subject: Re: [PATCH v9 5/5] xfs: add error injection for per-AG resv failure
Date: Thu, 25 Mar 2021 08:54:44 +0800 [thread overview]
Message-ID: <20210325005444.GC2421109@xiangao.remote.csb> (raw)
In-Reply-To: <20210324171744.GT22100@magnolia>
On Wed, Mar 24, 2021 at 10:17:44AM -0700, Darrick J. Wong wrote:
> On Wed, Mar 24, 2021 at 09:06:21AM +0800, Gao Xiang wrote:
> > per-AG resv failure after fixing up freespace is hard to test in an
> > effective way, so directly add an error injection path to observe
> > such error handling path works as expected.
> >
> > Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
>
> Looks good to me; can you send the latest version of the xfs_growfs
> patches to the list to get the review started for 5.13?
Yeah, I saw your comments on the xfs_growfs. I didn't send out just because
it can still apply with no conflict. Will update manpage as well.
>
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Thanks for the review.
Thanks,
Gao Xiang
>
> --D
>
> > ---
> > fs/xfs/libxfs/xfs_ag_resv.c | 6 +++++-
> > fs/xfs/libxfs/xfs_errortag.h | 4 +++-
> > fs/xfs/xfs_error.c | 3 +++
> > 3 files changed, 11 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/xfs/libxfs/xfs_ag_resv.c b/fs/xfs/libxfs/xfs_ag_resv.c
> > index fdfe6dc0d307..6c5f8d10589c 100644
> > --- a/fs/xfs/libxfs/xfs_ag_resv.c
> > +++ b/fs/xfs/libxfs/xfs_ag_resv.c
> > @@ -211,7 +211,11 @@ __xfs_ag_resv_init(
> > ASSERT(0);
> > return -EINVAL;
> > }
> > - error = xfs_mod_fdblocks(mp, -(int64_t)hidden_space, true);
> > +
> > + if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_AG_RESV_FAIL))
> > + error = -ENOSPC;
> > + else
> > + error = xfs_mod_fdblocks(mp, -(int64_t)hidden_space, true);
> > if (error) {
> > trace_xfs_ag_resv_init_error(pag->pag_mount, pag->pag_agno,
> > error, _RET_IP_);
> > diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
> > index 6ca9084b6934..a23a52e643ad 100644
> > --- a/fs/xfs/libxfs/xfs_errortag.h
> > +++ b/fs/xfs/libxfs/xfs_errortag.h
> > @@ -58,7 +58,8 @@
> > #define XFS_ERRTAG_BUF_IOERROR 35
> > #define XFS_ERRTAG_REDUCE_MAX_IEXTENTS 36
> > #define XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT 37
> > -#define XFS_ERRTAG_MAX 38
> > +#define XFS_ERRTAG_AG_RESV_FAIL 38
> > +#define XFS_ERRTAG_MAX 39
> >
> > /*
> > * Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
> > @@ -101,5 +102,6 @@
> > #define XFS_RANDOM_BUF_IOERROR XFS_RANDOM_DEFAULT
> > #define XFS_RANDOM_REDUCE_MAX_IEXTENTS 1
> > #define XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT 1
> > +#define XFS_RANDOM_AG_RESV_FAIL 1
> >
> > #endif /* __XFS_ERRORTAG_H_ */
> > diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
> > index 185b4915b7bf..f70984f3174d 100644
> > --- a/fs/xfs/xfs_error.c
> > +++ b/fs/xfs/xfs_error.c
> > @@ -56,6 +56,7 @@ static unsigned int xfs_errortag_random_default[] = {
> > XFS_RANDOM_BUF_IOERROR,
> > XFS_RANDOM_REDUCE_MAX_IEXTENTS,
> > XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT,
> > + XFS_RANDOM_AG_RESV_FAIL,
> > };
> >
> > struct xfs_errortag_attr {
> > @@ -168,6 +169,7 @@ XFS_ERRORTAG_ATTR_RW(iunlink_fallback, XFS_ERRTAG_IUNLINK_FALLBACK);
> > XFS_ERRORTAG_ATTR_RW(buf_ioerror, XFS_ERRTAG_BUF_IOERROR);
> > XFS_ERRORTAG_ATTR_RW(reduce_max_iextents, XFS_ERRTAG_REDUCE_MAX_IEXTENTS);
> > XFS_ERRORTAG_ATTR_RW(bmap_alloc_minlen_extent, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT);
> > +XFS_ERRORTAG_ATTR_RW(ag_resv_fail, XFS_ERRTAG_AG_RESV_FAIL);
> >
> > static struct attribute *xfs_errortag_attrs[] = {
> > XFS_ERRORTAG_ATTR_LIST(noerror),
> > @@ -208,6 +210,7 @@ static struct attribute *xfs_errortag_attrs[] = {
> > XFS_ERRORTAG_ATTR_LIST(buf_ioerror),
> > XFS_ERRORTAG_ATTR_LIST(reduce_max_iextents),
> > XFS_ERRORTAG_ATTR_LIST(bmap_alloc_minlen_extent),
> > + XFS_ERRORTAG_ATTR_LIST(ag_resv_fail),
> > NULL,
> > };
> >
> > --
> > 2.27.0
> >
>
prev parent reply other threads:[~2021-03-25 0:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 1:06 [PATCH v9 0/5] xfs: support shrinking free space in the last AG Gao Xiang
2021-03-24 1:06 ` [PATCH v9 1/5] xfs: update lazy sb counters immediately for resizefs Gao Xiang
2021-03-24 1:06 ` [PATCH v9 2/5] xfs: hoist out xfs_resizefs_init_new_ags() Gao Xiang
2021-03-24 1:06 ` [PATCH v9 3/5] xfs: introduce xfs_ag_shrink_space() Gao Xiang
2021-03-24 1:06 ` [PATCH v9 4/5] xfs: support shrinking unused space in the last AG Gao Xiang
2021-03-24 17:34 ` Darrick J. Wong
2021-03-25 0:50 ` Gao Xiang
2021-03-24 1:06 ` [PATCH v9 5/5] xfs: add error injection for per-AG resv failure Gao Xiang
2021-03-24 17:17 ` Darrick J. Wong
2021-03-25 0:54 ` Gao Xiang [this message]
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=20210325005444.GC2421109@xiangao.remote.csb \
--to=hsiangkao@redhat.com \
--cc=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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;
as well as URLs for NNTP newsgroup(s).