public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Chandan Babu R <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
	darrick.wong@oracle.com,
	Allison Henderson <allison.henderson@oracle.com>
Subject: [PATCH V11 09/14] xfs: Check for extent overflow when swapping extents
Date: Tue, 17 Nov 2020 19:14:11 +0530	[thread overview]
Message-ID: <20201117134416.207945-10-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20201117134416.207945-1-chandanrlinux@gmail.com>

Removing an initial range of source/donor file's extent and adding a new
extent (from donor/source file) in its place will cause extent count to
increase by 1.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
 fs/xfs/libxfs/xfs_inode_fork.h |  7 +++++++
 fs/xfs/xfs_bmap_util.c         | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index b99e67e7b59b..969b06160d44 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -87,6 +87,13 @@ struct xfs_ifork {
  */
 #define XFS_IEXT_REFLINK_END_COW_CNT	(2)
 
+/*
+ * Removing an initial range of source/donor file's extent and adding a new
+ * extent (from donor/source file) in its place will cause extent count to
+ * increase by 1.
+ */
+#define XFS_IEXT_SWAP_RMAP_CNT		(1)
+
 /*
  * Fork handling.
  */
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 0776abd0103c..b6728fdf50ae 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1407,6 +1407,22 @@ xfs_swap_extent_rmap(
 					irec.br_blockcount);
 			trace_xfs_swap_extent_rmap_remap_piece(tip, &uirec);
 
+			if (xfs_bmap_is_real_extent(&uirec)) {
+				error = xfs_iext_count_may_overflow(ip,
+						XFS_DATA_FORK,
+						XFS_IEXT_SWAP_RMAP_CNT);
+				if (error)
+					goto out;
+			}
+
+			if (xfs_bmap_is_real_extent(&irec)) {
+				error = xfs_iext_count_may_overflow(tip,
+						XFS_DATA_FORK,
+						XFS_IEXT_SWAP_RMAP_CNT);
+				if (error)
+					goto out;
+			}
+
 			/* Remove the mapping from the donor file. */
 			xfs_bmap_unmap_extent(tp, tip, &uirec);
 
-- 
2.28.0


  parent reply	other threads:[~2020-11-17 13:45 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-17 13:44 [PATCH V11 00/14] Bail out if transaction can cause extent count to overflow Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 01/14] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 02/14] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 03/14] xfs: Check for extent overflow when punching a hole Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 04/14] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2020-12-03 18:45   ` Darrick J. Wong
2020-12-04  9:04     ` Chandan Babu R
2020-12-09 18:51       ` Darrick J. Wong
2020-11-17 13:44 ` [PATCH V11 05/14] xfs: Check for extent overflow when adding/removing dir entries Chandan Babu R
2020-12-03 19:04   ` Darrick J. Wong
2020-12-04  9:04     ` Chandan Babu R
2020-12-07  8:18       ` Chandan Babu R
2020-12-09 19:24         ` Darrick J. Wong
2020-12-11  5:49           ` Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 06/14] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 07/14] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 08/14] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2020-11-17 13:44 ` Chandan Babu R [this message]
2020-11-17 13:44 ` [PATCH V11 10/14] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2020-12-03 19:06   ` Darrick J. Wong
2020-12-04  9:05     ` Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 11/14] xfs: Remove duplicate assert statement in xfs_bmap_btalloc() Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 12/14] xfs: Compute bmap extent alignments in a separate function Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 13/14] xfs: Process allocated extent " Chandan Babu R
2020-11-17 13:44 ` [PATCH V11 14/14] xfs: Introduce error injection to allocate only minlen size extents for files 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=20201117134416.207945-10-chandanrlinux@gmail.com \
    --to=chandanrlinux@gmail.com \
    --cc=allison.henderson@oracle.com \
    --cc=darrick.wong@oracle.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