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 V6 01/11] xfs: Add helper for checking per-inode extent count overflow
Date: Mon, 12 Oct 2020 14:59:28 +0530 [thread overview]
Message-ID: <20201012092938.50946-2-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20201012092938.50946-1-chandanrlinux@gmail.com>
XFS does not check for possible overflow of per-inode extent counter
fields when adding extents to either data or attr fork.
For e.g.
1. Insert 5 million xattrs (each having a value size of 255 bytes) and
then delete 50% of them in an alternating manner.
2. On a 4k block sized XFS filesystem instance, the above causes 98511
extents to be created in the attr fork of the inode.
xfsaild/loop0 2008 [003] 1475.127209: probe:xfs_inode_to_disk: (ffffffffa43fb6b0) if_nextents=98511 i_ino=131
3. The incore inode fork extent counter is a signed 32-bit
quantity. However the on-disk extent counter is an unsigned 16-bit
quantity and hence cannot hold 98511 extents.
4. The following incorrect value is stored in the attr extent counter,
# xfs_db -f -c 'inode 131' -c 'print core.naextents' /dev/loop0
core.naextents = -32561
This commit adds a new helper function (i.e.
xfs_iext_count_may_overflow()) to check for overflow of the per-inode
data and xattr extent counters. Future patches will use this function to
make sure that an FS operation won't cause the extent counter to
overflow.
Suggested-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_inode_fork.c | 23 +++++++++++++++++++++++
fs/xfs/libxfs/xfs_inode_fork.h | 2 ++
2 files changed, 25 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index 7575de5cecb1..8d48716547e5 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -23,6 +23,7 @@
#include "xfs_da_btree.h"
#include "xfs_dir2_priv.h"
#include "xfs_attr_leaf.h"
+#include "xfs_types.h"
kmem_zone_t *xfs_ifork_zone;
@@ -728,3 +729,25 @@ xfs_ifork_verify_local_attr(
return 0;
}
+
+int
+xfs_iext_count_may_overflow(
+ struct xfs_inode *ip,
+ int whichfork,
+ int nr_to_add)
+{
+ struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);
+ uint64_t max_exts;
+ uint64_t nr_exts;
+
+ if (whichfork == XFS_COW_FORK)
+ return 0;
+
+ max_exts = (whichfork == XFS_ATTR_FORK) ? MAXAEXTNUM : MAXEXTNUM;
+
+ nr_exts = ifp->if_nextents + nr_to_add;
+ if (nr_exts < ifp->if_nextents || nr_exts > max_exts)
+ return -EFBIG;
+
+ return 0;
+}
diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index a4953e95c4f3..0beb8e2a00be 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -172,5 +172,7 @@ extern void xfs_ifork_init_cow(struct xfs_inode *ip);
int xfs_ifork_verify_local_data(struct xfs_inode *ip);
int xfs_ifork_verify_local_attr(struct xfs_inode *ip);
+int xfs_iext_count_may_overflow(struct xfs_inode *ip, int whichfork,
+ int nr_to_add);
#endif /* __XFS_INODE_FORK_H__ */
--
2.28.0
next prev parent reply other threads:[~2020-10-12 9:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 9:29 [PATCH V6 00/11] Bail out if transaction can cause extent count to overflow Chandan Babu R
2020-10-12 9:29 ` Chandan Babu R [this message]
2020-10-15 8:34 ` [PATCH V6 01/11] xfs: Add helper for checking per-inode extent count overflow Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 02/11] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2020-10-15 8:34 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 03/11] xfs: Check for extent overflow when punching a hole Chandan Babu R
2020-10-15 8:35 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 04/11] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2020-10-15 8:36 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 05/11] xfs: Check for extent overflow when adding/removing dir entries Chandan Babu R
2020-10-15 8:36 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 06/11] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2020-10-15 8:36 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 07/11] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2020-10-15 8:37 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2020-10-15 8:39 ` Christoph Hellwig
2020-10-15 10:01 ` Chandan Babu R
2020-10-15 18:45 ` Darrick J. Wong
2020-10-16 4:27 ` Chandan Babu R
2020-10-16 7:04 ` Christoph Hellwig
2020-10-16 11:28 ` Chandan Babu R
2020-10-16 15:29 ` Darrick J. Wong
2020-10-17 2:55 ` Chandan Babu R
2020-10-12 9:29 ` [PATCH V6 09/11] xfs: Check for extent overflow when swapping extents Chandan Babu R
2020-10-12 9:29 ` [PATCH V6 10/11] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2020-10-15 8:40 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 11/11] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
2020-10-15 8:41 ` Christoph Hellwig
2020-10-15 10:02 ` Chandan Babu R
2020-10-15 18:41 ` Darrick J. Wong
2020-10-16 11:31 ` 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=20201012092938.50946-2-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;
as well as URLs for NNTP newsgroup(s).