From: Chandan Babu R <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
djwong@kernel.org, hch@lst.de, allison.henderson@oracle.com,
"Darrick J . Wong" <darrick.wong@oracle.com>
Subject: [PATCH V15 06/16] xfs: Check for extent overflow when renaming dir entries
Date: Tue, 26 Jan 2021 12:02:22 +0530 [thread overview]
Message-ID: <20210126063232.3648053-7-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20210126063232.3648053-1-chandanrlinux@gmail.com>
A rename operation is essentially a directory entry remove operation
from the perspective of parent directory (i.e. src_dp) of rename's
source. Hence the only place where we check for extent count overflow
for src_dp is in xfs_bmap_del_extent_real(). xfs_bmap_del_extent_real()
returns -ENOSPC when it detects a possible extent count overflow and in
response, the higher layers of directory handling code do the following:
1. Data/Free blocks: XFS lets these blocks linger until a future remove
operation removes them.
2. Dabtree blocks: XFS swaps the blocks with the last block in the Leaf
space and unmaps the last block.
For target_dp, there are two cases depending on whether the destination
directory entry exists or not.
When destination directory entry does not exist (i.e. target_ip ==
NULL), extent count overflow check is performed only when transaction
has a non-zero sized space reservation associated with it. With a
zero-sized space reservation, XFS allows a rename operation to continue
only when the directory has sufficient free space in its data/leaf/free
space blocks to hold the new entry.
When destination directory entry exists (i.e. target_ip != NULL), all
we need to do is change the inode number associated with the already
existing entry. Hence there is no need to perform an extent count
overflow check.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_bmap.c | 3 +++
fs/xfs/xfs_inode.c | 44 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 6c8f17a0e247..8ebe5f13279c 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -5160,6 +5160,9 @@ xfs_bmap_del_extent_real(
* until a future remove operation. Dabtree blocks would be
* swapped with the last block in the leaf space and then the
* new last block will be unmapped.
+ *
+ * The above logic also applies to the source directory entry of
+ * a rename operation.
*/
error = xfs_iext_count_may_overflow(ip, whichfork, 1);
if (error) {
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 4cc787cc4eee..f0a6d528cbc4 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -3116,6 +3116,35 @@ xfs_rename(
/*
* Check for expected errors before we dirty the transaction
* so we can return an error without a transaction abort.
+ *
+ * Extent count overflow check:
+ *
+ * From the perspective of src_dp, a rename operation is essentially a
+ * directory entry remove operation. Hence the only place where we check
+ * for extent count overflow for src_dp is in
+ * xfs_bmap_del_extent_real(). xfs_bmap_del_extent_real() returns
+ * -ENOSPC when it detects a possible extent count overflow and in
+ * response, the higher layers of directory handling code do the
+ * following:
+ * 1. Data/Free blocks: XFS lets these blocks linger until a
+ * future remove operation removes them.
+ * 2. Dabtree blocks: XFS swaps the blocks with the last block in the
+ * Leaf space and unmaps the last block.
+ *
+ * For target_dp, there are two cases depending on whether the
+ * destination directory entry exists or not.
+ *
+ * When destination directory entry does not exist (i.e. target_ip ==
+ * NULL), extent count overflow check is performed only when transaction
+ * has a non-zero sized space reservation associated with it. With a
+ * zero-sized space reservation, XFS allows a rename operation to
+ * continue only when the directory has sufficient free space in its
+ * data/leaf/free space blocks to hold the new entry.
+ *
+ * When destination directory entry exists (i.e. target_ip != NULL), all
+ * we need to do is change the inode number associated with the already
+ * existing entry. Hence there is no need to perform an extent count
+ * overflow check.
*/
if (target_ip == NULL) {
/*
@@ -3126,6 +3155,12 @@ xfs_rename(
error = xfs_dir_canenter(tp, target_dp, target_name);
if (error)
goto out_trans_cancel;
+ } else {
+ error = xfs_iext_count_may_overflow(target_dp,
+ XFS_DATA_FORK,
+ XFS_IEXT_DIR_MANIP_CNT(mp));
+ if (error)
+ goto out_trans_cancel;
}
} else {
/*
@@ -3283,9 +3318,16 @@ xfs_rename(
if (wip) {
error = xfs_dir_replace(tp, src_dp, src_name, wip->i_ino,
spaceres);
- } else
+ } else {
+ /*
+ * NOTE: We don't need to check for extent count overflow here
+ * because the dir remove name code will leave the dir block in
+ * place if the extent count would overflow.
+ */
error = xfs_dir_removename(tp, src_dp, src_name, src_ip->i_ino,
spaceres);
+ }
+
if (error)
goto out_trans_cancel;
--
2.29.2
next prev parent reply other threads:[~2021-01-26 18:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 6:32 [PATCH V15 00/16] Bail out if transaction can cause extent count to overflow Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 01/16] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 02/16] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 03/16] xfs: Check for extent overflow when punching a hole Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 04/16] xfs: Check for extent overflow when adding dir entries Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 05/16] xfs: Check for extent overflow when removing " Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` Chandan Babu R [this message]
2021-01-27 0:39 ` [PATCH V15 06/16] xfs: Check for extent overflow when renaming " Allison Henderson
2021-01-26 6:32 ` [PATCH V15 07/16] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 08/16] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 09/16] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 10/16] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 11/16] xfs: Check for extent overflow when swapping extents Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 12/16] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 13/16] xfs: Remove duplicate assert statement in xfs_bmap_btalloc() Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 14/16] xfs: Compute bmap extent alignments in a separate function Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 15/16] xfs: Process allocated extent " Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 16/16] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
2021-01-28 2:35 ` Allison Henderson
2021-01-26 18:00 ` [PATCH V15 00/16] Bail out if transaction can cause extent count to overflow 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=20210126063232.3648053-7-chandanrlinux@gmail.com \
--to=chandanrlinux@gmail.com \
--cc=allison.henderson@oracle.com \
--cc=darrick.wong@oracle.com \
--cc=djwong@kernel.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