From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, edwin@etorok.net
Subject: Re: [PATCH 1/9] xfs: fix reflink quota reservation accounting error
Date: Thu, 25 Jun 2020 08:26:35 -0400 [thread overview]
Message-ID: <20200625122635.GC2863@bfoster> (raw)
In-Reply-To: <159304786592.874036.13697964290841630094.stgit@magnolia>
On Wed, Jun 24, 2020 at 06:17:45PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Quota reservations are supposed to account for the blocks that might be
> allocated due to a bmap btree split. Reflink doesn't do this, so fix
> this to make the quota accounting more accurate before we start
> rearranging things.
>
> Fixes: 862bb360ef56 ("xfs: reflink extents from one file to another")
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_reflink.c | 21 ++++++++++++++-------
> 1 file changed, 14 insertions(+), 7 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index 107bf2a2f344..d89201d40891 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -1003,6 +1003,7 @@ xfs_reflink_remap_extent(
> xfs_filblks_t rlen;
> xfs_filblks_t unmap_len;
> xfs_off_t newlen;
> + int64_t qres;
> int error;
>
> unmap_len = irec->br_startoff + irec->br_blockcount - destoff;
> @@ -1025,13 +1026,19 @@ xfs_reflink_remap_extent(
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> xfs_trans_ijoin(tp, ip, 0);
>
> - /* If we're not just clearing space, then do we have enough quota? */
> - if (real_extent) {
> - error = xfs_trans_reserve_quota_nblks(tp, ip,
> - irec->br_blockcount, 0, XFS_QMOPT_RES_REGBLKS);
> - if (error)
> - goto out_cancel;
> - }
> + /*
> + * Reserve quota for this operation. We don't know if the first unmap
> + * in the dest file will cause a bmap btree split, so we always reserve
> + * at least enough blocks for that split. If the extent being mapped
> + * in is written, we need to reserve quota for that too.
> + */
> + qres = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK);
> + if (real_extent)
> + qres += irec->br_blockcount;
> + error = xfs_trans_reserve_quota_nblks(tp, ip, qres, 0,
> + XFS_QMOPT_RES_REGBLKS);
> + if (error)
> + goto out_cancel;
>
> trace_xfs_reflink_remap(ip, irec->br_startoff,
> irec->br_blockcount, irec->br_startblock);
>
next prev parent reply other threads:[~2020-06-25 12:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 1:17 [PATCH v2 0/9] xfs: reflink cleanups Darrick J. Wong
2020-06-25 1:17 ` [PATCH 1/9] xfs: fix reflink quota reservation accounting error Darrick J. Wong
2020-06-25 12:26 ` Brian Foster [this message]
2020-07-01 8:07 ` Christoph Hellwig
2020-06-25 1:17 ` [PATCH 2/9] xfs: rename xfs_bmap_is_real_extent to is_written_extent Darrick J. Wong
2020-06-25 12:26 ` Brian Foster
2020-07-01 8:08 ` Christoph Hellwig
2020-06-25 1:17 ` [PATCH 3/9] xfs: redesign the reflink remap loop to fix blkres depletion crash Darrick J. Wong
2020-06-25 12:27 ` Brian Foster
2020-06-25 16:57 ` Darrick J. Wong
2020-06-25 17:23 ` [PATCH v4.2 " Darrick J. Wong
2020-06-26 11:57 ` Brian Foster
2020-06-26 16:40 ` Darrick J. Wong
2020-07-01 8:20 ` Christoph Hellwig
2020-06-25 1:18 ` [PATCH 4/9] xfs: only reserve quota blocks for bmbt changes if we're changing the data fork Darrick J. Wong
2020-06-25 12:27 ` Brian Foster
2020-07-01 8:21 ` Christoph Hellwig
2020-06-25 1:18 ` [PATCH 5/9] xfs: only reserve quota blocks if we're mapping into a hole Darrick J. Wong
2020-06-25 12:28 ` Brian Foster
2020-07-01 8:22 ` Christoph Hellwig
2020-06-25 1:18 ` [PATCH 6/9] xfs: reflink can skip remap existing mappings Darrick J. Wong
2020-06-25 12:28 ` Brian Foster
2020-06-25 16:49 ` Darrick J. Wong
2020-06-25 1:18 ` [PATCH 7/9] xfs: fix xfs_reflink_remap_prep calling conventions Darrick J. Wong
2020-07-01 8:23 ` Christoph Hellwig
2020-06-25 1:18 ` [PATCH 8/9] xfs: refactor locking and unlocking two inodes against userspace IO Darrick J. Wong
2020-07-01 8:26 ` Christoph Hellwig
2020-06-25 1:18 ` [PATCH 9/9] xfs: move helpers that lock and unlock " Darrick J. Wong
2020-07-01 8:27 ` Christoph Hellwig
2020-06-28 12:06 ` [PATCH v2 0/9] xfs: reflink cleanups Edwin Török
2020-06-28 22:36 ` 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=20200625122635.GC2863@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=edwin@etorok.net \
--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