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 10/11] xfs: Introduce error injection to reduce maximum inode fork extent count
Date: Mon, 12 Oct 2020 14:59:37 +0530 [thread overview]
Message-ID: <20201012092938.50946-11-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20201012092938.50946-1-chandanrlinux@gmail.com>
This commit adds XFS_ERRTAG_REDUCE_MAX_IEXTENTS error tag which enables
userspace programs to test "Inode fork extent count overflow detection"
by reducing maximum possible inode fork extent count to 10.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_errortag.h | 4 +++-
fs/xfs/libxfs/xfs_inode_fork.c | 4 ++++
fs/xfs/xfs_error.c | 3 +++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_errortag.h b/fs/xfs/libxfs/xfs_errortag.h
index 53b305dea381..1c56fcceeea6 100644
--- a/fs/xfs/libxfs/xfs_errortag.h
+++ b/fs/xfs/libxfs/xfs_errortag.h
@@ -56,7 +56,8 @@
#define XFS_ERRTAG_FORCE_SUMMARY_RECALC 33
#define XFS_ERRTAG_IUNLINK_FALLBACK 34
#define XFS_ERRTAG_BUF_IOERROR 35
-#define XFS_ERRTAG_MAX 36
+#define XFS_ERRTAG_REDUCE_MAX_IEXTENTS 36
+#define XFS_ERRTAG_MAX 37
/*
* Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -97,5 +98,6 @@
#define XFS_RANDOM_FORCE_SUMMARY_RECALC 1
#define XFS_RANDOM_IUNLINK_FALLBACK (XFS_RANDOM_DEFAULT/10)
#define XFS_RANDOM_BUF_IOERROR XFS_RANDOM_DEFAULT
+#define XFS_RANDOM_REDUCE_MAX_IEXTENTS 1
#endif /* __XFS_ERRORTAG_H_ */
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index 8d48716547e5..e080d7e07643 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -24,6 +24,7 @@
#include "xfs_dir2_priv.h"
#include "xfs_attr_leaf.h"
#include "xfs_types.h"
+#include "xfs_errortag.h"
kmem_zone_t *xfs_ifork_zone;
@@ -745,6 +746,9 @@ xfs_iext_count_may_overflow(
max_exts = (whichfork == XFS_ATTR_FORK) ? MAXAEXTNUM : MAXEXTNUM;
+ if (XFS_TEST_ERROR(false, ip->i_mount, XFS_ERRTAG_REDUCE_MAX_IEXTENTS))
+ max_exts = 10;
+
nr_exts = ifp->if_nextents + nr_to_add;
if (nr_exts < ifp->if_nextents || nr_exts > max_exts)
return -EFBIG;
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 7f6e20899473..3780b118cc47 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -54,6 +54,7 @@ static unsigned int xfs_errortag_random_default[] = {
XFS_RANDOM_FORCE_SUMMARY_RECALC,
XFS_RANDOM_IUNLINK_FALLBACK,
XFS_RANDOM_BUF_IOERROR,
+ XFS_RANDOM_REDUCE_MAX_IEXTENTS,
};
struct xfs_errortag_attr {
@@ -164,6 +165,7 @@ XFS_ERRORTAG_ATTR_RW(force_repair, XFS_ERRTAG_FORCE_SCRUB_REPAIR);
XFS_ERRORTAG_ATTR_RW(bad_summary, XFS_ERRTAG_FORCE_SUMMARY_RECALC);
XFS_ERRORTAG_ATTR_RW(iunlink_fallback, XFS_ERRTAG_IUNLINK_FALLBACK);
XFS_ERRORTAG_ATTR_RW(buf_ioerror, XFS_ERRTAG_BUF_IOERROR);
+XFS_ERRORTAG_ATTR_RW(reduce_max_iextents, XFS_ERRTAG_REDUCE_MAX_IEXTENTS);
static struct attribute *xfs_errortag_attrs[] = {
XFS_ERRORTAG_ATTR_LIST(noerror),
@@ -202,6 +204,7 @@ static struct attribute *xfs_errortag_attrs[] = {
XFS_ERRORTAG_ATTR_LIST(bad_summary),
XFS_ERRORTAG_ATTR_LIST(iunlink_fallback),
XFS_ERRORTAG_ATTR_LIST(buf_ioerror),
+ XFS_ERRORTAG_ATTR_LIST(reduce_max_iextents),
NULL,
};
--
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 ` [PATCH V6 01/11] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2020-10-15 8:34 ` 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 ` Chandan Babu R [this message]
2020-10-15 8:40 ` [PATCH V6 10/11] xfs: Introduce error injection to reduce maximum inode fork extent count 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-11-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).