From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: linux-xfs@vger.kernel.org, hch@infradead.org, david@fromorbit.com
Subject: Re: [PATCH 07/12] xfs: flush eof/cowblocks if we can't reserve quota for file blocks
Date: Tue, 2 Feb 2021 10:38:59 -0500 [thread overview]
Message-ID: <20210202153859.GG3336100@bfoster> (raw)
In-Reply-To: <161214516600.140945.4401509001858536727.stgit@magnolia>
On Sun, Jan 31, 2021 at 06:06:06PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> If a fs modification (data write, reflink, xattr set, fallocate, etc.)
> is unable to reserve enough quota to handle the modification, try
> clearing whatever space the filesystem might have been hanging onto in
> the hopes of speeding up the filesystem. The flushing behavior will
> become particularly important when we add deferred inode inactivation
> because that will increase the amount of space that isn't actively tied
> to user data.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
(FWIW, I'm reviewing the patches from your reclaim-space-harder-5.12
branch as of this morning, which look like they have some deltas from
the posted versions based on Christoph's feedback.)
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_reflink.c | 5 +++++
> fs/xfs/xfs_trans.c | 10 ++++++++++
> 2 files changed, 15 insertions(+)
>
>
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index 086866f6e71f..725c7d8e4438 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -1092,6 +1092,11 @@ xfs_reflink_remap_extent(
> * count. This is suboptimal, but the VFS flushed the dest range
> * before we started. That should have removed all the delalloc
> * reservations, but we code defensively.
> + *
> + * xfs_trans_alloc_inode above already tried to grab an even larger
> + * quota reservation, and kicked off a blockgc scan if it couldn't.
> + * If we can't get a potentially smaller quota reservation now, we're
> + * done.
> */
> if (!quota_reserved && !smap_real && dmap_written) {
> error = xfs_trans_reserve_quota_nblks(tp, ip,
> diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
> index 466e1c86767f..f62c1c5f210f 100644
> --- a/fs/xfs/xfs_trans.c
> +++ b/fs/xfs/xfs_trans.c
> @@ -23,6 +23,7 @@
> #include "xfs_inode.h"
> #include "xfs_dquot_item.h"
> #include "xfs_dquot.h"
> +#include "xfs_icache.h"
>
> kmem_zone_t *xfs_trans_zone;
>
> @@ -1046,8 +1047,10 @@ xfs_trans_alloc_inode(
> {
> struct xfs_trans *tp;
> struct xfs_mount *mp = ip->i_mount;
> + bool retried = false;
> int error;
>
> +retry:
> error = xfs_trans_alloc(mp, resv, dblocks,
> rblocks / mp->m_sb.sb_rextsize,
> force ? XFS_TRANS_RESERVE : 0, &tp);
> @@ -1065,6 +1068,13 @@ xfs_trans_alloc_inode(
> }
>
> error = xfs_trans_reserve_quota_nblks(tp, ip, dblocks, rblocks, force);
> + if (!retried && (error == -EDQUOT || error == -ENOSPC)) {
> + xfs_trans_cancel(tp);
> + xfs_iunlock(ip, XFS_ILOCK_EXCL);
> + xfs_blockgc_free_quota(ip, 0);
> + retried = true;
> + goto retry;
> + }
> if (error)
> goto out_cancel;
>
>
next prev parent reply other threads:[~2021-02-02 15:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 2:05 [PATCHSET v7 00/12] xfs: try harder to reclaim space when we run out Darrick J. Wong
2021-02-01 2:05 ` [PATCH 01/12] xfs: trigger all block gc scans when low on quota space Darrick J. Wong
2021-02-01 2:05 ` [PATCH 02/12] xfs: don't stall cowblocks scan if we can't take locks Darrick J. Wong
2021-02-01 2:05 ` [PATCH 03/12] xfs: xfs_inode_free_quota_blocks should scan project quota Darrick J. Wong
2021-02-01 2:05 ` [PATCH 04/12] xfs: move and rename xfs_inode_free_quota_blocks to avoid conflicts Darrick J. Wong
2021-02-01 2:05 ` [PATCH 05/12] xfs: pass flags and return gc errors from xfs_blockgc_free_quota Darrick J. Wong
2021-02-01 2:06 ` [PATCH 06/12] xfs: try worst case space reservation upfront in xfs_reflink_remap_extent Darrick J. Wong
2021-02-01 12:24 ` Christoph Hellwig
2021-02-01 2:06 ` [PATCH 07/12] xfs: flush eof/cowblocks if we can't reserve quota for file blocks Darrick J. Wong
2021-02-01 12:32 ` Christoph Hellwig
2021-02-01 19:01 ` Darrick J. Wong
2021-02-02 15:38 ` Brian Foster [this message]
2021-02-02 16:53 ` Darrick J. Wong
2021-02-01 2:06 ` [PATCH 08/12] xfs: flush eof/cowblocks if we can't reserve quota for inode creation Darrick J. Wong
2021-02-01 12:35 ` Christoph Hellwig
2021-02-01 19:03 ` Darrick J. Wong
2021-02-02 15:39 ` Brian Foster
2021-02-01 2:06 ` [PATCH 09/12] xfs: flush eof/cowblocks if we can't reserve quota for chown Darrick J. Wong
2021-02-01 12:36 ` Christoph Hellwig
2021-02-01 19:12 ` Darrick J. Wong
2021-02-02 15:39 ` Brian Foster
2021-02-01 2:06 ` [PATCH 10/12] xfs: add a tracepoint for blockgc scans Darrick J. Wong
2021-02-01 2:06 ` [PATCH 11/12] xfs: refactor xfs_icache_free_{eof,cow}blocks call sites Darrick J. Wong
2021-02-01 2:06 ` [PATCH 12/12] xfs: flush speculative space allocations when we run out of space Darrick J. Wong
2021-02-02 15:39 ` Brian Foster
-- strict thread matches above, loose matches on Subject: below --
2021-01-29 2:17 [PATCHSET v6 00/12] xfs: try harder to reclaim space when we run out Darrick J. Wong
2021-01-29 2:18 ` [PATCH 07/12] xfs: flush eof/cowblocks if we can't reserve quota for file blocks Darrick J. Wong
[not found] ` <20210129160944.GE2665284@bfoster>
2021-01-29 17:47 ` Darrick J. Wong
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=20210202153859.GG3336100@bfoster \
--to=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--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