From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 3/3] xfs: factor free space tree transaciton reservations
Date: Wed, 9 Sep 2020 18:19:12 +1000 [thread overview]
Message-ID: <20200909081912.1185392-4-david@fromorbit.com> (raw)
In-Reply-To: <20200909081912.1185392-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Convert all the open coded free space tree modification reservations
to use the new xfs_allocfree_extent_res() function.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/libxfs/xfs_trans_resv.c | 116 +++++++++++++--------------------
1 file changed, 44 insertions(+), 72 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_trans_resv.c b/fs/xfs/libxfs/xfs_trans_resv.c
index 621ddb277dfa..cb3cddb84d75 100644
--- a/fs/xfs/libxfs/xfs_trans_resv.c
+++ b/fs/xfs/libxfs/xfs_trans_resv.c
@@ -143,18 +143,16 @@ xfs_calc_inode_res(
* reservation:
*
* the inode btree: max depth * blocksize
- * the allocation btrees: 2 trees * (max depth - 1) * block size
+ * one extent for the AG free space trees
*
- * The caller must account for SB and AG header modifications, etc.
*/
STATIC uint
xfs_calc_inobt_res(
struct xfs_mount *mp)
{
return xfs_calc_buf_res(M_IGEO(mp)->inobt_maxlevels,
- XFS_FSB_TO_B(mp, 1)) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),
- XFS_FSB_TO_B(mp, 1));
+ XFS_FSB_TO_B(mp, 1)) +
+ xfs_allocfree_extent_res(mp);
}
/*
@@ -200,8 +198,7 @@ xfs_calc_inode_chunk_res(
{
uint res, size = 0;
- res = xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),
- XFS_FSB_TO_B(mp, 1));
+ res = xfs_allocfree_extent_res(mp);
if (alloc) {
/* icreate tx uses ordered buffers */
if (xfs_sb_version_has_v3inode(&mp->m_sb))
@@ -256,22 +253,19 @@ xfs_rtalloc_log_count(
* extents. This gives (t1):
* the inode getting the new extents: inode size
* the inode's bmap btree: max depth * block size
- * the agfs of the ags from which the extents are allocated: 2 * sector
* the superblock free block counter: sector size
- * the allocation btrees: 2 exts * 2 trees * (2 * max depth - 1) * block size
+ * two extents for the AG free space trees
* Or, if we're writing to a realtime file (t2):
* the inode getting the new extents: inode size
* the inode's bmap btree: max depth * block size
- * the agfs of the ags from which the extents are allocated: 2 * sector
+ * one extent for the AG free space trees
* the superblock free block counter: sector size
* the realtime bitmap: ((MAXEXTLEN / rtextsize) / NBBY) bytes
* the realtime summary: 1 block
- * the allocation btrees: 2 trees * (2 * max depth - 1) * block size
* And the bmap_finish transaction can free bmap blocks in a join (t3):
- * the agfs of the ags containing the blocks: 2 * sector size
* the agfls of the ags containing the blocks: 2 * sector size
* the super block free block counter: sector size
- * the allocation btrees: 2 exts * 2 trees * (2 * max depth - 1) * block size
+ * two extents for the AG free space trees
*/
STATIC uint
xfs_calc_write_reservation(
@@ -282,8 +276,8 @@ xfs_calc_write_reservation(
t1 = xfs_calc_inode_res(mp, 1) +
xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK), blksz) +
- xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2), blksz);
+ xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp) * 2;
if (xfs_sb_version_hasrealtime(&mp->m_sb)) {
t2 = xfs_calc_inode_res(mp, 1) +
@@ -291,13 +285,13 @@ xfs_calc_write_reservation(
blksz) +
xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +
xfs_calc_buf_res(xfs_rtalloc_log_count(mp, 1), blksz) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1), blksz);
+ xfs_allocfree_extent_res(mp);
} else {
t2 = 0;
}
- t3 = xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2), blksz);
+ t3 = xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp) * 2;
return XFS_DQUOT_LOGRES(mp) + max3(t1, t2, t3);
}
@@ -307,19 +301,13 @@ xfs_calc_write_reservation(
* the inode being truncated: inode size
* the inode's bmap btree: (max depth + 1) * block size
* And the bmap_finish transaction can free the blocks and bmap blocks (t2):
- * the agf for each of the ags: 4 * sector size
- * the agfl for each of the ags: 4 * sector size
* the super block to reflect the freed blocks: sector size
- * worst case split in allocation btrees per extent assuming 4 extents:
- * 4 exts * 2 trees * (2 * max depth - 1) * block size
+ * four (XXX: one?) extents for the AG free space trees
* Or, if it's a realtime file (t3):
- * the agf for each of the ags: 2 * sector size
- * the agfl for each of the ags: 2 * sector size
* the super block to reflect the freed blocks: sector size
* the realtime bitmap: 2 exts * ((MAXEXTLEN / rtextsize) / NBBY) bytes
* the realtime summary: 2 exts * 1 block
- * worst case split in allocation btrees per extent assuming 2 extents:
- * 2 exts * 2 trees * (2 * max depth - 1) * block size
+ * two extents for the AG free space trees
*/
STATIC uint
xfs_calc_itruncate_reservation(
@@ -331,13 +319,13 @@ xfs_calc_itruncate_reservation(
t1 = xfs_calc_inode_res(mp, 1) +
xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) + 1, blksz);
- t2 = xfs_calc_buf_res(9, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 4), blksz);
+ t2 = xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp) * 4;
if (xfs_sb_version_hasrealtime(&mp->m_sb)) {
- t3 = xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +
+ t3 = xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
xfs_calc_buf_res(xfs_rtalloc_log_count(mp, 2), blksz) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2), blksz);
+ xfs_allocfree_extent_res(mp) * 2;
} else {
t3 = 0;
}
@@ -352,10 +340,8 @@ xfs_calc_itruncate_reservation(
* the two directory bmap btrees: 2 * max depth * block size
* And the bmap_finish transaction can free dir and bmap blocks (two sets
* of bmap blocks) giving:
- * the agf for the ags in which the blocks live: 3 * sector size
- * the agfl for the ags in which the blocks live: 3 * sector size
* the superblock for the free block count: sector size
- * the allocation btrees: 3 exts * 2 trees * (2 * max depth - 1) * block size
+ * three extents for the AG free space trees
*/
STATIC uint
xfs_calc_rename_reservation(
@@ -365,9 +351,8 @@ xfs_calc_rename_reservation(
max((xfs_calc_inode_res(mp, 4) +
xfs_calc_buf_res(2 * XFS_DIROP_LOG_COUNT(mp),
XFS_FSB_TO_B(mp, 1))),
- (xfs_calc_buf_res(7, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 3),
- XFS_FSB_TO_B(mp, 1))));
+ (xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp) * 3));
}
/*
@@ -381,20 +366,19 @@ xfs_calc_iunlink_remove_reservation(
struct xfs_mount *mp)
{
return xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
- 2 * M_IGEO(mp)->inode_cluster_size;
+ xfs_calc_buf_res(2, M_IGEO(mp)->inode_cluster_size);
}
/*
* For creating a link to an inode:
+ * the inode is removed from the iunlink list (O_TMPFILE)
* the parent directory inode: inode size
* the linked inode: inode size
* the directory btree could split: (max depth + v2) * dir block size
* the directory bmap btree could join or split: (max depth + v2) * blocksize
* And the bmap_finish transaction can free some bmap blocks giving:
- * the agf for the ag in which the blocks live: sector size
- * the agfl for the ag in which the blocks live: sector size
* the superblock for the free block count: sector size
- * the allocation btrees: 2 trees * (2 * max depth - 1) * block size
+ * one extent for the AG free space trees
*/
STATIC uint
xfs_calc_link_reservation(
@@ -405,9 +389,8 @@ xfs_calc_link_reservation(
max((xfs_calc_inode_res(mp, 2) +
xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),
XFS_FSB_TO_B(mp, 1))),
- (xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),
- XFS_FSB_TO_B(mp, 1))));
+ (xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp)));
}
/*
@@ -419,20 +402,19 @@ STATIC uint
xfs_calc_iunlink_add_reservation(xfs_mount_t *mp)
{
return xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
- M_IGEO(mp)->inode_cluster_size;
+ xfs_calc_buf_res(1, M_IGEO(mp)->inode_cluster_size);
}
/*
* For removing a directory entry we can modify:
+ * the inode is added to the agi unlinked list
* the parent directory inode: inode size
* the removed inode: inode size
* the directory btree could join: (max depth + v2) * dir block size
* the directory bmap btree could join or split: (max depth + v2) * blocksize
* And the bmap_finish transaction can free the dir and bmap blocks giving:
- * the agf for the ag in which the blocks live: 2 * sector size
- * the agfl for the ag in which the blocks live: 2 * sector size
* the superblock for the free block count: sector size
- * the allocation btrees: 2 exts * 2 trees * (2 * max depth - 1) * block size
+ * two extents for the AG free space trees
*/
STATIC uint
xfs_calc_remove_reservation(
@@ -443,9 +425,8 @@ xfs_calc_remove_reservation(
max((xfs_calc_inode_res(mp, 1) +
xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp),
XFS_FSB_TO_B(mp, 1))),
- (xfs_calc_buf_res(4, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2),
- XFS_FSB_TO_B(mp, 1))));
+ (xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp) * 2));
}
/*
@@ -582,15 +563,14 @@ xfs_calc_ichange_reservation(
* Growing the data section of the filesystem.
* superblock
* agi and agf
- * allocation btrees
+ * growing the last AG requires freeing one extent
*/
STATIC uint
xfs_calc_growdata_reservation(
struct xfs_mount *mp)
{
- return xfs_calc_buf_res(3, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),
- XFS_FSB_TO_B(mp, 1));
+ return xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp);
}
/*
@@ -598,10 +578,9 @@ xfs_calc_growdata_reservation(
* In the first set of transactions (ALLOC) we allocate space to the
* bitmap or summary files.
* superblock: sector size
- * agf of the ag from which the extent is allocated: sector size
* bmap btree for bitmap/summary inode: max depth * blocksize
* bitmap/summary inode: inode size
- * allocation btrees for 1 block alloc: 2 * (2 * maxdepth - 1) * blocksize
+ * one extent for the AG free space trees
*/
STATIC uint
xfs_calc_growrtalloc_reservation(
@@ -611,8 +590,7 @@ xfs_calc_growrtalloc_reservation(
xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK),
XFS_FSB_TO_B(mp, 1)) +
xfs_calc_inode_res(mp, 1) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),
- XFS_FSB_TO_B(mp, 1));
+ xfs_allocfree_extent_res(mp);
}
/*
@@ -675,7 +653,7 @@ xfs_calc_writeid_reservation(
* agf block and superblock (for block allocation)
* the new block (directory sized)
* bmap blocks for the new directory block
- * allocation btrees
+ * one extent for the AG free space trees
*/
STATIC uint
xfs_calc_addafork_reservation(
@@ -687,8 +665,7 @@ xfs_calc_addafork_reservation(
xfs_calc_buf_res(1, mp->m_dir_geo->blksize) +
xfs_calc_buf_res(XFS_DAENTER_BMAP1B(mp, XFS_DATA_FORK) + 1,
XFS_FSB_TO_B(mp, 1)) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 1),
- XFS_FSB_TO_B(mp, 1));
+ xfs_allocfree_extent_res(mp);
}
/*
@@ -696,11 +673,8 @@ xfs_calc_addafork_reservation(
* the inode being truncated: inode size
* the inode's bmap btree: max depth * block size
* And the bmap_finish transaction can free the blocks and bmap blocks:
- * the agf for each of the ags: 4 * sector size
- * the agfl for each of the ags: 4 * sector size
* the super block to reflect the freed blocks: sector size
- * worst case split in allocation btrees per extent assuming 4 extents:
- * 4 exts * 2 trees * (2 * max depth - 1) * block size
+ * four (XXX: really? should be one?) extents for the AG free space trees
*/
STATIC uint
xfs_calc_attrinval_reservation(
@@ -709,9 +683,8 @@ xfs_calc_attrinval_reservation(
return max((xfs_calc_inode_res(mp, 1) +
xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK),
XFS_FSB_TO_B(mp, 1))),
- (xfs_calc_buf_res(9, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 4),
- XFS_FSB_TO_B(mp, 1))));
+ (xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp) * 4));
}
/*
@@ -763,7 +736,7 @@ xfs_calc_attrsetrt_reservation(
* the agf for the ag in which the blocks live: 2 * sector size
* the agfl for the ag in which the blocks live: 2 * sector size
* the superblock for the free block count: sector size
- * the allocation btrees: 2 exts * 2 trees * (2 * max depth - 1) * block size
+ * two extents for the AG free space trees
*/
STATIC uint
xfs_calc_attrrm_reservation(
@@ -776,9 +749,8 @@ xfs_calc_attrrm_reservation(
(uint)XFS_FSB_TO_B(mp,
XFS_BM_MAXLEVELS(mp, XFS_ATTR_FORK)) +
xfs_calc_buf_res(XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK), 0)),
- (xfs_calc_buf_res(5, mp->m_sb.sb_sectsize) +
- xfs_calc_buf_res(xfs_allocfree_log_count(mp, 2),
- XFS_FSB_TO_B(mp, 1))));
+ (xfs_calc_buf_res(1, mp->m_sb.sb_sectsize) +
+ xfs_allocfree_extent_res(mp) * 2));
}
/*
--
2.28.0
prev parent reply other threads:[~2020-09-09 8:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 8:19 [PATCH 0/3] [RFC] xfs: intent recovery reservation changes Dave Chinner
2020-09-09 8:19 ` [PATCH 1/3] xfs: EFI recovery needs it's own transaction reservation Dave Chinner
2020-09-09 13:31 ` Brian Foster
2020-09-09 21:44 ` Dave Chinner
2020-09-10 13:18 ` Brian Foster
2020-09-10 21:29 ` Dave Chinner
2020-09-11 12:37 ` Brian Foster
2020-09-09 8:19 ` [PATCH 2/3] xfs: add a free space extent change reservation Dave Chinner
2020-09-09 13:35 ` Brian Foster
2020-09-09 22:51 ` Dave Chinner
2020-09-10 13:19 ` Brian Foster
2020-09-09 8:19 ` Dave Chinner [this message]
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=20200909081912.1185392-4-david@fromorbit.com \
--to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.