From: Chandan Babu R <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
darrick.wong@oracle.com, david@fromorbit.com
Subject: [PATCH V2 05/10] xfs: Check for extent overflow when adding/removing dir entries
Date: Fri, 14 Aug 2020 13:38:28 +0530 [thread overview]
Message-ID: <20200814080833.84760-6-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20200814080833.84760-1-chandanrlinux@gmail.com>
Directory entry addition/removal can cause the following,
1. Data block can be added/removed.
A new extent can cause extent count to increase by 1.
2. Free disk block can be added/removed.
Same behaviour as described above for Data block.
3. Dabtree blocks.
XFS_DA_NODE_MAXDEPTH blocks can be added. Each of these
can be new extents. Hence extent count can increase by
XFS_DA_NODE_MAXDEPTH.
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_inode_fork.h | 13 +++++++++++++
fs/xfs/xfs_inode.c | 27 +++++++++++++++++++++++++++
fs/xfs/xfs_symlink.c | 5 +++++
3 files changed, 45 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index 72a9daf5df16..e39ce09a824f 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -50,6 +50,19 @@ struct xfs_ifork {
*/
#define XFS_IEXT_ATTR_MANIP_CNT(rmt_blks) \
(XFS_DA_NODE_MAXDEPTH + max(1, rmt_blks))
+/*
+ * Directory entry addition/removal can cause the following,
+ * 1. Data block can be added/removed.
+ * A new extent can cause extent count to increase by 1.
+ * 2. Free disk block can be added/removed.
+ * Same behaviour as described above for Data block.
+ * 3. Dabtree blocks.
+ * XFS_DA_NODE_MAXDEPTH blocks can be added. Each of these
+ * can be new extents. Hence extent count can increase by
+ * XFS_DA_NODE_MAXDEPTH.
+ */
+#define XFS_IEXT_DIR_MANIP_CNT(mp) \
+ ((XFS_DA_NODE_MAXDEPTH + 1 + 1) * (mp)->m_dir_geo->fsbcount)
/*
* Fork handling.
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 407d6299606d..8d195b6ef326 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1175,6 +1175,11 @@ xfs_create(
if (error)
goto out_trans_cancel;
+ error = xfs_iext_count_may_overflow(dp, XFS_DATA_FORK,
+ XFS_IEXT_DIR_MANIP_CNT(mp));
+ if (error)
+ goto out_trans_cancel;
+
/*
* A newly created regular or special file just has one directory
* entry pointing to them, but a directory also the "." entry
@@ -1391,6 +1396,11 @@ xfs_link(
xfs_trans_ijoin(tp, sip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, tdp, XFS_ILOCK_EXCL);
+ error = xfs_iext_count_may_overflow(tdp, XFS_DATA_FORK,
+ XFS_IEXT_DIR_MANIP_CNT(mp));
+ if (error)
+ goto error_return;
+
/*
* If we are using project inheritance, we only allow hard link
* creation in our tree when the project IDs are the same; else
@@ -2861,6 +2871,11 @@ xfs_remove(
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
+ error = xfs_iext_count_may_overflow(dp, XFS_DATA_FORK,
+ XFS_IEXT_DIR_MANIP_CNT(mp));
+ if (error)
+ goto out_trans_cancel;
+
/*
* If we're removing a directory perform some additional validation.
*/
@@ -3221,6 +3236,18 @@ xfs_rename(
if (wip)
xfs_trans_ijoin(tp, wip, XFS_ILOCK_EXCL);
+ error = xfs_iext_count_may_overflow(src_dp, XFS_DATA_FORK,
+ XFS_IEXT_DIR_MANIP_CNT(mp));
+ if (error)
+ goto out_trans_cancel;
+
+ if (target_ip == NULL) {
+ error = xfs_iext_count_may_overflow(target_dp, XFS_DATA_FORK,
+ XFS_IEXT_DIR_MANIP_CNT(mp));
+ if (error)
+ goto out_trans_cancel;
+ }
+
/*
* If we are using project inheritance, we only allow renames
* into our tree when the project IDs are the same; else the
diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index 8e88a7ca387e..581a4032a817 100644
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -220,6 +220,11 @@ xfs_symlink(
if (error)
goto out_trans_cancel;
+ error = xfs_iext_count_may_overflow(dp, XFS_DATA_FORK,
+ XFS_IEXT_DIR_MANIP_CNT(mp));
+ if (error)
+ goto out_trans_cancel;
+
/*
* Allocate an inode for the symlink.
*/
--
2.28.0
next prev parent reply other threads:[~2020-08-14 8:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-14 8:08 [PATCH V2 00/10] Bail out if transaction can cause extent count to overflow Chandan Babu R
2020-08-14 8:08 ` [PATCH V2 01/10] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2020-08-17 6:51 ` Christoph Hellwig
2020-08-17 7:44 ` Chandan Babu R
2020-08-14 8:08 ` [PATCH V2 02/10] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2020-08-17 6:53 ` Christoph Hellwig
2020-08-17 7:44 ` Chandan Babu R
2020-08-27 8:09 ` Christoph Hellwig
2020-08-27 13:51 ` Chandan Babu R
2020-08-18 21:49 ` Dave Chinner
2020-08-18 21:57 ` Darrick J. Wong
2020-08-19 4:43 ` Chandan Babu R
2020-08-14 8:08 ` [PATCH V2 03/10] xfs: Check for extent overflow when deleting an extent Chandan Babu R
2020-08-14 8:08 ` [PATCH V2 04/10] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2020-08-14 8:08 ` Chandan Babu R [this message]
2020-08-14 8:08 ` [PATCH V2 06/10] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2020-08-14 8:08 ` [PATCH V2 07/10] xfs: Check for extent overflow when inserting a hole Chandan Babu R
2020-08-14 8:08 ` [PATCH V2 08/10] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2020-08-18 22:03 ` Darrick J. Wong
2020-08-19 5:04 ` Chandan Babu R
2020-08-14 8:08 ` [PATCH V2 09/10] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2020-08-14 8:08 ` [PATCH V2 10/10] xfs: Check for extent overflow when swapping extents 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=20200814080833.84760-6-chandanrlinux@gmail.com \
--to=chandanrlinux@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.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