From: Allison Henderson <allison.henderson@oracle.com>
To: Chandan Babu R <chandanrlinux@gmail.com>, linux-xfs@vger.kernel.org
Cc: darrick.wong@oracle.com, david@fromorbit.com, hch@infradead.org,
Christoph Hellwig <hch@lst.de>
Subject: Re: [PATCH V7 02/14] xfs: Check for extent overflow when trivally adding a new extent
Date: Sat, 24 Oct 2020 12:28:42 -0700 [thread overview]
Message-ID: <d342d680-472f-53db-04ee-44c25d7b7cc2@oracle.com> (raw)
In-Reply-To: <20201019064048.6591-3-chandanrlinux@gmail.com>
On 10/18/20 11:40 PM, Chandan Babu R wrote:
> When adding a new data extent (without modifying an inode's existing
> extents) the extent count increases only by 1. This commit checks for
> extent count overflow in such cases.
Looks ok
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
>
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
> ---
> fs/xfs/libxfs/xfs_bmap.c | 6 ++++++
> fs/xfs/libxfs/xfs_inode_fork.h | 6 ++++++
> fs/xfs/xfs_bmap_item.c | 7 +++++++
> fs/xfs/xfs_bmap_util.c | 5 +++++
> fs/xfs/xfs_dquot.c | 8 +++++++-
> fs/xfs/xfs_iomap.c | 5 +++++
> fs/xfs/xfs_rtalloc.c | 5 +++++
> 7 files changed, 41 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index d9a692484eae..505358839d2f 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -4527,6 +4527,12 @@ xfs_bmapi_convert_delalloc(
> return error;
>
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> +
> + error = xfs_iext_count_may_overflow(ip, whichfork,
> + XFS_IEXT_ADD_NOSPLIT_CNT);
> + if (error)
> + goto out_trans_cancel;
> +
> xfs_trans_ijoin(tp, ip, 0);
>
> if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &bma.icur, &bma.got) ||
> diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
> index 0beb8e2a00be..7fc2b129a2e7 100644
> --- a/fs/xfs/libxfs/xfs_inode_fork.h
> +++ b/fs/xfs/libxfs/xfs_inode_fork.h
> @@ -34,6 +34,12 @@ struct xfs_ifork {
> #define XFS_IFEXTENTS 0x02 /* All extent pointers are read in */
> #define XFS_IFBROOT 0x04 /* i_broot points to the bmap b-tree root */
>
> +/*
> + * Worst-case increase in the fork extent count when we're adding a single
> + * extent to a fork and there's no possibility of splitting an existing mapping.
> + */
> +#define XFS_IEXT_ADD_NOSPLIT_CNT (1)
> +
> /*
> * Fork handling.
> */
> diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> index 9e16a4d0f97c..1610d6ad089b 100644
> --- a/fs/xfs/xfs_bmap_item.c
> +++ b/fs/xfs/xfs_bmap_item.c
> @@ -497,6 +497,13 @@ xfs_bui_item_recover(
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> xfs_trans_ijoin(tp, ip, 0);
>
> + if (bui_type == XFS_BMAP_MAP) {
> + error = xfs_iext_count_may_overflow(ip, whichfork,
> + XFS_IEXT_ADD_NOSPLIT_CNT);
> + if (error)
> + goto err_cancel;
> + }
> +
> count = bmap->me_len;
> error = xfs_trans_log_finish_bmap_update(tp, budp, bui_type, ip,
> whichfork, bmap->me_startoff, bmap->me_startblock,
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index f2a8a0e75e1f..dcd6e61df711 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -822,6 +822,11 @@ xfs_alloc_file_space(
> if (error)
> goto error1;
>
> + error = xfs_iext_count_may_overflow(ip, XFS_DATA_FORK,
> + XFS_IEXT_ADD_NOSPLIT_CNT);
> + if (error)
> + goto error0;
> +
> xfs_trans_ijoin(tp, ip, 0);
>
> error = xfs_bmapi_write(tp, ip, startoffset_fsb,
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 1d95ed387d66..175f544f7c45 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -314,8 +314,14 @@ xfs_dquot_disk_alloc(
> return -ESRCH;
> }
>
> - /* Create the block mapping. */
> xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL);
> +
> + error = xfs_iext_count_may_overflow(quotip, XFS_DATA_FORK,
> + XFS_IEXT_ADD_NOSPLIT_CNT);
> + if (error)
> + return error;
> +
> + /* Create the block mapping. */
> error = xfs_bmapi_write(tp, quotip, dqp->q_fileoffset,
> XFS_DQUOT_CLUSTER_SIZE_FSB, XFS_BMAPI_METADATA, 0, &map,
> &nmaps);
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 3abb8b9d6f4c..a302a96823b8 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -250,6 +250,11 @@ xfs_iomap_write_direct(
> if (error)
> goto out_trans_cancel;
>
> + error = xfs_iext_count_may_overflow(ip, XFS_DATA_FORK,
> + XFS_IEXT_ADD_NOSPLIT_CNT);
> + if (error)
> + goto out_trans_cancel;
> +
> xfs_trans_ijoin(tp, ip, 0);
>
> /*
> diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
> index 9d4e33d70d2a..3e841a75f272 100644
> --- a/fs/xfs/xfs_rtalloc.c
> +++ b/fs/xfs/xfs_rtalloc.c
> @@ -804,6 +804,11 @@ xfs_growfs_rt_alloc(
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
>
> + error = xfs_iext_count_may_overflow(ip, XFS_DATA_FORK,
> + XFS_IEXT_ADD_NOSPLIT_CNT);
> + if (error)
> + goto out_trans_cancel;
> +
> /*
> * Allocate blocks to the bitmap file.
> */
>
next prev parent reply other threads:[~2020-10-24 19:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 6:40 [PATCH V7 00/14] Bail out if transaction can cause extent count to overflow Chandan Babu R
2020-10-19 6:40 ` [PATCH V7 01/14] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2020-10-24 19:28 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 02/14] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2020-10-24 19:28 ` Allison Henderson [this message]
2020-10-19 6:40 ` [PATCH V7 03/14] xfs: Check for extent overflow when punching a hole Chandan Babu R
2020-10-24 19:28 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 04/14] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2020-10-24 19:29 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 05/14] xfs: Check for extent overflow when adding/removing dir entries Chandan Babu R
2020-10-24 20:18 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 06/14] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2020-10-24 20:18 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 07/14] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2020-10-24 20:18 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 08/14] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2020-10-24 20:32 ` Allison Henderson
2020-10-26 23:10 ` Darrick J. Wong
2020-10-19 6:40 ` [PATCH V7 09/14] xfs: Check for extent overflow when swapping extents Chandan Babu R
2020-10-24 20:41 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 10/14] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2020-10-24 20:44 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 11/14] xfs: Remove duplicate assert statement in xfs_bmap_btalloc() Chandan Babu R
2020-10-24 22:21 ` Allison Henderson
2020-10-26 23:11 ` Darrick J. Wong
2020-10-19 6:40 ` [PATCH V7 12/14] xfs: Compute bmap extent alignments in a separate function Chandan Babu R
2020-10-24 22:25 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 13/14] xfs: Process allocated extent " Chandan Babu R
2020-10-24 23:15 ` Allison Henderson
2020-10-19 6:40 ` [PATCH V7 14/14] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
2020-10-25 1:22 ` Allison Henderson
2020-10-26 3:23 ` Chandan Babu R
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=d342d680-472f-53db-04ee-44c25d7b7cc2@oracle.com \
--to=allison.henderson@oracle.com \
--cc=chandanrlinux@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--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