Bail out if transaction can cause extent count to overflow
v6 cover Bail out if transaction can cause extent count to overflow
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 xattr extent counter,
# xfs_db -f -c 'inode 131' -c 'print core.naextents' /dev/loop0 core.naextents = -32561
This patchset 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 and invokes it before starting an fs operation (e.g. creating a new directory entry). With this patchset applied, XFS detects counter overflows and returns with an error rather than causing a silent corruption.
The patchset has been tested by executing xfstests with the following mkfs.xfs options,
1. -m crc=0 -b size=1k
2. -m crc=0 -b size=4k
3. -m crc=0 -b size=512
4. -m rmapbt=1,reflink=1 -b size=1k
5. -m rmapbt=1,reflink=1 -b size=4k
The patches can also be obtained from
https://github.com/chandanr/linux.git at branch xfs-reserve-extent-count-v6.
I have two patches that define the newly introduced error injection tags in xfsprogs
(https://github.com/chandanr/xfsprogs-dev/commit/7fd7aeef1cefbcc9abd6dd5887e710c80e48079d
and
https://github.com/chandanr/xfsprogs-dev/commit/3cbe12f6fdf306de06c4096eb50641fa2d834dc5).
I have also written tests
(https://github.com/chandanr/check-iext-overflow/blob/master/check-iext-overflow.sh/)
for verifying the checks introduced in the kernel. The tests have to be edited to make them suitable for merging with xfstests. But they also depend on error tags introduced in these patches . Hence, I am planning to post the changes for xfsprogs and xfstests if other developers are fine with the changes made in this patchset.
Changelog:
V5 -> V6:
1. Rebased the patchset on xfs-linux/for-next branch.
2. Drop "xfs: Set tp->t_firstblock only once during a transaction's lifetime" patch from the patchset.
3. Add a comment to xfs_bmap_btalloc() describing why it was chosen to start "free space extent search" from AG 0 when XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT is enabled and when the transaction is allocating its first extent.
4. Fix review comments associated with coding style.
V4 -> V5:
1. Introduce new error tag XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT to let user space programs to be able to guarantee that free space requests for files are satisfied by allocating minlen sized extents.
2. Change xfs_bmap_btalloc() and xfs_alloc_vextent() to allocate minlen sized extents when XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT is enabled.
3. Introduce a new patch that causes tp->t_firstblock to be assigned to a value only when its previous value is NULLFSBLOCK.
4. Replace the previously introduced MAXERRTAGEXTNUM (maximum inode fork extent count) with the hardcoded value of 10.
5. xfs_bui_item_recover(): Use XFS_IEXT_ADD_NOSPLIT_CNT when mapping an extent.
6. xfs_swap_extent_rmap(): Use xfs_bmap_is_real_extent() instead of xfs_bmap_is_update_needed() to assess if the extent really needs to be swapped.
V3 -> V4:
1. Introduce new patch which lets userspace programs to test "extent count overflow detection" by injecting an error tag. The new error tag reduces the maximum allowed extent count to 10.
2. Injecting the newly defined error tag prevents xfs_bmap_add_extent_hole_real() from merging a new extent with its neighbours to allow writing deterministic tests for testing extent count overflow for Directories, Xattr and growing realtime devices. This is required because the new extent being allocated can be contiguous with its neighbours (w.r.t both file and disk offsets).
3. Injecting the newly defined error tag forces block sized extents to be allocated for summary/bitmap files when growing a realtime device. This is required because xfs_growfs_rt_alloc() allocates as large an extent as possible for summary/bitmap files and hence it would be impossible to write deterministic tests.
4. Rename XFS_IEXT_REMOVE_CNT to XFS_IEXT_PUNCH_HOLE_CNT to reflect the actual meaning of the fs operation.
5. Fold XFS_IEXT_INSERT_HOLE_CNT code into that associated with XFS_IEXT_PUNCH_HOLE_CNT since both perform the same job.
6. xfs_swap_extent_rmap(): Check for extent overflow should be made on the source file only if the donor file extent has a valid on-disk mapping and vice versa.
V2 -> V3:
1. Move the definition of xfs_iext_count_may_overflow() from libxfs/xfs_trans_resv.c to libxfs/xfs_inode_fork.c. Also, I tried to make xfs_iext_count_may_overflow() an inline function by placing the definition in libxfs/xfs_inode_fork.h. However this required that the definition of 'struct xfs_inode' be available, since xfs_iext_count_may_overflow() uses a 'struct xfs_inode *' type variable.
2. Handle XFS_COW_FORK within xfs_iext_count_may_overflow() by returning a success value.
3. Rename XFS_IEXT_ADD_CNT to XFS_IEXT_ADD_NOSPLIT_CNT. Thanks to Darrick for the suggesting the new name.
4. Expand comments to make use of 80 columns.
V1 -> V2:
1. Rename helper function from xfs_trans_resv_ext_cnt() to xfs_iext_count_may_overflow().
2. Define and use macros to represent fs operations and the corresponding increase in extent count.
3. Split the patches based on the fs operation being performed.
Chandan Babu R (11):
xfs: Add helper for checking per-inode extent count overflow
xfs: Check for extent overflow when trivally adding a new extent
xfs: Check for extent overflow when punching a hole
xfs: Check for extent overflow when adding/removing xattrs
xfs: Check for extent overflow when adding/removing dir entries
xfs: Check for extent overflow when writing to unwritten extent
xfs: Check for extent overflow when moving extent from cow to data
fork
xfs: Check for extent overflow when remapping an extent
xfs: Check for extent overflow when swapping extents
xfs: Introduce error injection to reduce maximum inode fork extent
count
xfs: Introduce error injection to allocate only minlen size extents
for files
fs/xfs/libxfs/xfs_alloc.c | 46 ++++++++++++++++++++ fs/xfs/libxfs/xfs_alloc.h | 1 + fs/xfs/libxfs/xfs_attr.c | 13 ++++++ fs/xfs/libxfs/xfs_bmap.c | 40 ++++++++++++++---- fs/xfs/libxfs/xfs_errortag.h | 6 ++- fs/xfs/libxfs/xfs_inode_fork.c | 27 ++++++++++++ fs/xfs/libxfs/xfs_inode_fork.h | 77 ++++++++++++++++++++++++++++++++++ fs/xfs/xfs_bmap_item.c | 10 +++++ fs/xfs/xfs_bmap_util.c | 31 ++++++++++++++ fs/xfs/xfs_dquot.c | 8 +++- fs/xfs/xfs_error.c | 6 +++ fs/xfs/xfs_inode.c | 27 ++++++++++++ fs/xfs/xfs_iomap.c | 10 +++++ fs/xfs/xfs_reflink.c | 10 +++++ fs/xfs/xfs_rtalloc.c | 5 +++ fs/xfs/xfs_symlink.c | 5 +++ 16 files changed, 313 insertions(+), 9 deletions(-)
Signature · 1 line
2.28.0
PATCH v6 1/11 xfs: Add helper for checking per-inode extent count overflow
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.
--- fs/xfs/libxfs/xfs_inode_fork.c | 23 +++++++++++++++++++++++ fs/xfs/libxfs/xfs_inode_fork.h | 2 ++ 2 files changed, 25 insertions(+)
fs/xfs/libxfs/xfs_inode_fork.c +23 -0
@@ -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 ; +}
fs/xfs/libxfs/xfs_inode_fork.h +2 -0
@@ -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__ */
Signature · 1 line
2.28.0
Re: [PATCH V6 01/11] xfs: Add helper for checking per-inode extent count overflow
Looks good,
PATCH v6 2/11 xfs: Check for extent overflow when trivally adding a new extent
In reply to Chandan Babu RWhen adding a new data extent (without modifying an inode's existing extents) the extent count increases only by 1. This commit checks for extent count overflow in such cases.
--- fs/xfs/libxfs/xfs_bmap.c | 6 ++++++ fs/xfs/libxfs/xfs_inode_fork.h | 6 ++++++ fs/xfs/xfs_bmap_item.c | 7 +++++++ fs/xfs/xfs_bmap_util.c | 5 +++++ fs/xfs/xfs_dquot.c | 8 +++++++- fs/xfs/xfs_iomap.c | 5 +++++ fs/xfs/xfs_rtalloc.c | 5 +++++ 7 files changed, 41 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_bmap.c +6 -0
@@ -4527,6 +4527,12 @@ xfs_bmapi_convert_delalloc(return error;xfs_ilock (ip,XFS_ILOCK_EXCL ); + + error =xfs_iext_count_may_overflow (ip, whichfork, +XFS_IEXT_ADD_NOSPLIT_CNT ); +if (error) + goto out_trans_cancel; +xfs_trans_ijoin (tp, ip,0 ); if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &bma.icur, &bma.got) ||
fs/xfs/libxfs/xfs_inode_fork.h +6 -0
@@ -34,6 +34,12 @@ struct xfs_ifork {#define XFS_IFEXTENTS 0x02/* All extent pointers are read in */ #define XFS_IFBROOT 0x04/* i_broot points to the bmap b-tree root */ +/* +* Worst-case increase in the fork extent count when we're adding a single +* extent to a fork and there's no possibility of splitting an existing mapping. +*/ +#define XFS_IEXT_ADD_NOSPLIT_CNT (1) +/* * Fork handling. */
fs/xfs/xfs_bmap_item.c +7 -0
@@ -497,6 +497,13 @@ xfs_bui_item_recover(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,0 ); +if (bui_type ==XFS_BMAP_MAP ) { + error =xfs_iext_count_may_overflow (ip, whichfork, +XFS_IEXT_ADD_NOSPLIT_CNT ); +if (error) + goto err_cancel; + } + count = bmap->me_len; error = xfs_trans_log_finish_bmap_update(tp, budp, bui_type, ip, whichfork, bmap->me_startoff, bmap->me_startblock,
fs/xfs/xfs_bmap_util.c +5 -0
@@ -822,6 +822,11 @@ xfs_alloc_file_space(if (error) goto error1; + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_ADD_NOSPLIT_CNT ); +if (error) + goto error0; +xfs_trans_ijoin (tp, ip,0 ); error = xfs_bmapi_write(tp, ip, startoffset_fsb,
fs/xfs/xfs_dquot.c +7 -1
@@ -314,8 +314,14 @@ xfs_dquot_disk_alloc(return -ESRCH ; } -/* Create the block mapping. */ xfs_trans_ijoin (tp, quotip,XFS_ILOCK_EXCL ); + + error =xfs_iext_count_may_overflow (quotip,XFS_DATA_FORK , +XFS_IEXT_ADD_NOSPLIT_CNT ); +if (error) +return error; + +/* Create the block mapping. */ error =xfs_bmapi_write (tp, quotip, dqp->q_fileoffset,XFS_DQUOT_CLUSTER_SIZE_FSB ,XFS_BMAPI_METADATA ,0 , &map, &nmaps);
fs/xfs/xfs_iomap.c +5 -0
@@ -250,6 +250,11 @@ xfs_iomap_write_direct(if (error) goto out_trans_cancel; + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_ADD_NOSPLIT_CNT ); +if (error) + goto out_trans_cancel; +xfs_trans_ijoin (tp, ip,0 );/*
fs/xfs/xfs_rtalloc.c +5 -0
@@ -804,6 +804,11 @@ xfs_growfs_rt_alloc(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,XFS_ILOCK_EXCL ); + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_ADD_NOSPLIT_CNT ); +if (error) + goto out_trans_cancel; +/* * Allocate blocks to the bitmap file. */
Signature · 1 line
2.28.0
Re: [PATCH V6 02/11] xfs: Check for extent overflow when trivally adding a new extent
Quoted 6 lines · Chandan Babu R
When adding a new data extent (without modifying an inode's existing extents) the extent count increases only by 1. This commit checks for extent count overflow in such cases.
Reviewed-by Darrick J. Wong <[email protected]>Signed-off-by Chandan Babu R <[email protected]>
I still don't think XFS_IEXT_ADD_NOSPLIT_CNT is a good idea, but it seems like that is the minority opinion. The rest looks good:
PATCH v6 3/11 xfs: Check for extent overflow when punching a hole
In reply to Chandan Babu RThe extent mapping the file offset at which a hole has to be inserted will be split into two extents causing extent count to increase by 1.
--- fs/xfs/libxfs/xfs_inode_fork.h | 7 +++++++ fs/xfs/xfs_bmap_item.c | 15 +++++++++------ fs/xfs/xfs_bmap_util.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-)
fs/xfs/libxfs/xfs_inode_fork.h +7 -0
@@ -40,6 +40,13 @@ struct xfs_ifork {*/ #define XFS_IEXT_ADD_NOSPLIT_CNT (1) +/* +* Punching out an extent from the middle of an existing extent can cause the +* extent count to increase by 1. +* i.e. | Old extent | Hole | Old extent | +*/ +#define XFS_IEXT_PUNCH_HOLE_CNT (1) +/* * Fork handling. */
fs/xfs/xfs_bmap_item.c +9 -6
@@ -439,6 +439,7 @@ xfs_bui_item_recover(xfs_exntst_t state;unsigned int bui_type;int whichfork; +int iext_delta;int error =0 ;/* Only one mapping operation per BUI... */
@@ -497,12 +498,14 @@ xfs_bui_item_recover(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,0 ); -if (bui_type ==XFS_BMAP_MAP ) { - error =xfs_iext_count_may_overflow (ip, whichfork, -XFS_IEXT_ADD_NOSPLIT_CNT ); -if (error) - goto err_cancel; - } +if (bui_type ==XFS_BMAP_MAP ) + iext_delta =XFS_IEXT_ADD_NOSPLIT_CNT ; +else + iext_delta =XFS_IEXT_PUNCH_HOLE_CNT ; + + error =xfs_iext_count_may_overflow (ip, whichfork, iext_delta); +if (error) + goto err_cancel; count = bmap->me_len; error = xfs_trans_log_finish_bmap_update(tp, budp, bui_type, ip,
fs/xfs/xfs_bmap_util.c +10 -0
@@ -891,6 +891,11 @@ xfs_unmap_extent(xfs_trans_ijoin (tp, ip,0 ); + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_PUNCH_HOLE_CNT ); +if (error) + goto out_trans_cancel; + error =xfs_bunmapi (tp, ip, startoffset_fsb, len_fsb,0 ,2 , done);if (error) goto out_trans_cancel;
@@ -1176,6 +1181,11 @@ xfs_insert_file_space(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,0 ); + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_PUNCH_HOLE_CNT ); +if (error) + goto out_trans_cancel; +/* * The extent shifting code works on extent granularity. So, if stop_fsb * is not the starting block of extent, we need to split the extent at
Signature · 1 line
2.28.0
Re: [PATCH V6 03/11] xfs: Check for extent overflow when punching a hole
Looks good,
PATCH v6 4/11 xfs: Check for extent overflow when adding/removing xattrs
In reply to Chandan Babu RAdding/removing an xattr can cause XFS_DA_NODE_MAXDEPTH extents to be added. One extra extent for dabtree in case a local attr is large enough to cause a double split. It can also cause extent count to increase proportional to the size of a remote xattr's value.
--- fs/xfs/libxfs/xfs_attr.c | 13 +++++++++++++ fs/xfs/libxfs/xfs_inode_fork.h | 10 ++++++++++ 2 files changed, 23 insertions(+)
fs/xfs/libxfs/xfs_attr.c +13 -0
@@ -396,6 +396,7 @@ xfs_attr_set(struct xfs_trans_res tres;bool rsvd = (args->attr_filter &XFS_ATTR_ROOT );int error, local; +int rmt_blks =0 ;unsigned int total;if (XFS_FORCED_SHUTDOWN (dp->i_mount))
@@ -442,11 +443,15 @@ xfs_attr_set( tres.tr_logcount =XFS_ATTRSET_LOG_COUNT ; tres.tr_logflags =XFS_TRANS_PERM_LOG_RES ; total = args->total; + +if (!local) + rmt_blks =xfs_attr3_rmt_blocks (mp, args->valuelen); }else {XFS_STATS_INC (mp, xs_attr_remove); tres =M_RES (mp)->tr_attrrm; total =XFS_ATTRRM_SPACE_RES (mp); + rmt_blks =xfs_attr3_rmt_blocks (mp,XFS_XATTR_SIZE_MAX ); }/*
@@ -460,6 +465,14 @@ xfs_attr_set(xfs_ilock (dp,XFS_ILOCK_EXCL );xfs_trans_ijoin (args->trans, dp,0 ); + +if (args->value ||xfs_inode_hasattr (dp)) { + error =xfs_iext_count_may_overflow (dp,XFS_ATTR_FORK , +XFS_IEXT_ATTR_MANIP_CNT (rmt_blks)); +if (error) + goto out_trans_cancel; + } +if (args->value) {unsigned int quota_flags =XFS_QMOPT_RES_REGBLKS ;
fs/xfs/libxfs/xfs_inode_fork.h +10 -0
@@ -47,6 +47,16 @@ struct xfs_ifork {*/ #define XFS_IEXT_PUNCH_HOLE_CNT (1) +/* +* Adding/removing an xattr can cause XFS_DA_NODE_MAXDEPTH extents to +* be added. One extra extent for dabtree in case a local attr is +* large enough to cause a double split. It can also cause extent +* count to increase proportional to the size of a remote xattr's +* value. +*/ +#define XFS_IEXT_ATTR_MANIP_CNT (rmt_blks) \ + (XFS_DA_NODE_MAXDEPTH + max(1, rmt_blks)) +/* * Fork handling. */
Signature · 1 line
2.28.0
Re: [PATCH V6 04/11] xfs: Check for extent overflow when adding/removing xattrs
Looks good,
PATCH v6 5/11 xfs: Check for extent overflow when adding/removing dir entries
In reply to Chandan Babu RDirectory 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.
--- 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(+)
fs/xfs/libxfs/xfs_inode_fork.h +13 -0
@@ -57,6 +57,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. */
fs/xfs/xfs_inode.c +27 -0
@@ -1177,6 +1177,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
@@ -1393,6 +1398,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
fs/xfs/xfs_symlink.c +5 -0
@@ -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. */
Signature · 1 line
2.28.0
Re: [PATCH V6 05/11] xfs: Check for extent overflow when adding/removing dir entries
Looks good,
PATCH v6 6/11 xfs: Check for extent overflow when writing to unwritten extent
In reply to Chandan Babu RA write to a sub-interval of an existing unwritten extent causes the original extent to be split into 3 extents
i.e. | Unwritten | Real | Unwritten |
Hence extent count can increase by 2.
--- fs/xfs/libxfs/xfs_inode_fork.h | 8 ++++++++ fs/xfs/xfs_iomap.c | 5 +++++ 2 files changed, 13 insertions(+)
fs/xfs/libxfs/xfs_inode_fork.h +8 -0
@@ -70,6 +70,14 @@ struct xfs_ifork {#define XFS_IEXT_DIR_MANIP_CNT (mp) \ ((XFS_DA_NODE_MAXDEPTH + 1 + 1) * (mp)->m_dir_geo->fsbcount) +/* +* A write to a sub-interval of an existing unwritten extent causes the original +* extent to be split into 3 extents +* i.e. | Unwritten | Real | Unwritten | +* Hence extent count can increase by 2. +*/ +#define XFS_IEXT_WRITE_UNWRITTEN_CNT (2) +/* * Fork handling. */
fs/xfs/xfs_iomap.c +5 -0
@@ -566,6 +566,11 @@ xfs_iomap_write_unwritten(if (error) goto error_on_bmapi_transaction; + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_WRITE_UNWRITTEN_CNT ); +if (error) + goto error_on_bmapi_transaction; +/* * Modify the unwritten extent state of the buffer. */
Signature · 1 line
2.28.0
Re: [PATCH V6 06/11] xfs: Check for extent overflow when writing to unwritten extent
Looks good,
PATCH v6 7/11 xfs: Check for extent overflow when moving extent from cow to data fork
In reply to Chandan Babu RMoving an extent to data fork can cause a sub-interval of an existing extent to be unmapped. This will increase extent count by 1. Mapping in the new extent can increase the extent count by 1 again i.e.
| Old extent | New extent | Old extent |
Hence number of extents increases by 2.
--- fs/xfs/libxfs/xfs_inode_fork.h | 9 +++++++++ fs/xfs/xfs_reflink.c | 5 +++++ 2 files changed, 14 insertions(+)
fs/xfs/libxfs/xfs_inode_fork.h +9 -0
@@ -78,6 +78,15 @@ struct xfs_ifork {*/ #define XFS_IEXT_WRITE_UNWRITTEN_CNT (2) +/* +* Moving an extent to data fork can cause a sub-interval of an existing extent +* to be unmapped. This will increase extent count by 1. Mapping in the new +* extent can increase the extent count by 1 again i.e. +* | Old extent | New extent | Old extent | +* Hence number of extents increases by 2. +*/ +#define XFS_IEXT_REFLINK_END_COW_CNT (2) +/* * Fork handling. */
fs/xfs/xfs_reflink.c +5 -0
@@ -628,6 +628,11 @@ xfs_reflink_end_cow_extent(xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_trans_ijoin (tp, ip,0 ); + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_REFLINK_END_COW_CNT ); +if (error) + goto out_cancel; +/* * In case of racing, overlapping AIO writes no COW extents might be * left by the time I/O completes for the loser of the race. In that
Signature · 1 line
2.28.0
Re: [PATCH V6 07/11] xfs: Check for extent overflow when moving extent from cow to data fork
Looks good,
PATCH v6 8/11 xfs: Check for extent overflow when remapping an extent
In reply to Chandan Babu RRemapping an extent involves unmapping the existing extent and mapping in the new extent. When unmapping, an extent containing the entire unmap range can be split into two extents,
i.e. | Old extent | hole | Old extent |
Hence extent count increases by 1.
Mapping in the new extent into the destination file can increase the extent count by 1.
--- fs/xfs/libxfs/xfs_inode_fork.h | 15 +++++++++++++++ fs/xfs/xfs_reflink.c | 5 +++++ 2 files changed, 20 insertions(+)
fs/xfs/libxfs/xfs_inode_fork.h +15 -0
@@ -87,6 +87,21 @@ struct xfs_ifork {*/ #define XFS_IEXT_REFLINK_END_COW_CNT (2) +/* +* Remapping an extent involves unmapping the existing extent and mapping in the +* new extent. +* +* When unmapping, an extent containing the entire unmap range can be split into +* two extents, +* i.e. | Old extent | hole | Old extent | +* Hence extent count increases by 1. +* +* Mapping in the new extent into the destination file can increase the extent +* count by 1. +*/ +#define XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written) \ + (((smap_real) ? 1 : 0) + ((dmap_written) ? 1 : 0)) +/* * Fork handling. */
fs/xfs/xfs_reflink.c +5 -0
@@ -1099,6 +1099,11 @@ xfs_reflink_remap_extent( goto out_cancel; } + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written)); +if (error) + goto out_cancel; +if (smap_real) {/* * If the extent we're unmapping is backed by storage (written
Signature · 1 line
2.28.0
Re: [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent
This patch demonstrates very well why I think having these magic defines and the comments in a header makes no sense.
Quoted 23 lines
fs/xfs/libxfs/xfs_inode_fork.h +15
-0+/* +* Remapping an extent involves unmapping the existing extent and mapping in the +* new extent. +* +* When unmapping, an extent containing the entire unmap range can be split into +* two extents, +* i.e. | Old extent | hole | Old extent | +* Hence extent count increases by 1. +* +* Mapping in the new extent into the destination file can increase the extent +* count by 1. +*/ +#define XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written) \ + (((smap_real) ? 1 : 0) + ((dmap_written) ? 1 : 0)) +/* * Fork handling. */ fs/xfs/xfs_reflink.c +0
-0
fs/xfs/xfs_reflink.c xfs_reflink_remap_extent( · line 1106
Quoted 8 lines
fs/xfs/xfs_reflink.c +5
-0@@ -1099,6 +1099,11 @@ xfs_reflink_remap_extent( goto out_cancel; } + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written)); +if (error) + goto out_cancel; +
This is a completely mess.
If OTOH xfs_reflink_remap_extent had a local variable for the potential max number of extents, which is incremented near the initialization of smap_real and dmap_written, with a nice comment near to each increment it would make complete sense to the reader.
Re: [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent
Quoted 37 lines · IST Christoph Hellwig
This patch demonstrates very well why I think having these magic defines and the comments in a header makes no sense.
Quoted 23 lines
fs/xfs/libxfs/xfs_inode_fork.h +15
-0+/* +* Remapping an extent involves unmapping the existing extent and mapping in the +* new extent. +* +* When unmapping, an extent containing the entire unmap range can be split into +* two extents, +* i.e. | Old extent | hole | Old extent | +* Hence extent count increases by 1. +* +* Mapping in the new extent into the destination file can increase the extent +* count by 1. +*/ +#define XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written) \ + (((smap_real) ? 1 : 0) + ((dmap_written) ? 1 : 0)) +/* * Fork handling. */ fs/xfs/xfs_reflink.c +0
-0fs/xfs/xfs_reflink.c xfs_reflink_remap_extent( · line 1106
Quoted 8 lines
fs/xfs/xfs_reflink.c +5
-0@@ -1099,6 +1099,11 @@ xfs_reflink_remap_extent( goto out_cancel; } + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written)); +if (error) + goto out_cancel; +This is a completely mess.
Quoted 5 lines
If OTOH
xfs_reflink_remap_extenthad a local variable for the potential max number of extents, which is incremented near the initialization ofsmap_realanddmap_written, with a nice comment near to each increment it would make complete sense to the reader.
How about following the traits of XFS_IEXT_WRITE_UNWRITTEN_CNT (writing to unwritten extent) and XFS_IEXT_REFLINK_END_COW_CNT (moving an extent from cow fork to data fork) and setting XFS_IEXT_REFLINK_REMAP_CNT to a worst case value of 2? A write spanning the entirety of an unwritten extent does not change the extent count. Similarly, If there are no extents in the data fork spanning the file range mapped by an extent in the cow fork, moving the extent from cow fork to data fork increases the extent count by just 1 and not by the worst case count of 2.
Signature · 1 line
chandan
Re: [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent
Quoted 44 lines · Chandan Babu R
Quoted 37 lines · IST Christoph Hellwig
This patch demonstrates very well why I think having these magic defines and the comments in a header makes no sense.
Quoted 23 lines
fs/xfs/libxfs/xfs_inode_fork.h +15
-0+/* +* Remapping an extent involves unmapping the existing extent and mapping in the +* new extent. +* +* When unmapping, an extent containing the entire unmap range can be split into +* two extents, +* i.e. | Old extent | hole | Old extent | +* Hence extent count increases by 1. +* +* Mapping in the new extent into the destination file can increase the extent +* count by 1. +*/ +#define XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written) \ + (((smap_real) ? 1 : 0) + ((dmap_written) ? 1 : 0)) +/* * Fork handling. */ fs/xfs/xfs_reflink.c +0
-0fs/xfs/xfs_reflink.c xfs_reflink_remap_extent( · line 1106
Quoted 8 lines
fs/xfs/xfs_reflink.c +5
-0@@ -1099,6 +1099,11 @@ xfs_reflink_remap_extent( goto out_cancel; } + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written)); +if (error) + goto out_cancel; +This is a completely mess.
Quoted 5 lines
If OTOH
xfs_reflink_remap_extenthad a local variable for the potential max number of extents, which is incremented near the initialization ofsmap_realanddmap_written, with a nice comment near to each increment it would make complete sense to the reader.
Quoted 8 lines
How about following the traits of
XFS_IEXT_WRITE_UNWRITTEN_CNT(writing to unwritten extent) andXFS_IEXT_REFLINK_END_COW_CNT(moving an extent from cow fork to data fork) and settingXFS_IEXT_REFLINK_REMAP_CNTto a worst case value of 2? A write spanning the entirety of an unwritten extent does not change the extent count. Similarly, If there are no extents in the data fork spanning the file range mapped by an extent in the cow fork, moving the extent from cow fork to data fork increases the extent count by just 1 and not by the worst case count of 2.
Probably not a huge deal, since at worst we bail out of reflink early and userspace can just decide to fall back to a pagecache copy or whatever. It'd be harder to deal with if this was the cow path where we long ago returned from write() and even writeback...
...though now that I think about it, what /does/ happens if _reflink_end_cow trips over this? I wonder if inodes need to be able to reserve extent count for later, but ... hgnghghg that seems hard to reason about.
--D
Quoted 7 lines
Signature · 2 lines
-- chandan
Re: [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent
Quoted 59 lines · IST Darrick J. Wong
Quoted 44 lines · Chandan Babu R
Quoted 37 lines · IST Christoph Hellwig
This patch demonstrates very well why I think having these magic defines and the comments in a header makes no sense.
Quoted 23 lines
fs/xfs/libxfs/xfs_inode_fork.h +15
-0+/* +* Remapping an extent involves unmapping the existing extent and mapping in the +* new extent. +* +* When unmapping, an extent containing the entire unmap range can be split into +* two extents, +* i.e. | Old extent | hole | Old extent | +* Hence extent count increases by 1. +* +* Mapping in the new extent into the destination file can increase the extent +* count by 1. +*/ +#define XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written) \ + (((smap_real) ? 1 : 0) + ((dmap_written) ? 1 : 0)) +/* * Fork handling. */ fs/xfs/xfs_reflink.c +0
-0fs/xfs/xfs_reflink.c xfs_reflink_remap_extent( · line 1106
Quoted 8 lines
fs/xfs/xfs_reflink.c +5
-0@@ -1099,6 +1099,11 @@ xfs_reflink_remap_extent( goto out_cancel; } + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , +XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written)); +if (error) + goto out_cancel; +This is a completely mess.
Quoted 5 lines
If OTOH
xfs_reflink_remap_extenthad a local variable for the potential max number of extents, which is incremented near the initialization ofsmap_realanddmap_written, with a nice comment near to each increment it would make complete sense to the reader.Quoted 8 lines
How about following the traits of
XFS_IEXT_WRITE_UNWRITTEN_CNT(writing to unwritten extent) andXFS_IEXT_REFLINK_END_COW_CNT(moving an extent from cow fork to data fork) and settingXFS_IEXT_REFLINK_REMAP_CNTto a worst case value of 2? A write spanning the entirety of an unwritten extent does not change the extent count. Similarly, If there are no extents in the data fork spanning the file range mapped by an extent in the cow fork, moving the extent from cow fork to data fork increases the extent count by just 1 and not by the worst case count of 2.Probably not a huge deal, since at worst we bail out of reflink early and userspace can just decide to fall back to a pagecache copy or whatever. It'd be harder to deal with if this was the cow path where we long ago returned from
write()and even writeback...
Quoted 4 lines
...though now that I think about it, what /does/ happens if
_reflink_end_cowtrips over this? I wonder if inodes need to be able to reserve extent count for later, but ... hgnghghg that seems hard to reason about.
I am not sure if I am following you. Looks like you are asking about what happens if xfs_reflink_end_cow_extent() trips over XFS_IEXT_REFLINK_END_COW_CNT limit. If that occurs, then the end_io path would set AS_EIO on mapping->flags which would in turn cause the upper layers of the kernel to return -EIO to the corresponding fsync() call made by a userspace program.
Signature · 1 line
chandan
Re: [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent
In reply to Chandan Babu RQuoted 8 lines · Chandan Babu R
How about following the traits of
XFS_IEXT_WRITE_UNWRITTEN_CNT(writing to unwritten extent) andXFS_IEXT_REFLINK_END_COW_CNT(moving an extent from cow fork to data fork) and settingXFS_IEXT_REFLINK_REMAP_CNTto a worst case value of 2? A write spanning the entirety of an unwritten extent does not change the extent count. Similarly, If there are no extents in the data fork spanning the file range mapped by an extent in the cow fork, moving the extent from cow fork to data fork increases the extent count by just 1 and not by the worst case count of 2.
No, I think the dynamic value is perfectly fine, as we have all the information trivially available. I just don't think having a separate macro and the comment explaining it away from the actual functionality is helpful.
Re: [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent
Quoted 10 lines · IST Christoph Hellwig
Quoted 8 lines · Chandan Babu R
How about following the traits of
XFS_IEXT_WRITE_UNWRITTEN_CNT(writing to unwritten extent) andXFS_IEXT_REFLINK_END_COW_CNT(moving an extent from cow fork to data fork) and settingXFS_IEXT_REFLINK_REMAP_CNTto a worst case value of 2? A write spanning the entirety of an unwritten extent does not change the extent count. Similarly, If there are no extents in the data fork spanning the file range mapped by an extent in the cow fork, moving the extent from cow fork to data fork increases the extent count by just 1 and not by the worst case count of 2.
Quoted 5 lines
No, I think the dynamic value is perfectly fine, as we have all the information trivially available. I just don't think having a separate macro and the comment explaining it away from the actual functionality is helpful.
Darrick, I think using the macros approach is more suitable. But I can go ahead and implement the approach decided by the community. Please let me know your opinion.
Signature · 1 line
chandan
Re: [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent
Quoted 17 lines · Chandan Babu R
Quoted 10 lines · IST Christoph Hellwig
Quoted 8 lines · Chandan Babu R
How about following the traits of
XFS_IEXT_WRITE_UNWRITTEN_CNT(writing to unwritten extent) andXFS_IEXT_REFLINK_END_COW_CNT(moving an extent from cow fork to data fork) and settingXFS_IEXT_REFLINK_REMAP_CNTto a worst case value of 2? A write spanning the entirety of an unwritten extent does not change the extent count. Similarly, If there are no extents in the data fork spanning the file range mapped by an extent in the cow fork, moving the extent from cow fork to data fork increases the extent count by just 1 and not by the worst case count of 2.Quoted 5 lines
No, I think the dynamic value is perfectly fine, as we have all the information trivially available. I just don't think having a separate macro and the comment explaining it away from the actual functionality is helpful.
Quoted 3 lines
Darrick, I think using the macros approach is more suitable. But I can go ahead and implement the approach decided by the community. Please let me know your opinion.
The macro only gets used in one place anyway, so I don't see as strong a need for it as the other places. I think this one could be open-coded next to the places where we decide the values of smap_real and dmap_written. (i.e. what Christoph is suggesting)
--D
Quoted 5 lines
Signature · 1 line
chandan
Re: [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent
Quoted 18 lines · IST Darrick J. Wong
Quoted 17 lines · Chandan Babu R
Quoted 15 lines · IST Christoph Hellwig
Quoted 8 lines · Chandan Babu R
How about following the traits of
XFS_IEXT_WRITE_UNWRITTEN_CNT(writing to unwritten extent) andXFS_IEXT_REFLINK_END_COW_CNT(moving an extent from cow fork to data fork) and settingXFS_IEXT_REFLINK_REMAP_CNTto a worst case value of 2? A write spanning the entirety of an unwritten extent does not change the extent count. Similarly, If there are no extents in the data fork spanning the file range mapped by an extent in the cow fork, moving the extent from cow fork to data fork increases the extent count by just 1 and not by the worst case count of 2.No, I think the dynamic value is perfectly fine, as we have all the information trivially available. I just don't think having a separate macro and the comment explaining it away from the actual functionality is helpful.
Quoted 9 lines
Quoted 3 lines
Darrick, I think using the macros approach is more suitable. But I can go ahead and implement the approach decided by the community. Please let me know your opinion.
The macro only gets used in one place anyway, so I don't see as strong a need for it as the other places. I think this one could be open-coded next to the places where we decide the values of
smap_realanddmap_written. (i.e. what Christoph is suggesting)
Ok. I will make the relevant changes.
Signature · 1 line
chandan
PATCH v6 9/11 xfs: Check for extent overflow when swapping extents
In reply to Chandan Babu RRemoving 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.
--- fs/xfs/libxfs/xfs_inode_fork.h | 7 +++++++ fs/xfs/xfs_bmap_util.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+)
fs/xfs/libxfs/xfs_inode_fork.h +7 -0
@@ -102,6 +102,13 @@ struct xfs_ifork {#define XFS_IEXT_REFLINK_REMAP_CNT (smap_real, dmap_written) \ (((smap_real) ? 1 : 0) + ((dmap_written) ? 1 : 0)) +/* +* 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. */
fs/xfs/xfs_bmap_util.c +16 -0
@@ -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);
Signature · 1 line
2.28.0
PATCH v6 10/11 xfs: Introduce error injection to reduce maximum inode fork extent count
In reply to Chandan Babu RThis 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.
--- 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(-)
fs/xfs/libxfs/xfs_errortag.h +3 -1
@@ -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_ */
fs/xfs/libxfs/xfs_inode_fork.c +4 -0
@@ -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 ;
fs/xfs/xfs_error.c +3 -0
@@ -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, };
Signature · 1 line
2.28.0
Re: [PATCH V6 10/11] xfs: Introduce error injection to reduce maximum inode fork extent count
Quoted 6 lines · Chandan Babu R
This commit adds
XFS_ERRTAG_REDUCE_MAX_IEXTENTSerror 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 <[email protected]>Signed-off-by Chandan Babu R <[email protected]>
Looks good,
PATCH v6 11/11 xfs: Introduce error injection to allocate only minlen size extents for files
In reply to Chandan Babu RThis commit adds XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT error tag which helps userspace test programs to get xfs_bmap_btalloc() to always allocate minlen sized extents.
This is required for test programs which need a guarantee that minlen extents allocated for a file do not get merged with their existing neighbours in the inode's BMBT. "Inode fork extent overflow check" for Directories, Xattrs and extension of realtime inodes need this since the file offset at which the extents are being allocated cannot be explicitly controlled from userspace.
One way to use this error tag is to,
1. Consume all of the free space by sequentially writing to a file.
2. Punch alternate blocks of the file. This causes CNTBT to contain sufficient number of one block sized extent records.
3. Inject XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT error tag. After step 3, xfs_bmap_btalloc() will issue space allocation requests for minlen sized extents only.
ENOSPC error code is returned to userspace when there aren't any "one block sized" extents left in any of the AGs.
--- fs/xfs/libxfs/xfs_alloc.c | 46 ++++++++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_alloc.h | 1 + fs/xfs/libxfs/xfs_bmap.c | 34 ++++++++++++++++++++------ fs/xfs/libxfs/xfs_errortag.h | 4 +++- fs/xfs/xfs_error.c | 3 +++ 5 files changed, 80 insertions(+), 8 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +46 -0
@@ -2473,6 +2473,45 @@ xfs_defer_agfl_block(xfs_defer_add (tp,XFS_DEFER_OPS_TYPE_AGFL_FREE , &new->xefi_list); } +/* +* Check if an AGF has a free extent record whose length is equal to +* args->minlen. +*/ +STATIC int +xfs_exact_minlen_extent_available ( +struct xfs_alloc_arg *args, +struct xfs_buf *agbp, +int *stat) +{ +struct xfs_btree_cur *cnt_cur; +xfs_agblock_t fbno; +xfs_extlen_t flen; +int error =0 ; + + cnt_cur =xfs_allocbt_init_cursor (args->mp, args->tp, agbp, + args->agno,XFS_BTNUM_CNT ); + error =xfs_alloc_lookup_ge (cnt_cur,0 , args->minlen, stat); +if (error) + goto out; + +if (*stat ==0 ) { + error = -EFSCORRUPTED ; + goto out; + } + + error =xfs_alloc_get_rec (cnt_cur, &fbno, &flen, stat); +if (error) + goto out; + +if (*stat ==1 && flen != args->minlen) + *stat =0 ; + +out: +xfs_btree_del_cursor (cnt_cur, error); + +return error; +} +/* * Decide whether to use this allocation group for this allocation. * If so, fix up the btree freelist's size.
@@ -2490,6 +2529,7 @@ xfs_alloc_fix_freelist(struct xfs_alloc_arg targs;/* local allocation arguments */ xfs_agblock_t bno;/* freelist block */ xfs_extlen_t need;/* total blocks needed in freelist */ +int i;int error =0 ;/* deferred ops (AGFL block frees) require permanent transactions */
@@ -2544,6 +2584,12 @@ xfs_alloc_fix_freelist(if (!xfs_alloc_space_available (args, need, flags)) goto out_agbp_relse; +if (args->alloc_minlen_only) { + error =xfs_exact_minlen_extent_available (args, agbp, &i); +if (error || !i) + goto out_agbp_relse; + } +/* * Make the freelist shorter if it's too long. *
fs/xfs/libxfs/xfs_alloc.h +1 -0
@@ -75,6 +75,7 @@ typedef struct xfs_alloc_arg {char wasfromfl;/* set if allocation is from freelist */ struct xfs_owner_info oinfo;/* owner of blocks being allocated */ enum xfs_ag_resv_type resv;/* block reservation to use */ +bool alloc_minlen_only; } xfs_alloc_arg_t;/*
fs/xfs/libxfs/xfs_bmap.c +27 -7
@@ -3508,12 +3508,27 @@ xfs_bmap_btalloc(ASSERT (ap->length); } +memset (&args,0 ,sizeof (args)); + + args.alloc_minlen_only =XFS_TEST_ERROR (false, mp, +XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT ); nullfb = ap->tp->t_firstblock ==NULLFSBLOCK ; fb_agno = nullfb ?NULLAGNUMBER :XFS_FSB_TO_AGNO (mp, ap->tp->t_firstblock);if (nullfb) { -if ((ap->datatype &XFS_ALLOC_USERDATA ) && +if (args.alloc_minlen_only) { +/* +* Unlike the longest extent available in an AG, we +* don't track the length of an AG's shortest extent. +* XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT is a debug only +* knob and hence we can afford to start traversing from +* the 0th AG since we need not worry about a drop in +* performance in "debug only" code paths. +*/ + ag =0 ; + ap->blkno =XFS_AGB_TO_FSB (mp, ag,0 ); + }else if ((ap->datatype &XFS_ALLOC_USERDATA ) &&xfs_inode_is_filestream (ap->ip)) { ag =xfs_filestream_lookup_ag (ap->ip); ag = (ag !=NULLAGNUMBER ) ? ag :0 ;
@@ -3521,10 +3536,12 @@ xfs_bmap_btalloc( }else { ap->blkno =XFS_INO_TO_FSB (mp, ap->ip->i_ino); } - }else + }else { ap->blkno = ap->tp->t_firstblock; + } -xfs_bmap_adjacent (ap); +if (!args.alloc_minlen_only) +xfs_bmap_adjacent (ap);/* * If allowed, use ap->blkno; otherwise must use firstblock since
@@ -3538,7 +3555,6 @@ xfs_bmap_btalloc(* Normal allocation, done through xfs_alloc_vextent. */ tryagain = isaligned =0 ; -memset (&args,0 ,sizeof (args)); args.tp = ap->tp; args.mp = mp; args.fsbno = ap->blkno;
@@ -3547,7 +3563,10 @@ xfs_bmap_btalloc(/* Trim the allocation back to the maximum an AG can fit. */ args.maxlen =min (ap->length, mp->m_ag_max_usable); blen =0 ; -if (nullfb) { +if (args.alloc_minlen_only) { + args.type =XFS_ALLOCTYPE_FIRST_AG ; + args.total = args.minlen = args.maxlen = ap->minlen; + }else if (nullfb) {/* * Search for an allocation group with a single extent large * enough for the request. If one isn't found, then adjust
@@ -3593,7 +3612,8 @@ xfs_bmap_btalloc(* is only set if the allocation length is >= the stripe unit and the * allocation offset is at the end of file. */ -if (!(ap->tp->t_flags &XFS_TRANS_LOWMODE ) && ap->aeof) { +if (!(ap->tp->t_flags &XFS_TRANS_LOWMODE ) && ap->aeof && + !args.alloc_minlen_only) {if (!ap->offset) { args.alignment = stripe_align; atype = args.type;
@@ -3679,7 +3699,7 @@ xfs_bmap_btalloc(if ((error =xfs_alloc_vextent (&args)))return error; } -if (args.fsbno ==NULLFSBLOCK && nullfb) { +if (args.fsbno ==NULLFSBLOCK && nullfb && !args.alloc_minlen_only) { args.fsbno =0 ; args.type =XFS_ALLOCTYPE_FIRST_AG ; args.total = ap->minlen;
fs/xfs/libxfs/xfs_errortag.h +3 -1
@@ -57,7 +57,8 @@#define XFS_ERRTAG_IUNLINK_FALLBACK 34#define XFS_ERRTAG_BUF_IOERROR 35#define XFS_ERRTAG_REDUCE_MAX_IEXTENTS 36 -#define XFS_ERRTAG_MAX 37 +#define XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT 37 +#define XFS_ERRTAG_MAX 38/* * Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -99,5 +100,6 @@#define XFS_RANDOM_IUNLINK_FALLBACK (XFS_RANDOM_DEFAULT/10)#define XFS_RANDOM_BUF_IOERROR XFS_RANDOM_DEFAULT#define XFS_RANDOM_REDUCE_MAX_IEXTENTS 1 +#define XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT 1#endif /* __XFS_ERRORTAG_H_ */
fs/xfs/xfs_error.c +3 -0
@@ -55,6 +55,7 @@ static unsigned int xfs_errortag_random_default[] = {XFS_RANDOM_IUNLINK_FALLBACK ,XFS_RANDOM_BUF_IOERROR ,XFS_RANDOM_REDUCE_MAX_IEXTENTS , + XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT, }; struct xfs_errortag_attr {
@@ -166,6 +167,7 @@ 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 ); +XFS_ERRORTAG_ATTR_RW (bmap_alloc_minlen_extent,XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT );static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (noerror),
@@ -205,6 +207,7 @@ static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (iunlink_fallback),XFS_ERRORTAG_ATTR_LIST (buf_ioerror),XFS_ERRORTAG_ATTR_LIST (reduce_max_iextents), +XFS_ERRORTAG_ATTR_LIST (bmap_alloc_minlen_extent), NULL, };
Signature · 1 line
2.28.0
Re: [PATCH V6 11/11] xfs: Introduce error injection to allocate only minlen size extents for files
Quoted 19 lines · Chandan Babu R
This commit adds
XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENTerror tag which helps userspace test programs to getxfs_bmap_btalloc()to always allocate minlen sized extents.This is required for test programs which need a guarantee that minlen extents allocated for a file do not get merged with their existing neighbours in the inode's BMBT. "Inode fork extent overflow check" for Directories, Xattrs and extension of realtime inodes need this since the file offset at which the extents are being allocated cannot be explicitly controlled from userspace.
One way to use this error tag is to,
1. Consume all of the free space by sequentially writing to a file.
2. Punch alternate blocks of the file. This causes CNTBT to contain sufficient number of one block sized extent records.
3. InjectXFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENTerror tag. After step 3,xfs_bmap_btalloc()will issue space allocation requests for minlen sized extents only.
Quoted 2 lines
ENOSPC error code is returned to userspace when there aren't any "one block sized" extents left in any of the AGs.
Can we figure out a way to only build the extra code for debug kernels?
Re: [PATCH V6 11/11] xfs: Introduce error injection to allocate only minlen size extents for files
Quoted 20 lines · IST Christoph Hellwig
Quoted 19 lines · Chandan Babu R
This commit adds
XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENTerror tag which helps userspace test programs to getxfs_bmap_btalloc()to always allocate minlen sized extents.This is required for test programs which need a guarantee that minlen extents allocated for a file do not get merged with their existing neighbours in the inode's BMBT. "Inode fork extent overflow check" for Directories, Xattrs and extension of realtime inodes need this since the file offset at which the extents are being allocated cannot be explicitly controlled from userspace.
One way to use this error tag is to,
1. Consume all of the free space by sequentially writing to a file.
2. Punch alternate blocks of the file. This causes CNTBT to contain sufficient number of one block sized extent records.
3. InjectXFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENTerror tag. After step 3,xfs_bmap_btalloc()will issue space allocation requests for minlen sized extents only.
Quoted 5 lines
Quoted 2 lines
ENOSPC error code is returned to userspace when there aren't any "one block sized" extents left in any of the AGs.
Can we figure out a way to only build the extra code for debug kernels?
Ok. I will try to get this implemented.
Signature · 1 line
chandan
Re: [PATCH V6 11/11] xfs: Introduce error injection to allocate only minlen size extents for files
Quoted 21 lines · Chandan Babu R
Quoted 20 lines · IST Christoph Hellwig
Quoted 19 lines · Chandan Babu R
This commit adds
XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENTerror tag which helps userspace test programs to getxfs_bmap_btalloc()to always allocate minlen sized extents.This is required for test programs which need a guarantee that minlen extents allocated for a file do not get merged with their existing neighbours in the inode's BMBT. "Inode fork extent overflow check" for Directories, Xattrs and extension of realtime inodes need this since the file offset at which the extents are being allocated cannot be explicitly controlled from userspace.
One way to use this error tag is to,
1. Consume all of the free space by sequentially writing to a file.
2. Punch alternate blocks of the file. This causes CNTBT to contain sufficient number of one block sized extent records.
3. InjectXFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENTerror tag. After step 3,xfs_bmap_btalloc()will issue space allocation requests for minlen sized extents only.
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
ENOSPC error code is returned to userspace when there aren't any "one block sized" extents left in any of the AGs.
Can we figure out a way to only build the extra code for debug kernels?
Yeah, I was gonna say that too. You're basically installing a new allocator algorithm, but wow it scatters pieces of itself all over the place. :/
--D
Quoted 9 lines
Quoted 1 line
Ok. I will try to get this implemented.
Signature · 1 line
chandan
Re: [PATCH V6 11/11] xfs: Introduce error injection to allocate only minlen size extents for files
Quoted 22 lines · IST Darrick J. Wong
Quoted 21 lines · Chandan Babu R
Quoted 20 lines · IST Christoph Hellwig
Quoted 19 lines · Chandan Babu R
This commit adds
XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENTerror tag which helps userspace test programs to getxfs_bmap_btalloc()to always allocate minlen sized extents.This is required for test programs which need a guarantee that minlen extents allocated for a file do not get merged with their existing neighbours in the inode's BMBT. "Inode fork extent overflow check" for Directories, Xattrs and extension of realtime inodes need this since the file offset at which the extents are being allocated cannot be explicitly controlled from userspace.
One way to use this error tag is to,
1. Consume all of the free space by sequentially writing to a file.
2. Punch alternate blocks of the file. This causes CNTBT to contain sufficient number of one block sized extent records.
3. InjectXFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENTerror tag. After step 3,xfs_bmap_btalloc()will issue space allocation requests for minlen sized extents only.
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
ENOSPC error code is returned to userspace when there aren't any "one block sized" extents left in any of the AGs.
Can we figure out a way to only build the extra code for debug kernels?
Yeah, I was gonna say that too. You're basically installing a new allocator algorithm, but wow it scatters pieces of itself all over the place. :/
Right. I have almost completed refactoring the code into relevant functions. I will execute the test suite and if everything goes well I will be posting the next version of the patchset soon.
Thanks for the review comments.
Signature · 1 line
chandan