xfs: per-ag centric allocation alogrithms
cover xfs: per-ag centric allocation alogrithms
Hi folks,
This is "heads up" at this point so that people can see what is coming down the line and make early comments, not a request to consider these for merging soon. I may cherry pick some of the initial AGI/AGF cleanup patches patches for this cycle, but I'll send them separately if I do. The patch series is based on a 5.19-rc1 kernel.
This series continues the work towards making shrinking a filesystem possible. We need to be able to stop operations from taking place on AGs that need to be removed by a shrink, so before shrink can be implemented we need to have the infrastructure in place to prevent incursion into AGs that are going to be, or are in the process, of being removed from active duty.
The focus of this is making operations that depend on access to AGs use the perag to access and pin the AG in active use, thereby creating a barrier we can use to delay shrink until all active uses have been drained and new uses are prevented.
This series starts by driving the perag down into the AGI, AGF and AGFL access routines and unifies the perag structure initialisation with the high level AG header read functions. This largely replaces the xfs_mount/agno pair that is passed to all these functions with a perag, and in most places we already have a perag ready to pass in. There are a few places where perags need to be grabbed before reading the AG header buffers - some of these will need to be driven to higher layers to ensure we can run operations on AGs without getting stuck part way through waiting on a perag reference.
The next section of this patchset moves some of the AG geometry information from the xfs_mount to the xfs_perag, and starts converting code that requires geometry validation to use a perag instead of a mount and having to extract the AGNO from the object location. This also allows us to store the AG size in the perag and then we can stop having to compare the agno against sb_agcount to determine if the AG is the last AG and so has a runt size. This greatly simplifies some of the type validity checking we do and substantially reduces the CPU overhead of type validity checking. It also cuts over 1.2kB out of the binary size.
The series then starts converting the code to use active references. Active reference counts are used by high level code that needs to prevent the AG from being taken out from under it by a shrink operation. The high level code needs to be able to handle not getting an active reference gracefully, and the shrink code will need to wait for active references to drain before continuing.
Active references are implemented just as reference counts right now
- an active reference is taken at perag init during mount, and all other active references are dependent on the active reference count being greater than zero. This gives us an initial method of stopping new active references without needing other infrastructure; just drop the reference taken at filesystem mount time and when the refcount then falls to zero no new references can be taken.
In future, this will need to take into account AG control state (e.g. offline, no alloc, etc) as well as the reference count, but right now we can implement a basic barrier for shrink with just reference count manipulations. There are patches to convert the perag state to atomic opstate fields similar to the xfs_mount and xlog opstate fields in preparation for this.
The first target for active reference conversion is the for_each_perag*() iterators. This captures a lot of high level code that should skip offline AGs, and introduces the ability to differentiate between a lookup that didn't have an online AG and the end of the AG iteration range.
From there, the inode allocation AG selection is converted to active references, and the perag is driven deeper into the inode allocation and btree code to replace the xfs_mount. Most of the inode allocation code operates on a single AG once it is selected, hence it should pass the perag as the primary referenced object around for allocation, not the xfs_mount. There is a bit of churn here, but it emphasises that inode allocation is inherently an allocation group based operation.
Next the bmap/alloc interface undergoes a major untangling, reworking xfs_bmap_btalloc() into separate allocation operations for different contexts and failure handling behaviours. This then allows us to completely remove the xfs_alloc_vextent() layer via restructuring the xfs_alloc_vextent/xfs_alloc_ag_vextent() into a set of realtively simple helper function that describe the allocation that they are doing. e.g. xfs_alloc_vextent_exact_bno().
This allows the requirements for accessing AGs to be allocation context dependent. The allocations that require operation on a single AG generally can't tolerate failure after the allocation method and AG has been decided on, and hence the caller needs to manage the active references to ensure the allocation does not race with shrink removing the selected AG for the duration of the operation that requires access to that allocation group.
Other allocations iterate AGs and so the first AG is just a hint - these do not need to pin a perag first as they can tolerate not being able to access an AG by simply skipping over it. These require new perag iteration functions that can start at arbitrary AGs and wrap around at arbitrary AGs, hence a new set for for_each_perag_wrap*() helpers to do this.
Next is the rework of the filestreams allocator. This doesn't change any functionality, but gets rid of the unnecessary multi-pass selection algorithm when the selected AG is not available. It currently does a lookup pass which might iterate all AGs to select an AG, then checks if the AG is acceptible and if not does a "new AG" pass that is essentially identical to the lookup pass. Both of these scans also do the same "longest extent in AG" check before selecting an AG as is done after the AG is selected.
IOWs, the filestreams algorithm can be greatly simplified into a single new AG selection pass if the there is no current association or the currently associated AG doesn't have enough contiguous free space for the allocation to proceed. With this simplification of the filestreams allocator, it's then trivial to convert it to use for_each_ag_wrap() for the AG scan algorithm.
This actually passes auto group fstests with rmapbt=1 with only one regression - xfs/294 gets ENOSPC earlier and that makes unexpected output noise. The last patch in the series is needed to fix a AGF ABBA locking deadlock in g/476 - I only just worked this one out, and I strongly suspect that it's a pre-existing bug that leaves an AGF locked after failing to allocate anything from the AG.
This series currently ends at the xfs_bmap_btalloc ->allocator conversion. There still more to be done here before we can start disabling AGs for shrink:
- the bmapi layer needs to handle active AG references for exact and near allocation
- converting the allocation "firstblock" restrictions to hold an actively referenced perag, not a filesystem block address.
- inode cache lookups need to converted to active references
- audits needed to find and convert all the places that we use bp->b_pag instead of active references passed from high level code.
- addition of a "going offline" opstate and state machine to use for rejecting new active references as well as blocking shrink from making progress until all active references are gone
- ioctls for changing AG state from userspace
- audit of the freeing code to determine whether it can use passive references to allow freeing of blocks (which may require allocation!) whilst new allocations are prevented from being run on "going offline" AGs. This will allow userspace to stop new allocations in AGs to be shrunk before it starts emptying them and freeing the space that they have in use.
Cheers,
Dave.
PATCH 1/50 xfs: make last AG grow/shrink perag centric
From: Dave Chinner <[email protected]>
Because the perag must exist for these operations, look it up as part of the common shrink operations and pass it instead of the mount/agno pair.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 48 ++++++++++++++++-------------------------- fs/xfs/libxfs/xfs_ag.h | 11 +++++----- fs/xfs/xfs_fsops.c | 11 ++++++---- fs/xfs/xfs_ioctl.c | 8 ++++++- 4 files changed, 37 insertions(+), 41 deletions(-)
fs/xfs/libxfs/xfs_ag.c +18 -30
@@ -761,11 +761,11 @@ xfs_ag_init_headers(int xfs_ag_shrink_space ( -struct xfs_mount *mp, +struct xfs_perag *pag,struct xfs_trans **tpp, -xfs_agnumber_t agno,xfs_extlen_t delta) { +struct xfs_mount *mp = pag->pag_mount;struct xfs_alloc_arg args = { .tp = *tpp, .mp = mp,
@@ -782,14 +782,14 @@ xfs_ag_shrink_space(xfs_agblock_t aglen;int error, err2; -ASSERT (agno == mp->m_sb.sb_agcount -1 ); - error =xfs_ialloc_read_agi (mp, *tpp, agno, &agibp); +ASSERT (pag->pag_agno == mp->m_sb.sb_agcount -1 ); + error =xfs_ialloc_read_agi (mp, *tpp, pag->pag_agno, &agibp);if (error)return error; agi = agibp->b_addr; - error =xfs_alloc_read_agf (mp, *tpp, agno,0 , &agfbp); + error =xfs_alloc_read_agf (mp, *tpp, pag->pag_agno,0 , &agfbp);if (error)return error;
@@ -801,13 +801,13 @@ xfs_ag_shrink_space(if (delta >= aglen)return -EINVAL ; - args.fsbno =XFS_AGB_TO_FSB (mp, agno, aglen - delta); + args.fsbno =XFS_AGB_TO_FSB (mp, pag->pag_agno, aglen - delta);/* * Make sure that the last inode cluster cannot overlap with the new * end of the AG, even if it's sparse. */ - error =xfs_ialloc_check_shrink (*tpp, agno, agibp, aglen - delta); + error =xfs_ialloc_check_shrink (*tpp, pag->pag_agno, agibp, aglen - delta);if (error)return error;
@@ -883,9 +883,8 @@ xfs_ag_shrink_space(*/ int xfs_ag_extend_space ( -struct xfs_mount *mp, +struct xfs_perag *pag,struct xfs_trans *tp, -struct aghdr_init_data *id,xfs_extlen_t len) {struct xfs_buf *bp;
@@ -893,23 +892,20 @@ xfs_ag_extend_space(struct xfs_agf *agf;int error; -/* -* Change the agi length. -*/ - error =xfs_ialloc_read_agi (mp, tp, id->agno, &bp); +ASSERT (pag->pag_agno == pag->pag_mount->m_sb.sb_agcount -1 ); + + error =xfs_ialloc_read_agi (pag->pag_mount, tp, pag->pag_agno, &bp);if (error)return error; agi = bp->b_addr;be32_add_cpu (&agi->agi_length, len); -ASSERT (id->agno == mp->m_sb.sb_agcount -1 || -be32_to_cpu (agi->agi_length) == mp->m_sb.sb_agblocks);xfs_ialloc_log_agi (tp, bp,XFS_AGI_LENGTH );/* * Change agf length. */ - error =xfs_alloc_read_agf (mp, tp, id->agno,0 , &bp); + error =xfs_alloc_read_agf (pag->pag_mount, tp, pag->pag_agno,0 , &bp);if (error)return error;
@@ -924,13 +920,12 @@ xfs_ag_extend_space(* XFS_RMAP_OINFO_SKIP_UPDATE is used here to tell the rmap btree that * this doesn't actually exist in the rmap btree. */ - error =xfs_rmap_free (tp, bp, bp->b_pag, -be32_to_cpu (agf->agf_length) - len, + error =xfs_rmap_free (tp, bp, pag,be32_to_cpu (agf->agf_length) - len, len, &XFS_RMAP_OINFO_SKIP_UPDATE );if (error)return error; -return xfs_free_extent (tp,XFS_AGB_TO_FSB (mp, id->agno, +return xfs_free_extent (tp,XFS_AGB_TO_FSB (pag->pag_mount, pag->pag_agno,be32_to_cpu (agf->agf_length) - len), len, &XFS_RMAP_OINFO_SKIP_UPDATE ,XFS_AG_RESV_NONE );
@@ -939,34 +934,27 @@ xfs_ag_extend_space(/* Retrieve AG geometry. */ int xfs_ag_get_geometry ( -struct xfs_mount *mp, -xfs_agnumber_t agno, +struct xfs_perag *pag,struct xfs_ag_geometry *ageo) {struct xfs_buf *agi_bp;struct xfs_buf *agf_bp;struct xfs_agi *agi;struct xfs_agf *agf; -struct xfs_perag *pag;unsigned int freeblks;int error; -if (agno >= mp->m_sb.sb_agcount) -return -EINVAL ; -/* Lock the AG headers. */ - error =xfs_ialloc_read_agi (mp,NULL , agno, &agi_bp); + error =xfs_ialloc_read_agi (pag->pag_mount,NULL , pag->pag_agno, &agi_bp);if (error)return error; - error =xfs_alloc_read_agf (mp,NULL , agno,0 , &agf_bp); + error =xfs_alloc_read_agf (pag->pag_mount,NULL , pag->pag_agno,0 , &agf_bp);if (error) goto out_agi; - pag = agi_bp->b_pag; -/* Fill out form. */ memset (ageo,0 ,sizeof (*ageo)); - ageo->ag_number = agno; + ageo->ag_number = pag->pag_agno; agi = agi_bp->b_addr; ageo->ag_icount =be32_to_cpu (agi->agi_count);
fs/xfs/libxfs/xfs_ag.h +5 -6
@@ -168,11 +168,10 @@ struct aghdr_init_data { };int xfs_ag_init_headers (struct xfs_mount *mp,struct aghdr_init_data *id); -int xfs_ag_shrink_space (struct xfs_mount *mp,struct xfs_trans **tpp, -xfs_agnumber_t agno,xfs_extlen_t delta); -int xfs_ag_extend_space (struct xfs_mount *mp,struct xfs_trans *tp, -struct aghdr_init_data *id,xfs_extlen_t len); -int xfs_ag_get_geometry (struct xfs_mount *mp,xfs_agnumber_t agno, -struct xfs_ag_geometry *ageo); +int xfs_ag_shrink_space (struct xfs_perag *pag,struct xfs_trans **tpp, +xfs_extlen_t delta); +int xfs_ag_extend_space (struct xfs_perag *pag,struct xfs_trans *tp, +xfs_extlen_t len); +int xfs_ag_get_geometry (struct xfs_perag *pag,struct xfs_ag_geometry *ageo);#endif /* __LIBXFS_AG_H */
fs/xfs/xfs_fsops.c +7 -4
@@ -41,6 +41,7 @@ xfs_resizefs_init_new_ags(xfs_agnumber_t oagcount, xfs_agnumber_t nagcount, xfs_rfsblock_t delta, + struct xfs_perag *last_pag, bool *lastag_extended) { struct xfs_mount *mp = tp->t_mountp;
@@ -73,7 +74,7 @@ xfs_resizefs_init_new_ags(if (delta) { *lastag_extended = true; - error =xfs_ag_extend_space (mp, tp, id, delta); + error =xfs_ag_extend_space (last_pag, tp, delta); }return error; }
@@ -96,6 +97,7 @@ xfs_growfs_data_private(xfs_agnumber_t oagcount;struct xfs_trans *tp;struct aghdr_init_data id = {}; +struct xfs_perag *last_pag; nb = in->newblocks; error =xfs_sb_validate_fsb_count (&mp->m_sb, nb);
@@ -128,7 +130,6 @@ xfs_growfs_data_private(return -EINVAL ; oagcount = mp->m_sb.sb_agcount; -/* allocate the new per-ag structures */ if (nagcount > oagcount) { error =xfs_initialize_perag (mp, nagcount, &nagimax);
@@ -145,15 +146,17 @@ xfs_growfs_data_private(if (error)return error; + last_pag =xfs_perag_get (mp, oagcount -1 );if (delta >0 ) { error =xfs_resizefs_init_new_ags (tp, &id, oagcount, nagcount, - delta, &lastag_extended); + delta, last_pag, &lastag_extended); }else {xfs_warn_mount (mp,XFS_OPSTATE_WARNED_SHRINK ,"EXPERIMENTAL online shrink feature in use. Use at your own risk!" ); - error =xfs_ag_shrink_space (mp, &tp, nagcount -1 , -delta); + error =xfs_ag_shrink_space (last_pag, &tp, -delta); } +xfs_perag_put (last_pag);if (error) goto out_trans_cancel;
fs/xfs/xfs_ioctl.c +7 -1
@@ -955,6 +955,7 @@ xfs_ioc_ag_geometry(struct xfs_mount *mp, void __user *arg) { + struct xfs_perag *pag;struct xfs_ag_geometry ageo;int error;
@@ -965,7 +966,12 @@ xfs_ioc_ag_geometry(if (memchr_inv (&ageo.ag_reserved,0 ,sizeof (ageo.ag_reserved)))return -EINVAL ; - error =xfs_ag_get_geometry (mp, ageo.ag_number, &ageo); + pag =xfs_perag_get (mp, ageo.ag_number); +if (!pag) +return -EINVAL ; + + error =xfs_ag_get_geometry (pag, &ageo); +xfs_perag_put (pag);if (error)return error;
Signature · 1 line
2.35.1
Re: [PATCH 01/50] xfs: make last AG grow/shrink perag centric
fs/xfs/libxfs/xfs_ag.c xfs_ag_shrink_space( · line 810
Quoted 1 line · Dave Chinner
fs/xfs/libxfs/xfs_ag.c +1
-0+ error =xfs_ialloc_check_shrink (*tpp, pag->pag_agno, agibp, aglen - delta);
Overly long line here.
fs/xfs/libxfs/xfs_ag.c xfs_ag_extend_space( · line 951
Quoted 5 lines
fs/xfs/libxfs/xfs_ag.c +2
-1+ error =xfs_ialloc_read_agi (pag->pag_mount,NULL , pag->pag_agno, &agi_bp);if (error)return error; - error =xfs_alloc_read_agf (mp,NULL , agno,0 , &agf_bp); + error =xfs_alloc_read_agf (pag->pag_mount,NULL , pag->pag_agno,0 , &agf_bp);
.. and two more here
Otherwise looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 2/50 xfs: kill xfs_ialloc_pagi_init()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
This is just a basic wrapper around xfs_ialloc_read_agi(), which can be entirely handled by xfs_ialloc_read_agi() by passing a NULL agibpp....
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 3 ++- fs/xfs/libxfs/xfs_ialloc.c | 39 ++++++++++++++------------------------ fs/xfs/libxfs/xfs_ialloc.h | 10 ---------- 3 files changed, 16 insertions(+), 36 deletions(-)
fs/xfs/libxfs/xfs_ag.c +2 -1
@@ -128,9 +128,10 @@ xfs_initialize_perag_data(if (error)return error; - error =xfs_ialloc_pagi_init (mp,NULL , index); + error =xfs_ialloc_read_agi (mp,NULL , index,NULL );if (error)return error; + pag =xfs_perag_get (mp, index); ifree += pag->pagi_freecount; ialloc += pag->pagi_count;
fs/xfs/libxfs/xfs_ialloc.c +14 -25
@@ -1610,7 +1610,7 @@ xfs_dialloc_good_ag(return false;if (!pag->pagi_init) { - error =xfs_ialloc_pagi_init (mp, tp, pag->pag_agno); + error =xfs_ialloc_read_agi (mp, tp, pag->pag_agno,NULL );if (error)return false; }
@@ -2593,25 +2593,30 @@ xfs_read_agi(return 0 ; } +/* +* Read in the agi and initialise the per-ag data. If the caller supplies a +* @agibpp, return the locked AGI buffer to them, otherwise release it. +*/ int xfs_ialloc_read_agi (struct xfs_mount *mp,/* file system mount structure */ struct xfs_trans *tp,/* transaction pointer */ xfs_agnumber_t agno,/* allocation group number */ -struct xfs_buf **bpp)/* allocation group hdr buf */ +struct xfs_buf **agibpp) { +struct xfs_buf *agibp;struct xfs_agi *agi;/* allocation group header */ struct xfs_perag *pag;/* per allocation group data */ int error;trace_xfs_ialloc_read_agi (mp, agno); - error =xfs_read_agi (mp, tp, agno, bpp); + error =xfs_read_agi (mp, tp, agno, &agibp);if (error)return error; - agi = (*bpp)->b_addr; - pag = (*bpp)->b_pag; + agi = agibp->b_addr; + pag = agibp->b_pag;if (!pag->pagi_init) { pag->pagi_freecount =be32_to_cpu (agi->agi_freecount); pag->pagi_count =be32_to_cpu (agi->agi_count);
@@ -2624,26 +2629,10 @@ xfs_ialloc_read_agi(*/ ASSERT (pag->pagi_freecount ==be32_to_cpu (agi->agi_freecount) ||xfs_is_shutdown (mp)); -return 0 ; -} - -/* -* Read in the agi to initialise the per-ag data in the mount structure -*/ -int -xfs_ialloc_pagi_init ( -xfs_mount_t *mp,/* file system mount structure */ -xfs_trans_t *tp,/* transaction pointer */ -xfs_agnumber_t agno)/* allocation group number */ -{ -struct xfs_buf *bp =NULL ; -int error; - - error =xfs_ialloc_read_agi (mp, tp, agno, &bp); -if (error) -return error; -if (bp) -xfs_trans_brelse (tp, bp); +if (agibpp) + *agibpp = agibp; +else +xfs_trans_brelse (tp, agibp);return 0 ; }
fs/xfs/libxfs/xfs_ialloc.h +0 -10
@@ -72,16 +72,6 @@ xfs_ialloc_read_agi(xfs_agnumber_t agno,/* allocation group number */ struct xfs_buf **bpp); /* allocation group hdr buf */ -/* -* Read in the allocation group header to initialise the per-ag data -* in the mount structure -*/ -int -xfs_ialloc_pagi_init ( -struct xfs_mount *mp,/* file system mount structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno);/* allocation group number */ -/* * Lookup a record by ino in the btree given by cur. */
Signature · 1 line
2.35.1
Re: [PATCH 02/50] xfs: kill xfs_ialloc_pagi_init()
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 3/50 xfs: pass perag to xfs_ialloc_read_agi()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
xfs_ialloc_read_agi() initialises the perag if it hasn't been done yet, so it makes sense to pass it the perag rather than pull a reference from the buffer. This allows callers to be per-ag centric rather than passing mount/agno pairs everywhere.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 23 +++++++++++++---------- fs/xfs/libxfs/xfs_ialloc.c | 23 ++++++++++------------- fs/xfs/libxfs/xfs_ialloc.h | 7 ++----- fs/xfs/libxfs/xfs_ialloc_btree.c | 9 ++++----- fs/xfs/scrub/common.c | 2 +- fs/xfs/scrub/fscounters.c | 2 +- fs/xfs/scrub/repair.c | 2 +- 7 files changed, 32 insertions(+), 36 deletions(-)
fs/xfs/libxfs/xfs_ag.c +13 -10
@@ -128,11 +128,13 @@ xfs_initialize_perag_data(if (error)return error; - error =xfs_ialloc_read_agi (mp,NULL , index,NULL ); -if (error) + pag =xfs_perag_get (mp, index); + error =xfs_ialloc_read_agi (pag,NULL ,NULL ); +if (error) { +xfs_perag_put (pag);return error; + } - pag =xfs_perag_get (mp, index); ifree += pag->pagi_freecount; ialloc += pag->pagi_count; bfree += pag->pagf_freeblks;
@@ -784,7 +786,7 @@ xfs_ag_shrink_space(int error, err2;ASSERT (pag->pag_agno == mp->m_sb.sb_agcount -1 ); - error =xfs_ialloc_read_agi (mp, *tpp, pag->pag_agno, &agibp); + error =xfs_ialloc_read_agi (pag, *tpp, &agibp);if (error)return error;
@@ -816,7 +818,7 @@ xfs_ag_shrink_space(* Disable perag reservations so it doesn't cause the allocation request * to fail. We'll reestablish reservation before we return. */ - error =xfs_ag_resv_free (agibp->b_pag); + error =xfs_ag_resv_free (pag);if (error)return error;
@@ -833,7 +835,7 @@ xfs_ag_shrink_space(xfs_trans_bhold (*tpp, agfbp); err2 =xfs_trans_roll (tpp);if (err2) -return err2; +return error;xfs_trans_bjoin (*tpp, agfbp); goto resv_init_out; }
@@ -845,7 +847,7 @@ xfs_ag_shrink_space(be32_add_cpu (&agi->agi_length, -delta);be32_add_cpu (&agf->agf_length, -delta); - err2 =xfs_ag_resv_init (agibp->b_pag, *tpp); + err2 =xfs_ag_resv_init (pag, *tpp);if (err2) {be32_add_cpu (&agi->agi_length, delta);be32_add_cpu (&agf->agf_length, delta);
@@ -869,8 +871,9 @@ xfs_ag_shrink_space(xfs_ialloc_log_agi (*tpp, agibp,XFS_AGI_LENGTH );xfs_alloc_log_agf (*tpp, agfbp,XFS_AGF_LENGTH );return 0 ; + resv_init_out: - err2 =xfs_ag_resv_init (agibp->b_pag, *tpp); + err2 =xfs_ag_resv_init (pag, *tpp);if (!err2)return error; resv_err:
@@ -895,7 +898,7 @@ xfs_ag_extend_space(ASSERT (pag->pag_agno == pag->pag_mount->m_sb.sb_agcount -1 ); - error =xfs_ialloc_read_agi (pag->pag_mount, tp, pag->pag_agno, &bp); + error =xfs_ialloc_read_agi (pag, tp, &bp);if (error)return error;
@@ -946,7 +949,7 @@ xfs_ag_get_geometry(int error;/* Lock the AG headers. */ - error =xfs_ialloc_read_agi (pag->pag_mount,NULL , pag->pag_agno, &agi_bp); + error =xfs_ialloc_read_agi (pag,NULL , &agi_bp);if (error)return error; error =xfs_alloc_read_agf (pag->pag_mount,NULL , pag->pag_agno,0 , &agf_bp);
fs/xfs/libxfs/xfs_ialloc.c +10 -13
@@ -1610,7 +1610,7 @@ xfs_dialloc_good_ag(return false;if (!pag->pagi_init) { - error =xfs_ialloc_read_agi (mp, tp, pag->pag_agno,NULL ); + error =xfs_ialloc_read_agi (pag, tp,NULL );if (error)return false; }
@@ -1679,7 +1679,7 @@ xfs_dialloc_try_ag(* Then read in the AGI buffer and recheck with the AGI buffer * lock held. */ - error =xfs_ialloc_read_agi (pag->pag_mount, *tpp, pag->pag_agno, &agbp); + error =xfs_ialloc_read_agi (pag, *tpp, &agbp);if (error)return error;
@@ -2169,7 +2169,7 @@ xfs_difree(/* * Get the allocation group header. */ - error =xfs_ialloc_read_agi (mp, tp, pag->pag_agno, &agbp); + error =xfs_ialloc_read_agi (pag, tp, &agbp);if (error) {xfs_warn (mp,"%s: xfs_ialloc_read_agi() returned error %d." , __func__, error);
@@ -2215,7 +2215,7 @@ xfs_imap_lookup(int error;int i; - error =xfs_ialloc_read_agi (mp, tp, pag->pag_agno, &agbp); + error =xfs_ialloc_read_agi (pag, tp, &agbp);if (error) { xfs_alert(mp, "%s: xfs_ialloc_read_agi() returned error %d, agno %d",
@@ -2599,24 +2599,21 @@ xfs_read_agi(*/ int xfs_ialloc_read_agi ( -struct xfs_mount *mp,/* file system mount structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ +struct xfs_perag *pag, +struct xfs_trans *tp,struct xfs_buf **agibpp) {struct xfs_buf *agibp; -struct xfs_agi *agi;/* allocation group header */ -struct xfs_perag *pag;/* per allocation group data */ +struct xfs_agi *agi;int error; -trace_xfs_ialloc_read_agi (mp, agno); +trace_xfs_ialloc_read_agi (pag->pag_mount, pag->pag_agno); - error =xfs_read_agi (mp, tp, agno, &agibp); + error =xfs_read_agi (pag->pag_mount, tp, pag->pag_agno, &agibp);if (error)return error; agi = agibp->b_addr; - pag = agibp->b_pag;if (!pag->pagi_init) { pag->pagi_freecount =be32_to_cpu (agi->agi_freecount); pag->pagi_count =be32_to_cpu (agi->agi_count);
@@ -2628,7 +2625,7 @@ xfs_ialloc_read_agi(* we are in the middle of a forced shutdown. */ ASSERT (pag->pagi_freecount ==be32_to_cpu (agi->agi_freecount) || -xfs_is_shutdown (mp)); +xfs_is_shutdown (pag->pag_mount));if (agibpp) *agibpp = agibp;else
fs/xfs/libxfs/xfs_ialloc.h +2 -5
@@ -66,11 +66,8 @@ xfs_ialloc_log_agi(* Read in the allocation group header (inode allocation section) */ int /* error */ -xfs_ialloc_read_agi ( -struct xfs_mount *mp,/* file system mount structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -struct xfs_buf **bpp);/* allocation group hdr buf */ +xfs_ialloc_read_agi (struct xfs_perag *pag,struct xfs_trans *tp, +struct xfs_buf **agibpp);/* * Lookup a record by ino in the btree given by cur.
fs/xfs/libxfs/xfs_ialloc_btree.c +4 -5
@@ -722,7 +722,7 @@ xfs_inobt_cur(ASSERT (*agi_bpp ==NULL );ASSERT (*curpp ==NULL ); - error =xfs_ialloc_read_agi (mp, tp, pag->pag_agno, agi_bpp); + error =xfs_ialloc_read_agi (pag, tp, agi_bpp);if (error)return error;
@@ -757,16 +757,15 @@ xfs_inobt_count_blocks(/* Read finobt block count from AGI header. */ static int xfs_finobt_read_blocks ( -struct xfs_mount *mp, -struct xfs_trans *tp,struct xfs_perag *pag, +struct xfs_trans *tp,xfs_extlen_t *tree_blocks) {struct xfs_buf *agbp;struct xfs_agi *agi;int error; - error =xfs_ialloc_read_agi (mp, tp, pag->pag_agno, &agbp); + error =xfs_ialloc_read_agi (pag, tp, &agbp);if (error)return error;
@@ -794,7 +793,7 @@ xfs_finobt_calc_reserves(return 0 ;if (xfs_has_inobtcounts (mp)) - error =xfs_finobt_read_blocks (mp, tp, pag, &tree_len); + error =xfs_finobt_read_blocks (pag, tp, &tree_len);else error =xfs_inobt_count_blocks (mp, tp, pag,XFS_BTNUM_FINO , &tree_len);
fs/xfs/scrub/common.c +1 -1
@@ -416,7 +416,7 @@ xchk_ag_read_headers(if (!sa->pag)return -ENOENT ; - error =xfs_ialloc_read_agi (mp, sc->tp, agno, &sa->agi_bp); + error =xfs_ialloc_read_agi (sa->pag, sc->tp, &sa->agi_bp);if (error &&want_ag_read_header_failure (sc,XFS_SCRUB_TYPE_AGI ))return error;
fs/xfs/scrub/fscounters.c +1 -1
@@ -78,7 +78,7 @@ xchk_fscount_warmup(continue ;/* Lock both AG headers. */ - error =xfs_ialloc_read_agi (mp, sc->tp, agno, &agi_bp); + error =xfs_ialloc_read_agi (pag, sc->tp, &agi_bp);if (error)break ; error =xfs_alloc_read_agf (mp, sc->tp, agno,0 , &agf_bp);
fs/xfs/scrub/repair.c +1 -1
@@ -199,7 +199,7 @@ xrep_calc_ag_resblks( icount = pag->pagi_count; }else {/* Try to get the actual counters from disk. */ - error =xfs_ialloc_read_agi (mp,NULL , sm->sm_agno, &bp); + error =xfs_ialloc_read_agi (pag,NULL , &bp);if (!error) { icount = pag->pagi_count;xfs_buf_relse (bp);
Signature · 1 line
2.35.1
Re: [PATCH 03/50] xfs: pass perag to xfs_ialloc_read_agi()
fs/xfs/libxfs/xfs_ag.c xfs_ag_shrink_space( · line 841
Quoted 9 lines · Dave Chinner
fs/xfs/libxfs/xfs_ag.c +1
-1@@ -833,7 +835,7 @@ xfs_ag_shrink_space(xfs_trans_bhold (*tpp, agfbp); err2 =xfs_trans_roll (tpp);if (err2) -return err2; +return error;xfs_trans_bjoin (*tpp, agfbp); goto resv_init_out; }
This change looks unrelated and is undocumented.
Otherwise looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 4/50 xfs: kill xfs_alloc_pagf_init()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Trivial wrapper around xfs_alloc_read_agf(), can be easily replaced by passing a NULL agfbp to xfs_alloc_read_agf().
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 2 +- fs/xfs/libxfs/xfs_ag_resv.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 37 ++++++++++++------------------------- fs/xfs/libxfs/xfs_alloc.h | 10 ---------- fs/xfs/libxfs/xfs_bmap.c | 3 ++- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/xfs_filestream.c | 4 ++-- 7 files changed, 19 insertions(+), 41 deletions(-)
fs/xfs/libxfs/xfs_ag.c +1 -1
@@ -124,7 +124,7 @@ xfs_initialize_perag_data(* all the information we need and populates the * per-ag structures for us. */ - error =xfs_alloc_pagf_init (mp,NULL , index,0 ); + error =xfs_alloc_read_agf (mp,NULL , index,0 ,NULL );if (error)return error;
fs/xfs/libxfs/xfs_ag_resv.c +1 -1
@@ -322,7 +322,7 @@ xfs_ag_resv_init(* address. */ if (has_resv) { - error2 =xfs_alloc_pagf_init (mp, tp, pag->pag_agno,0 ); + error2 =xfs_alloc_read_agf (mp, tp, pag->pag_agno,0 ,NULL );if (error2)return error2;
fs/xfs/libxfs/xfs_alloc.c +12 -25
@@ -2867,25 +2867,6 @@ xfs_alloc_log_agf(xfs_trans_log_buf (tp, bp, (uint )first, (uint )last); } -/* -* Interface for inode allocation to force the pag data to be initialized. -*/ -int /* error */ -xfs_alloc_pagf_init ( -xfs_mount_t *mp,/* file system mount structure */ -xfs_trans_t *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -int flags)/* XFS_ALLOC_FLAGS_... */ -{ -struct xfs_buf *bp; -int error; - - error =xfs_alloc_read_agf (mp, tp, agno, flags, &bp); -if (!error) -xfs_trans_brelse (tp, bp); -return error; -} -/* * Put the block on the freelist for the allocation group. */
@@ -3095,7 +3076,9 @@ xfs_read_agf( }/* -* Read in the allocation group header (free/alloc section). +* Read in the allocation group header (free/alloc section) and initialise the +* perag structure if necessary. If the caller provides @agfbpp, then return the +* locked buffer to the caller, otherwise free it. */ int /* error */ xfs_alloc_read_agf(
@@ -3103,8 +3086,9 @@ xfs_alloc_read_agf(struct xfs_trans *tp,/* transaction pointer */ xfs_agnumber_t agno, /* allocation group number */ int flags, /* XFS_ALLOC_FLAG_... */ - struct xfs_buf **bpp) /* buffer for the ag freelist header */ + struct xfs_buf **agfbpp) { + struct xfs_buf *agfbp;struct xfs_agf *agf;/* ag freelist header */ struct xfs_perag *pag;/* per allocation group data */ int error;
@@ -3118,13 +3102,12 @@ xfs_alloc_read_agf(ASSERT (agno !=NULLAGNUMBER ); error =xfs_read_agf (mp, tp, agno, (flags &XFS_ALLOC_FLAG_TRYLOCK ) ?XBF_TRYLOCK :0 , - bpp); + &agfbp);if (error)return error; -ASSERT (!(*bpp)->b_error); - agf = (*bpp)->b_addr; - pag = (*bpp)->b_pag; + agf = agfbp->b_addr; + pag = agfbp->b_pag;if (!pag->pagf_init) { pag->pagf_freeblks =be32_to_cpu (agf->agf_freeblks); pag->pagf_btreeblks =be32_to_cpu (agf->agf_btreeblks);
@@ -3165,6 +3148,10 @@ xfs_alloc_read_agf( be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi])); }#endif +if (agfbpp) + *agfbpp = agfbp; +else +xfs_trans_brelse (tp, agfbp);return 0 ; }
fs/xfs/libxfs/xfs_alloc.h +0 -10
@@ -123,16 +123,6 @@ xfs_alloc_log_agf(struct xfs_buf *bp,/* buffer for a.g. freelist header */ uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) */ -/* -* Interface for inode allocation to force the pag data to be initialized. -*/ -int /* error */ -xfs_alloc_pagf_init ( -struct xfs_mount *mp,/* file system mount structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -int flags);/* XFS_ALLOC_FLAGS_... */ -/* * Put the block on the freelist for the allocation group. */
fs/xfs/libxfs/xfs_bmap.c +2 -1
@@ -3185,7 +3185,8 @@ xfs_bmap_longest_free_extent( pag =xfs_perag_get (mp, ag);if (!pag->pagf_init) { - error =xfs_alloc_pagf_init (mp, tp, ag,XFS_ALLOC_FLAG_TRYLOCK ); + error =xfs_alloc_read_agf (mp, tp, ag,XFS_ALLOC_FLAG_TRYLOCK , +NULL );if (error) {/* Couldn't lock the AGF, so skip this AG. */ if (error == -EAGAIN ) {
fs/xfs/libxfs/xfs_ialloc.c +1 -1
@@ -1621,7 +1621,7 @@ xfs_dialloc_good_ag(return false;if (!pag->pagf_init) { - error =xfs_alloc_pagf_init (mp, tp, pag->pag_agno, flags); + error =xfs_alloc_read_agf (mp, tp, pag->pag_agno, flags,NULL );if (error)return false; }
fs/xfs/xfs_filestream.c +2 -2
@@ -126,7 +126,7 @@ xfs_filestream_pick_ag( pag =xfs_perag_get (mp, ag);if (!pag->pagf_init) { - err =xfs_alloc_pagf_init (mp,NULL , ag, trylock); + err =xfs_alloc_read_agf (mp,NULL , ag, trylock,NULL );if (err) {if (err != -EAGAIN ) {xfs_perag_put (pag);
@@ -181,7 +181,7 @@ xfs_filestream_pick_ag(if (ag != startag)continue ; -/* Allow sleeping in xfs_alloc_pagf_init() on the 2nd pass. */ +/* Allow sleeping in xfs_alloc_read_agf() on the 2nd pass. */ if (trylock !=0 ) { trylock =0 ;continue ;
Signature · 1 line
2.35.1
Re: [PATCH 04/50] xfs: kill xfs_alloc_pagf_init()
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 5/50 xfs: pass perag to xfs_alloc_read_agf()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
xfs_alloc_read_agf() initialises the perag if it hasn't been done yet, so it makes sense to pass it the perag rather than pull a reference from the buffer. This allows callers to be per-ag centric rather than passing mount/agno pairs everywhere.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 19 +++++++-------- fs/xfs/libxfs/xfs_ag_resv.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 30 ++++++++++------------- fs/xfs/libxfs/xfs_alloc.h | 13 ++-------- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/libxfs/xfs_refcount.c | 6 ++--- fs/xfs/libxfs/xfs_refcount_btree.c | 2 +- fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- fs/xfs/scrub/agheader_repair.c | 6 ++--- fs/xfs/scrub/bmap.c | 2 +- fs/xfs/scrub/common.c | 2 +- fs/xfs/scrub/fscounters.c | 2 +- fs/xfs/scrub/repair.c | 5 ++-- fs/xfs/xfs_discard.c | 2 +- fs/xfs/xfs_extfree_item.c | 6 ++++- fs/xfs/xfs_filestream.c | 2 +- fs/xfs/xfs_fsmap.c | 3 +-- fs/xfs/xfs_reflink.c | 38 +++++++++++++++++------------- fs/xfs/xfs_reflink.h | 3 --- 20 files changed, 68 insertions(+), 81 deletions(-)
fs/xfs/libxfs/xfs_ag.c +8 -11
@@ -120,16 +120,13 @@ xfs_initialize_perag_data(for (index =0 ; index < agcount; index++) {/* -* read the agf, then the agi. This gets us -* all the information we need and populates the -* per-ag structures for us. +* Read the AGF and AGI buffers to populate the per-ag +* structures for us. */ - error =xfs_alloc_read_agf (mp,NULL , index,0 ,NULL ); -if (error) -return error; - pag =xfs_perag_get (mp, index); - error =xfs_ialloc_read_agi (pag,NULL ,NULL ); + error =xfs_alloc_read_agf (pag,NULL ,0 ,NULL ); +if (!error) + error =xfs_ialloc_read_agi (pag,NULL ,NULL );if (error) {xfs_perag_put (pag);return error;
@@ -792,7 +789,7 @@ xfs_ag_shrink_space( agi = agibp->b_addr; - error =xfs_alloc_read_agf (mp, *tpp, pag->pag_agno,0 , &agfbp); + error =xfs_alloc_read_agf (pag, *tpp,0 , &agfbp);if (error)return error;
@@ -909,7 +906,7 @@ xfs_ag_extend_space(/* * Change agf length. */ - error =xfs_alloc_read_agf (pag->pag_mount, tp, pag->pag_agno,0 , &bp); + error =xfs_alloc_read_agf (pag, tp,0 , &bp);if (error)return error;
@@ -952,7 +949,7 @@ xfs_ag_get_geometry( error =xfs_ialloc_read_agi (pag,NULL , &agi_bp);if (error)return error; - error =xfs_alloc_read_agf (pag->pag_mount,NULL , pag->pag_agno,0 , &agf_bp); + error =xfs_alloc_read_agf (pag,NULL ,0 , &agf_bp);if (error) goto out_agi;
fs/xfs/libxfs/xfs_ag_resv.c +1 -1
@@ -322,7 +322,7 @@ xfs_ag_resv_init(* address. */ if (has_resv) { - error2 =xfs_alloc_read_agf (mp, tp, pag->pag_agno,0 ,NULL ); + error2 =xfs_alloc_read_agf (pag, tp,0 ,NULL );if (error2)return error2;
fs/xfs/libxfs/xfs_alloc.c +13 -17
@@ -2609,7 +2609,7 @@ xfs_alloc_fix_freelist(ASSERT (tp->t_flags &XFS_TRANS_PERM_LOG_RES );if (!pag->pagf_init) { - error =xfs_alloc_read_agf (mp, tp, args->agno, flags, &agbp); + error =xfs_alloc_read_agf (pag, tp, flags, &agbp);if (error) {/* Couldn't lock the AGF so skip this AG. */ if (error == -EAGAIN )
@@ -2639,7 +2639,7 @@ xfs_alloc_fix_freelist(* Can fail if we're not blocking on locks, and it's held. */ if (!agbp) { - error =xfs_alloc_read_agf (mp, tp, args->agno, flags, &agbp); + error =xfs_alloc_read_agf (pag, tp, flags, &agbp);if (error) {/* Couldn't lock the AGF so skip this AG. */ if (error == -EAGAIN )
@@ -3080,34 +3080,30 @@ xfs_read_agf(* perag structure if necessary. If the caller provides @agfbpp, then return the * locked buffer to the caller, otherwise free it. */ -int /* error */ +int xfs_alloc_read_agf ( -struct xfs_mount *mp,/* mount point structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -int flags,/* XFS_ALLOC_FLAG_... */ +struct xfs_perag *pag, +struct xfs_trans *tp, +int flags,struct xfs_buf **agfbpp) {struct xfs_buf *agfbp; -struct xfs_agf *agf;/* ag freelist header */ -struct xfs_perag *pag;/* per allocation group data */ +struct xfs_agf *agf;int error;int allocbt_blks; -trace_xfs_alloc_read_agf (mp, agno); +trace_xfs_alloc_read_agf (pag->pag_mount, pag->pag_agno);/* We don't support trylock when freeing. */ ASSERT ((flags & (XFS_ALLOC_FLAG_FREEING |XFS_ALLOC_FLAG_TRYLOCK )) != (XFS_ALLOC_FLAG_FREEING |XFS_ALLOC_FLAG_TRYLOCK )); -ASSERT (agno !=NULLAGNUMBER ); - error =xfs_read_agf (mp, tp, agno, + error =xfs_read_agf (pag->pag_mount, tp, pag->pag_agno, (flags &XFS_ALLOC_FLAG_TRYLOCK ) ?XBF_TRYLOCK :0 , &agfbp);if (error)return error; agf = agfbp->b_addr; - pag = agfbp->b_pag;if (!pag->pagf_init) { pag->pagf_freeblks =be32_to_cpu (agf->agf_freeblks); pag->pagf_btreeblks =be32_to_cpu (agf->agf_btreeblks);
@@ -3121,7 +3117,7 @@ xfs_alloc_read_agf(be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAPi]); pag->pagf_refcount_level =be32_to_cpu (agf->agf_refcount_level); pag->pagf_init =1 ; - pag->pagf_agflreset =xfs_agfl_needs_reset (mp, agf); + pag->pagf_agflreset =xfs_agfl_needs_reset (pag->pag_mount, agf);/* * Update the in-core allocbt counter. Filter out the rmapbt
@@ -3131,13 +3127,13 @@ xfs_alloc_read_agf(* counter only tracks non-root blocks. */ allocbt_blks = pag->pagf_btreeblks; -if (xfs_has_rmapbt (mp)) +if (xfs_has_rmapbt (pag->pag_mount)) allocbt_blks -=be32_to_cpu (agf->agf_rmap_blocks) -1 ;if (allocbt_blks >0 ) -atomic64_add (allocbt_blks, &mp->m_allocbt_blks); +atomic64_add (allocbt_blks, &pag->pag_mount->m_allocbt_blks); }#ifdef DEBUG - else if (!xfs_is_shutdown(mp)) { + else if (!xfs_is_shutdown(pag->pag_mount)) {ASSERT (pag->pagf_freeblks ==be32_to_cpu (agf->agf_freeblks));ASSERT (pag->pagf_btreeblks ==be32_to_cpu (agf->agf_btreeblks));ASSERT (pag->pagf_flcount ==be32_to_cpu (agf->agf_flcount));
fs/xfs/libxfs/xfs_alloc.h +2 -11
@@ -134,17 +134,6 @@ xfs_alloc_put_freelist(xfs_agblock_t bno,/* block being freed */ int btreeblk); /* owner was a AGF btree */ -/* -* Read in the allocation group header (free/alloc section). -*/ -int /* error */ -xfs_alloc_read_agf ( -struct xfs_mount *mp,/* mount point structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -int flags,/* XFS_ALLOC_FLAG_... */ -struct xfs_buf **bpp);/* buffer for the ag freelist header */ -/* * Allocate an extent (variable-size). */
@@ -198,6 +187,8 @@ xfs_alloc_get_rec(int xfs_read_agf (struct xfs_mount *mp,struct xfs_trans *tp,xfs_agnumber_t agno,int flags,struct xfs_buf **bpp); +int xfs_alloc_read_agf (struct xfs_perag *pag,struct xfs_trans *tp,int flags, +struct xfs_buf **agfbpp);int xfs_alloc_read_agfl (struct xfs_mount *mp,struct xfs_trans *tp,xfs_agnumber_t agno,struct xfs_buf **bpp); int xfs_free_agfl_block(struct xfs_trans *, xfs_agnumber_t, xfs_agblock_t,
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -3185,7 +3185,7 @@ xfs_bmap_longest_free_extent( pag =xfs_perag_get (mp, ag);if (!pag->pagf_init) { - error =xfs_alloc_read_agf (mp, tp, ag,XFS_ALLOC_FLAG_TRYLOCK , + error =xfs_alloc_read_agf (pag, tp,XFS_ALLOC_FLAG_TRYLOCK ,NULL );if (error) {/* Couldn't lock the AGF, so skip this AG. */
fs/xfs/libxfs/xfs_ialloc.c +1 -1
@@ -1621,7 +1621,7 @@ xfs_dialloc_good_ag(return false;if (!pag->pagf_init) { - error =xfs_alloc_read_agf (mp, tp, pag->pag_agno, flags,NULL ); + error =xfs_alloc_read_agf (pag, tp, flags,NULL );if (error)return false; }
fs/xfs/libxfs/xfs_refcount.c +3 -3
@@ -1177,8 +1177,8 @@ xfs_refcount_finish_one( *pcur =NULL ; }if (rcur ==NULL ) { - error =xfs_alloc_read_agf (tp->t_mountp, tp, pag->pag_agno, -XFS_ALLOC_FLAG_FREEING , &agbp); + error =xfs_alloc_read_agf (pag, tp,XFS_ALLOC_FLAG_FREEING , + &agbp);if (error) goto out_drop;
@@ -1710,7 +1710,7 @@ xfs_refcount_recover_cow_leftovers(if (error)return error; - error =xfs_alloc_read_agf (mp, tp, pag->pag_agno,0 , &agbp); + error =xfs_alloc_read_agf (pag, tp,0 , &agbp);if (error) goto out_trans; cur =xfs_refcountbt_init_cursor (mp, tp, agbp, pag);
fs/xfs/libxfs/xfs_refcount_btree.c +1 -1
@@ -493,7 +493,7 @@ xfs_refcountbt_calc_reserves(if (!xfs_has_reflink (mp))return 0 ; - error =xfs_alloc_read_agf (mp, tp, pag->pag_agno,0 , &agbp); + error =xfs_alloc_read_agf (pag, tp,0 , &agbp);if (error)return error;
fs/xfs/libxfs/xfs_rmap_btree.c +1 -1
@@ -652,7 +652,7 @@ xfs_rmapbt_calc_reserves(if (!xfs_has_rmapbt (mp))return 0 ; - error =xfs_alloc_read_agf (mp, tp, pag->pag_agno,0 , &agbp); + error =xfs_alloc_read_agf (pag, tp,0 , &agbp);if (error)return error;
fs/xfs/scrub/agheader_repair.c +2 -4
@@ -666,8 +666,7 @@ xrep_agfl(* nothing wrong with the AGF, but all the AG header repair functions * have this chicken-and-egg problem. */ - error =xfs_alloc_read_agf (mp, sc->tp, sc->sa.pag->pag_agno,0 , - &agf_bp); + error =xfs_alloc_read_agf (sc->sa.pag, sc->tp,0 , &agf_bp);if (error)return error;
@@ -742,8 +741,7 @@ xrep_agi_find_btrees(int error;/* Read the AGF. */ - error =xfs_alloc_read_agf (mp, sc->tp, sc->sa.pag->pag_agno,0 , - &agf_bp); + error =xfs_alloc_read_agf (sc->sa.pag, sc->tp,0 , &agf_bp);if (error)return error;
fs/xfs/scrub/bmap.c +1 -1
@@ -540,7 +540,7 @@ xchk_bmap_check_ag_rmaps(struct xfs_buf *agf;int error; - error =xfs_alloc_read_agf (sc->mp, sc->tp, pag->pag_agno,0 , &agf); + error =xfs_alloc_read_agf (pag, sc->tp,0 , &agf);if (error)return error;
fs/xfs/scrub/common.c +1 -1
@@ -420,7 +420,7 @@ xchk_ag_read_headers(if (error &&want_ag_read_header_failure (sc,XFS_SCRUB_TYPE_AGI ))return error; - error =xfs_alloc_read_agf (mp, sc->tp, agno,0 , &sa->agf_bp); + error =xfs_alloc_read_agf (sa->pag, sc->tp,0 , &sa->agf_bp);if (error &&want_ag_read_header_failure (sc,XFS_SCRUB_TYPE_AGF ))return error;
fs/xfs/scrub/fscounters.c +1 -1
@@ -81,7 +81,7 @@ xchk_fscount_warmup( error =xfs_ialloc_read_agi (pag, sc->tp, &agi_bp);if (error)break ; - error =xfs_alloc_read_agf (mp, sc->tp, agno,0 , &agf_bp); + error =xfs_alloc_read_agf (pag, sc->tp,0 , &agf_bp);if (error)break ;
fs/xfs/scrub/repair.c +3 -2
@@ -207,7 +207,7 @@ xrep_calc_ag_resblks( }/* Now grab the block counters from the AGF. */ - error =xfs_alloc_read_agf (mp,NULL , sm->sm_agno,0 , &bp); + error =xfs_alloc_read_agf (pag,NULL ,0 , &bp);if (error) { aglen =xfs_ag_block_count (mp, sm->sm_agno); freelen = aglen;
@@ -543,6 +543,7 @@ xrep_reap_block( agno =XFS_FSB_TO_AGNO (sc->mp, fsbno); agbno =XFS_FSB_TO_AGBNO (sc->mp, fsbno); +ASSERT (agno == sc->sa.pag->pag_agno);/* * If we are repairing per-inode metadata, we need to read in the AGF
@@ -550,7 +551,7 @@ xrep_reap_block(* the AGF buffer that the setup functions already grabbed. */ if (sc->ip) { - error =xfs_alloc_read_agf (sc->mp, sc->tp, agno,0 , &agf_bp); + error =xfs_alloc_read_agf (sc->sa.pag, sc->tp,0 , &agf_bp);if (error)return error; }else {
fs/xfs/xfs_discard.c +1 -1
@@ -45,7 +45,7 @@ xfs_trim_extents(*/ xfs_log_force (mp,XFS_LOG_SYNC ); - error =xfs_alloc_read_agf (mp,NULL , agno,0 , &agbp); + error =xfs_alloc_read_agf (pag,NULL ,0 , &agbp);if (error) goto out_put_perag; agf = agbp->b_addr;
fs/xfs/xfs_extfree_item.c +5 -1
@@ -11,6 +11,7 @@#include "xfs_bit.h" #include "xfs_shared.h" #include "xfs_mount.h" +#include "xfs_ag.h" #include "xfs_defer.h" #include "xfs_trans.h" #include "xfs_trans_priv.h"
@@ -551,6 +552,7 @@ xfs_agfl_free_finish_item(xfs_agnumber_t agno;xfs_agblock_t agbno;uint next_extent; +struct xfs_perag *pag; free = container_of(item, struct xfs_extent_free_item, xefi_list);ASSERT (free->xefi_blockcount ==1 );
@@ -560,9 +562,11 @@ xfs_agfl_free_finish_item(trace_xfs_agfl_free_deferred (mp, agno,0 , agbno, free->xefi_blockcount); - error =xfs_alloc_read_agf (mp, tp, agno,0 , &agbp); + pag =xfs_perag_get (mp, agno); + error =xfs_alloc_read_agf (pag, tp,0 , &agbp);if (!error) error =xfs_free_agfl_block (tp, agno, agbno, agbp, &oinfo); +xfs_perag_put (pag);/* * Mark the transaction dirty, even on error. This ensures the
fs/xfs/xfs_filestream.c +1 -1
@@ -126,7 +126,7 @@ xfs_filestream_pick_ag( pag =xfs_perag_get (mp, ag);if (!pag->pagf_init) { - err =xfs_alloc_read_agf (mp,NULL , ag, trylock,NULL ); + err =xfs_alloc_read_agf (pag,NULL , trylock,NULL );if (err) {if (err != -EAGAIN ) {xfs_perag_put (pag);
fs/xfs/xfs_fsmap.c +1 -2
@@ -642,8 +642,7 @@ __xfs_getfsmap_datadev( info->agf_bp =NULL ; } - error =xfs_alloc_read_agf (mp, tp, pag->pag_agno,0 , - &info->agf_bp); + error =xfs_alloc_read_agf (pag, tp,0 , &info->agf_bp);if (error)break ;
fs/xfs/xfs_reflink.c +21 -17
@@ -127,9 +127,8 @@*/ int xfs_reflink_find_shared( - struct xfs_mount *mp, + struct xfs_perag *pag, struct xfs_trans *tp, - xfs_agnumber_t agno, xfs_agblock_t agbno, xfs_extlen_t aglen, xfs_agblock_t *fbno,
@@ -140,11 +139,11 @@ xfs_reflink_find_shared(struct xfs_btree_cur *cur;int error; - error =xfs_alloc_read_agf (mp, tp, agno,0 , &agbp); + error =xfs_alloc_read_agf (pag, tp,0 , &agbp);if (error)return error; - cur =xfs_refcountbt_init_cursor (mp, tp, agbp, agbp->b_pag); + cur =xfs_refcountbt_init_cursor (pag->pag_mount, tp, agbp, pag); error =xfs_refcount_find_shared (cur, agbno, aglen, fbno, flen, find_end_of_shared);
@@ -171,7 +170,8 @@ xfs_reflink_trim_around_shared(struct xfs_bmbt_irec *irec, bool *shared) { - xfs_agnumber_t agno; + struct xfs_mount *mp = ip->i_mount; +struct xfs_perag *pag;xfs_agblock_t agbno;xfs_extlen_t aglen;xfs_agblock_t fbno;
@@ -186,12 +186,13 @@ xfs_reflink_trim_around_shared(trace_xfs_reflink_trim_around_shared (ip, irec); - agno =XFS_FSB_TO_AGNO (ip->i_mount, irec->br_startblock); - agbno =XFS_FSB_TO_AGBNO (ip->i_mount, irec->br_startblock); + pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, irec->br_startblock)); + agbno =XFS_FSB_TO_AGBNO (mp, irec->br_startblock); aglen = irec->br_blockcount; - error =xfs_reflink_find_shared (ip->i_mount,NULL , agno, agbno, - aglen, &fbno, &flen, true); + error =xfs_reflink_find_shared (pag,NULL , agbno, aglen, &fbno, &flen, + true); +xfs_perag_put (pag);if (error)return error;
@@ -1420,11 +1421,6 @@ xfs_reflink_inode_has_shared_extents(struct xfs_bmbt_irec got;struct xfs_mount *mp = ip->i_mount;struct xfs_ifork *ifp; -xfs_agnumber_t agno; -xfs_agblock_t agbno; -xfs_extlen_t aglen; -xfs_agblock_t rbno; -xfs_extlen_t rlen;struct xfs_iext_cursor icur;bool found;int error;
@@ -1437,17 +1433,25 @@ xfs_reflink_inode_has_shared_extents( *has_shared = false; found =xfs_iext_lookup_extent (ip, ifp,0 , &icur, &got);while (found) { +struct xfs_perag *pag; +xfs_agblock_t agbno; +xfs_extlen_t aglen; +xfs_agblock_t rbno; +xfs_extlen_t rlen; +if (isnullstartblock (got.br_startblock) || got.br_state !=XFS_EXT_NORM ) goto next; - agno =XFS_FSB_TO_AGNO (mp, got.br_startblock); + + pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, got.br_startblock)); agbno =XFS_FSB_TO_AGBNO (mp, got.br_startblock); aglen = got.br_blockcount; - - error =xfs_reflink_find_shared (mp, tp, agno, agbno, aglen, + error =xfs_reflink_find_shared (pag, tp, agbno, aglen, &rbno, &rlen, false); +xfs_perag_put (pag);if (error)return error; +/* Is there still a shared block here? */ if (rbno !=NULLAGBLOCK ) { *has_shared = true;
fs/xfs/xfs_reflink.h +0 -3
@@ -16,9 +16,6 @@ static inline bool xfs_is_cow_inode(struct xfs_inode *ip)return xfs_is_reflink_inode (ip) ||xfs_is_always_cow_inode (ip); } -extern int xfs_reflink_find_shared (struct xfs_mount *mp,struct xfs_trans *tp, -xfs_agnumber_t agno,xfs_agblock_t agbno,xfs_extlen_t aglen, -xfs_agblock_t *fbno,xfs_extlen_t *flen,bool find_maximal);extern int xfs_reflink_trim_around_shared (struct xfs_inode *ip,struct xfs_bmbt_irec *irec,bool *shared); int xfs_bmap_trim_cow(struct xfs_inode *ip, struct xfs_bmbt_irec *imap,
Signature · 1 line
2.35.1
kernel test robot
build botRe: [PATCH 05/50] xfs: pass perag to xfs_alloc_read_agf()
Thank you for the patch! Perhaps something to improve:
Hi Dave,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on v5.19-rc1]
[also build test WARNING on next-20220610]
[cannot apply to xfs-linux/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 base: f2906aa863381afb0015a9eb7fefad885d4e5a56 config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20220611/[email protected]/config) compiler: arceb-elf-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/87045504fb13d6263ddf1d7780eef5eda1cee6ad
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 git checkout 87045504fb13d6263ddf1d7780eef5eda1cee6ad
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash fs/xfs/
If you fix the issue, kindly add following tag where applicable
Reported-by kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
>> fs/xfs/xfs_reflink.c:129:1: warning: no previous prototype for 'xfs_reflink_find_shared' [-Wmissing-prototypes]
129 | xfs_reflink_find_shared(
| ^~~~~~~~~~~~~~~~~~~~~~~vim +/xfs_reflink_find_shared +129 fs/xfs/xfs_reflink.c
3993baeb3c52f4 Darrick J. Wong 2016-10-03 32
3993baeb3c52f4 Darrick J. Wong 2016-10-03 33 /*
3993baeb3c52f4 Darrick J. Wong 2016-10-03 34 * Copy on Write of Shared Blocks
3993baeb3c52f4 Darrick J. Wong 2016-10-03 35 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 36 * XFS must preserve "the usual" file semantics even when two files share
3993baeb3c52f4 Darrick J. Wong 2016-10-03 37 * the same physical blocks. This means that a write to one file must not
3993baeb3c52f4 Darrick J. Wong 2016-10-03 38 * alter the blocks in a different file; the way that we'll do that is
3993baeb3c52f4 Darrick J. Wong 2016-10-03 39 * through the use of a copy-on-write mechanism. At a high level, that
3993baeb3c52f4 Darrick J. Wong 2016-10-03 40 * means that when we want to write to a shared block, we allocate a new
3993baeb3c52f4 Darrick J. Wong 2016-10-03 41 * block, write the data to the new block, and if that succeeds we map the
3993baeb3c52f4 Darrick J. Wong 2016-10-03 42 * new block into the file.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 43 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 44 * XFS provides a "delayed allocation" mechanism that defers the allocation
3993baeb3c52f4 Darrick J. Wong 2016-10-03 45 * of disk blocks to dirty-but-not-yet-mapped file blocks as long as
3993baeb3c52f4 Darrick J. Wong 2016-10-03 46 * possible. This reduces fragmentation by enabling the filesystem to ask
3993baeb3c52f4 Darrick J. Wong 2016-10-03 47 * for bigger chunks less often, which is exactly what we want for CoW.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 48 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 49 * The delalloc mechanism begins when the kernel wants to make a block
3993baeb3c52f4 Darrick J. Wong 2016-10-03 50 * writable (write_begin or page_mkwrite). If the offset is not mapped, we
3993baeb3c52f4 Darrick J. Wong 2016-10-03 51 * create a delalloc mapping, which is a regular in-core extent, but without
3993baeb3c52f4 Darrick J. Wong 2016-10-03 52 * a real startblock. (For delalloc mappings, the startblock encodes both
3993baeb3c52f4 Darrick J. Wong 2016-10-03 53 * a flag that this is a delalloc mapping, and a worst-case estimate of how
3993baeb3c52f4 Darrick J. Wong 2016-10-03 54 * many blocks might be required to put the mapping into the BMBT.) delalloc
3993baeb3c52f4 Darrick J. Wong 2016-10-03 55 * mappings are a reservation against the free space in the filesystem;
3993baeb3c52f4 Darrick J. Wong 2016-10-03 56 * adjacent mappings can also be combined into fewer larger mappings.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 57 *
5eda43000064a6 Darrick J. Wong 2017-02-02 58 * As an optimization, the CoW extent size hint (cowextsz) creates
5eda43000064a6 Darrick J. Wong 2017-02-02 59 * outsized aligned delalloc reservations in the hope of landing out of
5eda43000064a6 Darrick J. Wong 2017-02-02 60 * order nearby CoW writes in a single extent on disk, thereby reducing
5eda43000064a6 Darrick J. Wong 2017-02-02 61 * fragmentation and improving future performance.
5eda43000064a6 Darrick J. Wong 2017-02-02 62 *
5eda43000064a6 Darrick J. Wong 2017-02-02 63 * D: --RRRRRRSSSRRRRRRRR--- (data fork)
5eda43000064a6 Darrick J. Wong 2017-02-02 64 * C: ------DDDDDDD--------- (CoW fork)
5eda43000064a6 Darrick J. Wong 2017-02-02 65 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 66 * When dirty pages are being written out (typically in writepage), the
5eda43000064a6 Darrick J. Wong 2017-02-02 67 * delalloc reservations are converted into unwritten mappings by
5eda43000064a6 Darrick J. Wong 2017-02-02 68 * allocating blocks and replacing the delalloc mapping with real ones.
5eda43000064a6 Darrick J. Wong 2017-02-02 69 * A delalloc mapping can be replaced by several unwritten ones if the
5eda43000064a6 Darrick J. Wong 2017-02-02 70 * free space is fragmented.
5eda43000064a6 Darrick J. Wong 2017-02-02 71 *
5eda43000064a6 Darrick J. Wong 2017-02-02 72 * D: --RRRRRRSSSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 73 * C: ------UUUUUUU---------
3993baeb3c52f4 Darrick J. Wong 2016-10-03 74 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 75 * We want to adapt the delalloc mechanism for copy-on-write, since the
3993baeb3c52f4 Darrick J. Wong 2016-10-03 76 * write paths are similar. The first two steps (creating the reservation
3993baeb3c52f4 Darrick J. Wong 2016-10-03 77 * and allocating the blocks) are exactly the same as delalloc except that
3993baeb3c52f4 Darrick J. Wong 2016-10-03 78 * the mappings must be stored in a separate CoW fork because we do not want
3993baeb3c52f4 Darrick J. Wong 2016-10-03 79 * to disturb the mapping in the data fork until we're sure that the write
3993baeb3c52f4 Darrick J. Wong 2016-10-03 80 * succeeded. IO completion in this case is the process of removing the old
3993baeb3c52f4 Darrick J. Wong 2016-10-03 81 * mapping from the data fork and moving the new mapping from the CoW fork to
3993baeb3c52f4 Darrick J. Wong 2016-10-03 82 * the data fork. This will be discussed shortly.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 83 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 84 * For now, unaligned directio writes will be bounced back to the page cache.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 85 * Block-aligned directio writes will use the same mechanism as buffered
3993baeb3c52f4 Darrick J. Wong 2016-10-03 86 * writes.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 87 *
5eda43000064a6 Darrick J. Wong 2017-02-02 88 * Just prior to submitting the actual disk write requests, we convert
5eda43000064a6 Darrick J. Wong 2017-02-02 89 * the extents representing the range of the file actually being written
5eda43000064a6 Darrick J. Wong 2017-02-02 90 * (as opposed to extra pieces created for the cowextsize hint) to real
5eda43000064a6 Darrick J. Wong 2017-02-02 91 * extents. This will become important in the next step:
5eda43000064a6 Darrick J. Wong 2017-02-02 92 *
5eda43000064a6 Darrick J. Wong 2017-02-02 93 * D: --RRRRRRSSSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 94 * C: ------UUrrUUU---------
5eda43000064a6 Darrick J. Wong 2017-02-02 95 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 96 * CoW remapping must be done after the data block write completes,
3993baeb3c52f4 Darrick J. Wong 2016-10-03 97 * because we don't want to destroy the old data fork map until we're sure
3993baeb3c52f4 Darrick J. Wong 2016-10-03 98 * the new block has been written. Since the new mappings are kept in a
3993baeb3c52f4 Darrick J. Wong 2016-10-03 99 * separate fork, we can simply iterate these mappings to find the ones
3993baeb3c52f4 Darrick J. Wong 2016-10-03 100 * that cover the file blocks that we just CoW'd. For each extent, simply
3993baeb3c52f4 Darrick J. Wong 2016-10-03 101 * unmap the corresponding range in the data fork, map the new range into
5eda43000064a6 Darrick J. Wong 2017-02-02 102 * the data fork, and remove the extent from the CoW fork. Because of
5eda43000064a6 Darrick J. Wong 2017-02-02 103 * the presence of the cowextsize hint, however, we must be careful
5eda43000064a6 Darrick J. Wong 2017-02-02 104 * only to remap the blocks that we've actually written out -- we must
5eda43000064a6 Darrick J. Wong 2017-02-02 105 * never remap delalloc reservations nor CoW staging blocks that have
5eda43000064a6 Darrick J. Wong 2017-02-02 106 * yet to be written. This corresponds exactly to the real extents in
5eda43000064a6 Darrick J. Wong 2017-02-02 107 * the CoW fork:
5eda43000064a6 Darrick J. Wong 2017-02-02 108 *
5eda43000064a6 Darrick J. Wong 2017-02-02 109 * D: --RRRRRRrrSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 110 * C: ------UU--UUU---------
3993baeb3c52f4 Darrick J. Wong 2016-10-03 111 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 112 * Since the remapping operation can be applied to an arbitrary file
3993baeb3c52f4 Darrick J. Wong 2016-10-03 113 * range, we record the need for the remap step as a flag in the ioend
3993baeb3c52f4 Darrick J. Wong 2016-10-03 114 * instead of declaring a new IO type. This is required for direct io
3993baeb3c52f4 Darrick J. Wong 2016-10-03 115 * because we only have ioend for the whole dio, and we have to be able to
3993baeb3c52f4 Darrick J. Wong 2016-10-03 116 * remember the presence of unwritten blocks and CoW blocks with a single
3993baeb3c52f4 Darrick J. Wong 2016-10-03 117 * ioend structure. Better yet, the more ground we can cover with one
3993baeb3c52f4 Darrick J. Wong 2016-10-03 118 * ioend, the better.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 119 */
2a06705cd59540 Darrick J. Wong 2016-10-03 120
2a06705cd59540 Darrick J. Wong 2016-10-03 121 /*
2a06705cd59540 Darrick J. Wong 2016-10-03 122 * Given an AG extent, find the lowest-numbered run of shared blocks
2a06705cd59540 Darrick J. Wong 2016-10-03 123 * within that range and return the range in fbno/flen. If
2a06705cd59540 Darrick J. Wong 2016-10-03 124 * find_end_of_shared is true, return the longest contiguous extent of
2a06705cd59540 Darrick J. Wong 2016-10-03 125 * shared blocks. If there are no shared extents, fbno and flen will
2a06705cd59540 Darrick J. Wong 2016-10-03 126 * be set to NULLAGBLOCK and 0, respectively.
2a06705cd59540 Darrick J. Wong 2016-10-03 127 */
2a06705cd59540 Darrick J. Wong 2016-10-03 128 int
2a06705cd59540 Darrick J. Wong 2016-10-03 @129 xfs_reflink_find_shared(
87045504fb13d6 Dave Chinner 2022-06-11 130 struct xfs_perag *pag,
92ff7285f1df55 Darrick J. Wong 2017-06-16 131 struct xfs_trans *tp,
2a06705cd59540 Darrick J. Wong 2016-10-03 132 xfs_agblock_t agbno,
2a06705cd59540 Darrick J. Wong 2016-10-03 133 xfs_extlen_t aglen,
2a06705cd59540 Darrick J. Wong 2016-10-03 134 xfs_agblock_t *fbno,
2a06705cd59540 Darrick J. Wong 2016-10-03 135 xfs_extlen_t *flen,
2a06705cd59540 Darrick J. Wong 2016-10-03 136 bool find_end_of_shared)
2a06705cd59540 Darrick J. Wong 2016-10-03 137 {
2a06705cd59540 Darrick J. Wong 2016-10-03 138 struct xfs_buf *agbp;
2a06705cd59540 Darrick J. Wong 2016-10-03 139 struct xfs_btree_cur *cur;
2a06705cd59540 Darrick J. Wong 2016-10-03 140 int error;
2a06705cd59540 Darrick J. Wong 2016-10-03 141
87045504fb13d6 Dave Chinner 2022-06-11 142 error = xfs_alloc_read_agf(pag, tp, 0, &agbp);
2a06705cd59540 Darrick J. Wong 2016-10-03 143 if (error)
2a06705cd59540 Darrick J. Wong 2016-10-03 144 return error;
2a06705cd59540 Darrick J. Wong 2016-10-03 145
87045504fb13d6 Dave Chinner 2022-06-11 146 cur = xfs_refcountbt_init_cursor(pag->pag_mount, tp, agbp, pag);
2a06705cd59540 Darrick J. Wong 2016-10-03 147
2a06705cd59540 Darrick J. Wong 2016-10-03 148 error = xfs_refcount_find_shared(cur, agbno, aglen, fbno, flen,
2a06705cd59540 Darrick J. Wong 2016-10-03 149 find_end_of_shared);
2a06705cd59540 Darrick J. Wong 2016-10-03 150
0b04b6b875b32f Darrick J. Wong 2018-07-19 151 xfs_btree_del_cursor(cur, error);
2a06705cd59540 Darrick J. Wong 2016-10-03 152
92ff7285f1df55 Darrick J. Wong 2017-06-16 153 xfs_trans_brelse(tp, agbp);
2a06705cd59540 Darrick J. Wong 2016-10-03 154 return error;
2a06705cd59540 Darrick J. Wong 2016-10-03 155 }
2a06705cd59540 Darrick J. Wong 2016-10-03 156 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
kernel test robot
build botRe: [PATCH 05/50] xfs: pass perag to xfs_alloc_read_agf()
In reply to Dave ChinnerThank you for the patch! Perhaps something to improve:
Hi Dave,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on v5.19-rc1]
[also build test WARNING on next-20220610]
[cannot apply to xfs-linux/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 base: f2906aa863381afb0015a9eb7fefad885d4e5a56 config: hexagon-randconfig-r012-20220611 (https://download.01.org/0day-ci/archive/20220611/[email protected]/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project ff4abe755279a3a47cc416ef80dbc900d9a98a19)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/87045504fb13d6263ddf1d7780eef5eda1cee6ad
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 git checkout 87045504fb13d6263ddf1d7780eef5eda1cee6ad
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash fs/xfs/
If you fix the issue, kindly add following tag where applicable
Reported-by kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
>> fs/xfs/xfs_reflink.c:129:1: warning: no previous prototype for function 'xfs_reflink_find_shared' [-Wmissing-prototypes]
xfs_reflink_find_shared(
^
fs/xfs/xfs_reflink.c:128:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int
^
static
fs/xfs/xfs_reflink.c:1029:12: warning: variable 'qdelta' set but not used [-Wunused-but-set-variable]
int64_t qdelta = 0;
^2 warnings generated.
vim +/xfs_reflink_find_shared +129 fs/xfs/xfs_reflink.c
3993baeb3c52f4 Darrick J. Wong 2016-10-03 32
3993baeb3c52f4 Darrick J. Wong 2016-10-03 33 /*
3993baeb3c52f4 Darrick J. Wong 2016-10-03 34 * Copy on Write of Shared Blocks
3993baeb3c52f4 Darrick J. Wong 2016-10-03 35 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 36 * XFS must preserve "the usual" file semantics even when two files share
3993baeb3c52f4 Darrick J. Wong 2016-10-03 37 * the same physical blocks. This means that a write to one file must not
3993baeb3c52f4 Darrick J. Wong 2016-10-03 38 * alter the blocks in a different file; the way that we'll do that is
3993baeb3c52f4 Darrick J. Wong 2016-10-03 39 * through the use of a copy-on-write mechanism. At a high level, that
3993baeb3c52f4 Darrick J. Wong 2016-10-03 40 * means that when we want to write to a shared block, we allocate a new
3993baeb3c52f4 Darrick J. Wong 2016-10-03 41 * block, write the data to the new block, and if that succeeds we map the
3993baeb3c52f4 Darrick J. Wong 2016-10-03 42 * new block into the file.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 43 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 44 * XFS provides a "delayed allocation" mechanism that defers the allocation
3993baeb3c52f4 Darrick J. Wong 2016-10-03 45 * of disk blocks to dirty-but-not-yet-mapped file blocks as long as
3993baeb3c52f4 Darrick J. Wong 2016-10-03 46 * possible. This reduces fragmentation by enabling the filesystem to ask
3993baeb3c52f4 Darrick J. Wong 2016-10-03 47 * for bigger chunks less often, which is exactly what we want for CoW.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 48 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 49 * The delalloc mechanism begins when the kernel wants to make a block
3993baeb3c52f4 Darrick J. Wong 2016-10-03 50 * writable (write_begin or page_mkwrite). If the offset is not mapped, we
3993baeb3c52f4 Darrick J. Wong 2016-10-03 51 * create a delalloc mapping, which is a regular in-core extent, but without
3993baeb3c52f4 Darrick J. Wong 2016-10-03 52 * a real startblock. (For delalloc mappings, the startblock encodes both
3993baeb3c52f4 Darrick J. Wong 2016-10-03 53 * a flag that this is a delalloc mapping, and a worst-case estimate of how
3993baeb3c52f4 Darrick J. Wong 2016-10-03 54 * many blocks might be required to put the mapping into the BMBT.) delalloc
3993baeb3c52f4 Darrick J. Wong 2016-10-03 55 * mappings are a reservation against the free space in the filesystem;
3993baeb3c52f4 Darrick J. Wong 2016-10-03 56 * adjacent mappings can also be combined into fewer larger mappings.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 57 *
5eda43000064a6 Darrick J. Wong 2017-02-02 58 * As an optimization, the CoW extent size hint (cowextsz) creates
5eda43000064a6 Darrick J. Wong 2017-02-02 59 * outsized aligned delalloc reservations in the hope of landing out of
5eda43000064a6 Darrick J. Wong 2017-02-02 60 * order nearby CoW writes in a single extent on disk, thereby reducing
5eda43000064a6 Darrick J. Wong 2017-02-02 61 * fragmentation and improving future performance.
5eda43000064a6 Darrick J. Wong 2017-02-02 62 *
5eda43000064a6 Darrick J. Wong 2017-02-02 63 * D: --RRRRRRSSSRRRRRRRR--- (data fork)
5eda43000064a6 Darrick J. Wong 2017-02-02 64 * C: ------DDDDDDD--------- (CoW fork)
5eda43000064a6 Darrick J. Wong 2017-02-02 65 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 66 * When dirty pages are being written out (typically in writepage), the
5eda43000064a6 Darrick J. Wong 2017-02-02 67 * delalloc reservations are converted into unwritten mappings by
5eda43000064a6 Darrick J. Wong 2017-02-02 68 * allocating blocks and replacing the delalloc mapping with real ones.
5eda43000064a6 Darrick J. Wong 2017-02-02 69 * A delalloc mapping can be replaced by several unwritten ones if the
5eda43000064a6 Darrick J. Wong 2017-02-02 70 * free space is fragmented.
5eda43000064a6 Darrick J. Wong 2017-02-02 71 *
5eda43000064a6 Darrick J. Wong 2017-02-02 72 * D: --RRRRRRSSSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 73 * C: ------UUUUUUU---------
3993baeb3c52f4 Darrick J. Wong 2016-10-03 74 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 75 * We want to adapt the delalloc mechanism for copy-on-write, since the
3993baeb3c52f4 Darrick J. Wong 2016-10-03 76 * write paths are similar. The first two steps (creating the reservation
3993baeb3c52f4 Darrick J. Wong 2016-10-03 77 * and allocating the blocks) are exactly the same as delalloc except that
3993baeb3c52f4 Darrick J. Wong 2016-10-03 78 * the mappings must be stored in a separate CoW fork because we do not want
3993baeb3c52f4 Darrick J. Wong 2016-10-03 79 * to disturb the mapping in the data fork until we're sure that the write
3993baeb3c52f4 Darrick J. Wong 2016-10-03 80 * succeeded. IO completion in this case is the process of removing the old
3993baeb3c52f4 Darrick J. Wong 2016-10-03 81 * mapping from the data fork and moving the new mapping from the CoW fork to
3993baeb3c52f4 Darrick J. Wong 2016-10-03 82 * the data fork. This will be discussed shortly.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 83 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 84 * For now, unaligned directio writes will be bounced back to the page cache.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 85 * Block-aligned directio writes will use the same mechanism as buffered
3993baeb3c52f4 Darrick J. Wong 2016-10-03 86 * writes.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 87 *
5eda43000064a6 Darrick J. Wong 2017-02-02 88 * Just prior to submitting the actual disk write requests, we convert
5eda43000064a6 Darrick J. Wong 2017-02-02 89 * the extents representing the range of the file actually being written
5eda43000064a6 Darrick J. Wong 2017-02-02 90 * (as opposed to extra pieces created for the cowextsize hint) to real
5eda43000064a6 Darrick J. Wong 2017-02-02 91 * extents. This will become important in the next step:
5eda43000064a6 Darrick J. Wong 2017-02-02 92 *
5eda43000064a6 Darrick J. Wong 2017-02-02 93 * D: --RRRRRRSSSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 94 * C: ------UUrrUUU---------
5eda43000064a6 Darrick J. Wong 2017-02-02 95 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 96 * CoW remapping must be done after the data block write completes,
3993baeb3c52f4 Darrick J. Wong 2016-10-03 97 * because we don't want to destroy the old data fork map until we're sure
3993baeb3c52f4 Darrick J. Wong 2016-10-03 98 * the new block has been written. Since the new mappings are kept in a
3993baeb3c52f4 Darrick J. Wong 2016-10-03 99 * separate fork, we can simply iterate these mappings to find the ones
3993baeb3c52f4 Darrick J. Wong 2016-10-03 100 * that cover the file blocks that we just CoW'd. For each extent, simply
3993baeb3c52f4 Darrick J. Wong 2016-10-03 101 * unmap the corresponding range in the data fork, map the new range into
5eda43000064a6 Darrick J. Wong 2017-02-02 102 * the data fork, and remove the extent from the CoW fork. Because of
5eda43000064a6 Darrick J. Wong 2017-02-02 103 * the presence of the cowextsize hint, however, we must be careful
5eda43000064a6 Darrick J. Wong 2017-02-02 104 * only to remap the blocks that we've actually written out -- we must
5eda43000064a6 Darrick J. Wong 2017-02-02 105 * never remap delalloc reservations nor CoW staging blocks that have
5eda43000064a6 Darrick J. Wong 2017-02-02 106 * yet to be written. This corresponds exactly to the real extents in
5eda43000064a6 Darrick J. Wong 2017-02-02 107 * the CoW fork:
5eda43000064a6 Darrick J. Wong 2017-02-02 108 *
5eda43000064a6 Darrick J. Wong 2017-02-02 109 * D: --RRRRRRrrSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 110 * C: ------UU--UUU---------
3993baeb3c52f4 Darrick J. Wong 2016-10-03 111 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 112 * Since the remapping operation can be applied to an arbitrary file
3993baeb3c52f4 Darrick J. Wong 2016-10-03 113 * range, we record the need for the remap step as a flag in the ioend
3993baeb3c52f4 Darrick J. Wong 2016-10-03 114 * instead of declaring a new IO type. This is required for direct io
3993baeb3c52f4 Darrick J. Wong 2016-10-03 115 * because we only have ioend for the whole dio, and we have to be able to
3993baeb3c52f4 Darrick J. Wong 2016-10-03 116 * remember the presence of unwritten blocks and CoW blocks with a single
3993baeb3c52f4 Darrick J. Wong 2016-10-03 117 * ioend structure. Better yet, the more ground we can cover with one
3993baeb3c52f4 Darrick J. Wong 2016-10-03 118 * ioend, the better.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 119 */
2a06705cd59540 Darrick J. Wong 2016-10-03 120
2a06705cd59540 Darrick J. Wong 2016-10-03 121 /*
2a06705cd59540 Darrick J. Wong 2016-10-03 122 * Given an AG extent, find the lowest-numbered run of shared blocks
2a06705cd59540 Darrick J. Wong 2016-10-03 123 * within that range and return the range in fbno/flen. If
2a06705cd59540 Darrick J. Wong 2016-10-03 124 * find_end_of_shared is true, return the longest contiguous extent of
2a06705cd59540 Darrick J. Wong 2016-10-03 125 * shared blocks. If there are no shared extents, fbno and flen will
2a06705cd59540 Darrick J. Wong 2016-10-03 126 * be set to NULLAGBLOCK and 0, respectively.
2a06705cd59540 Darrick J. Wong 2016-10-03 127 */
2a06705cd59540 Darrick J. Wong 2016-10-03 128 int
2a06705cd59540 Darrick J. Wong 2016-10-03 @129 xfs_reflink_find_shared(
87045504fb13d6 Dave Chinner 2022-06-11 130 struct xfs_perag *pag,
92ff7285f1df55 Darrick J. Wong 2017-06-16 131 struct xfs_trans *tp,
2a06705cd59540 Darrick J. Wong 2016-10-03 132 xfs_agblock_t agbno,
2a06705cd59540 Darrick J. Wong 2016-10-03 133 xfs_extlen_t aglen,
2a06705cd59540 Darrick J. Wong 2016-10-03 134 xfs_agblock_t *fbno,
2a06705cd59540 Darrick J. Wong 2016-10-03 135 xfs_extlen_t *flen,
2a06705cd59540 Darrick J. Wong 2016-10-03 136 bool find_end_of_shared)
2a06705cd59540 Darrick J. Wong 2016-10-03 137 {
2a06705cd59540 Darrick J. Wong 2016-10-03 138 struct xfs_buf *agbp;
2a06705cd59540 Darrick J. Wong 2016-10-03 139 struct xfs_btree_cur *cur;
2a06705cd59540 Darrick J. Wong 2016-10-03 140 int error;
2a06705cd59540 Darrick J. Wong 2016-10-03 141
87045504fb13d6 Dave Chinner 2022-06-11 142 error = xfs_alloc_read_agf(pag, tp, 0, &agbp);
2a06705cd59540 Darrick J. Wong 2016-10-03 143 if (error)
2a06705cd59540 Darrick J. Wong 2016-10-03 144 return error;
2a06705cd59540 Darrick J. Wong 2016-10-03 145
87045504fb13d6 Dave Chinner 2022-06-11 146 cur = xfs_refcountbt_init_cursor(pag->pag_mount, tp, agbp, pag);
2a06705cd59540 Darrick J. Wong 2016-10-03 147
2a06705cd59540 Darrick J. Wong 2016-10-03 148 error = xfs_refcount_find_shared(cur, agbno, aglen, fbno, flen,
2a06705cd59540 Darrick J. Wong 2016-10-03 149 find_end_of_shared);
2a06705cd59540 Darrick J. Wong 2016-10-03 150
0b04b6b875b32f Darrick J. Wong 2018-07-19 151 xfs_btree_del_cursor(cur, error);
2a06705cd59540 Darrick J. Wong 2016-10-03 152
92ff7285f1df55 Darrick J. Wong 2017-06-16 153 xfs_trans_brelse(tp, agbp);
2a06705cd59540 Darrick J. Wong 2016-10-03 154 return error;
2a06705cd59540 Darrick J. Wong 2016-10-03 155 }
2a06705cd59540 Darrick J. Wong 2016-10-03 156 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
kernel test robot
build botRe: [PATCH 05/50] xfs: pass perag to xfs_alloc_read_agf()
In reply to Dave ChinnerThank you for the patch! Perhaps something to improve:
Hi Dave,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on v5.19-rc1]
[also build test WARNING on next-20220610]
[cannot apply to xfs-linux/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 base: f2906aa863381afb0015a9eb7fefad885d4e5a56 config: sparc64-randconfig-r034-20220611 (https://download.01.org/0day-ci/archive/20220611/[email protected]/config) compiler: sparc64-linux-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/87045504fb13d6263ddf1d7780eef5eda1cee6ad
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 git checkout 87045504fb13d6263ddf1d7780eef5eda1cee6ad
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=sparc64 SHELL=/bin/bash fs/xfs/
If you fix the issue, kindly add following tag where applicable
Reported-by kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
fs/xfs/scrub/repair.c: In function 'xrep_reap_block':
>> fs/xfs/scrub/repair.c:539:41: warning: variable 'agno' set but not used [-Wunused-but-set-variable]
539 | xfs_agnumber_t agno;
| ^~~~vim +/agno +539 fs/xfs/scrub/repair.c
12c6510e2ff17cf Darrick J. Wong 2018-05-29 528
86d969b425d7ecf Darrick J. Wong 2018-07-30 529 /* Dispose of a single block. */
12c6510e2ff17cf Darrick J. Wong 2018-05-29 530 STATIC int
86d969b425d7ecf Darrick J. Wong 2018-07-30 531 xrep_reap_block(
1d8a748a8aa94a7 Darrick J. Wong 2018-07-19 532 struct xfs_scrub *sc,
12c6510e2ff17cf Darrick J. Wong 2018-05-29 533 xfs_fsblock_t fsbno,
66e3237e724c665 Darrick J. Wong 2018-12-12 534 const struct xfs_owner_info *oinfo,
12c6510e2ff17cf Darrick J. Wong 2018-05-29 535 enum xfs_ag_resv_type resv)
12c6510e2ff17cf Darrick J. Wong 2018-05-29 536 {
12c6510e2ff17cf Darrick J. Wong 2018-05-29 537 struct xfs_btree_cur *cur;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 538 struct xfs_buf *agf_bp = NULL;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 @539 xfs_agnumber_t agno;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 540 xfs_agblock_t agbno;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 541 bool has_other_rmap;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 542 int error;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 543
12c6510e2ff17cf Darrick J. Wong 2018-05-29 544 agno = XFS_FSB_TO_AGNO(sc->mp, fsbno);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 545 agbno = XFS_FSB_TO_AGBNO(sc->mp, fsbno);
87045504fb13d62 Dave Chinner 2022-06-11 546 ASSERT(agno == sc->sa.pag->pag_agno);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 547
12c6510e2ff17cf Darrick J. Wong 2018-05-29 548 /*
12c6510e2ff17cf Darrick J. Wong 2018-05-29 549 * If we are repairing per-inode metadata, we need to read in the AGF
12c6510e2ff17cf Darrick J. Wong 2018-05-29 550 * buffer. Otherwise, we're repairing a per-AG structure, so reuse
12c6510e2ff17cf Darrick J. Wong 2018-05-29 551 * the AGF buffer that the setup functions already grabbed.
12c6510e2ff17cf Darrick J. Wong 2018-05-29 552 */
12c6510e2ff17cf Darrick J. Wong 2018-05-29 553 if (sc->ip) {
87045504fb13d62 Dave Chinner 2022-06-11 554 error = xfs_alloc_read_agf(sc->sa.pag, sc->tp, 0, &agf_bp);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 555 if (error)
12c6510e2ff17cf Darrick J. Wong 2018-05-29 556 return error;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 557 } else {
12c6510e2ff17cf Darrick J. Wong 2018-05-29 558 agf_bp = sc->sa.agf_bp;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 559 }
fa9c3c197329fda Dave Chinner 2021-06-02 560 cur = xfs_rmapbt_init_cursor(sc->mp, sc->tp, agf_bp, sc->sa.pag);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 561
12c6510e2ff17cf Darrick J. Wong 2018-05-29 562 /* Can we find any other rmappings? */
12c6510e2ff17cf Darrick J. Wong 2018-05-29 563 error = xfs_rmap_has_other_keys(cur, agbno, 1, oinfo, &has_other_rmap);
ef97ef26d263fb6 Darrick J. Wong 2018-07-19 564 xfs_btree_del_cursor(cur, error);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 565 if (error)
ef97ef26d263fb6 Darrick J. Wong 2018-07-19 566 goto out_free;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 567
12c6510e2ff17cf Darrick J. Wong 2018-05-29 568 /*
12c6510e2ff17cf Darrick J. Wong 2018-05-29 569 * If there are other rmappings, this block is cross linked and must
12c6510e2ff17cf Darrick J. Wong 2018-05-29 570 * not be freed. Remove the reverse mapping and move on. Otherwise,
12c6510e2ff17cf Darrick J. Wong 2018-05-29 571 * we were the only owner of the block, so free the extent, which will
12c6510e2ff17cf Darrick J. Wong 2018-05-29 572 * also remove the rmap.
12c6510e2ff17cf Darrick J. Wong 2018-05-29 573 *
12c6510e2ff17cf Darrick J. Wong 2018-05-29 574 * XXX: XFS doesn't support detecting the case where a single block
12c6510e2ff17cf Darrick J. Wong 2018-05-29 575 * metadata structure is crosslinked with a multi-block structure
12c6510e2ff17cf Darrick J. Wong 2018-05-29 576 * because the buffer cache doesn't detect aliasing problems, so we
12c6510e2ff17cf Darrick J. Wong 2018-05-29 577 * can't fix 100% of crosslinking problems (yet). The verifiers will
12c6510e2ff17cf Darrick J. Wong 2018-05-29 578 * blow on writeout, the filesystem will shut down, and the admin gets
12c6510e2ff17cf Darrick J. Wong 2018-05-29 579 * to run xfs_repair.
12c6510e2ff17cf Darrick J. Wong 2018-05-29 580 */
12c6510e2ff17cf Darrick J. Wong 2018-05-29 581 if (has_other_rmap)
fa9c3c197329fda Dave Chinner 2021-06-02 582 error = xfs_rmap_free(sc->tp, agf_bp, sc->sa.pag, agbno,
fa9c3c197329fda Dave Chinner 2021-06-02 583 1, oinfo);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 584 else if (resv == XFS_AG_RESV_AGFL)
b5e2196e9c72173 Darrick J. Wong 2018-07-19 585 error = xrep_put_freelist(sc, agbno);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 586 else
12c6510e2ff17cf Darrick J. Wong 2018-05-29 587 error = xfs_free_extent(sc->tp, fsbno, 1, oinfo, resv);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 588 if (agf_bp != sc->sa.agf_bp)
12c6510e2ff17cf Darrick J. Wong 2018-05-29 589 xfs_trans_brelse(sc->tp, agf_bp);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 590 if (error)
12c6510e2ff17cf Darrick J. Wong 2018-05-29 591 return error;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 592
12c6510e2ff17cf Darrick J. Wong 2018-05-29 593 if (sc->ip)
12c6510e2ff17cf Darrick J. Wong 2018-05-29 594 return xfs_trans_roll_inode(&sc->tp, sc->ip);
b5e2196e9c72173 Darrick J. Wong 2018-07-19 595 return xrep_roll_ag_trans(sc);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 596
ef97ef26d263fb6 Darrick J. Wong 2018-07-19 597 out_free:
12c6510e2ff17cf Darrick J. Wong 2018-05-29 598 if (agf_bp != sc->sa.agf_bp)
12c6510e2ff17cf Darrick J. Wong 2018-05-29 599 xfs_trans_brelse(sc->tp, agf_bp);
12c6510e2ff17cf Darrick J. Wong 2018-05-29 600 return error;
12c6510e2ff17cf Darrick J. Wong 2018-05-29 601 }
12c6510e2ff17cf Darrick J. Wong 2018-05-29 602 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
kernel test robot
build botRe: [PATCH 05/50] xfs: pass perag to xfs_alloc_read_agf()
In reply to Dave ChinnerThank you for the patch! Perhaps something to improve:
Hi Dave,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on v5.19-rc1]
[also build test WARNING on next-20220614]
[cannot apply to xfs-linux/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 base: f2906aa863381afb0015a9eb7fefad885d4e5a56 config: arc-randconfig-s032-20220613 (https://download.01.org/0day-ci/archive/20220614/[email protected]/config) compiler: arc-elf-gcc (GCC) 11.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.4-30-g92122700-dirty
# https://github.com/intel-lab-lkp/linux/commit/87045504fb13d6263ddf1d7780eef5eda1cee6ad
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037
git checkout 87045504fb13d6263ddf1d7780eef5eda1cee6ad
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=arc SHELL=/bin/bash fs/xfs/
If you fix the issue, kindly add following tag where applicable
Reported-by kernel test robot <[email protected]>
sparse warnings: (new ones prefixed by >>)
>> fs/xfs/xfs_reflink.c:129:1: sparse: sparse: symbol 'xfs_reflink_find_shared' was not declared. Should it be static?
vim +/xfs_reflink_find_shared +129 fs/xfs/xfs_reflink.c
3993baeb3c52f4 Darrick J. Wong 2016-10-03 32
3993baeb3c52f4 Darrick J. Wong 2016-10-03 33 /*
3993baeb3c52f4 Darrick J. Wong 2016-10-03 34 * Copy on Write of Shared Blocks
3993baeb3c52f4 Darrick J. Wong 2016-10-03 35 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 36 * XFS must preserve "the usual" file semantics even when two files share
3993baeb3c52f4 Darrick J. Wong 2016-10-03 37 * the same physical blocks. This means that a write to one file must not
3993baeb3c52f4 Darrick J. Wong 2016-10-03 38 * alter the blocks in a different file; the way that we'll do that is
3993baeb3c52f4 Darrick J. Wong 2016-10-03 39 * through the use of a copy-on-write mechanism. At a high level, that
3993baeb3c52f4 Darrick J. Wong 2016-10-03 40 * means that when we want to write to a shared block, we allocate a new
3993baeb3c52f4 Darrick J. Wong 2016-10-03 41 * block, write the data to the new block, and if that succeeds we map the
3993baeb3c52f4 Darrick J. Wong 2016-10-03 42 * new block into the file.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 43 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 44 * XFS provides a "delayed allocation" mechanism that defers the allocation
3993baeb3c52f4 Darrick J. Wong 2016-10-03 45 * of disk blocks to dirty-but-not-yet-mapped file blocks as long as
3993baeb3c52f4 Darrick J. Wong 2016-10-03 46 * possible. This reduces fragmentation by enabling the filesystem to ask
3993baeb3c52f4 Darrick J. Wong 2016-10-03 47 * for bigger chunks less often, which is exactly what we want for CoW.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 48 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 49 * The delalloc mechanism begins when the kernel wants to make a block
3993baeb3c52f4 Darrick J. Wong 2016-10-03 50 * writable (write_begin or page_mkwrite). If the offset is not mapped, we
3993baeb3c52f4 Darrick J. Wong 2016-10-03 51 * create a delalloc mapping, which is a regular in-core extent, but without
3993baeb3c52f4 Darrick J. Wong 2016-10-03 52 * a real startblock. (For delalloc mappings, the startblock encodes both
3993baeb3c52f4 Darrick J. Wong 2016-10-03 53 * a flag that this is a delalloc mapping, and a worst-case estimate of how
3993baeb3c52f4 Darrick J. Wong 2016-10-03 54 * many blocks might be required to put the mapping into the BMBT.) delalloc
3993baeb3c52f4 Darrick J. Wong 2016-10-03 55 * mappings are a reservation against the free space in the filesystem;
3993baeb3c52f4 Darrick J. Wong 2016-10-03 56 * adjacent mappings can also be combined into fewer larger mappings.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 57 *
5eda43000064a6 Darrick J. Wong 2017-02-02 58 * As an optimization, the CoW extent size hint (cowextsz) creates
5eda43000064a6 Darrick J. Wong 2017-02-02 59 * outsized aligned delalloc reservations in the hope of landing out of
5eda43000064a6 Darrick J. Wong 2017-02-02 60 * order nearby CoW writes in a single extent on disk, thereby reducing
5eda43000064a6 Darrick J. Wong 2017-02-02 61 * fragmentation and improving future performance.
5eda43000064a6 Darrick J. Wong 2017-02-02 62 *
5eda43000064a6 Darrick J. Wong 2017-02-02 63 * D: --RRRRRRSSSRRRRRRRR--- (data fork)
5eda43000064a6 Darrick J. Wong 2017-02-02 64 * C: ------DDDDDDD--------- (CoW fork)
5eda43000064a6 Darrick J. Wong 2017-02-02 65 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 66 * When dirty pages are being written out (typically in writepage), the
5eda43000064a6 Darrick J. Wong 2017-02-02 67 * delalloc reservations are converted into unwritten mappings by
5eda43000064a6 Darrick J. Wong 2017-02-02 68 * allocating blocks and replacing the delalloc mapping with real ones.
5eda43000064a6 Darrick J. Wong 2017-02-02 69 * A delalloc mapping can be replaced by several unwritten ones if the
5eda43000064a6 Darrick J. Wong 2017-02-02 70 * free space is fragmented.
5eda43000064a6 Darrick J. Wong 2017-02-02 71 *
5eda43000064a6 Darrick J. Wong 2017-02-02 72 * D: --RRRRRRSSSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 73 * C: ------UUUUUUU---------
3993baeb3c52f4 Darrick J. Wong 2016-10-03 74 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 75 * We want to adapt the delalloc mechanism for copy-on-write, since the
3993baeb3c52f4 Darrick J. Wong 2016-10-03 76 * write paths are similar. The first two steps (creating the reservation
3993baeb3c52f4 Darrick J. Wong 2016-10-03 77 * and allocating the blocks) are exactly the same as delalloc except that
3993baeb3c52f4 Darrick J. Wong 2016-10-03 78 * the mappings must be stored in a separate CoW fork because we do not want
3993baeb3c52f4 Darrick J. Wong 2016-10-03 79 * to disturb the mapping in the data fork until we're sure that the write
3993baeb3c52f4 Darrick J. Wong 2016-10-03 80 * succeeded. IO completion in this case is the process of removing the old
3993baeb3c52f4 Darrick J. Wong 2016-10-03 81 * mapping from the data fork and moving the new mapping from the CoW fork to
3993baeb3c52f4 Darrick J. Wong 2016-10-03 82 * the data fork. This will be discussed shortly.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 83 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 84 * For now, unaligned directio writes will be bounced back to the page cache.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 85 * Block-aligned directio writes will use the same mechanism as buffered
3993baeb3c52f4 Darrick J. Wong 2016-10-03 86 * writes.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 87 *
5eda43000064a6 Darrick J. Wong 2017-02-02 88 * Just prior to submitting the actual disk write requests, we convert
5eda43000064a6 Darrick J. Wong 2017-02-02 89 * the extents representing the range of the file actually being written
5eda43000064a6 Darrick J. Wong 2017-02-02 90 * (as opposed to extra pieces created for the cowextsize hint) to real
5eda43000064a6 Darrick J. Wong 2017-02-02 91 * extents. This will become important in the next step:
5eda43000064a6 Darrick J. Wong 2017-02-02 92 *
5eda43000064a6 Darrick J. Wong 2017-02-02 93 * D: --RRRRRRSSSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 94 * C: ------UUrrUUU---------
5eda43000064a6 Darrick J. Wong 2017-02-02 95 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 96 * CoW remapping must be done after the data block write completes,
3993baeb3c52f4 Darrick J. Wong 2016-10-03 97 * because we don't want to destroy the old data fork map until we're sure
3993baeb3c52f4 Darrick J. Wong 2016-10-03 98 * the new block has been written. Since the new mappings are kept in a
3993baeb3c52f4 Darrick J. Wong 2016-10-03 99 * separate fork, we can simply iterate these mappings to find the ones
3993baeb3c52f4 Darrick J. Wong 2016-10-03 100 * that cover the file blocks that we just CoW'd. For each extent, simply
3993baeb3c52f4 Darrick J. Wong 2016-10-03 101 * unmap the corresponding range in the data fork, map the new range into
5eda43000064a6 Darrick J. Wong 2017-02-02 102 * the data fork, and remove the extent from the CoW fork. Because of
5eda43000064a6 Darrick J. Wong 2017-02-02 103 * the presence of the cowextsize hint, however, we must be careful
5eda43000064a6 Darrick J. Wong 2017-02-02 104 * only to remap the blocks that we've actually written out -- we must
5eda43000064a6 Darrick J. Wong 2017-02-02 105 * never remap delalloc reservations nor CoW staging blocks that have
5eda43000064a6 Darrick J. Wong 2017-02-02 106 * yet to be written. This corresponds exactly to the real extents in
5eda43000064a6 Darrick J. Wong 2017-02-02 107 * the CoW fork:
5eda43000064a6 Darrick J. Wong 2017-02-02 108 *
5eda43000064a6 Darrick J. Wong 2017-02-02 109 * D: --RRRRRRrrSRRRRRRRR---
5eda43000064a6 Darrick J. Wong 2017-02-02 110 * C: ------UU--UUU---------
3993baeb3c52f4 Darrick J. Wong 2016-10-03 111 *
3993baeb3c52f4 Darrick J. Wong 2016-10-03 112 * Since the remapping operation can be applied to an arbitrary file
3993baeb3c52f4 Darrick J. Wong 2016-10-03 113 * range, we record the need for the remap step as a flag in the ioend
3993baeb3c52f4 Darrick J. Wong 2016-10-03 114 * instead of declaring a new IO type. This is required for direct io
3993baeb3c52f4 Darrick J. Wong 2016-10-03 115 * because we only have ioend for the whole dio, and we have to be able to
3993baeb3c52f4 Darrick J. Wong 2016-10-03 116 * remember the presence of unwritten blocks and CoW blocks with a single
3993baeb3c52f4 Darrick J. Wong 2016-10-03 117 * ioend structure. Better yet, the more ground we can cover with one
3993baeb3c52f4 Darrick J. Wong 2016-10-03 118 * ioend, the better.
3993baeb3c52f4 Darrick J. Wong 2016-10-03 119 */
2a06705cd59540 Darrick J. Wong 2016-10-03 120
2a06705cd59540 Darrick J. Wong 2016-10-03 121 /*
2a06705cd59540 Darrick J. Wong 2016-10-03 122 * Given an AG extent, find the lowest-numbered run of shared blocks
2a06705cd59540 Darrick J. Wong 2016-10-03 123 * within that range and return the range in fbno/flen. If
2a06705cd59540 Darrick J. Wong 2016-10-03 124 * find_end_of_shared is true, return the longest contiguous extent of
2a06705cd59540 Darrick J. Wong 2016-10-03 125 * shared blocks. If there are no shared extents, fbno and flen will
2a06705cd59540 Darrick J. Wong 2016-10-03 126 * be set to NULLAGBLOCK and 0, respectively.
2a06705cd59540 Darrick J. Wong 2016-10-03 127 */
2a06705cd59540 Darrick J. Wong 2016-10-03 128 int
2a06705cd59540 Darrick J. Wong 2016-10-03 @129 xfs_reflink_find_shared(
87045504fb13d6 Dave Chinner 2022-06-11 130 struct xfs_perag *pag,
92ff7285f1df55 Darrick J. Wong 2017-06-16 131 struct xfs_trans *tp,
2a06705cd59540 Darrick J. Wong 2016-10-03 132 xfs_agblock_t agbno,
2a06705cd59540 Darrick J. Wong 2016-10-03 133 xfs_extlen_t aglen,
2a06705cd59540 Darrick J. Wong 2016-10-03 134 xfs_agblock_t *fbno,
2a06705cd59540 Darrick J. Wong 2016-10-03 135 xfs_extlen_t *flen,
2a06705cd59540 Darrick J. Wong 2016-10-03 136 bool find_end_of_shared)
2a06705cd59540 Darrick J. Wong 2016-10-03 137 {
2a06705cd59540 Darrick J. Wong 2016-10-03 138 struct xfs_buf *agbp;
2a06705cd59540 Darrick J. Wong 2016-10-03 139 struct xfs_btree_cur *cur;
2a06705cd59540 Darrick J. Wong 2016-10-03 140 int error;
2a06705cd59540 Darrick J. Wong 2016-10-03 141
87045504fb13d6 Dave Chinner 2022-06-11 142 error = xfs_alloc_read_agf(pag, tp, 0, &agbp);
2a06705cd59540 Darrick J. Wong 2016-10-03 143 if (error)
2a06705cd59540 Darrick J. Wong 2016-10-03 144 return error;
2a06705cd59540 Darrick J. Wong 2016-10-03 145
87045504fb13d6 Dave Chinner 2022-06-11 146 cur = xfs_refcountbt_init_cursor(pag->pag_mount, tp, agbp, pag);
2a06705cd59540 Darrick J. Wong 2016-10-03 147
2a06705cd59540 Darrick J. Wong 2016-10-03 148 error = xfs_refcount_find_shared(cur, agbno, aglen, fbno, flen,
2a06705cd59540 Darrick J. Wong 2016-10-03 149 find_end_of_shared);
2a06705cd59540 Darrick J. Wong 2016-10-03 150
0b04b6b875b32f Darrick J. Wong 2018-07-19 151 xfs_btree_del_cursor(cur, error);
2a06705cd59540 Darrick J. Wong 2016-10-03 152
92ff7285f1df55 Darrick J. Wong 2017-06-16 153 xfs_trans_brelse(tp, agbp);
2a06705cd59540 Darrick J. Wong 2016-10-03 154 return error;
2a06705cd59540 Darrick J. Wong 2016-10-03 155 }
2a06705cd59540 Darrick J. Wong 2016-10-03 156 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
Re: [PATCH 05/50] xfs: pass perag to xfs_alloc_read_agf()
In reply to Dave ChinnerQuoted 171 lines · Dave Chinner
From: Dave Chinner <[email protected]>
xfs_alloc_read_agf()initialises the perag if it hasn't been done yet, so it makes sense to pass it the perag rather than pull a reference from the buffer. This allows callers to be per-ag centric rather than passing mount/agno pairs everywhere.Signed-off-by Dave Chinner <[email protected]>--- fs/xfs/libxfs/xfs_ag.c | 19 +++++++-------- fs/xfs/libxfs/xfs_ag_resv.c | 2 +- fs/xfs/libxfs/xfs_alloc.c | 30 ++++++++++------------- fs/xfs/libxfs/xfs_alloc.h | 13 ++-------- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 2 +- fs/xfs/libxfs/xfs_refcount.c | 6 ++--- fs/xfs/libxfs/xfs_refcount_btree.c | 2 +- fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- fs/xfs/scrub/agheader_repair.c | 6 ++--- fs/xfs/scrub/bmap.c | 2 +- fs/xfs/scrub/common.c | 2 +- fs/xfs/scrub/fscounters.c | 2 +- fs/xfs/scrub/repair.c | 5 ++-- fs/xfs/xfs_discard.c | 2 +- fs/xfs/xfs_extfree_item.c | 6 ++++- fs/xfs/xfs_filestream.c | 2 +- fs/xfs/xfs_fsmap.c | 3 +-- fs/xfs/xfs_reflink.c | 38 +++++++++++++++++------------- fs/xfs/xfs_reflink.h | 3 --- 20 files changed, 68 insertions(+), 81 deletions(-)fs/xfs/libxfs/xfs_ag.c +8
-11@@ -120,16 +120,13 @@ xfs_initialize_perag_data(for (index =0 ; index < agcount; index++) {/* -* read the agf, then the agi. This gets us -* all the information we need and populates the -* per-ag structures for us. +* Read the AGF and AGI buffers to populate the per-ag +* structures for us. */ - error =xfs_alloc_read_agf (mp,NULL , index,0 ,NULL ); -if (error) -return error; - pag =xfs_perag_get (mp, index); - error =xfs_ialloc_read_agi (pag,NULL ,NULL ); + error =xfs_alloc_read_agf (pag,NULL ,0 ,NULL ); +if (!error) + error =xfs_ialloc_read_agi (pag,NULL ,NULL );if (error) {xfs_perag_put (pag);return error;@@ -792,7 +789,7 @@ xfs_ag_shrink_space( agi = agibp->b_addr; - error =xfs_alloc_read_agf (mp, *tpp, pag->pag_agno,0 , &agfbp); + error =xfs_alloc_read_agf (pag, *tpp,0 , &agfbp);if (error)return error;@@ -909,7 +906,7 @@ xfs_ag_extend_space(/* * Change agf length. */ - error =xfs_alloc_read_agf (pag->pag_mount, tp, pag->pag_agno,0 , &bp); + error =xfs_alloc_read_agf (pag, tp,0 , &bp);if (error)return error;@@ -952,7 +949,7 @@ xfs_ag_get_geometry( error =xfs_ialloc_read_agi (pag,NULL , &agi_bp);if (error)return error; - error =xfs_alloc_read_agf (pag->pag_mount,NULL , pag->pag_agno,0 , &agf_bp); + error =xfs_alloc_read_agf (pag,NULL ,0 , &agf_bp);if (error) goto out_agi;fs/xfs/libxfs/xfs_ag_resv.c +1
-1@@ -322,7 +322,7 @@ xfs_ag_resv_init(* address. */ if (has_resv) { - error2 =xfs_alloc_read_agf (mp, tp, pag->pag_agno,0 ,NULL ); + error2 =xfs_alloc_read_agf (pag, tp,0 ,NULL );if (error2)return error2;fs/xfs/libxfs/xfs_alloc.c +10
-14@@ -2609,7 +2609,7 @@ xfs_alloc_fix_freelist(ASSERT (tp->t_flags &XFS_TRANS_PERM_LOG_RES );if (!pag->pagf_init) { - error =xfs_alloc_read_agf (mp, tp, args->agno, flags, &agbp); + error =xfs_alloc_read_agf (pag, tp, flags, &agbp);if (error) {/* Couldn't lock the AGF so skip this AG. */ if (error == -EAGAIN )@@ -2639,7 +2639,7 @@ xfs_alloc_fix_freelist(* Can fail if we're not blocking on locks, and it's held. */ if (!agbp) { - error =xfs_alloc_read_agf (mp, tp, args->agno, flags, &agbp); + error =xfs_alloc_read_agf (pag, tp, flags, &agbp);if (error) {/* Couldn't lock the AGF so skip this AG. */ if (error == -EAGAIN )@@ -3080,34 +3080,30 @@ xfs_read_agf(* perag structure if necessary. If the caller provides @agfbpp, then return the * locked buffer to the caller, otherwise free it. */ -int /* error */ +int xfs_alloc_read_agf ( -struct xfs_mount *mp,/* mount point structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -int flags,/* XFS_ALLOC_FLAG_... */ +struct xfs_perag *pag, +struct xfs_trans *tp, +int flags,struct xfs_buf **agfbpp) {struct xfs_buf *agfbp; -struct xfs_agf *agf;/* ag freelist header */ -struct xfs_perag *pag;/* per allocation group data */ +struct xfs_agf *agf;int error;int allocbt_blks; -trace_xfs_alloc_read_agf (mp, agno); +trace_xfs_alloc_read_agf (pag->pag_mount, pag->pag_agno);/* We don't support trylock when freeing. */ ASSERT ((flags & (XFS_ALLOC_FLAG_FREEING |XFS_ALLOC_FLAG_TRYLOCK )) != (XFS_ALLOC_FLAG_FREEING |XFS_ALLOC_FLAG_TRYLOCK )); -ASSERT (agno !=NULLAGNUMBER ); - error =xfs_read_agf (mp, tp, agno, + error =xfs_read_agf (pag->pag_mount, tp, pag->pag_agno, (flags &XFS_ALLOC_FLAG_TRYLOCK ) ?XBF_TRYLOCK :0 , &agfbp);if (error)return error; agf = agfbp->b_addr; - pag = agfbp->b_pag;if (!pag->pagf_init) { pag->pagf_freeblks =be32_to_cpu (agf->agf_freeblks); pag->pagf_btreeblks =be32_to_cpu (agf->agf_btreeblks);@@ -3121,7 +3117,7 @@ xfs_alloc_read_agf(be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAPi]); pag->pagf_refcount_level =be32_to_cpu (agf->agf_refcount_level); pag->pagf_init =1 ; - pag->pagf_agflreset =xfs_agfl_needs_reset (mp, agf); + pag->pagf_agflreset =xfs_agfl_needs_reset (pag->pag_mount, agf);/* * Update the in-core allocbt counter. Filter out the rmapbt
fs/xfs/libxfs/xfs_alloc.c xfs_alloc_read_agf( · line 3133
Quoted 9 lines
fs/xfs/libxfs/xfs_alloc.c +2
-2@@ -3131,13 +3127,13 @@ xfs_alloc_read_agf(* counter only tracks non-root blocks. */ allocbt_blks = pag->pagf_btreeblks; -if (xfs_has_rmapbt (mp)) +if (xfs_has_rmapbt (pag->pag_mount)) allocbt_blks -=be32_to_cpu (agf->agf_rmap_blocks) -1 ;if (allocbt_blks >0 ) -atomic64_add (allocbt_blks, &mp->m_allocbt_blks); +atomic64_add (allocbt_blks, &pag->pag_mount->m_allocbt_blks);
Overly long line here. I think in general this function would benefit from a local xfs_mount *mp variable anyway.
fs/xfs/xfs_reflink.h static inline bool xfs_is_cow_inode(struct xfs_inode *ip) · line 21
Quoted 11 lines
fs/xfs/xfs_reflink.h +0
-3@@ -16,9 +16,6 @@ static inline bool xfs_is_cow_inode(struct xfs_inode *ip)return xfs_is_reflink_inode (ip) ||xfs_is_always_cow_inode (ip); } -extern int xfs_reflink_find_shared (struct xfs_mount *mp,struct xfs_trans *tp, -xfs_agnumber_t agno,xfs_agblock_t agbno,xfs_extlen_t aglen, -xfs_agblock_t *fbno,xfs_extlen_t *flen,bool find_maximal);
Dropping this extern seems unrelated, and should move into a separate patch together with actually marking it static.
Otherwise looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 6/50 xfs: pass perag to xfs_read_agi
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We have the perag in most palces we call xfs_read_agi, so pass the perag instead of a mount/agno pair.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ialloc.c | 21 ++++++++++----------- fs/xfs/libxfs/xfs_ialloc.h | 10 +++------- fs/xfs/xfs_inode.c | 14 ++++++++------ fs/xfs/xfs_log_recover.c | 38 +++++++++++++++++++------------------- 4 files changed, 40 insertions(+), 43 deletions(-)
fs/xfs/libxfs/xfs_ialloc.c +10 -11
@@ -2571,25 +2571,24 @@ const struct xfs_buf_ops xfs_agi_buf_ops = {*/ int xfs_read_agi ( -struct xfs_mount *mp,/* file system mount structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -struct xfs_buf **bpp)/* allocation group hdr buf */ +struct xfs_perag *pag, +struct xfs_trans *tp, +struct xfs_buf **agibpp) { +struct xfs_mount *mp = pag->pag_mount;int error; -trace_xfs_read_agi (mp, agno); +trace_xfs_read_agi (pag->pag_mount, pag->pag_agno); -ASSERT (agno !=NULLAGNUMBER ); error =xfs_trans_read_buf (mp, tp, mp->m_ddev_targp, -XFS_AG_DADDR (mp, agno,XFS_AGI_DADDR (mp)), -XFS_FSS_TO_BB (mp,1 ),0 , bpp, &xfs_agi_buf_ops); +XFS_AG_DADDR (mp, pag->pag_agno,XFS_AGI_DADDR (mp)), +XFS_FSS_TO_BB (mp,1 ),0 , agibpp, &xfs_agi_buf_ops);if (error)return error;if (tp) -xfs_trans_buf_set_type (tp, *bpp,XFS_BLFT_AGI_BUF ); +xfs_trans_buf_set_type (tp, *agibpp,XFS_BLFT_AGI_BUF ); -xfs_buf_set_ref (*bpp,XFS_AGI_REF ); +xfs_buf_set_ref (*agibpp,XFS_AGI_REF );return 0 ; }
@@ -2609,7 +2608,7 @@ xfs_ialloc_read_agi(trace_xfs_ialloc_read_agi (pag->pag_mount, pag->pag_agno); - error =xfs_read_agi (pag->pag_mount, tp, pag->pag_agno, &agibp); + error =xfs_read_agi (pag, tp, &agibp);if (error)return error;
fs/xfs/libxfs/xfs_ialloc.h +3 -7
@@ -62,11 +62,9 @@ xfs_ialloc_log_agi(struct xfs_buf *bp,/* allocation group header buffer */ uint32_t fields); /* bitmask of fields to log */ -/* -* Read in the allocation group header (inode allocation section) -*/ -int /* error */ -xfs_ialloc_read_agi (struct xfs_perag *pag,struct xfs_trans *tp, +int xfs_read_agi (struct xfs_perag *pag,struct xfs_trans *tp, +struct xfs_buf **agibpp); +int xfs_ialloc_read_agi (struct xfs_perag *pag,struct xfs_trans *tp,struct xfs_buf **agibpp);/*
@@ -89,8 +87,6 @@ int xfs_ialloc_inode_init(struct xfs_mount *mp, struct xfs_trans *tp, xfs_agnumber_t agno, xfs_agblock_t agbno, xfs_agblock_t length, unsigned int gen); -int xfs_read_agi (struct xfs_mount *mp,struct xfs_trans *tp, -xfs_agnumber_t agno,struct xfs_buf **bpp);union xfs_btree_rec ; void xfs_inobt_btrec_to_irec(struct xfs_mount *mp,
fs/xfs/xfs_inode.c +8 -6
@@ -2157,7 +2157,7 @@ xfs_iunlink( pag =xfs_perag_get (mp,XFS_INO_TO_AGNO (mp, ip->i_ino));/* Get the agi buffer first. It ensures lock ordering on the list. */ - error =xfs_read_agi (mp, tp, pag->pag_agno, &agibp); + error =xfs_read_agi (pag, tp, &agibp);if (error) goto out; agi = agibp->b_addr;
@@ -2342,7 +2342,7 @@ xfs_iunlink_remove(trace_xfs_iunlink_remove (ip);/* Get the agi buffer first. It ensures lock ordering on the list. */ - error =xfs_read_agi (mp, tp, pag->pag_agno, &agibp); + error =xfs_read_agi (pag, tp, &agibp);if (error)return error; agi = agibp->b_addr;
@@ -3243,11 +3243,13 @@ xfs_rename(if (inodes[i] == wip || (inodes[i] == target_ip && (VFS_I (target_ip)->i_nlink ==1 || src_is_directory))) { -struct xfs_buf *bp; -xfs_agnumber_t agno; +struct xfs_perag *pag; +struct xfs_buf *bp; - agno =XFS_INO_TO_AGNO (mp, inodes[i]->i_ino); - error =xfs_read_agi (mp, tp, agno, &bp); + pag =xfs_perag_get (mp, +XFS_INO_TO_AGNO (mp, inodes[i]->i_ino)); + error =xfs_read_agi (pag, tp, &bp); +xfs_perag_put (pag);if (error) goto out_trans_cancel; }
fs/xfs/xfs_log_recover.c +19 -19
@@ -2629,21 +2629,21 @@ xlog_recover_cancel_intents(*/ STATIC voidxlog_recover_clear_agi_bucket ( -xfs_mount_t *mp, -xfs_agnumber_t agno, -int bucket) +struct xfs_perag *pag, +int bucket) { -xfs_trans_t *tp; -xfs_agi_t *agi; -struct xfs_buf *agibp; -int offset; -int error; +struct xfs_mount *mp = pag->pag_mount; +struct xfs_trans *tp; +struct xfs_agi *agi; +struct xfs_buf *agibp; +int offset; +int error; error =xfs_trans_alloc (mp, &M_RES (mp)->tr_clearagi,0 ,0 ,0 , &tp);if (error) goto out_error; - error =xfs_read_agi (mp, tp, agno, &agibp); + error =xfs_read_agi (pag, tp, &agibp);if (error) goto out_abort;
@@ -2662,14 +2662,14 @@ xlog_recover_clear_agi_bucket( out_abort:xfs_trans_cancel (tp); out_error: -xfs_warn (mp,"%s: failed to clear agi %d. Continuing." , __func__, agno); +xfs_warn (mp,"%s: failed to clear agi %d. Continuing." , __func__, + pag->pag_agno);return ; } STATIC xfs_agino_txlog_recover_process_one_iunlink ( -struct xfs_mount *mp, -xfs_agnumber_t agno, +struct xfs_perag *pag,xfs_agino_t agino,int bucket) {
@@ -2679,15 +2679,15 @@ xlog_recover_process_one_iunlink(xfs_ino_t ino;int error; - ino =XFS_AGINO_TO_INO (mp, agno, agino); - error =xfs_iget (mp,NULL , ino,0 ,0 , &ip); + ino =XFS_AGINO_TO_INO (pag->pag_mount, pag->pag_agno, agino); + error =xfs_iget (pag->pag_mount,NULL , ino,0 ,0 , &ip);if (error) goto fail;/* * Get the on disk inode to find the next inode in the bucket. */ - error =xfs_imap_to_bp (mp,NULL , &ip->i_imap, &ibp); + error =xfs_imap_to_bp (pag->pag_mount,NULL , &ip->i_imap, &ibp);if (error) goto fail_iput; dip =xfs_buf_offset (ibp, ip->i_imap.im_boffset);
@@ -2714,7 +2714,7 @@ xlog_recover_process_one_iunlink(* Call xlog_recover_clear_agi_bucket() to perform a transaction to * clear the inode pointer in the bucket. */ -xlog_recover_clear_agi_bucket (mp, agno, bucket); +xlog_recover_clear_agi_bucket (pag, bucket);return NULLAGINO ; }
@@ -2755,7 +2755,7 @@ xlog_recover_process_iunlinks(int error;for_each_perag (mp, agno, pag) { - error =xfs_read_agi (mp,NULL , pag->pag_agno, &agibp); + error =xfs_read_agi (pag,NULL , &agibp);if (error) {/* * AGI is b0rked. Don't process it.
@@ -2780,8 +2780,8 @@ xlog_recover_process_iunlinks(for (bucket =0 ; bucket <XFS_AGI_UNLINKED_BUCKETS ; bucket++) { agino =be32_to_cpu (agi->agi_unlinked[bucket]);while (agino !=NULLAGINO ) { - agino =xlog_recover_process_one_iunlink (mp, - pag->pag_agno, agino, bucket); + agino =xlog_recover_process_one_iunlink (pag, + agino, bucket);cond_resched (); } }
Signature · 1 line
2.35.1
Re: [PATCH 06/50] xfs: pass perag to xfs_read_agi
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Re: [PATCH 06/50] xfs: pass perag to xfs_read_agi
In reply to Dave ChinnerLooks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 7/50 xfs: pass perag to xfs_read_agf
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We have the perag in most places we call xfs_read_agf, so pass the perag instead of a mount/agno pair.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 26 ++++++++++++-------------- fs/xfs/libxfs/xfs_alloc.h | 4 ++-- 2 files changed, 14 insertions(+), 16 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +12 -14
@@ -3051,27 +3051,25 @@ const struct xfs_buf_ops xfs_agf_buf_ops = {/* * Read in the allocation group header (free/alloc section). */ -int /* error */ +int xfs_read_agf ( -struct xfs_mount *mp,/* mount point structure */ -struct xfs_trans *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -int flags,/* XFS_BUF_ */ -struct xfs_buf **bpp)/* buffer for the ag freelist header */ +struct xfs_perag *pag, +struct xfs_trans *tp, +int flags, +struct xfs_buf **agfbpp) { -int error; +struct xfs_mount *mp = pag->pag_mount; +int error; -trace_xfs_read_agf (mp, agno); +trace_xfs_read_agf (pag->pag_mount, pag->pag_agno); -ASSERT (agno !=NULLAGNUMBER ); error =xfs_trans_read_buf (mp, tp, mp->m_ddev_targp, -XFS_AG_DADDR (mp, agno,XFS_AGF_DADDR (mp)), -XFS_FSS_TO_BB (mp,1 ), flags, bpp, &xfs_agf_buf_ops); +XFS_AG_DADDR (mp, pag->pag_agno,XFS_AGF_DADDR (mp)), +XFS_FSS_TO_BB (mp,1 ), flags, agfbpp, &xfs_agf_buf_ops);if (error)return error; -ASSERT (!(*bpp)->b_error); -xfs_buf_set_ref (*bpp,XFS_AGF_REF ); +xfs_buf_set_ref (*agfbpp,XFS_AGF_REF );return 0 ; }
@@ -3097,7 +3095,7 @@ xfs_alloc_read_agf(/* We don't support trylock when freeing. */ ASSERT ((flags & (XFS_ALLOC_FLAG_FREEING |XFS_ALLOC_FLAG_TRYLOCK )) != (XFS_ALLOC_FLAG_FREEING |XFS_ALLOC_FLAG_TRYLOCK )); - error =xfs_read_agf (pag->pag_mount, tp, pag->pag_agno, + error =xfs_read_agf (pag, tp, (flags &XFS_ALLOC_FLAG_TRYLOCK ) ?XBF_TRYLOCK :0 , &agfbp);if (error)
fs/xfs/libxfs/xfs_alloc.h +2 -2
@@ -185,8 +185,8 @@ xfs_alloc_get_rec( xfs_extlen_t *len,/* output: length of extent */ int *stat); /* output: success/failure */ -int xfs_read_agf (struct xfs_mount *mp,struct xfs_trans *tp, -xfs_agnumber_t agno,int flags,struct xfs_buf **bpp); +int xfs_read_agf (struct xfs_perag *pag,struct xfs_trans *tp,int flags, +struct xfs_buf **agfbpp);int xfs_alloc_read_agf (struct xfs_perag *pag,struct xfs_trans *tp,int flags,struct xfs_buf **agfbpp); int xfs_alloc_read_agfl(struct xfs_mount *mp, struct xfs_trans *tp,
Signature · 1 line
2.35.1
Re: [PATCH 07/50] xfs: pass perag to xfs_read_agf
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 8/50 xfs: pass perag to xfs_alloc_get_freelist
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
It's available in all callers, so pass it in so that the perag can be passed further down the stack.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 8 ++++---- fs/xfs/libxfs/xfs_alloc.h | 13 ++----------- fs/xfs/libxfs/xfs_alloc_btree.c | 6 +++--- fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- fs/xfs/scrub/repair.c | 6 +++--- 5 files changed, 13 insertions(+), 22 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +4 -4
@@ -1075,7 +1075,8 @@ xfs_alloc_ag_vextent_small( be32_to_cpu(agf->agf_flcount) <= args->minleft) goto out; - error =xfs_alloc_get_freelist (args->tp, args->agbp, &fbno,0 ); + error =xfs_alloc_get_freelist (args->pag, args->tp, args->agbp, + &fbno,0 );if (error) goto error;if (fbno ==NULLAGBLOCK )
@@ -2697,7 +2698,7 @@ xfs_alloc_fix_freelist(else targs.oinfo =XFS_RMAP_OINFO_AG ;while (!(flags &XFS_ALLOC_FLAG_NOSHRINK ) && pag->pagf_flcount > need) { - error =xfs_alloc_get_freelist (tp, agbp, &bno,0 ); + error =xfs_alloc_get_freelist (pag, tp, agbp, &bno,0 );if (error) goto out_agbp_relse;
@@ -2767,6 +2768,7 @@ xfs_alloc_fix_freelist(*/ int xfs_alloc_get_freelist( + struct xfs_perag *pag, struct xfs_trans *tp, struct xfs_buf *agbp, xfs_agblock_t *bnop,
@@ -2779,7 +2781,6 @@ xfs_alloc_get_freelist(int error;uint32_t logflags;struct xfs_mount *mp = tp->t_mountp; -struct xfs_perag *pag;/* * Freelist is empty, give up.
@@ -2807,7 +2808,6 @@ xfs_alloc_get_freelist(if (be32_to_cpu (agf->agf_flfirst) ==xfs_agfl_size (mp)) agf->agf_flfirst =0 ; - pag = agbp->b_pag;ASSERT (!pag->pagf_agflreset);be32_add_cpu (&agf->agf_flcount,-1 ); pag->pagf_flcount--;
fs/xfs/libxfs/xfs_alloc.h +2 -11
@@ -95,6 +95,8 @@ xfs_extlen_t xfs_alloc_longest_free_extent(struct xfs_perag *pag, xfs_extlen_t need, xfs_extlen_t reserved);unsigned int xfs_alloc_min_freelist (struct xfs_mount *mp,struct xfs_perag *pag); +int xfs_alloc_get_freelist (struct xfs_perag *pag,struct xfs_trans *tp, +struct xfs_buf *agfbp,xfs_agblock_t *bnop,int btreeblk);/* * Compute and fill in value of m_alloc_maxlevels.
@@ -103,17 +105,6 @@ voidxfs_alloc_compute_maxlevels ( struct xfs_mount *mp); /* file system mount structure */ -/* -* Get a block from the freelist. -* Returns with the buffer for the block gotten. -*/ -int /* error */ -xfs_alloc_get_freelist ( -struct xfs_trans *tp,/* transaction pointer */ -struct xfs_buf *agbp,/* buffer containing the agf structure */ -xfs_agblock_t *bnop,/* block address retrieved from freelist */ -int btreeblk);/* destination is a AGF btree */ -/* * Log the given fields from the agf structure. */
fs/xfs/libxfs/xfs_alloc_btree.c +3 -3
@@ -60,8 +60,8 @@ xfs_allocbt_alloc_block(xfs_agblock_t bno;/* Allocate the new block from the freelist. If we can't, give up. */ - error =xfs_alloc_get_freelist (cur->bc_tp, cur->bc_ag.agbp, - &bno,1 ); + error =xfs_alloc_get_freelist (cur->bc_ag.pag, cur->bc_tp, + cur->bc_ag.agbp, &bno,1 );if (error)return error;
@@ -71,7 +71,7 @@ xfs_allocbt_alloc_block( }atomic64_inc (&cur->bc_mp->m_allocbt_blks); -xfs_extent_busy_reuse (cur->bc_mp, cur->bc_ag.agbp->b_pag, bno,1 , false); +xfs_extent_busy_reuse (cur->bc_mp, cur->bc_ag.pag, bno,1 , false); new->s =cpu_to_be32 (bno);
fs/xfs/libxfs/xfs_rmap_btree.c +1 -1
@@ -90,7 +90,7 @@ xfs_rmapbt_alloc_block(xfs_agblock_t bno;/* Allocate the new block from the freelist. If we can't, give up. */ - error =xfs_alloc_get_freelist (cur->bc_tp, cur->bc_ag.agbp, + error =xfs_alloc_get_freelist (pag, cur->bc_tp, cur->bc_ag.agbp, &bno,1 );if (error)return error;
fs/xfs/scrub/repair.c +3 -3
@@ -300,13 +300,13 @@ xrep_alloc_ag_block(switch (resv) {case XFS_AG_RESV_AGFL :case XFS_AG_RESV_RMAPBT : - error =xfs_alloc_get_freelist (sc->tp, sc->sa.agf_bp, &bno,1 ); + error =xfs_alloc_get_freelist (sc->sa.pag, sc->tp, + sc->sa.agf_bp, &bno,1 );if (error)return error;if (bno ==NULLAGBLOCK )return -ENOSPC ; -xfs_extent_busy_reuse (sc->mp, sc->sa.pag, bno, -1 , false); +xfs_extent_busy_reuse (sc->mp, sc->sa.pag, bno,1 , false); *fsbno =XFS_AGB_TO_FSB (sc->mp, sc->sa.pag->pag_agno, bno);if (resv ==XFS_AG_RESV_RMAPBT )xfs_ag_resv_rmapbt_alloc (sc->mp, sc->sa.pag->pag_agno);
Signature · 1 line
2.35.1
Re: [PATCH 08/50] xfs: pass perag to xfs_alloc_get_freelist
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 9/50 xfs: pass perag to xfs_alloc_put_freelist
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
It's available in all callers, so pass it in so that the perag can be passed further down the stack.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 5 ++--- fs/xfs/libxfs/xfs_alloc.h | 14 +++----------- fs/xfs/libxfs/xfs_alloc_btree.c | 3 ++- fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- fs/xfs/scrub/repair.c | 4 ++-- 5 files changed, 10 insertions(+), 18 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +2 -3
@@ -2742,7 +2742,7 @@ xfs_alloc_fix_freelist(* Put each allocated block on the list. */ for (bno = targs.agbno; bno < targs.agbno + targs.len; bno++) { - error =xfs_alloc_put_freelist (tp, agbp, + error =xfs_alloc_put_freelist (pag, tp, agbp, agflbp, bno,0 );if (error) goto out_agflbp_relse;
@@ -2872,6 +2872,7 @@ xfs_alloc_log_agf(*/ int xfs_alloc_put_freelist( + struct xfs_perag *pag, struct xfs_trans *tp, struct xfs_buf *agbp, struct xfs_buf *agflbp,
@@ -2880,7 +2881,6 @@ xfs_alloc_put_freelist( {struct xfs_mount *mp = tp->t_mountp;struct xfs_agf *agf = agbp->b_addr; -struct xfs_perag *pag;__be32 *blockp;int error;uint32_t logflags;
@@ -2894,7 +2894,6 @@ xfs_alloc_put_freelist(if (be32_to_cpu (agf->agf_fllast) ==xfs_agfl_size (mp)) agf->agf_fllast =0 ; - pag = agbp->b_pag;ASSERT (!pag->pagf_agflreset);be32_add_cpu (&agf->agf_flcount,1 ); pag->pagf_flcount++;
fs/xfs/libxfs/xfs_alloc.h +3 -11
@@ -97,6 +97,9 @@ unsigned int xfs_alloc_min_freelist(struct xfs_mount *mp, struct xfs_perag *pag);int xfs_alloc_get_freelist (struct xfs_perag *pag,struct xfs_trans *tp,struct xfs_buf *agfbp,xfs_agblock_t *bnop,int btreeblk); +int xfs_alloc_put_freelist (struct xfs_perag *pag,struct xfs_trans *tp, +struct xfs_buf *agfbp,struct xfs_buf *agflbp, +xfs_agblock_t bno,int btreeblk);/* * Compute and fill in value of m_alloc_maxlevels.
@@ -114,17 +117,6 @@ xfs_alloc_log_agf(struct xfs_buf *bp,/* buffer for a.g. freelist header */ uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) */ -/* -* Put the block on the freelist for the allocation group. -*/ -int /* error */ -xfs_alloc_put_freelist ( -struct xfs_trans *tp,/* transaction pointer */ -struct xfs_buf *agbp,/* buffer for a.g. freelist header */ -struct xfs_buf *agflbp,/* buffer for a.g. free block array */ -xfs_agblock_t bno,/* block being freed */ -int btreeblk);/* owner was a AGF btree */ -/* * Allocate an extent (variable-size). */
fs/xfs/libxfs/xfs_alloc_btree.c +2 -1
@@ -89,7 +89,8 @@ xfs_allocbt_free_block(int error; bno =xfs_daddr_to_agbno (cur->bc_mp,xfs_buf_daddr (bp)); - error =xfs_alloc_put_freelist (cur->bc_tp, agbp,NULL , bno,1 ); + error =xfs_alloc_put_freelist (cur->bc_ag.pag, cur->bc_tp, agbp,NULL , + bno,1 );if (error)return error;
fs/xfs/libxfs/xfs_rmap_btree.c +1 -1
@@ -129,7 +129,7 @@ xfs_rmapbt_free_block( bno, 1);be32_add_cpu (&agf->agf_rmap_blocks,-1 );xfs_alloc_log_agf (cur->bc_tp, agbp,XFS_AGF_RMAP_BLOCKS ); - error =xfs_alloc_put_freelist (cur->bc_tp, agbp,NULL , bno,1 ); + error =xfs_alloc_put_freelist (pag, cur->bc_tp, agbp,NULL , bno,1 );if (error)return error;
fs/xfs/scrub/repair.c +2 -2
@@ -516,8 +516,8 @@ xrep_put_freelist(return error;/* Put the block on the AGFL. */ - error =xfs_alloc_put_freelist (sc->tp, sc->sa.agf_bp, sc->sa.agfl_bp, - agbno,0 ); + error =xfs_alloc_put_freelist (sc->sa.pag, sc->tp, sc->sa.agf_bp, + sc->sa.agfl_bp, agbno,0 );if (error)return error; xfs_extent_busy_insert(sc->tp, sc->sa.pag, agbno, 1,
Signature · 1 line
2.35.1
Re: [PATCH 09/50] xfs: pass perag to xfs_alloc_put_freelist
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 10/50 xfs: pass perag to xfs_alloc_read_agfl
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We have the perag in most places we call xfs_alloc_read_agfl, so pass the perag instead of a mount/agno pair.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 31 ++++++++++++++++--------------- fs/xfs/libxfs/xfs_alloc.h | 4 ++-- fs/xfs/scrub/agheader_repair.c | 2 +- fs/xfs/scrub/common.c | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +16 -15
@@ -703,20 +703,19 @@ const struct xfs_buf_ops xfs_agfl_buf_ops = {/* * Read in the allocation group free block array. */ -int /* error */ +int xfs_alloc_read_agfl ( -xfs_mount_t *mp,/* mount point structure */ -xfs_trans_t *tp,/* transaction pointer */ -xfs_agnumber_t agno,/* allocation group number */ -struct xfs_buf **bpp)/* buffer for the ag free block array */ +struct xfs_perag *pag, +struct xfs_trans *tp, +struct xfs_buf **bpp) { -struct xfs_buf *bp;/* return value */ -int error; +struct xfs_mount *mp = pag->pag_mount; +struct xfs_buf *bp; +int error; -ASSERT (agno !=NULLAGNUMBER ); error =xfs_trans_read_buf ( mp, tp, mp->m_ddev_targp, -XFS_AG_DADDR (mp, agno,XFS_AGFL_DADDR (mp)), +XFS_AG_DADDR (mp, pag->pag_agno,XFS_AGFL_DADDR (mp)),XFS_FSS_TO_BB (mp,1 ),0 , &bp, &xfs_agfl_buf_ops);if (error)return error;
@@ -2713,7 +2712,7 @@ xfs_alloc_fix_freelist( targs.alignment = targs.minlen = targs.prod =1 ; targs.type =XFS_ALLOCTYPE_THIS_AG ; targs.pag = pag; - error =xfs_alloc_read_agfl (mp, tp, targs.agno, &agflbp); + error =xfs_alloc_read_agfl (pag, tp, &agflbp);if (error) goto out_agbp_relse;
@@ -2792,8 +2791,7 @@ xfs_alloc_get_freelist(/* * Read the array of free blocks. */ - error =xfs_alloc_read_agfl (mp, tp,be32_to_cpu (agf->agf_seqno), - &agflbp); + error =xfs_alloc_read_agfl (pag, tp, &agflbp);if (error)return error;
@@ -2887,9 +2885,12 @@ xfs_alloc_put_freelist(__be32 *agfl_bno;int startoff; -if (!agflbp && (error =xfs_alloc_read_agfl (mp, tp, -be32_to_cpu (agf->agf_seqno), &agflbp))) -return error; +if (!agflbp) { + error =xfs_alloc_read_agfl (pag, tp, &agflbp); +if (error) +return error; + } +be32_add_cpu (&agf->agf_fllast,1 );if (be32_to_cpu (agf->agf_fllast) ==xfs_agfl_size (mp)) agf->agf_fllast =0 ;
fs/xfs/libxfs/xfs_alloc.h +2 -2
@@ -172,8 +172,8 @@ int xfs_read_agf(struct xfs_perag *pag, struct xfs_trans *tp, int flags, struct xfs_buf **agfbpp);int xfs_alloc_read_agf (struct xfs_perag *pag,struct xfs_trans *tp,int flags,struct xfs_buf **agfbpp); -int xfs_alloc_read_agfl (struct xfs_mount *mp,struct xfs_trans *tp, -xfs_agnumber_t agno,struct xfs_buf **bpp); +int xfs_alloc_read_agfl (struct xfs_perag *pag,struct xfs_trans *tp, +struct xfs_buf **bpp);int xfs_free_agfl_block (struct xfs_trans *,xfs_agnumber_t ,xfs_agblock_t ,struct xfs_buf *,struct xfs_owner_info *);int xfs_alloc_fix_freelist (struct xfs_alloc_arg *args,int flags);
fs/xfs/scrub/agheader_repair.c +1 -1
@@ -405,7 +405,7 @@ xrep_agf(* btrees rooted in the AGF. If the AGFL contents are obviously bad * then we'll bail out. */ - error =xfs_alloc_read_agfl (mp, sc->tp, sc->sa.pag->pag_agno, &agfl_bp); + error =xfs_alloc_read_agfl (sc->sa.pag, sc->tp, &agfl_bp);if (error)return error;
fs/xfs/scrub/common.c +1 -1
@@ -424,7 +424,7 @@ xchk_ag_read_headers(if (error &&want_ag_read_header_failure (sc,XFS_SCRUB_TYPE_AGF ))return error; - error =xfs_alloc_read_agfl (mp, sc->tp, agno, &sa->agfl_bp); + error =xfs_alloc_read_agfl (sa->pag, sc->tp, &sa->agfl_bp);if (error &&want_ag_read_header_failure (sc,XFS_SCRUB_TYPE_AGFL ))return error;
Signature · 1 line
2.35.1
Re: [PATCH 10/50] xfs: pass perag to xfs_alloc_read_agfl
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
PATCH 11/50 xfs: Pre-calculate per-AG agbno geometry
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
There is a lot of overhead in functions like xfs_verify_agbno() that repeatedly calculate the geometry limits of an AG. These can be pre-calculated as they are static and the verification context has a per-ag context it can quickly reference.
In the case of xfs_verify_agbno(), we now always have a perag context handy, so we can store the AG length and the minimum valid block in the AG in the perag. This means we don't have to calculate it on every call and it can be inlined in callers if we move it to xfs_ag.h.
Move xfs_ag_block_count() to xfs_ag.c because it's really a per-ag function and not an XFS type function. We need a little bit of rework that is specific to xfs_initialise_perag() to allow growfs to calculate the new perag sizes before we've updated the primary superblock during the grow (chicken/egg situation).
Note that we leave the original xfs_verify_agbno in place in xfs_types.c as a static function as other callers in that file do not have per-ag contexts so still need to go the long way. It's been renamed to xfs_verify_agno_agbno() to indicate it takes both an agno and an agbno to differentiate it from new function.
Future commits will make similar changes for other per-ag geometry validation functions.
Further:
$ size --totals fs/xfs/built-in.a text data bss dec hex filename before 1137325 322835 484 1460644 1649a4 (TOTALS) after 1136681 322835 484 1460000 164720 (TOTALS)
This rework reduces the binary size by ~650 bytes, indicating that much less work is being done to bounds check the agbno values against on per-ag geometry information.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 40 +++++++++++++++++++++++++++++++++- fs/xfs/libxfs/xfs_ag.h | 21 +++++++++++++++++- fs/xfs/libxfs/xfs_alloc.c | 9 ++++---- fs/xfs/libxfs/xfs_btree.c | 25 +++++++++------------ fs/xfs/libxfs/xfs_refcount.c | 13 +++++------ fs/xfs/libxfs/xfs_rmap.c | 8 +++---- fs/xfs/libxfs/xfs_types.c | 18 +++------------ fs/xfs/libxfs/xfs_types.h | 3 --- fs/xfs/scrub/agheader.c | 19 ++++++++-------- fs/xfs/scrub/agheader_repair.c | 7 ++---- fs/xfs/scrub/alloc.c | 7 +++--- fs/xfs/scrub/ialloc.c | 6 ++--- fs/xfs/scrub/refcount.c | 7 +++--- fs/xfs/scrub/rmap.c | 6 ++--- fs/xfs/xfs_fsops.c | 2 +- fs/xfs/xfs_log_recover.c | 3 ++- fs/xfs/xfs_mount.c | 3 ++- 17 files changed, 115 insertions(+), 82 deletions(-)
fs/xfs/libxfs/xfs_ag.c +39 -1
@@ -201,10 +201,35 @@ xfs_free_perag( } } +/* Find the size of the AG, in blocks. */ +static xfs_agblock_t +__xfs_ag_block_count ( +struct xfs_mount *mp, +xfs_agnumber_t agno, +xfs_agnumber_t agcount, +xfs_rfsblock_t dblocks) +{ +ASSERT (agno < agcount); + +if (agno < agcount -1 ) +return mp->m_sb.sb_agblocks; +return dblocks - (agno * mp->m_sb.sb_agblocks); +} + +xfs_agblock_t +xfs_ag_block_count ( +struct xfs_mount *mp, +xfs_agnumber_t agno) +{ +return __xfs_ag_block_count (mp, agno, mp->m_sb.sb_agcount, + mp->m_sb.sb_dblocks); +} +int xfs_initialize_perag (struct xfs_mount *mp,xfs_agnumber_t agcount, +xfs_rfsblock_t dblocks,xfs_agnumber_t *maxagi) {struct xfs_perag *pag;
@@ -270,6 +295,13 @@ xfs_initialize_perag(/* first new pag is fully initialized */ if (first_initialised ==NULLAGNUMBER ) first_initialised = index; + +/* +* Pre-calculated geometry +*/ + pag->block_count =__xfs_ag_block_count (mp, index, agcount, + dblocks); + pag->min_block =XFS_AGFL_BLOCK (mp); } index =xfs_set_inode_alloc (mp, agcount);
@@ -926,10 +958,16 @@ xfs_ag_extend_space(if (error)return error; -return xfs_free_extent (tp,XFS_AGB_TO_FSB (pag->pag_mount, pag->pag_agno, + error =xfs_free_extent (tp,XFS_AGB_TO_FSB (pag->pag_mount, pag->pag_agno,be32_to_cpu (agf->agf_length) - len), len, &XFS_RMAP_OINFO_SKIP_UPDATE ,XFS_AG_RESV_NONE ); +if (error) +return error; + +/* Update perag geometry */ + pag->block_count =be32_to_cpu (agf->agf_length); +return 0 ; }/* Retrieve AG geometry. */
fs/xfs/libxfs/xfs_ag.h +20 -1
@@ -67,6 +67,10 @@ struct xfs_perag {/* for rcu-safe freeing */ struct rcu_head rcu_head; +/* Precalculated geometry info */ +xfs_agblock_t block_count; +xfs_agblock_t min_block; +#ifdef __KERNEL__/* -- kernel only structures below this line -- */
@@ -107,7 +111,7 @@ struct xfs_perag { };int xfs_initialize_perag (struct xfs_mount *mp,xfs_agnumber_t agcount, -xfs_agnumber_t *maxagi); +xfs_rfsblock_t dcount,xfs_agnumber_t *maxagi);int xfs_initialize_perag_data (struct xfs_mount *mp,xfs_agnumber_t agno);void xfs_free_perag (struct xfs_mount *mp);
@@ -116,6 +120,21 @@ struct xfs_perag *xfs_perag_get_tag(struct xfs_mount *mp, xfs_agnumber_t agno, unsigned int tag);void xfs_perag_put (struct xfs_perag *pag); +/* +* Per-ag geometry infomation and validation +*/ +xfs_agblock_t xfs_ag_block_count (struct xfs_mount *mp,xfs_agnumber_t agno); + +static inline bool +xfs_verify_agbno (struct xfs_perag *pag,xfs_agblock_t agbno) +{ +if (agbno >= pag->block_count) +return false; +if (agbno <= pag->min_block) +return false; +return true; +} +/* * Perag iteration APIs */
fs/xfs/libxfs/xfs_alloc.c +5 -4
@@ -248,7 +248,7 @@ xfs_alloc_get_rec( int *stat) /* output: success/failure */ {struct xfs_mount *mp = cur->bc_mp; -xfs_agnumber_t agno = cur->bc_ag.pag->pag_agno; +struct xfs_perag *pag = cur->bc_ag.pag;union xfs_btree_rec *rec;int error;
@@ -263,11 +263,11 @@ xfs_alloc_get_rec( goto out_bad_rec;/* check for valid extent range, including overflow */ -if (!xfs_verify_agbno (mp, agno, *bno)) +if (!xfs_verify_agbno (pag, *bno)) goto out_bad_rec;if (*bno > *bno + *len) goto out_bad_rec; -if (!xfs_verify_agbno (mp, agno, *bno + *len -1 )) +if (!xfs_verify_agbno (pag, *bno + *len -1 )) goto out_bad_rec;return 0 ;
@@ -275,7 +275,8 @@ xfs_alloc_get_rec( out_bad_rec:xfs_warn (mp,"%s Freespace BTree record corruption in AG %d detected!" , - cur->bc_btnum ==XFS_BTNUM_BNO ?"Block" :"Size" , agno); + cur->bc_btnum ==XFS_BTNUM_BNO ?"Block" :"Size" , + pag->pag_agno);xfs_warn (mp,"start block 0x%x block count 0x%x" , *bno, *len);return -EFSCORRUPTED ;
fs/xfs/libxfs/xfs_btree.c +10 -15
@@ -91,10 +91,9 @@ xfs_btree_check_lblock_siblings(static inline xfs_failaddr_t xfs_btree_check_sblock_siblings ( -struct xfs_mount *mp, +struct xfs_perag *pag,struct xfs_btree_cur *cur,int level, -xfs_agnumber_t agno,xfs_agblock_t agbno,__be32 dsibling) {
@@ -110,7 +109,7 @@ xfs_btree_check_sblock_siblings(if (!xfs_btree_check_sptr (cur, sibling, level +1 ))return __this_address; }else { -if (!xfs_verify_agbno (mp, agno, sibling)) +if (!xfs_verify_agbno (pag, sibling))return __this_address; }return NULL ;
@@ -195,11 +194,11 @@ __xfs_btree_check_sblock( struct xfs_buf *bp) {struct xfs_mount *mp = cur->bc_mp; +struct xfs_perag *pag = cur->bc_ag.pag;xfs_btnum_t btnum = cur->bc_btnum;int crc =xfs_has_crc (mp);xfs_failaddr_t fa;xfs_agblock_t agbno =NULLAGBLOCK ; -xfs_agnumber_t agno =NULLAGNUMBER ;if (crc) {if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))
@@ -217,16 +216,14 @@ __xfs_btree_check_sblock( cur->bc_ops->get_maxrecs(cur, level))return __this_address; -if (bp) { +if (bp) agbno =xfs_daddr_to_agbno (mp,xfs_buf_daddr (bp)); - agno =xfs_daddr_to_agno (mp,xfs_buf_daddr (bp)); - } - fa =xfs_btree_check_sblock_siblings (mp, cur, level, agno, agbno, + fa =xfs_btree_check_sblock_siblings (pag, cur, level, agbno, block->bb_u.s.bb_leftsib);if (!fa) - fa =xfs_btree_check_sblock_siblings (mp, cur, level, agno, - agbno, block->bb_u.s.bb_rightsib); + fa =xfs_btree_check_sblock_siblings (pag, cur, level, agbno, + block->bb_u.s.bb_rightsib);return fa; }
@@ -288,7 +285,7 @@ xfs_btree_check_sptr( {if (level <=0 )return false; -return xfs_verify_agbno (cur->bc_mp, cur->bc_ag.pag->pag_agno, agbno); +return xfs_verify_agbno (cur->bc_ag.pag, agbno); }/*
@@ -4595,7 +4592,6 @@ xfs_btree_sblock_verify( {struct xfs_mount *mp = bp->b_mount;struct xfs_btree_block *block =XFS_BUF_TO_BLOCK (bp); -xfs_agnumber_t agno;xfs_agblock_t agbno;xfs_failaddr_t fa;
@@ -4604,12 +4600,11 @@ xfs_btree_sblock_verify(return __this_address;/* sibling pointer verification */ - agno =xfs_daddr_to_agno (mp,xfs_buf_daddr (bp)); agbno =xfs_daddr_to_agbno (mp,xfs_buf_daddr (bp)); - fa =xfs_btree_check_sblock_siblings (mp,NULL ,-1 , agno, agbno, + fa =xfs_btree_check_sblock_siblings (bp->b_pag,NULL ,-1 , agbno, block->bb_u.s.bb_leftsib);if (!fa) - fa =xfs_btree_check_sblock_siblings (mp,NULL ,-1 , agno, agbno, + fa =xfs_btree_check_sblock_siblings (bp->b_pag,NULL ,-1 , agbno, block->bb_u.s.bb_rightsib);return fa; }
fs/xfs/libxfs/xfs_refcount.c +6 -7
@@ -111,7 +111,7 @@ xfs_refcount_get_rec( int *stat) {struct xfs_mount *mp = cur->bc_mp; -xfs_agnumber_t agno = cur->bc_ag.pag->pag_agno; +struct xfs_perag *pag = cur->bc_ag.pag;union xfs_btree_rec *rec;int error;xfs_agblock_t realstart;
@@ -121,8 +121,6 @@ xfs_refcount_get_rec(return error;xfs_refcount_btrec_to_irec (rec, irec); - - agno = cur->bc_ag.pag->pag_agno;if (irec->rc_blockcount ==0 || irec->rc_blockcount >MAXREFCEXTLEN ) goto out_bad_rec;
@@ -137,22 +135,23 @@ xfs_refcount_get_rec( }/* check for valid extent range, including overflow */ -if (!xfs_verify_agbno (mp, agno, realstart)) +if (!xfs_verify_agbno (pag, realstart)) goto out_bad_rec;if (realstart > realstart + irec->rc_blockcount) goto out_bad_rec; -if (!xfs_verify_agbno (mp, agno, realstart + irec->rc_blockcount -1 )) +if (!xfs_verify_agbno (pag, realstart + irec->rc_blockcount -1 )) goto out_bad_rec;if (irec->rc_refcount ==0 || irec->rc_refcount >MAXREFCOUNT ) goto out_bad_rec; -trace_xfs_refcount_get (cur->bc_mp, cur->bc_ag.pag->pag_agno, irec); +trace_xfs_refcount_get (cur->bc_mp, pag->pag_agno, irec);return 0 ; out_bad_rec:xfs_warn (mp, -"Refcount BTree record corruption in AG %d detected!" , agno); +"Refcount BTree record corruption in AG %d detected!" , + pag->pag_agno);xfs_warn (mp,"Start block 0x%x, block count 0x%x, references 0x%x" , irec->rc_startblock, irec->rc_blockcount, irec->rc_refcount);
fs/xfs/libxfs/xfs_rmap.c +4 -4
@@ -215,7 +215,7 @@ xfs_rmap_get_rec( int *stat) {struct xfs_mount *mp = cur->bc_mp; -xfs_agnumber_t agno = cur->bc_ag.pag->pag_agno; +struct xfs_perag *pag = cur->bc_ag.pag;union xfs_btree_rec *rec;int error;
@@ -235,12 +235,12 @@ xfs_rmap_get_rec( goto out_bad_rec; }else {/* check for valid extent range, including overflow */ -if (!xfs_verify_agbno (mp, agno, irec->rm_startblock)) +if (!xfs_verify_agbno (pag, irec->rm_startblock)) goto out_bad_rec;if (irec->rm_startblock > irec->rm_startblock + irec->rm_blockcount) goto out_bad_rec; -if (!xfs_verify_agbno (mp, agno, +if (!xfs_verify_agbno (pag, irec->rm_startblock + irec->rm_blockcount -1 )) goto out_bad_rec; }
@@ -254,7 +254,7 @@ xfs_rmap_get_rec( out_bad_rec:xfs_warn (mp,"Reverse Mapping BTree record corruption in AG %d detected!" , - agno); + pag->pag_agno); xfs_warn(mp, "Owner 0x%llx, flags 0x%x, start block 0x%x block count 0x%x", irec->rm_owner, irec->rm_flags, irec->rm_startblock,
fs/xfs/libxfs/xfs_types.c +3 -15
@@ -13,25 +13,13 @@#include "xfs_mount.h" #include "xfs_ag.h" -/* Find the size of the AG, in blocks. */ -inline xfs_agblock_t -xfs_ag_block_count ( -struct xfs_mount *mp, -xfs_agnumber_t agno) -{ -ASSERT (agno < mp->m_sb.sb_agcount); - -if (agno < mp->m_sb.sb_agcount -1 ) -return mp->m_sb.sb_agblocks; -return mp->m_sb.sb_dblocks - (agno * mp->m_sb.sb_agblocks); -}/* * Verify that an AG block number pointer neither points outside the AG * nor points at static metadata. */ -inline bool -xfs_verify_agbno ( +static inline bool +xfs_verify_agno_agbno (struct xfs_mount *mp,xfs_agnumber_t agno,xfs_agblock_t agbno)
@@ -59,7 +47,7 @@ xfs_verify_fsbno(if (agno >= mp->m_sb.sb_agcount)return false; -return xfs_verify_agbno (mp, agno,XFS_FSB_TO_AGBNO (mp, fsbno)); +return xfs_verify_agno_agbno (mp, agno,XFS_FSB_TO_AGBNO (mp, fsbno)); }/*
fs/xfs/libxfs/xfs_types.h +0 -3
@@ -179,9 +179,6 @@ enum xfs_ag_resv_type {*/ struct xfs_mount ; -xfs_agblock_t xfs_ag_block_count (struct xfs_mount *mp,xfs_agnumber_t agno); -bool xfs_verify_agbno (struct xfs_mount *mp,xfs_agnumber_t agno, -xfs_agblock_t agbno);bool xfs_verify_fsbno (struct xfs_mount *mp,xfs_fsblock_t fsbno);bool xfs_verify_fsbext (struct xfs_mount *mp,xfs_fsblock_t fsbno,xfs_fsblock_t len);
fs/xfs/scrub/agheader.c +9 -10
@@ -541,16 +541,16 @@ xchk_agf(/* Check the AG length */ eoag =be32_to_cpu (agf->agf_length); -if (eoag !=xfs_ag_block_count (mp, agno)) +if (eoag != pag->block_count)xchk_block_set_corrupt (sc, sc->sa.agf_bp);/* Check the AGF btree roots and levels */ agbno =be32_to_cpu (agf->agf_roots[XFS_BTNUM_BNO ]); -if (!xfs_verify_agbno (mp, agno, agbno)) +if (!xfs_verify_agbno (pag, agbno))xchk_block_set_corrupt (sc, sc->sa.agf_bp); agbno =be32_to_cpu (agf->agf_roots[XFS_BTNUM_CNT ]); -if (!xfs_verify_agbno (mp, agno, agbno)) +if (!xfs_verify_agbno (pag, agbno))xchk_block_set_corrupt (sc, sc->sa.agf_bp); level =be32_to_cpu (agf->agf_levels[XFS_BTNUM_BNO ]);
@@ -563,7 +563,7 @@ xchk_agf(if (xfs_has_rmapbt (mp)) { agbno =be32_to_cpu (agf->agf_roots[XFS_BTNUM_RMAP ]); -if (!xfs_verify_agbno (mp, agno, agbno)) +if (!xfs_verify_agbno (pag, agbno))xchk_block_set_corrupt (sc, sc->sa.agf_bp); level =be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAP ]);
@@ -573,7 +573,7 @@ xchk_agf(if (xfs_has_reflink (mp)) { agbno =be32_to_cpu (agf->agf_refcount_root); -if (!xfs_verify_agbno (mp, agno, agbno)) +if (!xfs_verify_agbno (pag, agbno))xchk_block_set_corrupt (sc, sc->sa.agf_bp); level =be32_to_cpu (agf->agf_refcount_level);
@@ -639,9 +639,8 @@ xchk_agfl_block( {struct xchk_agfl_info *sai = priv;struct xfs_scrub *sc = sai->sc; -xfs_agnumber_t agno = sc->sa.pag->pag_agno; -if (xfs_verify_agbno (mp, agno, agbno) && +if (xfs_verify_agbno (sc->sa.pag, agbno) && sai->nr_entries < sai->sz_entries) sai->entries[sai->nr_entries++] = agbno;else
@@ -871,12 +870,12 @@ xchk_agi(/* Check the AG length */ eoag =be32_to_cpu (agi->agi_length); -if (eoag !=xfs_ag_block_count (mp, agno)) +if (eoag != pag->block_count)xchk_block_set_corrupt (sc, sc->sa.agi_bp);/* Check btree roots and levels */ agbno =be32_to_cpu (agi->agi_root); -if (!xfs_verify_agbno (mp, agno, agbno)) +if (!xfs_verify_agbno (pag, agbno))xchk_block_set_corrupt (sc, sc->sa.agi_bp); level =be32_to_cpu (agi->agi_level);
@@ -885,7 +884,7 @@ xchk_agi(if (xfs_has_finobt (mp)) { agbno =be32_to_cpu (agi->agi_free_root); -if (!xfs_verify_agbno (mp, agno, agbno)) +if (!xfs_verify_agbno (pag, agbno))xchk_block_set_corrupt (sc, sc->sa.agi_bp); level =be32_to_cpu (agi->agi_free_level);
fs/xfs/scrub/agheader_repair.c +2 -5
@@ -106,7 +106,7 @@ xrep_agf_check_agfl_block( {struct xfs_scrub *sc = priv; -if (!xfs_verify_agbno (mp, sc->sa.pag->pag_agno, agbno)) +if (!xfs_verify_agbno (sc->sa.pag, agbno))return -EFSCORRUPTED ;return 0 ; }
@@ -130,10 +130,7 @@ xrep_check_btree_root( struct xfs_scrub *sc, struct xrep_find_ag_btree *fab) { - struct xfs_mount *mp = sc->mp; -xfs_agnumber_t agno = sc->sm->sm_agno; - -return xfs_verify_agbno (mp, agno, fab->root) && + return xfs_verify_agbno(sc->sa.pag, fab->root) && fab->height <= fab->maxlevels; }
fs/xfs/scrub/alloc.c +3 -4
@@ -93,8 +93,7 @@ xchk_allocbt_rec(struct xchk_btree *bs, const union xfs_btree_rec *rec) { - struct xfs_mount *mp = bs->cur->bc_mp; -xfs_agnumber_t agno = bs->cur->bc_ag.pag->pag_agno; + struct xfs_perag *pag = bs->cur->bc_ag.pag;xfs_agblock_t bno;xfs_extlen_t len;
@@ -102,8 +101,8 @@ xchk_allocbt_rec( len =be32_to_cpu (rec->alloc.ar_blockcount);if (bno + len <= bno || - !xfs_verify_agbno (mp, agno, bno) || - !xfs_verify_agbno (mp, agno, bno + len -1 )) + !xfs_verify_agbno (pag, bno) || + !xfs_verify_agbno (pag, bno + len -1 ))xchk_btree_set_corrupt (bs->sc, bs->cur,0 );xchk_allocbt_xref (bs->sc, bno, len);
fs/xfs/scrub/ialloc.c +3 -3
@@ -104,13 +104,13 @@ xchk_iallocbt_chunk( xfs_extlen_t len) {struct xfs_mount *mp = bs->cur->bc_mp; -xfs_agnumber_t agno = bs->cur->bc_ag.pag->pag_agno; +struct xfs_perag *pag = bs->cur->bc_ag.pag;xfs_agblock_t bno; bno =XFS_AGINO_TO_AGBNO (mp, agino);if (bno + len <= bno || - !xfs_verify_agbno (mp, agno, bno) || - !xfs_verify_agbno (mp, agno, bno + len -1 )) + !xfs_verify_agbno (pag, bno) || + !xfs_verify_agbno (pag, bno + len -1 ))xchk_btree_set_corrupt (bs->sc, bs->cur,0 );xchk_iallocbt_chunk_xref (bs->sc, irec, agino, bno, len);
fs/xfs/scrub/refcount.c +3 -4
@@ -332,9 +332,8 @@ xchk_refcountbt_rec(struct xchk_btree *bs, const union xfs_btree_rec *rec) { - struct xfs_mount *mp = bs->cur->bc_mp; xfs_agblock_t *cow_blocks = bs->private; -xfs_agnumber_t agno = bs->cur->bc_ag.pag->pag_agno; +struct xfs_perag *pag = bs->cur->bc_ag.pag;xfs_agblock_t bno;xfs_extlen_t len;xfs_nlink_t refcount;
@@ -354,8 +353,8 @@ xchk_refcountbt_rec(/* Check the extent. */ bno &= ~XFS_REFC_COW_START ;if (bno + len <= bno || - !xfs_verify_agbno (mp, agno, bno) || - !xfs_verify_agbno (mp, agno, bno + len -1 )) + !xfs_verify_agbno (pag, bno) || + !xfs_verify_agbno (pag, bno + len -1 ))xchk_btree_set_corrupt (bs->sc, bs->cur,0 );if (refcount ==0 )
fs/xfs/scrub/rmap.c +3 -3
@@ -92,7 +92,7 @@ xchk_rmapbt_rec( {struct xfs_mount *mp = bs->cur->bc_mp;struct xfs_rmap_irec irec; -xfs_agnumber_t agno = bs->cur->bc_ag.pag->pag_agno; +struct xfs_perag *pag = bs->cur->bc_ag.pag;bool non_inode;bool is_unwritten;bool is_bmbt;
@@ -121,8 +121,8 @@ xchk_rmapbt_rec(* Otherwise we must point somewhere past the static metadata * but before the end of the FS. Run the regular check. */ -if (!xfs_verify_agbno (mp, agno, irec.rm_startblock) || - !xfs_verify_agbno (mp, agno, irec.rm_startblock + +if (!xfs_verify_agbno (pag, irec.rm_startblock) || + !xfs_verify_agbno (pag, irec.rm_startblock + irec.rm_blockcount -1 ))xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); }
fs/xfs/xfs_fsops.c +1 -1
@@ -132,7 +132,7 @@ xfs_growfs_data_private( oagcount = mp->m_sb.sb_agcount;/* allocate the new per-ag structures */ if (nagcount > oagcount) { - error =xfs_initialize_perag (mp, nagcount, &nagimax); + error =xfs_initialize_perag (mp, nagcount, nb, &nagimax);if (error)return error; }else if (nagcount < oagcount) {
fs/xfs/xfs_log_recover.c +2 -1
@@ -3313,7 +3313,8 @@ xlog_do_recover(/* re-initialise in-core superblock and geometry structures */ mp->m_features |=xfs_sb_version_to_features (sbp);xfs_reinit_percpu_counters (mp); - error =xfs_initialize_perag (mp, sbp->sb_agcount, &mp->m_maxagi); + error =xfs_initialize_perag (mp, sbp->sb_agcount, sbp->sb_dblocks, + &mp->m_maxagi);if (error) {xfs_warn (mp,"Failed post-recovery per-ag init: %d" , error);return error;
fs/xfs/xfs_mount.c +2 -1
@@ -778,7 +778,8 @@ xfs_mountfs(/* * Allocate and initialize the per-ag data. */ - error =xfs_initialize_perag (mp, sbp->sb_agcount, &mp->m_maxagi); + error =xfs_initialize_perag (mp, sbp->sb_agcount, mp->m_sb.sb_dblocks, + &mp->m_maxagi);if (error) {xfs_warn (mp,"Failed per-ag init: %d" , error); goto out_free_dir;
Signature · 1 line
2.35.1
PATCH 12/50 xfs: Pre-calculate per-AG agino geometry
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
There is a lot of overhead in functions like xfs_verify_agino() that repeatedly calculate the geometry limits of an AG. These can be pre-calculated as they are static and the verification context has a per-ag context it can quickly reference.
In the case of xfs_verify_agino(), we now always have a perag context handy, so we can store the minimum and maximum agino values in the AG in the perag. This means we don't have to calculate it on every call and it can be inlined in callers if we move it to xfs_ag.h.
xfs_verify_agino_or_null() gets the same perag treatment.
xfs_agino_range() is moved to xfs_ag.c as it's not really a type function, and it's use is largely restricted as the first and last aginos can be grabbed straight from the perag in most cases.
Note that we leave the original xfs_verify_agino in place in xfs_types.c as a static function as other callers in that file do not have per-ag contexts so still need to go the long way. It's been renamed to xfs_verify_agno_agino() to indicate it takes both an agno and an agino to differentiate it from new function.
$ size --totals fs/xfs/built-in.a text data bss dec hex filename before 1136681 322835 484 1460000 164720 (TOTALS) after 1136315 322835 484 1459634 1645b2 (TOTALS)
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 39 +++++++++++++++++++++++++ fs/xfs/libxfs/xfs_ag.h | 30 +++++++++++++++++++ fs/xfs/libxfs/xfs_ialloc.c | 6 ++-- fs/xfs/libxfs/xfs_inode_buf.c | 3 +- fs/xfs/libxfs/xfs_sb.c | 9 ++++++ fs/xfs/libxfs/xfs_types.c | 55 ++++------------------------------- fs/xfs/libxfs/xfs_types.h | 6 ---- fs/xfs/scrub/agheader.c | 6 ++-- fs/xfs/scrub/ialloc.c | 6 ++-- fs/xfs/scrub/repair.c | 9 ++---- fs/xfs/xfs_inode.c | 14 ++++----- 11 files changed, 104 insertions(+), 79 deletions(-)
fs/xfs/libxfs/xfs_ag.c +39 -0
@@ -225,6 +225,41 @@ xfs_ag_block_count( mp->m_sb.sb_dblocks); } +/* Calculate the first and last possible inode number in an AG. */ +static void +__xfs_agino_range ( +struct xfs_mount *mp, +xfs_agblock_t eoag, +xfs_agino_t *first, +xfs_agino_t *last) +{ +xfs_agblock_t bno; + +/* +* Calculate the first inode, which will be in the first +* cluster-aligned block after the AGFL. +*/ + bno =round_up (XFS_AGFL_BLOCK (mp) +1 ,M_IGEO (mp)->cluster_align); + *first =XFS_AGB_TO_AGINO (mp, bno); + +/* +* Calculate the last inode, which will be at the end of the +* last (aligned) cluster that can be allocated in the AG. +*/ + bno =round_down (eoag,M_IGEO (mp)->cluster_align); + *last =XFS_AGB_TO_AGINO (mp, bno) -1 ; +} + +void +xfs_agino_range ( +struct xfs_mount *mp, +xfs_agnumber_t agno, +xfs_agino_t *first, +xfs_agino_t *last) +{ +return __xfs_agino_range (mp,xfs_ag_block_count (mp, agno), first, last); +} + int xfs_initialize_perag( struct xfs_mount *mp,
@@ -302,6 +337,8 @@ xfs_initialize_perag( pag->block_count =__xfs_ag_block_count (mp, index, agcount, dblocks); pag->min_block =XFS_AGFL_BLOCK (mp); +__xfs_agino_range (mp, pag->block_count, &pag->agino_min, + &pag->agino_max); } index =xfs_set_inode_alloc (mp, agcount);
@@ -967,6 +1004,8 @@ xfs_ag_extend_space(/* Update perag geometry */ pag->block_count =be32_to_cpu (agf->agf_length); +__xfs_agino_range (pag->pag_mount, pag->block_count, &pag->agino_min, + &pag->agino_max);return 0 ; }
fs/xfs/libxfs/xfs_ag.h +30 -0
@@ -70,6 +70,8 @@ struct xfs_perag {/* Precalculated geometry info */ xfs_agblock_t block_count;xfs_agblock_t min_block; +xfs_agino_t agino_min; +xfs_agino_t agino_max;#ifdef __KERNEL__/* -- kernel only structures below this line -- */
@@ -124,6 +126,8 @@ void xfs_perag_put(struct xfs_perag *pag);* Per-ag geometry infomation and validation */ xfs_agblock_t xfs_ag_block_count (struct xfs_mount *mp,xfs_agnumber_t agno); +void xfs_agino_range (struct xfs_mount *mp,xfs_agnumber_t agno, +xfs_agino_t *first,xfs_agino_t *last);static inline bool xfs_verify_agbno (struct xfs_perag *pag,xfs_agblock_t agbno)
@@ -135,6 +139,32 @@ xfs_verify_agbno(struct xfs_perag *pag, xfs_agblock_t agbno)return true; } +/* +* Verify that an AG inode number pointer neither points outside the AG +* nor points at static metadata. +*/ +static inline bool +xfs_verify_agino (struct xfs_perag *pag,xfs_agino_t agino) +{ +if (agino < pag->agino_min) +return false; +if (agino > pag->agino_max) +return false; +return true; +} + +/* +* Verify that an AG inode number pointer neither points outside the AG +* nor points at static metadata, or is NULLAGINO. +*/ +static inline bool +xfs_verify_agino_or_null (struct xfs_perag *pag,xfs_agino_t agino) +{ +if (agino ==NULLAGINO ) +return true; +return xfs_verify_agino (pag, agino); +} +/* * Perag iteration APIs */
fs/xfs/libxfs/xfs_ialloc.c +3 -3
@@ -105,7 +105,6 @@ xfs_inobt_get_rec( int *stat) {struct xfs_mount *mp = cur->bc_mp; -xfs_agnumber_t agno = cur->bc_ag.pag->pag_agno;union xfs_btree_rec *rec;int error;uint64_t realfree;
@@ -116,7 +115,7 @@ xfs_inobt_get_rec(xfs_inobt_btrec_to_irec (mp, rec, irec); -if (!xfs_verify_agino (mp, agno, irec->ir_startino)) +if (!xfs_verify_agino (cur->bc_ag.pag, irec->ir_startino)) goto out_bad_rec;if (irec->ir_count <XFS_INODES_PER_HOLEMASK_BIT || irec->ir_count >XFS_INODES_PER_CHUNK )
@@ -137,7 +136,8 @@ xfs_inobt_get_rec( out_bad_rec:xfs_warn (mp,"%s Inode BTree record corruption in AG %d detected!" , - cur->bc_btnum ==XFS_BTNUM_INO ?"Used" :"Free" , agno); + cur->bc_btnum ==XFS_BTNUM_INO ?"Used" :"Free" , + cur->bc_ag.pag->pag_agno); xfs_warn(mp, "start inode 0x%x, count 0x%x, free 0x%x freemask 0x%llx, holemask 0x%x", irec->ir_startino, irec->ir_count, irec->ir_freecount,
fs/xfs/libxfs/xfs_inode_buf.c +2 -1
@@ -10,6 +10,7 @@#include "xfs_log_format.h" #include "xfs_trans_resv.h" #include "xfs_mount.h" +#include "xfs_ag.h" #include "xfs_inode.h" #include "xfs_errortag.h" #include "xfs_error.h"
@@ -59,7 +60,7 @@ xfs_inode_buf_verify( unlinked_ino =be32_to_cpu (dip->di_next_unlinked); di_ok =xfs_verify_magic16 (bp, dip->di_magic) &&xfs_dinode_good_version (mp, dip->di_version) && -xfs_verify_agino_or_null (mp, agno, unlinked_ino); +xfs_verify_agino_or_null (bp->b_pag, unlinked_ino);if (unlikely (XFS_TEST_ERROR (!di_ok, mp,XFS_ERRTAG_ITOBP_INOTOBP ))) {if (readahead) {
fs/xfs/libxfs/xfs_sb.c +9 -0
@@ -246,6 +246,15 @@ xfs_validate_sb_write( (sbp->sb_fdblocks > sbp->sb_dblocks || !xfs_verify_icount(mp, sbp->sb_icount) || sbp->sb_ifree > sbp->sb_icount)) { +/* +printk("pag blocks %d agblocks %d min_ino %d max_ino %d\n", +bp->b_pag->block_count, +xfs_ag_block_count(mp, bp->b_pag->pag_agno), +bp->b_pag->agino_min, bp->b_pag->agino_max); +*/ +printk ("sb dblocks %lld fdblocks %lld icount %lld, ifree %lld\n" , + sbp->sb_dblocks, sbp->sb_fdblocks, sbp->sb_icount, + sbp->sb_ifree);xfs_warn (mp,"SB summary counter sanity check failed" );return -EFSCORRUPTED ; }
fs/xfs/libxfs/xfs_types.c +5 -50
83 lines not on this page · raw message
fs/xfs/libxfs/xfs_types.h +0 -6
@@ -183,12 +183,6 @@ bool xfs_verify_fsbno(struct xfs_mount *mp, xfs_fsblock_t fsbno);bool xfs_verify_fsbext (struct xfs_mount *mp,xfs_fsblock_t fsbno,xfs_fsblock_t len); -void xfs_agino_range (struct xfs_mount *mp,xfs_agnumber_t agno, -xfs_agino_t *first,xfs_agino_t *last); -bool xfs_verify_agino (struct xfs_mount *mp,xfs_agnumber_t agno, -xfs_agino_t agino); -bool xfs_verify_agino_or_null (struct xfs_mount *mp,xfs_agnumber_t agno, -xfs_agino_t agino);bool xfs_verify_ino (struct xfs_mount *mp,xfs_ino_t ino);bool xfs_internal_inum (struct xfs_mount *mp,xfs_ino_t ino);bool xfs_verify_dir_ino (struct xfs_mount *mp,xfs_ino_t ino);
fs/xfs/scrub/agheader.c +3 -3
@@ -901,17 +901,17 @@ xchk_agi(/* Check inode pointers */ agino =be32_to_cpu (agi->agi_newino); -if (!xfs_verify_agino_or_null (mp, agno, agino)) +if (!xfs_verify_agino_or_null (pag, agino))xchk_block_set_corrupt (sc, sc->sa.agi_bp); agino =be32_to_cpu (agi->agi_dirino); -if (!xfs_verify_agino_or_null (mp, agno, agino)) +if (!xfs_verify_agino_or_null (pag, agino))xchk_block_set_corrupt (sc, sc->sa.agi_bp);/* Check unlinked inode buckets */ for (i =0 ; i <XFS_AGI_UNLINKED_BUCKETS ; i++) { agino =be32_to_cpu (agi->agi_unlinked[i]); -if (!xfs_verify_agino_or_null (mp, agno, agino)) +if (!xfs_verify_agino_or_null (pag, agino))xchk_block_set_corrupt (sc, sc->sa.agi_bp); }
fs/xfs/scrub/ialloc.c +3 -3
@@ -421,10 +421,10 @@ xchk_iallocbt_rec( const union xfs_btree_rec *rec) {struct xfs_mount *mp = bs->cur->bc_mp; +struct xfs_perag *pag = bs->cur->bc_ag.pag;struct xchk_iallocbt *iabt = bs->private;struct xfs_inobt_rec_incore irec;uint64_t holes; -xfs_agnumber_t agno = bs->cur->bc_ag.pag->pag_agno;xfs_agino_t agino;xfs_extlen_t len;int holecount;
@@ -446,8 +446,8 @@ xchk_iallocbt_rec( agino = irec.ir_startino;/* Record has to be properly aligned within the AG. */ -if (!xfs_verify_agino (mp, agno, agino) || - !xfs_verify_agino (mp, agno, agino +XFS_INODES_PER_CHUNK -1 )) { +if (!xfs_verify_agino (pag, agino) || + !xfs_verify_agino (pag, agino +XFS_INODES_PER_CHUNK -1 )) {xchk_btree_set_corrupt (bs->sc, bs->cur,0 ); goto out; }
fs/xfs/scrub/repair.c +3 -6
@@ -220,16 +220,13 @@ xrep_calc_ag_resblks( usedlen = aglen - freelen;xfs_buf_relse (bp); } -xfs_perag_put (pag);/* If the icount is impossible, make some worst-case assumptions. */ if (icount ==NULLAGINO || - !xfs_verify_agino (mp, sm->sm_agno, icount)) { -xfs_agino_t first, last; - -xfs_agino_range (mp, sm->sm_agno, &first, &last); - icount = last - first +1 ; + !xfs_verify_agino (pag, icount)) { + icount = pag->agino_max - pag->agino_min +1 ; } +xfs_perag_put (pag);/* If the block counts are impossible, make worst-case assumptions. */ if (aglen == NULLAGBLOCK ||
fs/xfs/xfs_inode.c +7 -7
@@ -2022,7 +2022,7 @@ xfs_iunlink_update_bucket(xfs_agino_t old_value;int offset; -ASSERT (xfs_verify_agino_or_null (tp->t_mountp, pag->pag_agno, new_agino)); +ASSERT (xfs_verify_agino_or_null (pag, new_agino)); old_value =be32_to_cpu (agi->agi_unlinked[bucket_index]); trace_xfs_iunlink_update_bucket(tp->t_mountp, pag->pag_agno, bucket_index,
@@ -2059,7 +2059,7 @@ xfs_iunlink_update_dinode(struct xfs_mount *mp = tp->t_mountp;int offset; -ASSERT (xfs_verify_agino_or_null (mp, pag->pag_agno, next_agino)); +ASSERT (xfs_verify_agino_or_null (pag, next_agino));trace_xfs_iunlink_update_dinode (mp, pag->pag_agno, agino,be32_to_cpu (dip->di_next_unlinked), next_agino);
@@ -2089,7 +2089,7 @@ xfs_iunlink_update_inode(xfs_agino_t old_value;int error; -ASSERT (xfs_verify_agino_or_null (mp, pag->pag_agno, next_agino)); +ASSERT (xfs_verify_agino_or_null (pag, next_agino)); error =xfs_imap_to_bp (mp, tp, &ip->i_imap, &ibp);if (error)
@@ -2098,7 +2098,7 @@ xfs_iunlink_update_inode(/* Make sure the old pointer isn't garbage. */ old_value =be32_to_cpu (dip->di_next_unlinked); -if (!xfs_verify_agino_or_null (mp, pag->pag_agno, old_value)) { +if (!xfs_verify_agino_or_null (pag, old_value)) {xfs_inode_verifier_error (ip, -EFSCORRUPTED , __func__, dip,sizeof (*dip), __this_address); error = -EFSCORRUPTED ;
@@ -2169,7 +2169,7 @@ xfs_iunlink(*/ next_agino =be32_to_cpu (agi->agi_unlinked[bucket_index]);if (next_agino == agino || - !xfs_verify_agino_or_null (mp, pag->pag_agno, next_agino)) { + !xfs_verify_agino_or_null (pag, next_agino)) {xfs_buf_mark_corrupt (agibp); error = -EFSCORRUPTED ; goto out;
@@ -2305,7 +2305,7 @@ xfs_iunlink_map_prev(* Make sure this pointer is valid and isn't an obvious * infinite loop. */ -if (!xfs_verify_agino (mp, pag->pag_agno, unlinked_agino) || +if (!xfs_verify_agino (pag, unlinked_agino) || next_agino == unlinked_agino) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
@@ -2352,7 +2352,7 @@ xfs_iunlink_remove(* go on. Make sure the head pointer isn't garbage. */ head_agino =be32_to_cpu (agi->agi_unlinked[bucket_index]); -if (!xfs_verify_agino (mp, pag->pag_agno, head_agino)) { +if (!xfs_verify_agino (pag, head_agino)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, agi,sizeof (*agi));return -EFSCORRUPTED ;
Signature · 1 line
2.35.1
kernel test robot
build botRe: [PATCH 12/50] xfs: Pre-calculate per-AG agino geometry
Thank you for the patch! Perhaps something to improve:
Hi Dave,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on v5.19-rc1]
[also build test WARNING on next-20220610]
[cannot apply to xfs-linux/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 base: f2906aa863381afb0015a9eb7fefad885d4e5a56 config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20220611/[email protected]/config) compiler: arceb-elf-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/d341008ddc3f6c84be5dae69931ed7d24ec08db4
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Dave-Chinner/xfs-per-ag-centric-allocation-alogrithms/20220611-093037 git checkout d341008ddc3f6c84be5dae69931ed7d24ec08db4
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash fs/xfs/
If you fix the issue, kindly add following tag where applicable
Reported-by kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
fs/xfs/libxfs/xfs_inode_buf.c: In function 'xfs_inode_buf_verify':
>> fs/xfs/libxfs/xfs_inode_buf.c:45:25: warning: variable 'agno' set but not used [-Wunused-but-set-variable]
45 | xfs_agnumber_t agno;
| ^~~~vim +/agno +45 fs/xfs/libxfs/xfs_inode_buf.c
f0e28280629e0e fs/xfs/libxfs/xfs_inode_buf.c Jeff Layton 2017-12-11 23
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 24 /*
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 25 * If we are doing readahead on an inode buffer, we might be in log recovery
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 26 * reading an inode allocation buffer that hasn't yet been replayed, and hence
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 27 * has not had the inode cores stamped into it. Hence for readahead, the buffer
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 28 * may be potentially invalid.
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 29 *
b79f4a1c68bb99 fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2016-01-12 30 * If the readahead buffer is invalid, we need to mark it with an error and
b79f4a1c68bb99 fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2016-01-12 31 * clear the DONE status of the buffer so that a followup read will re-read it
b79f4a1c68bb99 fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2016-01-12 32 * from disk. We don't report the error otherwise to avoid warnings during log
06734e3c95a34e fs/xfs/libxfs/xfs_inode_buf.c Keyur Patel 2020-06-29 33 * recovery and we don't get unnecessary panics on debug kernels. We use EIO here
b79f4a1c68bb99 fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2016-01-12 34 * because all we want to do is say readahead failed; there is no-one to report
b79f4a1c68bb99 fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2016-01-12 35 * the error to, so this will distinguish it from a non-ra verifier failure.
06734e3c95a34e fs/xfs/libxfs/xfs_inode_buf.c Keyur Patel 2020-06-29 36 * Changes to this readahead error behaviour also need to be reflected in
7d6a13f023567d fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2016-01-12 37 * xfs_dquot_buf_readahead_verify().
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 38 */
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 39 static void
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 40 xfs_inode_buf_verify(
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 41 struct xfs_buf *bp,
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 42 bool readahead)
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 43 {
dbd329f1e44ed4 fs/xfs/libxfs/xfs_inode_buf.c Christoph Hellwig 2019-06-28 44 struct xfs_mount *mp = bp->b_mount;
6a96c5650568a2 fs/xfs/libxfs/xfs_inode_buf.c Darrick J. Wong 2018-03-23 @45 xfs_agnumber_t agno;
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 46 int i;
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 47 int ni;
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 48
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 49 /*
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 50 * Validate the magic number and version of every inode in the buffer
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 51 */
04fcad80cd0687 fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2021-08-18 52 agno = xfs_daddr_to_agno(mp, xfs_buf_daddr(bp));
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 53 ni = XFS_BB_TO_FSB(mp, bp->b_length) * mp->m_sb.sb_inopblock;
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 54 for (i = 0; i < ni; i++) {
de38db7239c4bd fs/xfs/libxfs/xfs_inode_buf.c Christoph Hellwig 2021-10-11 55 struct xfs_dinode *dip;
6a96c5650568a2 fs/xfs/libxfs/xfs_inode_buf.c Darrick J. Wong 2018-03-23 56 xfs_agino_t unlinked_ino;
de38db7239c4bd fs/xfs/libxfs/xfs_inode_buf.c Christoph Hellwig 2021-10-11 57 int di_ok;
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 58
88ee2df7f25911 fs/xfs/libxfs/xfs_inode_buf.c Christoph Hellwig 2015-06-22 59 dip = xfs_buf_offset(bp, (i << mp->m_sb.sb_inodelog));
6a96c5650568a2 fs/xfs/libxfs/xfs_inode_buf.c Darrick J. Wong 2018-03-23 60 unlinked_ino = be32_to_cpu(dip->di_next_unlinked);
15baadf72cedc2 fs/xfs/libxfs/xfs_inode_buf.c Darrick J. Wong 2019-02-16 61 di_ok = xfs_verify_magic16(bp, dip->di_magic) &&
cf28e17c9186c8 fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2021-08-18 62 xfs_dinode_good_version(mp, dip->di_version) &&
d341008ddc3f6c fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2022-06-11 63 xfs_verify_agino_or_null(bp->b_pag, unlinked_ino);
1fd7115eda5661 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-12 64 if (unlikely(XFS_TEST_ERROR(!di_ok, mp,
9e24cfd044853e fs/xfs/libxfs/xfs_inode_buf.c Darrick J. Wong 2017-06-20 65 XFS_ERRTAG_ITOBP_INOTOBP))) {
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 66 if (readahead) {
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 67 bp->b_flags &= ~XBF_DONE;
b79f4a1c68bb99 fs/xfs/libxfs/xfs_inode_buf.c Dave Chinner 2016-01-12 68 xfs_buf_ioerror(bp, -EIO);
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 69 return;
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 70 }
d8914002a03913 fs/xfs/xfs_inode_buf.c Dave Chinner 2013-08-27 71 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
PATCH 13/50 xfs: replace xfs_ag_block_count() with perag accesses
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Many of the places that call xfs_ag_block_count() have a perag available. These places can just read pag->block_count directly instead of calculating the AG block count from first principles.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ialloc_btree.c | 10 +++++----- fs/xfs/scrub/agheader_repair.c | 6 ++---- fs/xfs/scrub/repair.c | 8 ++++---- 3 files changed, 11 insertions(+), 13 deletions(-)
fs/xfs/libxfs/xfs_ialloc_btree.c +5 -5
@@ -683,10 +683,10 @@ xfs_inobt_rec_check_count(static xfs_extlen_t xfs_inobt_max_size ( -struct xfs_mount *mp, -xfs_agnumber_t agno) +struct xfs_perag *pag) { -xfs_agblock_t agblocks =xfs_ag_block_count (mp, agno); +struct xfs_mount *mp = pag->pag_mount; +xfs_agblock_t agblocks = pag->block_count;/* Bail out if we're uninitialized, which can happen in mkfs. */ if (M_IGEO (mp)->inobt_mxr[0 ] ==0 )
@@ -698,7 +698,7 @@ xfs_inobt_max_size(* expansion. We therefore can pretend the space isn't there. */ if (mp->m_sb.sb_logstart && -XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart) == agno) +XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart) == pag->pag_agno) agblocks -= mp->m_sb.sb_logblocks; return xfs_btree_calc_size(M_IGEO(mp)->inobt_mnr,
@@ -800,7 +800,7 @@ xfs_finobt_calc_reserves(if (error)return error; - *ask +=xfs_inobt_max_size (mp, pag->pag_agno); + *ask +=xfs_inobt_max_size (pag); *used += tree_len;return 0 ; }
fs/xfs/scrub/agheader_repair.c +2 -4
@@ -198,8 +198,7 @@ xrep_agf_init_header( agf->agf_magicnum =cpu_to_be32 (XFS_AGF_MAGIC ); agf->agf_versionnum =cpu_to_be32 (XFS_AGF_VERSION ); agf->agf_seqno =cpu_to_be32 (sc->sa.pag->pag_agno); - agf->agf_length =cpu_to_be32 (xfs_ag_block_count (mp, - sc->sa.pag->pag_agno)); + agf->agf_length =cpu_to_be32 (sc->sa.pag->block_count); agf->agf_flfirst = old_agf->agf_flfirst; agf->agf_fllast = old_agf->agf_fllast; agf->agf_flcount = old_agf->agf_flcount;
@@ -777,8 +776,7 @@ xrep_agi_init_header( agi->agi_magicnum =cpu_to_be32 (XFS_AGI_MAGIC ); agi->agi_versionnum =cpu_to_be32 (XFS_AGI_VERSION ); agi->agi_seqno =cpu_to_be32 (sc->sa.pag->pag_agno); - agi->agi_length =cpu_to_be32 (xfs_ag_block_count (mp, - sc->sa.pag->pag_agno)); + agi->agi_length =cpu_to_be32 (sc->sa.pag->block_count); agi->agi_newino =cpu_to_be32 (NULLAGINO ); agi->agi_dirino =cpu_to_be32 (NULLAGINO );if (xfs_has_crc (mp))
fs/xfs/scrub/repair.c +4 -4
@@ -209,7 +209,7 @@ xrep_calc_ag_resblks(/* Now grab the block counters from the AGF. */ error =xfs_alloc_read_agf (pag,NULL ,0 , &bp);if (error) { - aglen =xfs_ag_block_count (mp, sm->sm_agno); + aglen = pag->block_count; freelen = aglen; usedlen = aglen; }else {
@@ -226,16 +226,16 @@ xrep_calc_ag_resblks( !xfs_verify_agino(pag, icount)) { icount = pag->agino_max - pag->agino_min +1 ; } -xfs_perag_put (pag);/* If the block counts are impossible, make worst-case assumptions. */ if (aglen ==NULLAGBLOCK || - aglen !=xfs_ag_block_count (mp, sm->sm_agno) || + aglen != pag->block_count || freelen >= aglen) { - aglen =xfs_ag_block_count (mp, sm->sm_agno); + aglen = pag->block_count; freelen = aglen; usedlen = aglen; } +xfs_perag_put (pag);trace_xrep_calc_ag_resblks (mp, sm->sm_agno, icount, aglen, freelen, usedlen);
Signature · 1 line
2.35.1
PATCH 14/50 xfs: make is_log_ag() a first class helper
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We check if an ag contains the log in many places, so make this a first class XFS helper by lifting it to fs/xfs/libxfs/xfs_ag.h and renaming it xfs_ag_contains_log(). The convert all the places that check if the AG contains the log to use this helper.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 12 +++--------- fs/xfs/libxfs/xfs_ag.h | 7 +++++++ fs/xfs/libxfs/xfs_ialloc.c | 3 +-- fs/xfs/libxfs/xfs_ialloc_btree.c | 3 +-- fs/xfs/libxfs/xfs_refcount_btree.c | 3 +-- fs/xfs/libxfs/xfs_rmap_btree.c | 3 +-- fs/xfs/scrub/health.c | 2 ++ fs/xfs/scrub/refcount.c | 2 ++ 8 files changed, 18 insertions(+), 17 deletions(-)
fs/xfs/libxfs/xfs_ag.c +3 -9
@@ -390,12 +390,6 @@ xfs_get_aghdr_buf(return 0 ; } -static inline bool is_log_ag (struct xfs_mount *mp,struct aghdr_init_data *id) -{ -return mp->m_sb.sb_logstart >0 && - id->agno ==XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart); -} -/* * Generic btree root block init function */
@@ -421,7 +415,7 @@ xfs_freesp_init_recs( arec =XFS_ALLOC_REC_ADDR (mp,XFS_BUF_TO_BLOCK (bp),1 ); arec->ar_startblock =cpu_to_be32 (mp->m_ag_prealloc_blocks); -if (is_log_ag (mp, id)) { +if (xfs_ag_contains_log (mp, id->agno)) {struct xfs_alloc_rec *nrec;xfs_agblock_t start =XFS_FSB_TO_AGBNO (mp, mp->m_sb.sb_logstart);
@@ -548,7 +542,7 @@ xfs_rmaproot_init( }/* account for the log space */ -if (is_log_ag (mp, id)) { +if (xfs_ag_contains_log (mp, id->agno)) { rrec =XFS_RMAP_REC_ADDR (block,be16_to_cpu (block->bb_numrecs) +1 ); rrec->rm_startblock = cpu_to_be32(
@@ -619,7 +613,7 @@ xfs_agfblock_init( agf->agf_refcount_blocks =cpu_to_be32 (1 ); } -if (is_log_ag (mp, id)) { +if (xfs_ag_contains_log (mp, id->agno)) {int64_t logblocks = mp->m_sb.sb_logblocks;be32_add_cpu (&agf->agf_freeblks, -logblocks);
fs/xfs/libxfs/xfs_ag.h +7 -0
@@ -165,6 +165,13 @@ xfs_verify_agino_or_null(struct xfs_perag *pag, xfs_agino_t agino)return xfs_verify_agino (pag, agino); } +static inline bool +xfs_ag_contains_log (struct xfs_mount *mp,xfs_agnumber_t agno) +{ +return mp->m_sb.sb_logstart >0 && + agno ==XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart); +} +/* * Perag iteration APIs */
fs/xfs/libxfs/xfs_ialloc.c +1 -2
@@ -2897,8 +2897,7 @@ xfs_ialloc_calc_rootino(* allocation group, or very odd geometries created by old mkfs * versions on very small filesystems. */ -if (mp->m_sb.sb_logstart && -XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart) ==0 ) +if (xfs_ag_contains_log (mp,0 )) first_bno += mp->m_sb.sb_logblocks;/*
fs/xfs/libxfs/xfs_ialloc_btree.c +1 -2
@@ -697,8 +697,7 @@ xfs_inobt_max_size(* never be available for the kinds of things that would require btree * expansion. We therefore can pretend the space isn't there. */ -if (mp->m_sb.sb_logstart && -XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart) == pag->pag_agno) +if (xfs_ag_contains_log (mp, pag->pag_agno)) agblocks -= mp->m_sb.sb_logblocks; return xfs_btree_calc_size(M_IGEO(mp)->inobt_mnr,
fs/xfs/libxfs/xfs_refcount_btree.c +1 -2
@@ -507,8 +507,7 @@ xfs_refcountbt_calc_reserves(* never be available for the kinds of things that would require btree * expansion. We therefore can pretend the space isn't there. */ -if (mp->m_sb.sb_logstart && -XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart) == pag->pag_agno) +if (xfs_ag_contains_log (mp, pag->pag_agno)) agblocks -= mp->m_sb.sb_logblocks; *ask +=xfs_refcountbt_max_size (mp, agblocks);
fs/xfs/libxfs/xfs_rmap_btree.c +1 -2
@@ -666,8 +666,7 @@ xfs_rmapbt_calc_reserves(* never be available for the kinds of things that would require btree * expansion. We therefore can pretend the space isn't there. */ -if (mp->m_sb.sb_logstart && -XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart) == pag->pag_agno) +if (xfs_ag_contains_log (mp, pag->pag_agno)) agblocks -= mp->m_sb.sb_logblocks;/* Reserve 1% of the AG or enough for 1 block per record. */
fs/xfs/scrub/health.c +2 -0
@@ -8,6 +8,8 @@#include "xfs_shared.h" #include "xfs_format.h" #include "xfs_btree.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" #include "xfs_ag.h" #include "xfs_health.h" #include "scrub/scrub.h"
fs/xfs/scrub/refcount.c +2 -0
@@ -13,6 +13,8 @@#include "scrub/scrub.h" #include "scrub/common.h" #include "scrub/btree.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" #include "xfs_ag.h" /*
Signature · 1 line
2.35.1
PATCH 15/50 xfs: active perag reference counting
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We need to be able to dynamically remove instantiated AGs from memory safely, either for shrinking the filesystem or paging AG state in and out of memory (e.g. supporting millions of AGs). This means we need to be able to safely exclude operations from accessing perags while dynamic removal is in progress.
To do this, introduce the concept of active and passive references. Active references are required for high level operations that make use of an AG for a given operation (e.g. allocation) and pin the perag in memory for the duration of the operation that is operating on the perag (e.g. transaction scope). This means we can fail to get an active reference to an AG, hence callers of the new active reference API must be able to handle lookup failure gracefully.
Passive references are used in low level code, where we might need to access the perag structure for the purposes of completing high level operations. For example, buffers need to use passive references because:
- we need to be able to do metadata IO during operations like grow and shrink transactions where high level active references to the AG have already been blocked
- buffers need to pin the perag until they are reclaimed from memory, something that high level code has no direct control over.
- unused cached buffers should not prevent a shrink from being started.
Hence we have active references that will form exclusion barriers for operations to be performed on an AG, and passive references that will prevent reclaim of the perag until all objects with passive references have been reclaimed themselves.
This patch introduce xfs_perag_grab()/xfs_perag_rele() as the API for active AG reference functionality. We also need to convert the for_each_perag*() iterators to use active references, which will start the process of converting high level code over to using active references. Conversion of non-iterator based code to active references will be done in followup patches.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 74 +++++++++++++++++++++++++++++++++++++-- fs/xfs/libxfs/xfs_ag.h | 31 +++++++++++----- fs/xfs/scrub/bmap.c | 2 +- fs/xfs/scrub/fscounters.c | 4 +-- fs/xfs/xfs_fsmap.c | 4 +-- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_iwalk.c | 6 ++-- fs/xfs/xfs_reflink.c | 2 +- fs/xfs/xfs_trace.h | 3 ++ 9 files changed, 107 insertions(+), 21 deletions(-)
fs/xfs/libxfs/xfs_ag.c +72 -2
@@ -94,6 +94,68 @@ xfs_perag_put(trace_xfs_perag_put (pag->pag_mount, pag->pag_agno, ref, _RET_IP_); } +/* +* Active references for perag structures. This is for short term access to the +* per ag structures for walking trees or accessing state. If an AG is being +* shrunk or is offline, then this will fail to find that AG and return NULL +* instead. +*/ +struct xfs_perag * +xfs_perag_grab ( +struct xfs_mount *mp, +xfs_agnumber_t agno) +{ +struct xfs_perag *pag; + +rcu_read_lock (); + pag =radix_tree_lookup (&mp->m_perag_tree, agno); +if (pag) { +trace_xfs_perag_grab (mp, pag->pag_agno, +atomic_read (&pag->pag_active_ref), _RET_IP_); +if (!atomic_inc_not_zero (&pag->pag_active_ref)) + pag =NULL ; + } +rcu_read_unlock (); +return pag; +} + +/* +* search from @first to find the next perag with the given tag set. +*/ +struct xfs_perag * +xfs_perag_grab_tag ( +struct xfs_mount *mp, +xfs_agnumber_t first, +int tag) +{ +struct xfs_perag *pag; +int found; + +rcu_read_lock (); + found =radix_tree_gang_lookup_tag (&mp->m_perag_tree, + (void **)&pag, first,1 , tag); +if (found <=0 ) { +rcu_read_unlock (); +return NULL ; + } +trace_xfs_perag_grab_tag (mp, pag->pag_agno, +atomic_read (&pag->pag_active_ref), _RET_IP_); +if (!atomic_inc_not_zero (&pag->pag_active_ref)) + pag =NULL ; +rcu_read_unlock (); +return pag; +} + +void +xfs_perag_rele ( +struct xfs_perag *pag) +{ +trace_xfs_perag_rele (pag->pag_mount, pag->pag_agno, +atomic_read (&pag->pag_active_ref), _RET_IP_); +if (atomic_dec_and_test (&pag->pag_active_ref)) +wake_up (&pag->pag_active_wq); +} +/* * xfs_initialize_perag_data *
@@ -191,12 +253,15 @@ xfs_free_perag( pag =radix_tree_delete (&mp->m_perag_tree, agno);spin_unlock (&mp->m_perag_lock);ASSERT (pag); -XFS_IS_CORRUPT (pag->pag_mount,atomic_read (&pag->pag_ref) !=0 ); +XFS_IS_CORRUPT (mp,atomic_read (&pag->pag_ref) !=0 );cancel_delayed_work_sync (&pag->pag_blockgc_work);xfs_iunlink_destroy (pag);xfs_buf_hash_destroy (pag); +/* drop the mount's active reference */ +xfs_perag_rele (pag); +XFS_IS_CORRUPT (mp,atomic_read (&pag->pag_active_ref) !=0 );call_rcu (&pag->rcu_head, __xfs_free_perag); } }
@@ -315,6 +380,7 @@ xfs_initialize_perag(INIT_DELAYED_WORK (&pag->pag_blockgc_work, xfs_blockgc_worker);INIT_RADIX_TREE (&pag->pag_ici_root,GFP_ATOMIC );init_waitqueue_head (&pag->pagb_wait); +init_waitqueue_head (&pag->pag_active_wq); pag->pagb_count =0 ; pag->pagb_tree =RB_ROOT ;#endif /* __KERNEL__ */
@@ -327,6 +393,9 @@ xfs_initialize_perag(if (error) goto out_hash_destroy; +/* Active ref owned by mount indicates AG is online. */ +atomic_set (&pag->pag_active_ref,1 ); +/* first new pag is fully initialized */ if (first_initialised ==NULLAGNUMBER ) first_initialised = index;
@@ -363,7 +432,8 @@ xfs_initialize_perag(break ;xfs_buf_hash_destroy (pag);xfs_iunlink_destroy (pag); -kmem_free (pag); +xfs_perag_rele (pag); +__xfs_free_perag (&pag->rcu_head); }return error; }
fs/xfs/libxfs/xfs_ag.h +22 -9
@@ -32,7 +32,9 @@ struct xfs_ag_resv {struct xfs_perag {struct xfs_mount *pag_mount;/* owner filesystem */ xfs_agnumber_t pag_agno;/* AG this structure belongs to */ -atomic_t pag_ref;/* perag reference count */ +atomic_t pag_ref;/* passive reference count */ +atomic_t pag_active_ref;/* active reference count */ +wait_queue_head_t pag_active_wq;/* woken active_ref falls to zero */ char pagf_init;/* this agf's entry is initialized */ char pagi_init;/* this agi's entry is initialized */ char pagf_metadata;/* the agf is preferred to be metadata */
@@ -117,11 +119,18 @@ int xfs_initialize_perag(struct xfs_mount *mp, xfs_agnumber_t agcount,int xfs_initialize_perag_data (struct xfs_mount *mp,xfs_agnumber_t agno);void xfs_free_perag (struct xfs_mount *mp); +/* Passive AG references */ struct xfs_perag *xfs_perag_get (struct xfs_mount *mp,xfs_agnumber_t agno);struct xfs_perag *xfs_perag_get_tag (struct xfs_mount *mp,xfs_agnumber_t agno,unsigned int tag);void xfs_perag_put (struct xfs_perag *pag); +/* Active AG references */ +struct xfs_perag *xfs_perag_grab (struct xfs_mount *,xfs_agnumber_t ); +struct xfs_perag *xfs_perag_grab_tag (struct xfs_mount *,xfs_agnumber_t , +int tag); +void xfs_perag_rele (struct xfs_perag *pag); +/* * Per-ag geometry infomation and validation */
@@ -184,14 +193,18 @@ xfs_perag_next(struct xfs_mount *mp = pag->pag_mount; *agno = pag->pag_agno +1 ; -xfs_perag_put (pag); -if (*agno > end_agno) -return NULL ; -return xfs_perag_get (mp, *agno); +xfs_perag_rele (pag); +while (*agno <= end_agno) { + pag =xfs_perag_grab (mp, *agno); +if (pag) +return pag; + (*agno)++; + } +return NULL ; }#define for_each_perag_range (mp, agno, end_agno, pag) \ - for ((pag) = xfs_perag_get((mp), (agno)); \ + for ((pag) = xfs_perag_grab((mp), (agno)); \ (pag) != NULL; \ (pag) = xfs_perag_next((pag), &(agno), (end_agno)))
@@ -204,11 +217,11 @@ xfs_perag_next( for_each_perag_from((mp), (agno), (pag))#define for_each_perag_tag (mp, agno, pag, tag) \ - for ((agno) = 0, (pag) = xfs_perag_get_tag((mp), 0, (tag)); \ + for ((agno) = 0, (pag) = xfs_perag_grab_tag((mp), 0, (tag)); \ (pag) != NULL; \ (agno) = (pag)->pag_agno + 1, \ - xfs_perag_put(pag), \ - (pag) = xfs_perag_get_tag((mp), (agno), (tag))) + xfs_perag_rele(pag), \ + (pag) = xfs_perag_grab_tag((mp), (agno), (tag)))struct aghdr_init_data {/* per ag data */
fs/xfs/scrub/bmap.c +1 -1
@@ -605,7 +605,7 @@ xchk_bmap_check_rmaps(break ; }if (pag) -xfs_perag_put (pag); +xfs_perag_rele (pag);return error; }
fs/xfs/scrub/fscounters.c +2 -2
@@ -105,7 +105,7 @@ xchk_fscount_warmup(if (agi_bp)xfs_buf_relse (agi_bp);if (pag) -xfs_perag_put (pag); +xfs_perag_rele (pag);return error; }
@@ -224,7 +224,7 @@ xchk_fscount_aggregate_agcounts( }if (pag) -xfs_perag_put (pag); +xfs_perag_rele (pag);if (error)return error;
fs/xfs/xfs_fsmap.c +2 -2
@@ -688,11 +688,11 @@ __xfs_getfsmap_datadev( info->agf_bp =NULL ; }if (info->pag) { -xfs_perag_put (info->pag); +xfs_perag_rele (info->pag); info->pag =NULL ; }else if (pag) {/* loop termination case */ -xfs_perag_put (pag); +xfs_perag_rele (pag); }return error;
fs/xfs/xfs_icache.c +1 -1
@@ -1759,7 +1759,7 @@ xfs_icwalk(if (error) { last_error = error;if (error == -EFSCORRUPTED ) { -xfs_perag_put (pag); +xfs_perag_rele (pag);break ; } }
fs/xfs/xfs_iwalk.c +3 -3
@@ -591,7 +591,7 @@ xfs_iwalk( }if (iwag.pag) -xfs_perag_put (pag); +xfs_perag_rele (pag);xfs_iwalk_free (&iwag);return error; }
@@ -683,7 +683,7 @@ xfs_iwalk_threaded(break ; }if (pag) -xfs_perag_put (pag); +xfs_perag_rele (pag);if (polled)xfs_pwork_poll (&pctl);return xfs_pwork_destroy (&pctl);
@@ -776,7 +776,7 @@ xfs_inobt_walk( }if (iwag.pag) -xfs_perag_put (pag); +xfs_perag_rele (pag);xfs_iwalk_free (&iwag);return error; }
fs/xfs/xfs_reflink.c +1 -1
@@ -799,7 +799,7 @@ xfs_reflink_recover_cow(for_each_perag (mp, agno, pag) { error =xfs_refcount_recover_cow_leftovers (mp, pag);if (error) { -xfs_perag_put (pag); +xfs_perag_rele (pag);break ; } }
fs/xfs/xfs_trace.h +3 -0
@@ -189,6 +189,9 @@ DEFINE_EVENT(xfs_perag_class, name, \DEFINE_PERAG_REF_EVENT (xfs_perag_get);DEFINE_PERAG_REF_EVENT (xfs_perag_get_tag);DEFINE_PERAG_REF_EVENT (xfs_perag_put); +DEFINE_PERAG_REF_EVENT (xfs_perag_grab); +DEFINE_PERAG_REF_EVENT (xfs_perag_grab_tag); +DEFINE_PERAG_REF_EVENT (xfs_perag_rele);DEFINE_PERAG_REF_EVENT (xfs_perag_set_inode_tag);DEFINE_PERAG_REF_EVENT (xfs_perag_clear_inode_tag);
Signature · 1 line
2.35.1
PATCH 16/50 xfs: rework the perag trace points to be perag centric
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
So that they all output the same information in the traces to make debugging refcount issues easier.
This means that all the lookup/drop functions no longer need to use the full memory barrier atomic operations (atomic*_return()) so will have less overhead when tracing is off. The set/clear tag tracepoints no longer abuse the reference count to pass the tag - the tag being cleared is obvious from the _RET_IP_ that is recorded in the trace point.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 25 +++++++++---------------- fs/xfs/xfs_icache.c | 4 ++-- fs/xfs/xfs_trace.h | 21 +++++++++++---------- 3 files changed, 22 insertions(+), 28 deletions(-)
fs/xfs/libxfs/xfs_ag.c +9 -16
@@ -44,16 +44,15 @@ xfs_perag_get( xfs_agnumber_t agno) {struct xfs_perag *pag; -int ref =0 ;rcu_read_lock (); pag =radix_tree_lookup (&mp->m_perag_tree, agno);if (pag) { +trace_xfs_perag_get (pag, _RET_IP_);ASSERT (atomic_read (&pag->pag_ref) >=0 ); - ref =atomic_inc_return (&pag->pag_ref); +atomic_inc (&pag->pag_ref); }rcu_read_unlock (); -trace_xfs_perag_get (mp, agno, ref, _RET_IP_);return pag; }
@@ -68,7 +67,6 @@ xfs_perag_get_tag( {struct xfs_perag *pag;int found; -int ref;rcu_read_lock (); found = radix_tree_gang_lookup_tag(&mp->m_perag_tree,
@@ -77,9 +75,9 @@ xfs_perag_get_tag(rcu_read_unlock ();return NULL ; } - ref =atomic_inc_return (&pag->pag_ref); +trace_xfs_perag_get_tag (pag, _RET_IP_); +atomic_inc (&pag->pag_ref);rcu_read_unlock (); -trace_xfs_perag_get_tag (mp, pag->pag_agno, ref, _RET_IP_);return pag; }
@@ -87,11 +85,9 @@ voidxfs_perag_put ( struct xfs_perag *pag) { -int ref; - +trace_xfs_perag_put (pag, _RET_IP_);ASSERT (atomic_read (&pag->pag_ref) >0 ); - ref =atomic_dec_return (&pag->pag_ref); -trace_xfs_perag_put (pag->pag_mount, pag->pag_agno, ref, _RET_IP_); +atomic_dec (&pag->pag_ref); }/*
@@ -110,8 +106,7 @@ xfs_perag_grab(rcu_read_lock (); pag =radix_tree_lookup (&mp->m_perag_tree, agno);if (pag) { -trace_xfs_perag_grab (mp, pag->pag_agno, -atomic_read (&pag->pag_active_ref), _RET_IP_); +trace_xfs_perag_grab (pag, _RET_IP_);if (!atomic_inc_not_zero (&pag->pag_active_ref)) pag =NULL ; }
@@ -138,8 +133,7 @@ xfs_perag_grab_tag(rcu_read_unlock ();return NULL ; } -trace_xfs_perag_grab_tag (mp, pag->pag_agno, -atomic_read (&pag->pag_active_ref), _RET_IP_); +trace_xfs_perag_grab_tag (pag, _RET_IP_);if (!atomic_inc_not_zero (&pag->pag_active_ref)) pag =NULL ;rcu_read_unlock ();
@@ -150,8 +144,7 @@ voidxfs_perag_rele ( struct xfs_perag *pag) { -trace_xfs_perag_rele (pag->pag_mount, pag->pag_agno, -atomic_read (&pag->pag_active_ref), _RET_IP_); +trace_xfs_perag_rele (pag, _RET_IP_);if (atomic_dec_and_test (&pag->pag_active_ref))wake_up (&pag->pag_active_wq); }
fs/xfs/xfs_icache.c +2 -2
@@ -254,7 +254,7 @@ xfs_perag_set_inode_tag(break ; } -trace_xfs_perag_set_inode_tag (mp, pag->pag_agno, tag, _RET_IP_); +trace_xfs_perag_set_inode_tag (pag, _RET_IP_); }/* Clear a tag on both the AG incore inode tree and the AG radix tree. */
@@ -288,7 +288,7 @@ xfs_perag_clear_inode_tag(radix_tree_tag_clear (&mp->m_perag_tree, pag->pag_agno, tag);spin_unlock (&mp->m_perag_lock); -trace_xfs_perag_clear_inode_tag (mp, pag->pag_agno, tag, _RET_IP_); +trace_xfs_perag_clear_inode_tag (pag, _RET_IP_); }/*
fs/xfs/xfs_trace.h +11 -10
@@ -159,33 +159,34 @@ TRACE_EVENT(xlog_intent_recovery_failed, );DECLARE_EVENT_CLASS (xfs_perag_class, - TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int refcount, - unsigned long caller_ip), -TP_ARGS (mp, agno, refcount, caller_ip), + TP_PROTO(struct xfs_perag *pag, unsigned long caller_ip), +TP_ARGS (pag, caller_ip),TP_STRUCT__entry ( __field(dev_t, dev) __field(xfs_agnumber_t, agno) __field(int, refcount) + __field(int, active_refcount) __field(unsigned long, caller_ip) ),TP_fast_assign ( - __entry->dev = mp->m_super->s_dev; - __entry->agno = agno; - __entry->refcount = refcount; + __entry->dev = pag->pag_mount->m_super->s_dev; + __entry->agno = pag->pag_agno; + __entry->refcount = atomic_read(&pag->pag_ref); + __entry->active_refcount = atomic_read(&pag->pag_active_ref); __entry->caller_ip = caller_ip; ), -TP_printk ("dev %d:%d agno 0x%x refcount %d caller %pS" , +TP_printk ("dev %d:%d agno 0x%x passive refs %d active refs %d caller %pS" ,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->agno, __entry->refcount, + __entry->active_refcount, (char *)__entry->caller_ip) );#define DEFINE_PERAG_REF_EVENT (name) \ DEFINE_EVENT(xfs_perag_class, name, \ - TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int refcount, \ - unsigned long caller_ip), \ - TP_ARGS(mp, agno, refcount, caller_ip)) + TP_PROTO(struct xfs_perag *pag, unsigned long caller_ip), \ + TP_ARGS(pag, caller_ip))DEFINE_PERAG_REF_EVENT (xfs_perag_get);DEFINE_PERAG_REF_EVENT (xfs_perag_get_tag);DEFINE_PERAG_REF_EVENT (xfs_perag_put);
Signature · 1 line
2.35.1
PATCH 17/50 xfs: convert xfs_imap() to take a perag
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Callers have referenced perags but they don't pass it into xfs_imap() so it takes it's own reference. Fix that so we can change inode allocation over to using active references.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ialloc.c | 43 +++++++++++++------------------------- fs/xfs/libxfs/xfs_ialloc.h | 3 ++- fs/xfs/scrub/common.c | 13 ++++++++---- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_inode.c | 9 ++++---- 5 files changed, 32 insertions(+), 38 deletions(-)
fs/xfs/libxfs/xfs_ialloc.c +15 -28
@@ -2200,15 +2200,15 @@ xfs_difree( STATIC intxfs_imap_lookup ( -struct xfs_mount *mp, -struct xfs_trans *tp,struct xfs_perag *pag, +struct xfs_trans *tp,xfs_agino_t agino,xfs_agblock_t agbno,xfs_agblock_t *chunk_agbno,xfs_agblock_t *offset_agbno,int flags) { +struct xfs_mount *mp = pag->pag_mount;struct xfs_inobt_rec_incore rec;struct xfs_btree_cur *cur;struct xfs_buf *agbp;
@@ -2263,12 +2263,13 @@ xfs_imap_lookup(*/ int xfs_imap ( -struct xfs_mount *mp,/* file system mount structure */ +struct xfs_perag *pag,struct xfs_trans *tp,/* transaction pointer */ xfs_ino_t ino,/* inode to locate */ struct xfs_imap *imap,/* location map structure */ uint flags)/* flags for inode btree lookup */ { +struct xfs_mount *mp = pag->pag_mount;xfs_agblock_t agbno;/* block number of inode in the alloc group */ xfs_agino_t agino;/* inode number within alloc group */ xfs_agblock_t chunk_agbno;/* first block in inode chunk */
@@ -2276,17 +2277,15 @@ xfs_imap(int error;/* error code */ int offset;/* index of inode in its buffer */ xfs_agblock_t offset_agbno;/* blks from chunk start to inode */ -struct xfs_perag *pag;ASSERT (ino !=NULLFSINO );/* * Split up the inode number into its parts. */ - pag =xfs_perag_get (mp,XFS_INO_TO_AGNO (mp, ino)); agino =XFS_INO_TO_AGINO (mp, ino); agbno =XFS_AGINO_TO_AGBNO (mp, agino); -if (!pag || agbno >= mp->m_sb.sb_agblocks || +if (agbno >= mp->m_sb.sb_agblocks || ino !=XFS_AGINO_TO_INO (mp, pag->pag_agno, agino)) { error = -EINVAL ;#ifdef DEBUG
@@ -2295,20 +2294,14 @@ xfs_imap(* as they can be invalid without implying corruption. */ if (flags &XFS_IGET_UNTRUSTED ) - goto out_drop; -if (!pag) { -xfs_alert (mp, -"%s: agno (%d) >= mp->m_sb.sb_agcount (%d)" , - __func__,XFS_INO_TO_AGNO (mp, ino), - mp->m_sb.sb_agcount); - } +return error;if (agbno >= mp->m_sb.sb_agblocks) {xfs_alert (mp,"%s: agbno (0x%llx) >= mp->m_sb.sb_agblocks (0x%lx)" , __func__, (unsigned long long )agbno, (unsigned long )mp->m_sb.sb_agblocks); } -if (pag && ino !=XFS_AGINO_TO_INO (mp, pag->pag_agno, agino)) { +if (ino !=XFS_AGINO_TO_INO (mp, pag->pag_agno, agino)) { xfs_alert(mp, "%s: ino (0x%llx) != XFS_AGINO_TO_INO() (0x%llx)", __func__, ino,
@@ -2316,7 +2309,7 @@ xfs_imap( }xfs_stack_trace ();#endif /* DEBUG */ - goto out_drop; +return error; }/*
@@ -2327,10 +2320,10 @@ xfs_imap(* in all cases where an untrusted inode number is passed. */ if (flags &XFS_IGET_UNTRUSTED ) { - error =xfs_imap_lookup (mp, tp, pag, agino, agbno, + error =xfs_imap_lookup (pag, tp, agino, agbno, &chunk_agbno, &offset_agbno, flags);if (error) - goto out_drop; +return error; goto out_map; }
@@ -2346,8 +2339,7 @@ xfs_imap( imap->im_len =XFS_FSB_TO_BB (mp,1 ); imap->im_boffset = (unsigned short )(offset << mp->m_sb.sb_inodelog); - error =0 ; - goto out_drop; +return 0 ; }/*
@@ -2359,10 +2351,10 @@ xfs_imap( offset_agbno = agbno &M_IGEO (mp)->inoalign_mask; chunk_agbno = agbno - offset_agbno; }else { - error =xfs_imap_lookup (mp, tp, pag, agino, agbno, + error =xfs_imap_lookup (pag, tp, agino, agbno, &chunk_agbno, &offset_agbno, flags);if (error) - goto out_drop; +return error; } out_map:
@@ -2390,14 +2382,9 @@ xfs_imap( __func__, (unsigned long long ) imap->im_blkno, (unsigned long long ) imap->im_len, XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks)); - error = -EINVAL ; - goto out_drop; +return -EINVAL ; } - error =0 ; -out_drop: -if (pag) -xfs_perag_put (pag); -return error; +return 0 ; }/*
fs/xfs/libxfs/xfs_ialloc.h +2 -1
@@ -12,6 +12,7 @@ struct xfs_imap;struct xfs_mount ;struct xfs_trans ;struct xfs_btree_cur ; +struct xfs_perag ;/* Move inodes in clusters of this size */ #define XFS_INODE_BIG_CLUSTER_SIZE 8192
@@ -47,7 +48,7 @@ int xfs_difree(struct xfs_trans *tp, struct xfs_perag *pag,*/ int xfs_imap( - struct xfs_mount *mp, /* file system mount structure */ + struct xfs_perag *pag, struct xfs_trans *tp, /* transaction pointer */ xfs_ino_t ino, /* inode to locate */ struct xfs_imap *imap, /* location map structure */
fs/xfs/scrub/common.c +9 -4
@@ -644,6 +644,7 @@ xchk_get_inode( {struct xfs_imap imap;struct xfs_mount *mp = sc->mp; +struct xfs_perag *pag;struct xfs_inode *ip_in =XFS_I (file_inode (sc->file));struct xfs_inode *ip =NULL ;int error;
@@ -679,10 +680,14 @@ xchk_get_inode(* Otherwise, we really couldn't find it so tell userspace * that it no longer exists. */ - error =xfs_imap (sc->mp, sc->tp, sc->sm->sm_ino, &imap, -XFS_IGET_UNTRUSTED |XFS_IGET_DONTCACHE ); -if (error) -return -ENOENT ; + pag =xfs_perag_get (mp,XFS_INO_TO_AGNO (mp, sc->sm->sm_ino)); +if (pag) { + error =xfs_imap (pag, sc->tp, sc->sm->sm_ino, &imap, +XFS_IGET_UNTRUSTED |XFS_IGET_DONTCACHE ); +xfs_perag_put (pag); +if (error) +return -ENOENT ; + } error = -EFSCORRUPTED ; fallthrough;default :
fs/xfs/xfs_icache.c +1 -1
@@ -579,7 +579,7 @@ xfs_iget_cache_miss(if (!ip)return -ENOMEM ; - error =xfs_imap (mp, tp, ip->i_ino, &ip->i_imap, flags); + error =xfs_imap (pag, tp, ip->i_ino, &ip->i_imap, flags);if (error) goto out_destroy;
fs/xfs/xfs_inode.c +5 -4
@@ -2207,8 +2207,8 @@ xfs_iunlink(/* Return the imap, dinode pointer, and buffer for an inode. */ STATIC int xfs_iunlink_map_ino( + struct xfs_perag *pag, struct xfs_trans *tp, - xfs_agnumber_t agno, xfs_agino_t agino, struct xfs_imap *imap, struct xfs_dinode **dipp,
@@ -2218,7 +2218,8 @@ xfs_iunlink_map_ino(int error; imap->im_blkno =0 ; - error =xfs_imap (mp, tp,XFS_AGINO_TO_INO (mp, agno, agino), imap,0 ); + error =xfs_imap (pag, tp,XFS_AGINO_TO_INO (mp, pag->pag_agno, agino), + imap,0 );if (error) {xfs_warn (mp,"%s: xfs_imap returned error %d." , __func__, error);
@@ -2267,7 +2268,7 @@ xfs_iunlink_map_prev(/* See if our backref cache can find it faster. */ *agino =xfs_iunlink_lookup_backref (pag, target_agino);if (*agino !=NULLAGINO ) { - error =xfs_iunlink_map_ino (tp, pag->pag_agno, *agino, imap, + error =xfs_iunlink_map_ino (pag, tp, *agino, imap, dipp, bpp);if (error)return error;
@@ -2295,7 +2296,7 @@ xfs_iunlink_map_prev(xfs_trans_brelse (tp, *bpp); *agino = next_agino; - error =xfs_iunlink_map_ino (tp, pag->pag_agno, next_agino, imap, + error =xfs_iunlink_map_ino (pag, tp, next_agino, imap, dipp, bpp);if (error)return error;
Signature · 1 line
2.35.1
PATCH 18/50 xfs: use active perag references for inode allocation
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Convert the inode allocation routines to use active perag references or references held by callers rather than grab their own. Also drive the perag further inwards to replace xfs_mounts when doing operations on a specific AG.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 63 +++++++++++++++++++------------------- fs/xfs/libxfs/xfs_ialloc.h | 2 +- 3 files changed, 33 insertions(+), 34 deletions(-)
fs/xfs/libxfs/xfs_ag.c +1 -1
@@ -933,7 +933,7 @@ xfs_ag_shrink_space(* Make sure that the last inode cluster cannot overlap with the new * end of the AG, even if it's sparse. */ - error =xfs_ialloc_check_shrink (*tpp, pag->pag_agno, agibp, aglen - delta); + error =xfs_ialloc_check_shrink (pag, *tpp, agibp, aglen - delta);if (error)return error;
fs/xfs/libxfs/xfs_ialloc.c +31 -32
246 lines not on this page · raw message
fs/xfs/libxfs/xfs_ialloc.h +1 -1
@@ -107,7 +107,7 @@ int xfs_ialloc_cluster_alignment(struct xfs_mount *mp);void xfs_ialloc_setup_geometry (struct xfs_mount *mp);xfs_ino_t xfs_ialloc_calc_rootino (struct xfs_mount *mp,int sunit); -int xfs_ialloc_check_shrink (struct xfs_trans *tp,xfs_agnumber_t agno, +int xfs_ialloc_check_shrink (struct xfs_perag *pag,struct xfs_trans *tp,struct xfs_buf *agibp,xfs_agblock_t new_length);#endif /* __XFS_IALLOC_H__ */
Signature · 1 line
2.35.1
PATCH 19/50 xfs: inobt can use perags in many more places than it does
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Lots of code in the inobt infrastructure is passed both xfs_mount and perags. We only need perags for the per-ag inode allocation code, so reduce the duplication by passing only the perags as the primary object.
This ends up reducing the code size by a bit:
text data bss dec hex filename
orig 1138878 323979 548 1463405 16546d (TOTALS)
patched 1138709 323979 548 1463236 1653c4 (TOTALS)
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag_resv.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 25 +++++++++++---------- fs/xfs/libxfs/xfs_ialloc_btree.c | 37 ++++++++++++++------------------ fs/xfs/libxfs/xfs_ialloc_btree.h | 20 ++++++++--------- fs/xfs/scrub/agheader_repair.c | 7 +++--- fs/xfs/scrub/common.c | 8 +++---- fs/xfs/xfs_iwalk.c | 4 ++-- 7 files changed, 47 insertions(+), 56 deletions(-)
fs/xfs/libxfs/xfs_ag_resv.c +1 -1
@@ -264,7 +264,7 @@ xfs_ag_resv_init(if (error) goto out; - error =xfs_finobt_calc_reserves (mp, tp, pag, &ask, &used); + error =xfs_finobt_calc_reserves (pag, tp, &ask, &used);if (error) goto out;
fs/xfs/libxfs/xfs_ialloc.c +12 -13
@@ -176,13 +176,12 @@ xfs_inobt_insert( xfs_agino_t newlen, xfs_btnum_t btnum) { -struct xfs_mount *mp = pag->pag_mount;struct xfs_btree_cur *cur;xfs_agino_t thisino;int i;int error; - cur =xfs_inobt_init_cursor (mp, tp, agbp, pag, btnum); + cur =xfs_inobt_init_cursor (pag, tp, agbp, btnum); for (thisino = newino; thisino < newino + newlen;
@@ -527,7 +526,7 @@ xfs_inobt_insert_sprec(int i;struct xfs_inobt_rec_incore rec; - cur =xfs_inobt_init_cursor (mp, tp, agbp, pag, btnum); + cur =xfs_inobt_init_cursor (pag, tp, agbp, btnum);/* the new record is pre-aligned so we know where to look */ error =xfs_inobt_lookup (cur, nrec->ir_startino,XFS_LOOKUP_EQ , &i);
@@ -1004,7 +1003,7 @@ xfs_dialloc_ag_inobt(ASSERT (pag->pagi_freecount >0 ); restart_pagno: - cur =xfs_inobt_init_cursor (mp, tp, agbp, pag,XFS_BTNUM_INO ); + cur =xfs_inobt_init_cursor (pag, tp, agbp,XFS_BTNUM_INO );/* * If pagino is 0 (this is the root inode allocation) use newino. * This must work because we've just allocated some.
@@ -1457,7 +1456,7 @@ xfs_dialloc_ag(if (!pagino) pagino =be32_to_cpu (agi->agi_newino); - cur =xfs_inobt_init_cursor (mp, tp, agbp, pag,XFS_BTNUM_FINO ); + cur =xfs_inobt_init_cursor (pag, tp, agbp,XFS_BTNUM_FINO ); error =xfs_check_agi_freecount (cur);if (error)
@@ -1500,7 +1499,7 @@ xfs_dialloc_ag(* the original freecount. If all is well, make the equivalent update to * the inobt using the finobt record and offset information. */ - icur =xfs_inobt_init_cursor (mp, tp, agbp, pag,XFS_BTNUM_INO ); + icur =xfs_inobt_init_cursor (pag, tp, agbp,XFS_BTNUM_INO ); error =xfs_check_agi_freecount (icur);if (error)
@@ -1909,7 +1908,7 @@ xfs_difree_inobt(/* * Initialize the cursor. */ - cur =xfs_inobt_init_cursor (mp, tp, agbp, pag,XFS_BTNUM_INO ); + cur =xfs_inobt_init_cursor (pag, tp, agbp,XFS_BTNUM_INO ); error =xfs_check_agi_freecount (cur);if (error)
@@ -2034,7 +2033,7 @@ xfs_difree_finobt(int error;int i; - cur =xfs_inobt_init_cursor (mp, tp, agbp, pag,XFS_BTNUM_FINO ); + cur =xfs_inobt_init_cursor (pag, tp, agbp,XFS_BTNUM_FINO ); error =xfs_inobt_lookup (cur, ibtrec->ir_startino,XFS_LOOKUP_EQ , &i);if (error)
@@ -2231,7 +2230,7 @@ xfs_imap_lookup(* we have a record, we need to ensure it contains the inode number * we are looking up. */ - cur =xfs_inobt_init_cursor (mp, tp, agbp, pag,XFS_BTNUM_INO ); + cur =xfs_inobt_init_cursor (pag, tp, agbp,XFS_BTNUM_INO ); error =xfs_inobt_lookup (cur, agino,XFS_LOOKUP_LE , &i);if (!error) {if (i)
@@ -2920,17 +2919,17 @@ xfs_ialloc_check_shrink( {struct xfs_inobt_rec_incore rec;struct xfs_btree_cur *cur; -struct xfs_mount *mp = tp->t_mountp; -xfs_agino_t agino =XFS_AGB_TO_AGINO (mp, new_length); +xfs_agino_t agino;int has;int error; -if (!xfs_has_sparseinodes (mp)) +if (!xfs_has_sparseinodes (pag->pag_mount))return 0 ; - cur =xfs_inobt_init_cursor (mp, tp, agibp, pag,XFS_BTNUM_INO ); + cur =xfs_inobt_init_cursor (pag, tp, agibp,XFS_BTNUM_INO );/* Look up the inobt record that would correspond to the new EOFS. */ + agino =XFS_AGB_TO_AGINO (pag->pag_mount, new_length); error =xfs_inobt_lookup (cur, agino,XFS_LOOKUP_LE , &has);if (error || !has) goto out;
fs/xfs/libxfs/xfs_ialloc_btree.c +16 -21
@@ -36,8 +36,8 @@ STATIC struct xfs_btree_cur *xfs_inobt_dup_cursor ( struct xfs_btree_cur *cur) { -return xfs_inobt_init_cursor (cur->bc_mp, cur->bc_tp, - cur->bc_ag.agbp, cur->bc_ag.pag, cur->bc_btnum); +return xfs_inobt_init_cursor (cur->bc_ag.pag, cur->bc_tp, + cur->bc_ag.agbp, cur->bc_btnum); }STATIC void
@@ -427,11 +427,11 @@ static const struct xfs_btree_ops xfs_finobt_ops = {*/ static struct xfs_btree_cur *xfs_inobt_init_common ( -struct xfs_mount *mp,/* file system mount point */ -struct xfs_trans *tp,/* transaction pointer */ struct xfs_perag *pag, +struct xfs_trans *tp,/* transaction pointer */ xfs_btnum_t btnum)/* ialloc or free ino btree */ { +struct xfs_mount *mp = pag->pag_mount;struct xfs_btree_cur *cur; cur = xfs_btree_alloc_cursor(mp, tp, btnum,
@@ -456,16 +456,15 @@ xfs_inobt_init_common(/* Create an inode btree cursor. */ struct xfs_btree_cur *xfs_inobt_init_cursor ( -struct xfs_mount *mp, +struct xfs_perag *pag,struct xfs_trans *tp,struct xfs_buf *agbp, -struct xfs_perag *pag,xfs_btnum_t btnum) {struct xfs_btree_cur *cur;struct xfs_agi *agi = agbp->b_addr; - cur =xfs_inobt_init_common (mp, tp, pag, btnum); + cur =xfs_inobt_init_common (pag, tp, btnum);if (btnum ==XFS_BTNUM_INO ) cur->bc_nlevels =be32_to_cpu (agi->agi_level);else
@@ -477,14 +476,13 @@ xfs_inobt_init_cursor(/* Create an inode btree cursor with a fake root for staging. */ struct xfs_btree_cur *xfs_inobt_stage_cursor ( -struct xfs_mount *mp, -struct xbtree_afakeroot *afake,struct xfs_perag *pag, +struct xbtree_afakeroot *afake,xfs_btnum_t btnum) {struct xfs_btree_cur *cur; - cur =xfs_inobt_init_common (mp,NULL , pag, btnum); + cur =xfs_inobt_init_common (pag,NULL , btnum);xfs_btree_stage_afakeroot (cur, afake);return cur; }
@@ -708,9 +706,8 @@ xfs_inobt_max_size(/* Read AGI and create inobt cursor. */ int xfs_inobt_cur ( -struct xfs_mount *mp, -struct xfs_trans *tp,struct xfs_perag *pag, +struct xfs_trans *tp,xfs_btnum_t which,struct xfs_btree_cur **curpp,struct xfs_buf **agi_bpp)
@@ -725,16 +722,15 @@ xfs_inobt_cur(if (error)return error; - cur =xfs_inobt_init_cursor (mp, tp, *agi_bpp, pag, which); + cur =xfs_inobt_init_cursor (pag, tp, *agi_bpp, which); *curpp = cur;return 0 ; }static int xfs_inobt_count_blocks ( -struct xfs_mount *mp, -struct xfs_trans *tp,struct xfs_perag *pag, +struct xfs_trans *tp,xfs_btnum_t btnum,xfs_extlen_t *tree_blocks) {
@@ -742,7 +738,7 @@ xfs_inobt_count_blocks(struct xfs_btree_cur *cur =NULL ;int error; - error =xfs_inobt_cur (mp, tp, pag, btnum, &cur, &agbp); + error =xfs_inobt_cur (pag, tp, btnum, &cur, &agbp);if (error)return error;
@@ -779,22 +775,21 @@ xfs_finobt_read_blocks(*/ int xfs_finobt_calc_reserves ( -struct xfs_mount *mp, -struct xfs_trans *tp,struct xfs_perag *pag, +struct xfs_trans *tp,xfs_extlen_t *ask,xfs_extlen_t *used) {xfs_extlen_t tree_len =0 ;int error; -if (!xfs_has_finobt (mp)) +if (!xfs_has_finobt (pag->pag_mount))return 0 ; -if (xfs_has_inobtcounts (mp)) +if (xfs_has_inobtcounts (pag->pag_mount)) error =xfs_finobt_read_blocks (pag, tp, &tree_len);else - error =xfs_inobt_count_blocks (mp, tp, pag,XFS_BTNUM_FINO , + error =xfs_inobt_count_blocks (pag, tp,XFS_BTNUM_FINO , &tree_len);if (error)return error;
fs/xfs/libxfs/xfs_ialloc_btree.h +9 -11
@@ -46,12 +46,10 @@ struct xfs_perag; (maxrecs) * sizeof(xfs_inobt_key_t) + \ ((index) - 1) * sizeof(xfs_inobt_ptr_t))) -extern struct xfs_btree_cur *xfs_inobt_init_cursor (struct xfs_mount *mp, -struct xfs_trans *tp,struct xfs_buf *agbp, -struct xfs_perag *pag,xfs_btnum_t btnum); -struct xfs_btree_cur *xfs_inobt_stage_cursor (struct xfs_mount *mp, -struct xbtree_afakeroot *afake,struct xfs_perag *pag, -xfs_btnum_t btnum); +extern struct xfs_btree_cur *xfs_inobt_init_cursor (struct xfs_perag *pag, +struct xfs_trans *tp,struct xfs_buf *agbp,xfs_btnum_t btnum); +struct xfs_btree_cur *xfs_inobt_stage_cursor (struct xfs_perag *pag, +struct xbtree_afakeroot *afake,xfs_btnum_t btnum);extern int xfs_inobt_maxrecs (struct xfs_mount *,int ,int );/* ir_holemask to inode allocation bitmap conversion */
@@ -64,13 +62,13 @@ int xfs_inobt_rec_check_count(struct xfs_mount *,#define xfs_inobt_rec_check_count (mp, rec) 0#endif /* DEBUG */ -int xfs_finobt_calc_reserves (struct xfs_mount *mp,struct xfs_trans *tp, -struct xfs_perag *pag,xfs_extlen_t *ask,xfs_extlen_t *used); +int xfs_finobt_calc_reserves (struct xfs_perag *perag,struct xfs_trans *tp, +xfs_extlen_t *ask,xfs_extlen_t *used);extern xfs_extlen_t xfs_iallocbt_calc_size (struct xfs_mount *mp,unsigned long long len); -int xfs_inobt_cur (struct xfs_mount *mp,struct xfs_trans *tp, -struct xfs_perag *pag,xfs_btnum_t btnum, -struct xfs_btree_cur **curpp,struct xfs_buf **agi_bpp); +int xfs_inobt_cur (struct xfs_perag *pag,struct xfs_trans *tp, +xfs_btnum_t btnum,struct xfs_btree_cur **curpp, +struct xfs_buf **agi_bpp);void xfs_inobt_commit_staged_btree (struct xfs_btree_cur *cur,struct xfs_trans *tp,struct xfs_buf *agbp);
fs/xfs/scrub/agheader_repair.c +3 -4
@@ -820,8 +820,7 @@ xrep_agi_calc_from_btrees(xfs_agino_t freecount;int error; - cur =xfs_inobt_init_cursor (mp, sc->tp, agi_bp, - sc->sa.pag,XFS_BTNUM_INO ); + cur =xfs_inobt_init_cursor (sc->sa.pag, sc->tp, agi_bp,XFS_BTNUM_INO ); error =xfs_ialloc_count_inodes (cur, &count, &freecount);if (error) goto err;
@@ -841,8 +840,8 @@ xrep_agi_calc_from_btrees(if (xfs_has_finobt (mp) &&xfs_has_inobtcounts (mp)) {xfs_agblock_t blocks; - cur =xfs_inobt_init_cursor (mp, sc->tp, agi_bp, - sc->sa.pag,XFS_BTNUM_FINO ); + cur =xfs_inobt_init_cursor (sc->sa.pag, sc->tp, agi_bp, +XFS_BTNUM_FINO ); error =xfs_btree_count_blocks (cur, &blocks);if (error) goto err;
fs/xfs/scrub/common.c +4 -4
@@ -482,15 +482,15 @@ xchk_ag_btcur_init(/* Set up a inobt cursor for cross-referencing. */ if (sa->agi_bp &&xchk_ag_btree_healthy_enough (sc, sa->pag,XFS_BTNUM_INO )) { - sa->ino_cur =xfs_inobt_init_cursor (mp, sc->tp, sa->agi_bp, - sa->pag,XFS_BTNUM_INO ); + sa->ino_cur =xfs_inobt_init_cursor (sa->pag, sc->tp, sa->agi_bp, +XFS_BTNUM_INO ); }/* Set up a finobt cursor for cross-referencing. */ if (sa->agi_bp &&xfs_has_finobt (mp) &&xchk_ag_btree_healthy_enough (sc, sa->pag,XFS_BTNUM_FINO )) { - sa->fino_cur =xfs_inobt_init_cursor (mp, sc->tp, sa->agi_bp, - sa->pag,XFS_BTNUM_FINO ); + sa->fino_cur =xfs_inobt_init_cursor (sa->pag, sc->tp, sa->agi_bp, +XFS_BTNUM_FINO ); }/* Set up a rmapbt cursor for cross-referencing. */
fs/xfs/xfs_iwalk.c +2 -2
@@ -275,7 +275,7 @@ xfs_iwalk_ag_start(/* Set up a fresh cursor and empty the inobt cache. */ iwag->nr_recs =0 ; - error =xfs_inobt_cur (mp, tp, pag,XFS_BTNUM_INO , curpp, agi_bpp); + error =xfs_inobt_cur (pag, tp,XFS_BTNUM_INO , curpp, agi_bpp);if (error)return error;
@@ -390,7 +390,7 @@ xfs_iwalk_run_callbacks( }/* ...and recreate the cursor just past where we left off. */ - error =xfs_inobt_cur (mp, iwag->tp, iwag->pag,XFS_BTNUM_INO , curpp, + error =xfs_inobt_cur (iwag->pag, iwag->tp,XFS_BTNUM_INO , curpp, agi_bpp);if (error)return error;
Signature · 1 line
2.35.1
PATCH 20/50 xfs: convert xfs_ialloc_next_ag() to an atomic
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
This is currently a spinlock lock protected rotor which can be implemented with a single atomic operation. Change it to be more efficient and get rid of the m_agirotor_lock. Noticed while converting the inode allocation AG selection loop to active perag references.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ialloc.c | 17 +---------------- fs/xfs/libxfs/xfs_sb.c | 3 ++- fs/xfs/xfs_mount.h | 3 +-- fs/xfs/xfs_super.c | 1 - 4 files changed, 4 insertions(+), 20 deletions(-)
fs/xfs/libxfs/xfs_ialloc.c +1 -16
@@ -1576,21 +1576,6 @@ xfs_dialloc_roll(return error; } -static xfs_agnumber_t -xfs_ialloc_next_ag ( -xfs_mount_t *mp) -{ -xfs_agnumber_t agno; - -spin_lock (&mp->m_agirotor_lock); - agno = mp->m_agirotor; -if (++mp->m_agirotor >= mp->m_maxagi) - mp->m_agirotor =0 ; -spin_unlock (&mp->m_agirotor_lock); - -return agno; -} - static bool xfs_dialloc_good_ag( struct xfs_perag *pag,
@@ -1747,7 +1732,7 @@ xfs_dialloc(* an AG has enough space for file creation. */ if (S_ISDIR (mode)) - start_agno =xfs_ialloc_next_ag (mp); + start_agno =atomic_inc_return (&mp->m_agirotor) % mp->m_maxagi;else { start_agno =XFS_INO_TO_AGNO (mp, parent);if (start_agno >= mp->m_maxagi)
fs/xfs/libxfs/xfs_sb.c +2 -1
@@ -918,7 +918,8 @@ xfs_sb_mount_common(struct xfs_mount *mp, struct xfs_sb *sbp) { - mp->m_agfrotor = mp->m_agirotor = 0; + mp->m_agfrotor = 0; +atomic_set (&mp->m_agirotor,0 ); mp->m_maxagi = mp->m_sb.sb_agcount; mp->m_blkbit_log = sbp->sb_blocklog +XFS_NBBYLOG ; mp->m_blkbb_log = sbp->sb_blocklog -BBSHIFT ;
fs/xfs/xfs_mount.h +1 -2
@@ -210,8 +210,7 @@ typedef struct xfs_mount {struct xfs_error_cfg m_error_cfg[XFS_ERR_CLASS_MAX ][XFS_ERR_ERRNO_MAX ];struct xstats m_stats;/* per-fs stats */ xfs_agnumber_t m_agfrotor;/* last ag where space found */ -xfs_agnumber_t m_agirotor;/* last ag dir inode alloced */ -spinlock_t m_agirotor_lock;/* .. and lock protecting it */ +atomic_t m_agirotor;/* last ag dir inode alloced */ /* Memory shrinker to throttle and reprioritize inodegc */ struct shrinker m_inodegc_shrinker;
fs/xfs/xfs_super.c +0 -1
@@ -1910,7 +1910,6 @@ static int xfs_init_fs_context(return -ENOMEM ;spin_lock_init (&mp->m_sb_lock); -spin_lock_init (&mp->m_agirotor_lock);INIT_RADIX_TREE (&mp->m_perag_tree,GFP_ATOMIC );spin_lock_init (&mp->m_perag_lock);mutex_init (&mp->m_growlock);
Signature · 1 line
2.35.1
PATCH 21/50 xfs: perags need atomic operational state
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We currently don't have any flags or operational state in the xfs_perag except for the pagf_init and pagi_init flags. And the agflreset flag. Oh, there's also the pagf_metadata and pagi_inodeok flags, too.
For controlling per-ag operations, we are going to need some atomic state flags. Hence add an opstate field similar to what we already have in the mount and log, and convert all these state flags across to atomic bit operations.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.h | 27 ++++++++++++++---- fs/xfs/libxfs/xfs_alloc.c | 23 ++++++++------- fs/xfs/libxfs/xfs_alloc_btree.c | 2 +- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 14 ++++----- fs/xfs/libxfs/xfs_ialloc_btree.c | 4 +-- fs/xfs/libxfs/xfs_refcount_btree.c | 2 +- fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- fs/xfs/scrub/agheader_repair.c | 28 +++++++++--------- fs/xfs/scrub/fscounters.c | 9 ++++-- fs/xfs/scrub/repair.c | 2 +- fs/xfs/xfs_filestream.c | 5 ++-- fs/xfs/xfs_super.c | 46 ++++++++++++++++++------------ 13 files changed, 101 insertions(+), 65 deletions(-)
fs/xfs/libxfs/xfs_ag.h +22 -5
@@ -35,13 +35,9 @@ struct xfs_perag {atomic_t pag_ref;/* passive reference count */ atomic_t pag_active_ref;/* active reference count */ wait_queue_head_t pag_active_wq;/* woken active_ref falls to zero */ -char pagf_init;/* this agf's entry is initialized */ -char pagi_init;/* this agi's entry is initialized */ -char pagf_metadata;/* the agf is preferred to be metadata */ -char pagi_inodeok;/* The agi is ok for inodes */ +unsigned long pag_opstate;uint8_t pagf_levels[XFS_BTNUM_AGF ];/* # of levels in bno & cnt btree */ -bool pagf_agflreset;/* agfl requires reset before use */ uint32_t pagf_flcount;/* count of blocks in freelist */ xfs_extlen_t pagf_freeblks;/* total free blocks */ xfs_extlen_t pagf_longest;/* longest free space */
@@ -114,6 +110,27 @@ struct xfs_perag {#endif /* __KERNEL__ */ }; +/* +* Per-AG operational state. These are atomic flag bits. +*/ +#define XFS_AGSTATE_AGF_INIT 0 +#define XFS_AGSTATE_AGI_INIT 1 +#define XFS_AGSTATE_PREFERS_METADATA 2 +#define XFS_AGSTATE_ALLOWS_INODES 3 +#define XFS_AGSTATE_AGFL_NEEDS_RESET 4 + +#define __XFS_AG_OPSTATE (name,NAME ) \ +static inline bool xfs_perag_ ## name (struct xfs_perag *pag) \ +{ \ + return test_bit(XFS_AGSTATE_ ## NAME, &pag->pag_opstate); \ +} + +__XFS_AG_OPSTATE(initialised_agf, AGF_INIT) +__XFS_AG_OPSTATE(initialised_agi, AGI_INIT) +__XFS_AG_OPSTATE(prefers_metadata, PREFERS_METADATA) +__XFS_AG_OPSTATE(allows_inodes, ALLOWS_INODES) +__XFS_AG_OPSTATE(agfl_needs_reset, AGFL_NEEDS_RESET) +int xfs_initialize_perag (struct xfs_mount *mp,xfs_agnumber_t agcount,xfs_rfsblock_t dcount,xfs_agnumber_t *maxagi);int xfs_initialize_perag_data (struct xfs_mount *mp,xfs_agnumber_t agno);
fs/xfs/libxfs/xfs_alloc.c +13 -10
@@ -2439,7 +2439,7 @@ xfs_agfl_reset(struct xfs_mount *mp = tp->t_mountp;struct xfs_agf *agf = agbp->b_addr; -ASSERT (pag->pagf_agflreset); +ASSERT (xfs_perag_agfl_needs_reset (pag));trace_xfs_agfl_reset (mp, agf,0 , _RET_IP_); xfs_warn(mp,
@@ -2454,7 +2454,7 @@ xfs_agfl_reset( XFS_AGF_FLCOUNT); pag->pagf_flcount =0 ; - pag->pagf_agflreset = false; +clear_bit (XFS_AGSTATE_AGFL_NEEDS_RESET , &pag->pag_opstate); }/*
@@ -2609,7 +2609,7 @@ xfs_alloc_fix_freelist(/* deferred ops (AGFL block frees) require permanent transactions */ ASSERT (tp->t_flags &XFS_TRANS_PERM_LOG_RES ); -if (!pag->pagf_init) { +if (!xfs_perag_initialised_agf (pag)) { error =xfs_alloc_read_agf (pag, tp, flags, &agbp);if (error) {/* Couldn't lock the AGF so skip this AG. */
@@ -2624,7 +2624,8 @@ xfs_alloc_fix_freelist(* somewhere else if we are not being asked to try harder at this * point */ -if (pag->pagf_metadata && (args->datatype &XFS_ALLOC_USERDATA ) && +if (xfs_perag_prefers_metadata (pag) && + (args->datatype &XFS_ALLOC_USERDATA ) && (flags &XFS_ALLOC_FLAG_TRYLOCK )) {ASSERT (!(flags &XFS_ALLOC_FLAG_FREEING )); goto out_agbp_relse;
@@ -2650,7 +2651,7 @@ xfs_alloc_fix_freelist( }/* reset a padding mismatched agfl before final free space check */ -if (pag->pagf_agflreset) +if (xfs_perag_agfl_needs_reset (pag))xfs_agfl_reset (tp, agbp, pag);/* If there isn't enough total space or single-extent, reject it. */
@@ -2807,7 +2808,7 @@ xfs_alloc_get_freelist(if (be32_to_cpu (agf->agf_flfirst) ==xfs_agfl_size (mp)) agf->agf_flfirst =0 ; -ASSERT (!pag->pagf_agflreset); +ASSERT (!xfs_perag_agfl_needs_reset (pag));be32_add_cpu (&agf->agf_flcount,-1 ); pag->pagf_flcount--;
@@ -2896,7 +2897,7 @@ xfs_alloc_put_freelist(if (be32_to_cpu (agf->agf_fllast) ==xfs_agfl_size (mp)) agf->agf_fllast =0 ; -ASSERT (!pag->pagf_agflreset); +ASSERT (!xfs_perag_agfl_needs_reset (pag));be32_add_cpu (&agf->agf_flcount,1 ); pag->pagf_flcount++;
@@ -3103,7 +3104,7 @@ xfs_alloc_read_agf(return error; agf = agfbp->b_addr; -if (!pag->pagf_init) { +if (!xfs_perag_initialised_agf (pag)) { pag->pagf_freeblks =be32_to_cpu (agf->agf_freeblks); pag->pagf_btreeblks =be32_to_cpu (agf->agf_btreeblks); pag->pagf_flcount =be32_to_cpu (agf->agf_flcount);
@@ -3115,8 +3116,8 @@ xfs_alloc_read_agf( pag->pagf_levels[XFS_BTNUM_RMAPi] =be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAPi]); pag->pagf_refcount_level =be32_to_cpu (agf->agf_refcount_level); - pag->pagf_init =1 ; - pag->pagf_agflreset =xfs_agfl_needs_reset (pag->pag_mount, agf); +if (xfs_agfl_needs_reset (pag->pag_mount, agf)) +set_bit (XFS_AGSTATE_AGFL_NEEDS_RESET , &pag->pag_opstate);/* * Update the in-core allocbt counter. Filter out the rmapbt
@@ -3130,6 +3131,8 @@ xfs_alloc_read_agf( allocbt_blks -=be32_to_cpu (agf->agf_rmap_blocks) -1 ;if (allocbt_blks >0 )atomic64_add (allocbt_blks, &pag->pag_mount->m_allocbt_blks); + +set_bit (XFS_AGSTATE_AGF_INIT , &pag->pag_opstate); }#ifdef DEBUG else if (!xfs_is_shutdown(pag->pag_mount)) {
fs/xfs/libxfs/xfs_alloc_btree.c +1 -1
@@ -315,7 +315,7 @@ xfs_allocbt_verify( level =be16_to_cpu (block->bb_level);if (bp->b_ops->magic[0 ] ==cpu_to_be32 (XFS_ABTC_MAGIC )) btnum = XFS_BTNUM_CNTi; -if (pag && pag->pagf_init) { +if (pag &&xfs_perag_initialised_agf (pag)) {if (level >= pag->pagf_levels[btnum])return __this_address; }else if (level >= mp->m_alloc_maxlevels)
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -3184,7 +3184,7 @@ xfs_bmap_longest_free_extent(int error =0 ; pag =xfs_perag_get (mp, ag); -if (!pag->pagf_init) { +if (!xfs_perag_initialised_agf (pag)) { error =xfs_alloc_read_agf (pag, tp,XFS_ALLOC_FLAG_TRYLOCK ,NULL );if (error) {
fs/xfs/libxfs/xfs_ialloc.c +7 -7
@@ -998,8 +998,8 @@ xfs_dialloc_ag_inobt(int i, j;int searchdistance =10 ; -ASSERT (pag->pagi_init); -ASSERT (pag->pagi_inodeok); +ASSERT (xfs_perag_initialised_agi (pag)); +ASSERT (xfs_perag_allows_inodes (pag));ASSERT (pag->pagi_freecount >0 ); restart_pagno:
@@ -1592,10 +1592,10 @@ xfs_dialloc_good_ag(if (!pag)return false; -if (!pag->pagi_inodeok) +if (!xfs_perag_allows_inodes (pag))return false; -if (!pag->pagi_init) { +if (!xfs_perag_initialised_agi (pag)) { error =xfs_ialloc_read_agi (pag, tp,NULL );if (error)return false;
@@ -1606,7 +1606,7 @@ xfs_dialloc_good_ag(if (!ok_alloc)return false; -if (!pag->pagf_init) { +if (!xfs_perag_initialised_agf (pag)) { error =xfs_alloc_read_agf (pag, tp, flags,NULL );if (error)return false;
@@ -2586,10 +2586,10 @@ xfs_ialloc_read_agi(return error; agi = agibp->b_addr; -if (!pag->pagi_init) { +if (!xfs_perag_initialised_agi (pag)) { pag->pagi_freecount =be32_to_cpu (agi->agi_freecount); pag->pagi_count =be32_to_cpu (agi->agi_count); - pag->pagi_init =1 ; +set_bit (XFS_AGSTATE_AGI_INIT , &pag->pag_opstate); }/*
fs/xfs/libxfs/xfs_ialloc_btree.c +2 -2
@@ -291,8 +291,8 @@ xfs_inobt_verify(* Similarly, during log recovery we will have a perag structure * attached, but the agi information will not yet have been initialised * from the on disk AGI. We don't currently use any of this information, -* but beware of the landmine (i.e. need to check pag->pagi_init) if we -* ever do. +* but beware of the landmine (i.e. need to check +* xfs_perag_initialised_agi(pag)) if we ever do. */ if (xfs_has_crc (mp)) { fa =xfs_btree_sblock_v5hdr_verify (bp);
fs/xfs/libxfs/xfs_refcount_btree.c +1 -1
@@ -218,7 +218,7 @@ xfs_refcountbt_verify(return fa; level =be16_to_cpu (block->bb_level); -if (pag && pag->pagf_init) { +if (pag &&xfs_perag_initialised_agf (pag)) {if (level >= pag->pagf_refcount_level)return __this_address; }else if (level >= mp->m_refc_maxlevels)
fs/xfs/libxfs/xfs_rmap_btree.c +1 -1
@@ -313,7 +313,7 @@ xfs_rmapbt_verify(return fa; level =be16_to_cpu (block->bb_level); -if (pag && pag->pagf_init) { +if (pag &&xfs_perag_initialised_agf (pag)) {if (level >= pag->pagf_levels[XFS_BTNUM_RMAPi])return __this_address; }else if (level >= mp->m_rmap_maxlevels)
fs/xfs/scrub/agheader_repair.c +15 -13
@@ -191,14 +191,15 @@ xrep_agf_init_header( struct xfs_agf *old_agf) {struct xfs_mount *mp = sc->mp; +struct xfs_perag *pag = sc->sa.pag;struct xfs_agf *agf = agf_bp->b_addr;memcpy (old_agf, agf,sizeof (*old_agf));memset (agf,0 ,BBTOB (agf_bp->b_length)); agf->agf_magicnum =cpu_to_be32 (XFS_AGF_MAGIC ); agf->agf_versionnum =cpu_to_be32 (XFS_AGF_VERSION ); - agf->agf_seqno =cpu_to_be32 (sc->sa.pag->pag_agno); - agf->agf_length =cpu_to_be32 (sc->sa.pag->block_count); + agf->agf_seqno =cpu_to_be32 (pag->pag_agno); + agf->agf_length =cpu_to_be32 (pag->block_count); agf->agf_flfirst = old_agf->agf_flfirst; agf->agf_fllast = old_agf->agf_fllast; agf->agf_flcount = old_agf->agf_flcount;
@@ -206,8 +207,8 @@ xrep_agf_init_header(uuid_copy (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid);/* Mark the incore AGF data stale until we're done fixing things. */ -ASSERT (sc->sa.pag->pagf_init); - sc->sa.pag->pagf_init =0 ; +ASSERT (xfs_perag_initialised_agf (pag)); +clear_bit (XFS_AGSTATE_AGF_INIT , &pag->pag_opstate); }/* Set btree root information in an AGF. */
@@ -333,7 +334,7 @@ xrep_agf_commit_new( pag->pagf_levels[XFS_BTNUM_RMAPi] =be32_to_cpu (agf->agf_levels[XFS_BTNUM_RMAPi]); pag->pagf_refcount_level =be32_to_cpu (agf->agf_refcount_level); - pag->pagf_init =1 ; +set_bit (XFS_AGSTATE_AGF_INIT , &pag->pag_opstate);return 0 ; }
@@ -434,7 +435,7 @@ xrep_agf( out_revert:/* Mark the incore AGF state stale and revert the AGF. */ - sc->sa.pag->pagf_init =0 ; +clear_bit (XFS_AGSTATE_AGF_INIT , &sc->sa.pag->pag_opstate);memcpy (agf, &old_agf,sizeof (old_agf));return error; }
@@ -564,7 +565,7 @@ xrep_agfl_update_agf(xfs_force_summary_recalc (sc->mp);/* Update the AGF counters. */ -if (sc->sa.pag->pagf_init) +if (xfs_perag_initialised_agf (sc->sa.pag)) sc->sa.pag->pagf_flcount = flcount; agf->agf_flfirst =cpu_to_be32 (0 ); agf->agf_flcount =cpu_to_be32 (flcount);
@@ -769,14 +770,15 @@ xrep_agi_init_header( struct xfs_agi *old_agi) {struct xfs_agi *agi = agi_bp->b_addr; +struct xfs_perag *pag = sc->sa.pag;struct xfs_mount *mp = sc->mp;memcpy (old_agi, agi,sizeof (*old_agi));memset (agi,0 ,BBTOB (agi_bp->b_length)); agi->agi_magicnum =cpu_to_be32 (XFS_AGI_MAGIC ); agi->agi_versionnum =cpu_to_be32 (XFS_AGI_VERSION ); - agi->agi_seqno =cpu_to_be32 (sc->sa.pag->pag_agno); - agi->agi_length =cpu_to_be32 (sc->sa.pag->block_count); + agi->agi_seqno =cpu_to_be32 (pag->pag_agno); + agi->agi_length =cpu_to_be32 (pag->block_count); agi->agi_newino =cpu_to_be32 (NULLAGINO ); agi->agi_dirino =cpu_to_be32 (NULLAGINO );if (xfs_has_crc (mp))
@@ -787,8 +789,8 @@ xrep_agi_init_header( sizeof(agi->agi_unlinked));/* Mark the incore AGF data stale until we're done fixing things. */ -ASSERT (sc->sa.pag->pagi_init); - sc->sa.pag->pagi_init =0 ; +ASSERT (xfs_perag_initialised_agi (pag)); +clear_bit (XFS_AGSTATE_AGI_INIT , &pag->pag_opstate); }/* Set btree root information in an AGI. */
@@ -875,7 +877,7 @@ xrep_agi_commit_new( pag = sc->sa.pag; pag->pagi_count =be32_to_cpu (agi->agi_count); pag->pagi_freecount =be32_to_cpu (agi->agi_freecount); - pag->pagi_init =1 ; +set_bit (XFS_AGSTATE_AGI_INIT , &pag->pag_opstate);return 0 ; }
@@ -940,7 +942,7 @@ xrep_agi( out_revert:/* Mark the incore AGI state stale and revert the AGI. */ - sc->sa.pag->pagi_init =0 ; +clear_bit (XFS_AGSTATE_AGI_INIT , &sc->sa.pag->pag_opstate);memcpy (agi, &old_agi,sizeof (old_agi));return error; }
fs/xfs/scrub/fscounters.c +6 -3
@@ -74,7 +74,8 @@ xchk_fscount_warmup(for_each_perag (mp, agno, pag) {if (xchk_should_terminate (sc, &error))break ; -if (pag->pagi_init && pag->pagf_init) +if (xfs_perag_initialised_agi (pag) && +xfs_perag_initialised_agf (pag))continue ;/* Lock both AG headers. */
@@ -89,7 +90,8 @@ xchk_fscount_warmup(* These are supposed to be initialized by the header read * function. */ -if (!pag->pagi_init || !pag->pagf_init) { +if (!xfs_perag_initialised_agi (pag) || + !xfs_perag_initialised_agf (pag)) { error = -EFSCORRUPTED ;break ; }
@@ -195,7 +197,8 @@ xchk_fscount_aggregate_agcounts(break ;/* This somehow got unset since the warmup? */ -if (!pag->pagi_init || !pag->pagf_init) { +if (!xfs_perag_initialised_agi (pag) || + !xfs_perag_initialised_agf (pag)) { error = -EFSCORRUPTED ;break ; }
fs/xfs/scrub/repair.c +1 -1
@@ -194,7 +194,7 @@ xrep_calc_ag_resblks(return 0 ; pag =xfs_perag_get (mp, sm->sm_agno); -if (pag->pagi_init) { +if (xfs_perag_initialised_agi (pag)) {/* Use in-core icount if possible. */ icount = pag->pagi_count; }else {
fs/xfs/xfs_filestream.c +3 -2
@@ -125,7 +125,7 @@ xfs_filestream_pick_ag( pag =xfs_perag_get (mp, ag); -if (!pag->pagf_init) { +if (!xfs_perag_initialised_agf (pag)) { err =xfs_alloc_read_agf (pag,NULL , trylock,NULL );if (err) {if (err != -EAGAIN ) {
@@ -159,7 +159,8 @@ xfs_filestream_pick_ag( xfs_ag_resv_needed(pag, XFS_AG_RESV_NONE));if (((minlen && longest >= minlen) || (!minlen && pag->pagf_freeblks >= minfree)) && - (!pag->pagf_metadata || !(flags &XFS_PICK_USERDATA ) || + (!xfs_perag_prefers_metadata (pag) || + !(flags &XFS_PICK_USERDATA ) || (flags &XFS_PICK_LOWSPACE ))) {/* Break out, retaining the reference on the AG. */
fs/xfs/xfs_super.c +28 -18
58 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 22/50 xfs: introduce xfs_for_each_perag_wrap()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
In several places we iterate every AG from a specific start agno and wrap back to the first AG when we reach the end of the filesystem to continue searching. We don't have a primitive for this iteration yet, so add one for conversion of these algorithms to per-ag based iteration.
The filestream AG select code is a mess, and this initially makes it worse. The per-ag selection needs to be driven completely into the filesystem code to clean this up and it will be done in a future patch that makes the filestream allocator use active per-ag references correctly.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.h | 45 +++++++++++++++++++++- fs/xfs/libxfs/xfs_bmap.c | 76 ++++++++++++++++++++++---------------- fs/xfs/libxfs/xfs_ialloc.c | 32 ++++++++-------- 3 files changed, 104 insertions(+), 49 deletions(-)
fs/xfs/libxfs/xfs_ag.h +44 -1
@@ -228,7 +228,6 @@ xfs_perag_next(#define for_each_perag_from (mp, agno, pag) \ for_each_perag_range((mp), (agno), (mp)->m_sb.sb_agcount - 1, (pag)) -#define for_each_perag (mp, agno, pag) \ (agno) = 0; \ for_each_perag_from((mp), (agno), (pag))
@@ -240,6 +239,50 @@ xfs_perag_next( xfs_perag_rele(pag), \ (pag) = xfs_perag_grab_tag((mp), (agno), (tag))) +static inline struct xfs_perag * +xfs_perag_next_wrap ( +struct xfs_perag *pag, +xfs_agnumber_t *agno, +xfs_agnumber_t stop_agno, +xfs_agnumber_t wrap_agno) +{ +struct xfs_mount *mp = pag->pag_mount; + + *agno = pag->pag_agno +1 ; +xfs_perag_rele (pag); +while (*agno != stop_agno) { +if (*agno >= wrap_agno) + *agno =0 ; +if (*agno == stop_agno) +break ; + + pag =xfs_perag_grab (mp, *agno); +if (pag) +return pag; + (*agno)++; + } +return NULL ; +} + +/* +* Iterate all AGs from start_agno through wrap_agno, then 0 through +* (start_agno - 1). +*/ +#define for_each_perag_wrap_at (mp, start_agno, wrap_agno, agno, pag) \ + for ((agno) = (start_agno), (pag) = xfs_perag_grab((mp), (agno)); \ + (pag) != NULL; \ + (pag) = xfs_perag_next_wrap((pag), &(agno), (start_agno), \ + (wrap_agno))) + +/* +* Iterate all AGs from start_agno through to the end of the filesystem, then 0 +* through (start_agno - 1). +*/ +#define for_each_perag_wrap (mp, start_agno, agno, pag) \ + for_each_perag_wrap_at((mp), (start_agno), (mp)->m_sb.sb_agcount, \ + (agno), (pag)) + +struct aghdr_init_data {/* per ag data */ xfs_agblock_t agno;/* ag to init */
fs/xfs/libxfs/xfs_bmap.c +45 -31
149 lines not on this page · raw message
fs/xfs/libxfs/xfs_ialloc.c +15 -17
@@ -1724,7 +1724,7 @@ xfs_dialloc(struct xfs_ino_geometry *igeo =M_IGEO (mp);bool ok_alloc = true;int flags; -xfs_ino_t ino; +xfs_ino_t ino =NULLFSINO ;/* * Directories, symlinks, and regular files frequently allocate at least
@@ -1758,37 +1758,35 @@ xfs_dialloc(* or in which we can allocate some inodes. Iterate through the * allocation groups upward, wrapping at the end. */ - agno = start_agno; flags =XFS_ALLOC_FLAG_TRYLOCK ; -for (;;) { - pag =xfs_perag_grab (mp, agno); +retry: +for_each_perag_wrap_at (mp, start_agno, mp->m_maxagi, agno, pag) {if (xfs_dialloc_good_ag (pag, *tpp, mode, flags, ok_alloc)) { error =xfs_dialloc_try_ag (pag, tpp, parent, &ino, ok_alloc);if (error != -EAGAIN )break ; + error =0 ; }if (xfs_is_shutdown (mp)) { error = -EFSCORRUPTED ;break ; } -if (++agno == mp->m_maxagi) - agno =0 ; -if (agno == start_agno) { -if (!flags) { - error = -ENOSPC ; -break ; - } + } +if (pag) +xfs_perag_rele (pag); +if (error) +return error; +if (ino ==NULLFSINO ) { +if (flags) { flags =0 ; + goto retry; } -xfs_perag_rele (pag); +return -ENOSPC ; } - -if (!error) - *new_ino = ino; -xfs_perag_rele (pag); -return error; + *new_ino = ino; +return 0 ; }/*
Signature · 1 line
2.35.1
PATCH 23/50 xfs: rework xfs_alloc_vextent()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
It's a multiplexing mess that can be greatly simplified, and really needs to be simplified to allow active per-ag references to propagate from initial AG selection code the the bmapi code.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 398 ++++++++++++++++++++++++-------------- 1 file changed, 255 insertions(+), 143 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +255 -143
@@ -3154,26 +3154,20 @@ xfs_alloc_read_agf( }/* -* Allocate an extent (variable-size). -* Depending on the allocation type, we either look in a single allocation -* group or loop over the allocation groups to find the result. +* Pre-proces allocation arguments to set initial state that we don't require +* callers to set up correctly, as well as bounds check the allocation args +* that are set up. */ -int /* error */ -xfs_alloc_vextent ( -struct xfs_alloc_arg *args)/* allocation argument structure */ +static int +xfs_alloc_vextent_check_args ( +struct xfs_alloc_arg *args) { -xfs_agblock_t agsize;/* allocation group size */ -int error; -int flags;/* XFS_ALLOC_FLAG_... locking flags */ -struct xfs_mount *mp;/* mount structure pointer */ -xfs_agnumber_t sagno;/* starting allocation group number */ -xfs_alloctype_t type;/* input allocation type */ -int bump_rotor =0 ; -xfs_agnumber_t rotorstep = xfs_rotorstep;/* inode32 agf stepper */ - - mp = args->mp; - type = args->otype = args->type; +struct xfs_mount *mp = args->mp; +xfs_agblock_t agsize; + + args->otype = args->type; args->agbno =NULLAGBLOCK ; +/* * Just fix this up, for the case where the last a.g. is shorter * (or there's only one a.g.) and the caller couldn't easily figure
@@ -3195,157 +3189,275 @@ xfs_alloc_vextent( args->mod >= args->prod) { args->fsbno =NULLFSBLOCK ;trace_xfs_alloc_vextent_badargs (args); -return 0 ; +return -ENOSPC ; } +return 0 ; +} +/* +* Post-process allocation results to set the allocated block number correctly +* for the caller. +* +* XXX: xfs_alloc_vextent() should really be returning ENOSPC for ENOSPC, not +* hiding it behind a "successful" NULLFSBLOCK allocation. +*/ +static void +xfs_alloc_vextent_set_fsbno ( +struct xfs_alloc_arg *args) +{ +struct xfs_mount *mp = args->mp; -switch (type) { -case XFS_ALLOCTYPE_THIS_AG : -case XFS_ALLOCTYPE_NEAR_BNO : -case XFS_ALLOCTYPE_THIS_BNO : -/* -* These three force us into a single a.g. -*/ - args->agno =XFS_FSB_TO_AGNO (mp, args->fsbno); +/* Allocation failed with ENOSPC if NULLAGBLOCK was returned. */ +if (args->agbno ==NULLAGBLOCK ) { + args->fsbno =NULLFSBLOCK ; +return ; + } + + args->fsbno =XFS_AGB_TO_FSB (mp, args->agno, args->agbno); +#ifdef DEBUG +ASSERT (args->len >= args->minlen); +ASSERT (args->len <= args->maxlen); +ASSERT (args->agbno % args->alignment ==0 ); +XFS_AG_CHECK_DADDR (mp,XFS_FSB_TO_DADDR (mp, args->fsbno), args->len); +#endif +} + +/* +* Allocate within a single AG only. +*/ +static int +xfs_alloc_vextent_this_ag ( +struct xfs_alloc_arg *args) +{ +struct xfs_mount *mp = args->mp; +int error; + + error =xfs_alloc_vextent_check_args (args); +if (error) { +if (error == -ENOSPC ) +return 0 ; +return error; + } + + args->agno =XFS_FSB_TO_AGNO (mp, args->fsbno); + args->pag =xfs_perag_get (mp, args->agno); + error =xfs_alloc_fix_freelist (args,0 ); +if (error) { +trace_xfs_alloc_vextent_nofix (args); + goto out_error; + } +if (!args->agbp) { +trace_xfs_alloc_vextent_noagbp (args); + goto out_error; + } + args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); + error =xfs_alloc_ag_vextent (args); +if (error) + goto out_error; + +xfs_alloc_vextent_set_fsbno (args); +out_error: +xfs_perag_put (args->pag); +return error; +} + +/* +* Iterate all AGs trying to allocate an extent starting from @start_ag. +* +* If the +* incoming allocation type is XFS_ALLOCTYPE_NEAR_BNO, it means the allocation +* attempts in @start_agno have locality information. If we fail to allocate in +* that AG, then we revert to anywhere-in-AG for all the other AGs we attempt to +* allocation in as there is no locality optimisation possible for those +* allocations. +* +* When we wrap the AG iteration at the end of the filesystem, we have to be +* careful not to wrap into AGs below ones we already have locked in the +* transaction. This will result in an out-of-order locking of AGFs and hence +* can cause deadlocks. +* +* XXX(dgc): when wrapping in potential deadlock scenarios, we could use +* try-locks on the AGFs below the critical AG rather than skip them entirely. +* We won't deadlock in that case, we'll just skip the AGFs we can't lock. +*/ +static int +xfs_alloc_vextent_iterate_ags ( +struct xfs_alloc_arg *args, +xfs_agnumber_t start_agno, +uint32_t flags) +{ +struct xfs_mount *mp = args->mp; +int error =0 ; + +/* +* Loop over allocation groups twice; first time with +* trylock set, second time without. +*/ + args->agno = start_agno; +for (;;) { args->pag =xfs_perag_get (mp, args->agno); - error =xfs_alloc_fix_freelist (args,0 ); + error =xfs_alloc_fix_freelist (args, flags);if (error) {trace_xfs_alloc_vextent_nofix (args); - goto error0; - } -if (!args->agbp) { -trace_xfs_alloc_vextent_noagbp (args);break ; } - args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); -if ((error =xfs_alloc_ag_vextent (args))) - goto error0; -break ; -case XFS_ALLOCTYPE_START_BNO :/* -* Try near allocation first, then anywhere-in-ag after -* the first a.g. fails. +* If we get a buffer back then the allocation will fly. */ -if ((args->datatype &XFS_ALLOC_INITIAL_USER_DATA ) && -xfs_is_inode32 (mp)) { - args->fsbno =XFS_AGB_TO_FSB (mp, - ((mp->m_agfrotor / rotorstep) % - mp->m_sb.sb_agcount),0 ); - bump_rotor =1 ; +if (args->agbp) { + error =xfs_alloc_ag_vextent (args); +break ; } - args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); - args->type =XFS_ALLOCTYPE_NEAR_BNO ; - fallthrough; -case XFS_ALLOCTYPE_FIRST_AG : + +trace_xfs_alloc_vextent_loopfailed (args); +/* -* Rotate through the allocation groups looking for a winner. +* Didn't work, figure out the next iteration. */ -if (type ==XFS_ALLOCTYPE_FIRST_AG ) { -/* -* Start with allocation group given by bno. -*/ - args->agno =XFS_FSB_TO_AGNO (mp, args->fsbno); +if (args->agno == start_agno && + args->otype ==XFS_ALLOCTYPE_START_BNO ) args->type =XFS_ALLOCTYPE_THIS_AG ; - sagno =0 ; - flags =0 ; - }else { -/* -* Start with the given allocation group. -*/ - args->agno = sagno =XFS_FSB_TO_AGNO (mp, args->fsbno); - flags =XFS_ALLOC_FLAG_TRYLOCK ; +/* +* For the first allocation, we can try any AG to get +* space. However, if we already have allocated a +* block, we don't want to try AGs whose number is below +* sagno. Otherwise, we may end up with out-of-order +* locking of AGF, which might cause deadlock. +*/ +if (++(args->agno) == mp->m_sb.sb_agcount) { +if (args->tp->t_firstblock !=NULLFSBLOCK ) + args->agno = start_agno; +else + args->agno =0 ; }/* -* Loop over allocation groups twice; first time with -* trylock set, second time without. +* Reached the starting a.g., must either be done +* or switch to non-trylock mode. */ -for (;;) { - args->pag =xfs_perag_get (mp, args->agno); - error =xfs_alloc_fix_freelist (args, flags); -if (error) { -trace_xfs_alloc_vextent_nofix (args); - goto error0; - } -/* -* If we get a buffer back then the allocation will fly. -*/ -if (args->agbp) { -if ((error =xfs_alloc_ag_vextent (args))) - goto error0; +if (args->agno == start_agno) { +if (flags ==0 ) { + args->agbno =NULLAGBLOCK ; +trace_xfs_alloc_vextent_allfailed (args);break ; } -trace_xfs_alloc_vextent_loopfailed (args); - -/* -* Didn't work, figure out the next iteration. -*/ -if (args->agno == sagno && - type ==XFS_ALLOCTYPE_START_BNO ) - args->type =XFS_ALLOCTYPE_THIS_AG ; -/* -* For the first allocation, we can try any AG to get -* space. However, if we already have allocated a -* block, we don't want to try AGs whose number is below -* sagno. Otherwise, we may end up with out-of-order -* locking of AGF, which might cause deadlock. -*/ -if (++(args->agno) == mp->m_sb.sb_agcount) { -if (args->tp->t_firstblock !=NULLFSBLOCK ) - args->agno = sagno; -else - args->agno =0 ; - } -/* -* Reached the starting a.g., must either be done -* or switch to non-trylock mode. -*/ -if (args->agno == sagno) { -if (flags ==0 ) { - args->agbno =NULLAGBLOCK ; -trace_xfs_alloc_vextent_allfailed (args); -break ; - } - - flags =0 ; -if (type ==XFS_ALLOCTYPE_START_BNO ) { - args->agbno =XFS_FSB_TO_AGBNO (mp, - args->fsbno); - args->type =XFS_ALLOCTYPE_NEAR_BNO ; - } + flags =0 ; +if (args->otype ==XFS_ALLOCTYPE_START_BNO ) { + args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); + args->type =XFS_ALLOCTYPE_NEAR_BNO ; } -xfs_perag_put (args->pag); - } -if (bump_rotor) { -if (args->agno == sagno) - mp->m_agfrotor = (mp->m_agfrotor +1 ) % - (mp->m_sb.sb_agcount * rotorstep); -else - mp->m_agfrotor = (args->agno * rotorstep +1 ) % - (mp->m_sb.sb_agcount * rotorstep); } -break ; -default : -ASSERT (0 ); -/* NOTREACHED */ +xfs_perag_put (args->pag); } -if (args->agbno ==NULLAGBLOCK ) - args->fsbno =NULLFSBLOCK ; -else { - args->fsbno =XFS_AGB_TO_FSB (mp, args->agno, args->agbno); -#ifdef DEBUG -ASSERT (args->len >= args->minlen); -ASSERT (args->len <= args->maxlen); -ASSERT (args->agbno % args->alignment ==0 ); -XFS_AG_CHECK_DADDR (mp,XFS_FSB_TO_DADDR (mp, args->fsbno), - args->len); -#endif +xfs_perag_put (args->pag); +return error; +} + +/* +* Iterate from the AGs from the start AG to the end of the filesystem, trying +* to allocate blocks. It starts with a near allocation attempt in the initial +* AG, then falls back to anywhere-in-ag after the first AG fails. It will wrap +* back to zero if allowed by previous allocations in this transaction, +* otherwise will wrap back to the start AG and run a second blocking pass to +* the end of the filesystem. +*/ +static int +xfs_alloc_vextent_start_ag ( +struct xfs_alloc_arg *args) +{ +struct xfs_mount *mp = args->mp; +xfs_agnumber_t start_agno; +xfs_agnumber_t rotorstep = xfs_rotorstep; +bool bump_rotor = false; +int error; + error =xfs_alloc_vextent_check_args (args); +if (error) { +if (error == -ENOSPC ) +return 0 ; +return error; } -xfs_perag_put (args->pag); + +if ((args->datatype &XFS_ALLOC_INITIAL_USER_DATA ) && +xfs_is_inode32 (mp)) { + args->fsbno =XFS_AGB_TO_FSB (mp, + ((mp->m_agfrotor / rotorstep) % + mp->m_sb.sb_agcount),0 ); + bump_rotor =1 ; + } + start_agno =XFS_FSB_TO_AGNO (mp, args->fsbno); + args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); + args->type =XFS_ALLOCTYPE_NEAR_BNO ; + + error =xfs_alloc_vextent_iterate_ags (args, start_agno, +XFS_ALLOC_FLAG_TRYLOCK ); +if (error) +return error; + +if (bump_rotor) { +if (args->agno == start_agno) + mp->m_agfrotor = (mp->m_agfrotor +1 ) % + (mp->m_sb.sb_agcount * rotorstep); +else + mp->m_agfrotor = (args->agno * rotorstep +1 ) % + (mp->m_sb.sb_agcount * rotorstep); + } + +xfs_alloc_vextent_set_fsbno (args);return 0 ; -error0: -xfs_perag_put (args->pag); -return error; +} + +/* +* Iterate from the agno indicated from args->fsbno through to the end of the +* filesystem attempting blocking allocation. This does not wrap or try a second +* pass, so will not recurse into AGs lower than indicated by fsbno. +*/ +static int +xfs_alloc_vextent_first_ag ( +struct xfs_alloc_arg *args) +{ +struct xfs_mount *mp = args->mp; +int error; + + error =xfs_alloc_vextent_check_args (args); +if (error) { +if (error == -ENOSPC ) +return 0 ; +return error; + } + + args->type =XFS_ALLOCTYPE_THIS_AG ; + error =xfs_alloc_vextent_iterate_ags (args, +XFS_FSB_TO_AGNO (mp, args->fsbno),0 ); +if (error) +return error; +xfs_alloc_vextent_set_fsbno (args); +return 0 ; +} + +/* +* Allocate an extent (variable-size). +* Depending on the allocation type, we either look in a single allocation +* group or loop over the allocation groups to find the result. +*/ +int +xfs_alloc_vextent ( +struct xfs_alloc_arg *args) +{ +switch (args->type) { +case XFS_ALLOCTYPE_THIS_AG : +case XFS_ALLOCTYPE_NEAR_BNO : +case XFS_ALLOCTYPE_THIS_BNO : +return xfs_alloc_vextent_this_ag (args); +case XFS_ALLOCTYPE_START_BNO : +return xfs_alloc_vextent_start_ag (args); +case XFS_ALLOCTYPE_FIRST_AG : +return xfs_alloc_vextent_first_ag (args); +default : +ASSERT (0 ); +/* NOTREACHED */ + } +/* Should never get here */ +return -EFSCORRUPTED ; }/* Ensure that the freelist is at full capacity. */
Signature · 1 line
2.35.1
PATCH 24/50 xfs: use xfs_alloc_vextent_this_ag() in _iterate_ags()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Because the core of the per-ag iteration is calling "this ag" allocation on one AG at a time. This brings the number of callers of xfs_alloc_ag_vextent() down to 1.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 57 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 29 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +28 -29
@@ -3224,6 +3224,28 @@ xfs_alloc_vextent_set_fsbno(/* * Allocate within a single AG only. */ +static int +__xfs_alloc_vextent_this_ag ( +struct xfs_alloc_arg *args) +{ +struct xfs_mount *mp = args->mp; +int error; + + error =xfs_alloc_fix_freelist (args,0 ); +if (error) { +trace_xfs_alloc_vextent_nofix (args); +return error; + } +if (!args->agbp) { +/* cannot allocate in this AG at all */ +trace_xfs_alloc_vextent_noagbp (args); + args->agbno =NULLAGBLOCK ; +return 0 ; + } + args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); +return xfs_alloc_ag_vextent (args); +} +static int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args)
@@ -3240,24 +3262,13 @@ xfs_alloc_vextent_this_ag( args->agno =XFS_FSB_TO_AGNO (mp, args->fsbno); args->pag =xfs_perag_get (mp, args->agno); - error =xfs_alloc_fix_freelist (args,0 ); -if (error) { -trace_xfs_alloc_vextent_nofix (args); - goto out_error; - } -if (!args->agbp) { -trace_xfs_alloc_vextent_noagbp (args); - goto out_error; - } - args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); - error =xfs_alloc_ag_vextent (args); + error =__xfs_alloc_vextent_this_ag (args); +xfs_perag_put (args->pag);if (error) - goto out_error; +return error;xfs_alloc_vextent_set_fsbno (args); -out_error: -xfs_perag_put (args->pag); -return error; +return 0 ; }/*
@@ -3295,24 +3306,12 @@ xfs_alloc_vextent_iterate_ags( args->agno = start_agno;for (;;) { args->pag =xfs_perag_get (mp, args->agno); - error =xfs_alloc_fix_freelist (args, flags); -if (error) { -trace_xfs_alloc_vextent_nofix (args); -break ; - } -/* -* If we get a buffer back then the allocation will fly. -*/ -if (args->agbp) { - error =xfs_alloc_ag_vextent (args); + error =__xfs_alloc_vextent_this_ag (args); +if (error || args->agbp)break ; - }trace_xfs_alloc_vextent_loopfailed (args); -/* -* Didn't work, figure out the next iteration. -*/ if (args->agno == start_agno && args->otype ==XFS_ALLOCTYPE_START_BNO ) args->type =XFS_ALLOCTYPE_THIS_AG ;
Signature · 1 line
2.35.1
PATCH 25/50 xfs: combine __xfs_alloc_vextent_this_ag and xfs_alloc_ag_vextent
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
THere's a bit of a recursive conundrum around xfs_alloc_ag_vextent(). We can't first call xfs_alloc_ag_vextent() without preparing the AGFL for the allocation, and preparing the AGFL call xfs_alloc_ag_vextent() to prepare the AGFL for the allocation. This "double allocation" requirement is not really clear from the current xfs_alloc_fix_freelist() calls that are sprinkled through the allocation code.
It's not helped that xfs_alloc_ag_vextent() can actually allocate from the AGFL itself, but there's special code to prevent AGFL prep allocations from allocating from the free list it's trying to prep. The naming is not clear (args->wasfromfl is true when allocated from the free list, but the indication that we are allocating for the free list is via (args->resv == XFS_AG_RESV_AGFL).
So, lets make this "allocation required for allocation" situation clear by moving it all inside xfs_alloc_ag_vextent(). The freelist allocation is a specific XFS_ALLOCTYPE_THIS_AG allocation, which translated directly to xfs_alloc_ag_vextent_size() allocation.
This enables us to replace __xfs_alloc_vextent_this_ag() with a call to xfs_alloc_ag_vextent(), and we drive the freelist fixing further into the per-ag allocation algrothim.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 65 +++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 30 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +35 -30
@@ -1144,22 +1144,38 @@ xfs_alloc_ag_vextent_small(* and of the form k * prod + mod unless there's nothing that large. * Return the starting a.g. block, or NULLAGBLOCK if we can't do it. */ -STATIC int /* error */ +static int xfs_alloc_ag_vextent ( -xfs_alloc_arg_t *args)/* argument structure for allocation */ +struct xfs_alloc_arg *args) { -int error=0 ; +struct xfs_mount *mp = args->mp; +int error =0 ;ASSERT (args->minlen >0 );ASSERT (args->maxlen >0 );ASSERT (args->minlen <= args->maxlen);ASSERT (args->mod < args->prod);ASSERT (args->alignment >0 ); +ASSERT (args->resv !=XFS_AG_RESV_AGFL ); + + + error =xfs_alloc_fix_freelist (args,0 ); +if (error) { +trace_xfs_alloc_vextent_nofix (args); +return error; + } +if (!args->agbp) { +/* cannot allocate in this AG at all */ +trace_xfs_alloc_vextent_noagbp (args); + args->agbno =NULLAGBLOCK ; +return 0 ; + } + args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); + args->wasfromfl =0 ;/* * Branch to correct routine based on the type. */ - args->wasfromfl =0 ;switch (args->type) {case XFS_ALLOCTYPE_THIS_AG : error =xfs_alloc_ag_vextent_size (args);
@@ -1180,7 +1196,6 @@ xfs_alloc_ag_vextent(ASSERT (args->len >= args->minlen);ASSERT (args->len <= args->maxlen); -ASSERT (!args->wasfromfl || args->resv !=XFS_AG_RESV_AGFL );ASSERT (args->agbno % args->alignment ==0 );/* if not file data, insert new block into the reverse map btree */
@@ -2725,7 +2740,7 @@ xfs_alloc_fix_freelist( targs.resv =XFS_AG_RESV_AGFL ;/* Allocate as many blocks as possible at once. */ - error =xfs_alloc_ag_vextent (&targs); + error =xfs_alloc_ag_vextent_size (&targs);if (error) goto out_agflbp_relse;
@@ -2739,6 +2754,18 @@ xfs_alloc_fix_freelist(break ; goto out_agflbp_relse; } + +if (!xfs_rmap_should_skip_owner_update (&targs.oinfo)) { + error =xfs_rmap_alloc (tp, agbp, pag, + targs.agbno, targs.len, &targs.oinfo); +if (error) + goto out_agflbp_relse; + } + error =xfs_alloc_update_counters (tp, agbp, + -((long )(targs.len))); +if (error) + goto out_agflbp_relse; +/* * Put each allocated block on the list. */
@@ -3224,28 +3251,6 @@ xfs_alloc_vextent_set_fsbno(/* * Allocate within a single AG only. */ -static int -__xfs_alloc_vextent_this_ag ( -struct xfs_alloc_arg *args) -{ -struct xfs_mount *mp = args->mp; -int error; - - error =xfs_alloc_fix_freelist (args,0 ); -if (error) { -trace_xfs_alloc_vextent_nofix (args); -return error; - } -if (!args->agbp) { -/* cannot allocate in this AG at all */ -trace_xfs_alloc_vextent_noagbp (args); - args->agbno =NULLAGBLOCK ; -return 0 ; - } - args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); -return xfs_alloc_ag_vextent (args); -} -static int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args)
@@ -3262,7 +3267,7 @@ xfs_alloc_vextent_this_ag( args->agno =XFS_FSB_TO_AGNO (mp, args->fsbno); args->pag =xfs_perag_get (mp, args->agno); - error =__xfs_alloc_vextent_this_ag (args); + error =xfs_alloc_ag_vextent (args);xfs_perag_put (args->pag);if (error)return error;
@@ -3306,7 +3311,7 @@ xfs_alloc_vextent_iterate_ags( args->agno = start_agno;for (;;) { args->pag =xfs_perag_get (mp, args->agno); - error =__xfs_alloc_vextent_this_ag (args); + error =xfs_alloc_ag_vextent (args);if (error || args->agbp)break ;
Signature · 1 line
2.35.1
PATCH 26/50 xfs: use xfs_alloc_vextent_this_ag() where appropriate
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Change obvious callers of single AG allocation to use xfs_alloc_vextent_this_ag(). Drive the per-ag grabbing out to the callers, too, so that callers with active references don't need to do new lookups just for an allocation in a context that already has a perag reference.
The only remaining caller that does single AG allocation through xfs_alloc_vextent() is xfs_bmap_btalloc() with XFS_ALLOCTYPE_NEAR_BNO. That is going to need more untangling before it can be converted cleanly.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 3 +- fs/xfs/libxfs/xfs_alloc.c | 15 ++++--- fs/xfs/libxfs/xfs_alloc.h | 6 +++ fs/xfs/libxfs/xfs_bmap.c | 71 ++++++++++++++++++------------ fs/xfs/libxfs/xfs_bmap_btree.c | 48 +++++++++++--------- fs/xfs/libxfs/xfs_ialloc.c | 9 ++-- fs/xfs/libxfs/xfs_ialloc_btree.c | 3 +- fs/xfs/libxfs/xfs_refcount_btree.c | 3 +- fs/xfs/scrub/repair.c | 3 +- 9 files changed, 98 insertions(+), 63 deletions(-)
fs/xfs/libxfs/xfs_ag.c +2 -1
@@ -895,6 +895,7 @@ xfs_ag_shrink_space(struct xfs_alloc_arg args = { .tp = *tpp, .mp = mp, + .pag = pag, .type =XFS_ALLOCTYPE_THIS_BNO , .minlen = delta, .maxlen = delta,
@@ -946,7 +947,7 @@ xfs_ag_shrink_space(return error;/* internal log shouldn't also show up in the free space btrees */ - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_this_ag (&args);if (!error && args.agbno ==NULLAGBLOCK ) error = -ENOSPC ;
fs/xfs/libxfs/xfs_alloc.c +8 -7
@@ -2727,7 +2727,6 @@ xfs_alloc_fix_freelist( targs.agbp = agbp; targs.agno = args->agno; targs.alignment = targs.minlen = targs.prod =1 ; - targs.type =XFS_ALLOCTYPE_THIS_AG ; targs.pag = pag; error =xfs_alloc_read_agfl (pag, tp, &agflbp);if (error)
@@ -3251,7 +3250,7 @@ xfs_alloc_vextent_set_fsbno(/* * Allocate within a single AG only. */ -static int +int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args) {
@@ -3266,9 +3265,7 @@ xfs_alloc_vextent_this_ag( } args->agno =XFS_FSB_TO_AGNO (mp, args->fsbno); - args->pag =xfs_perag_get (mp, args->agno); error =xfs_alloc_ag_vextent (args); -xfs_perag_put (args->pag);if (error)return error;
@@ -3447,11 +3444,15 @@ intxfs_alloc_vextent ( struct xfs_alloc_arg *args) { +int error; +switch (args->type) { -case XFS_ALLOCTYPE_THIS_AG :case XFS_ALLOCTYPE_NEAR_BNO : -case XFS_ALLOCTYPE_THIS_BNO : -return xfs_alloc_vextent_this_ag (args); + args->pag =xfs_perag_get (args->mp, +XFS_FSB_TO_AGNO (args->mp, args->fsbno)); + error =xfs_alloc_vextent_this_ag (args); +xfs_perag_put (args->pag); +return error;case XFS_ALLOCTYPE_START_BNO :return xfs_alloc_vextent_start_ag (args);case XFS_ALLOCTYPE_FIRST_AG :
fs/xfs/libxfs/xfs_alloc.h +6 -0
@@ -124,6 +124,12 @@ int /* error */xfs_alloc_vextent ( xfs_alloc_arg_t *args);/* allocation argument structure */ +/* +* Allocate an extent in the specific AG defined by args->fsbno. If there is no +* space in that AG, then the allocation will fail. +*/ +int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args); +/* * Free an extent. */
fs/xfs/libxfs/xfs_bmap.c +43 -28
152 lines not on this page · raw message
fs/xfs/libxfs/xfs_bmap_btree.c +27 -21
74 lines not on this page · raw message
fs/xfs/libxfs/xfs_ialloc.c +6 -3
@@ -630,6 +630,7 @@ xfs_ialloc_ag_alloc( args.mp = tp->t_mountp; args.fsbno =NULLFSBLOCK ; args.oinfo =XFS_RMAP_OINFO_INODES ; + args.pag = pag;#ifdef DEBUG /* randomly do sparse inode allocations */
@@ -683,7 +684,8 @@ xfs_ialloc_ag_alloc(/* Allow space for the inode btree to split. */ args.minleft = igeo->inobt_maxlevels; -if ((error =xfs_alloc_vextent (&args))) + error =xfs_alloc_vextent_this_ag (&args); +if (error)return error;/*
@@ -731,7 +733,8 @@ xfs_ialloc_ag_alloc(* Allow space for the inode btree to split. */ args.minleft = igeo->inobt_maxlevels; -if ((error =xfs_alloc_vextent (&args))) + error =xfs_alloc_vextent_this_ag (&args); +if (error)return error; }
@@ -780,7 +783,7 @@ xfs_ialloc_ag_alloc( args.mp->m_sb.sb_inoalignmt) - igeo->ialloc_blks; - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_this_ag (&args);if (error)return error;
fs/xfs/libxfs/xfs_ialloc_btree.c +2 -1
@@ -103,6 +103,7 @@ __xfs_inobt_alloc_block(memset (&args,0 ,sizeof (args)); args.tp = cur->bc_tp; args.mp = cur->bc_mp; + args.pag = cur->bc_ag.pag; args.oinfo =XFS_RMAP_OINFO_INOBT ; args.fsbno =XFS_AGB_TO_FSB (args.mp, cur->bc_ag.pag->pag_agno, sbno); args.minlen =1 ;
@@ -111,7 +112,7 @@ __xfs_inobt_alloc_block( args.type =XFS_ALLOCTYPE_NEAR_BNO ; args.resv = resv; - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_this_ag (&args);if (error)return error;
fs/xfs/libxfs/xfs_refcount_btree.c +2 -1
@@ -66,6 +66,7 @@ xfs_refcountbt_alloc_block(memset (&args,0 ,sizeof (args)); args.tp = cur->bc_tp; args.mp = cur->bc_mp; + args.pag = cur->bc_ag.pag; args.type =XFS_ALLOCTYPE_NEAR_BNO ; args.fsbno =XFS_AGB_TO_FSB (cur->bc_mp, cur->bc_ag.pag->pag_agno,xfs_refc_block (args.mp));
@@ -73,7 +74,7 @@ xfs_refcountbt_alloc_block( args.minlen = args.maxlen = args.prod =1 ; args.resv =XFS_AG_RESV_METADATA ; - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_this_ag (&args);if (error) goto out_error; trace_xfs_refcountbt_alloc_block(cur->bc_mp, cur->bc_ag.pag->pag_agno,
fs/xfs/scrub/repair.c +2 -1
@@ -314,6 +314,7 @@ xrep_alloc_ag_block( args.tp = sc->tp; args.mp = sc->mp; + args.pag = sc->sa.pag; args.oinfo = *oinfo; args.fsbno =XFS_AGB_TO_FSB (args.mp, sc->sa.pag->pag_agno,0 ); args.minlen =1 ;
@@ -322,7 +323,7 @@ xrep_alloc_ag_block( args.type =XFS_ALLOCTYPE_THIS_AG ; args.resv = resv; - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_this_ag (&args);if (error)return error;if (args.fsbno ==NULLFSBLOCK )
Signature · 1 line
2.35.1
PATCH 27/50 xfs: factor xfs_bmap_btalloc()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
There are several different contexts xfs_bmap_btalloc() handles, and large chunks of the code execute individual contexts. For example, "nullfb" and "low mode" are mutually exclusive, but the code that handles them is deeply intertwined. Try to untangle this mess a bit.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_bmap.c | 475 +++++++++++++++++++++++---------------- 1 file changed, 277 insertions(+), 198 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +277 -198
@@ -3239,41 +3239,6 @@ xfs_bmap_select_minlen( } } -STATIC int -xfs_bmap_btalloc_nullfb ( -struct xfs_bmalloca *ap, -struct xfs_alloc_arg *args, -xfs_extlen_t *blen) -{ -struct xfs_mount *mp = ap->ip->i_mount; -struct xfs_perag *pag; -xfs_agnumber_t agno, startag; -int notinit =0 ; -int error =0 ; - - args->type =XFS_ALLOCTYPE_START_BNO ; - args->total = ap->total; - - startag =XFS_FSB_TO_AGNO (mp, args->fsbno); -if (startag ==NULLAGNUMBER ) - startag =0 ; - - *blen =0 ; -for_each_perag_wrap (mp, startag, agno, pag) { - error =xfs_bmap_longest_free_extent (pag, args->tp, blen, - ¬init); -if (error) -break ; -if (*blen >= args->maxlen) -break ; - } -if (pag) -xfs_perag_rele (pag); - -xfs_bmap_select_minlen (ap, args, blen, notinit); -return 0 ; -} - STATIC int xfs_bmap_btalloc_filestreams( struct xfs_bmalloca *ap,
@@ -3544,202 +3509,316 @@ xfs_bmap_exact_minlen_extent_alloc(#define xfs_bmap_exact_minlen_extent_alloc (bma) (-EFSCORRUPTED)#endif - -STATIC int -xfs_bmap_btalloc ( -struct xfs_bmalloca *ap) +/* +* If we are not low on available data blocks and we are allocating at +* EOF, optimise allocation for contiguous file extension and/or stripe +* alignment of the new extent. +* +* NOTE: ap->aeof is only set if the allocation length is >= the +* stripe unit and the allocation offset is at the end of file. +*/ +static int +xfs_btalloc_at_eof ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args, +xfs_extlen_t blen, +int stripe_align) { -struct xfs_mount *mp = ap->ip->i_mount; -struct xfs_alloc_arg args = { .tp = ap->tp, .mp = mp }; -xfs_alloctype_t atype =0 ; -xfs_agnumber_t fb_agno;/* ag number of ap->firstblock */ -xfs_agnumber_t ag; -xfs_fileoff_t orig_offset; -xfs_extlen_t orig_length; -xfs_extlen_t blen; -xfs_extlen_t nextminlen =0 ; -int nullfb;/* true if ap->firstblock isn't set */ -int isaligned; +struct xfs_mount *mp = args->mp; +xfs_alloctype_t atype;int error; -int stripe_align; - -ASSERT (ap->length); - orig_offset = ap->offset; - orig_length = ap->length; - - stripe_align =xfs_bmap_compute_alignments (ap, &args); - - 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 ) && -xfs_inode_is_filestream (ap->ip)) { - ag =xfs_filestream_lookup_ag (ap->ip); - ag = (ag !=NULLAGNUMBER ) ? ag :0 ; - ap->blkno =XFS_AGB_TO_FSB (mp, ag,0 ); - }else { - ap->blkno =XFS_INO_TO_FSB (mp, ap->ip->i_ino); - } - }else - ap->blkno = ap->tp->t_firstblock; - -xfs_bmap_adjacent (ap);/* -* If allowed, use ap->blkno; otherwise must use firstblock since -* it's in the right allocation group. +* If there are already extents in the file, try an exact EOF block +* allocation to extend the file as a contiguous extent. If that fails, +* or it's the first allocation in a file, just try for a stripe aligned +* allocation. */ -if (nullfb ||XFS_FSB_TO_AGNO (mp, ap->blkno) == fb_agno) - ; -else - ap->blkno = ap->tp->t_firstblock; -/* -* Normal allocation, done through xfs_alloc_vextent. -*/ - isaligned =0 ; - args.fsbno = ap->blkno; - args.oinfo =XFS_RMAP_OINFO_SKIP_UPDATE ; +if (ap->offset) { +xfs_extlen_t nextminlen =0 ; + + atype = args->type; + args->type =XFS_ALLOCTYPE_THIS_BNO ; + args->alignment =1 ; -/* 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) {/* -* Search for an allocation group with a single extent large -* enough for the request. If one isn't found, then adjust -* the minimum allocation size to the largest space found. +* Compute the minlen+alignment for the next case. Set slop so +* that the value of minlen+alignment+slop doesn't go up between +* the calls. */ -if ((ap->datatype &XFS_ALLOC_USERDATA ) && -xfs_inode_is_filestream (ap->ip)) - error =xfs_bmap_btalloc_filestreams (ap, &args, &blen); +if (blen > stripe_align && blen <= args->maxlen) + nextminlen = blen - stripe_align;else - error =xfs_bmap_btalloc_nullfb (ap, &args, &blen); + nextminlen = args->minlen; +if (nextminlen + stripe_align > args->minlen +1 ) + args->minalignslop = nextminlen + stripe_align - + args->minlen -1 ; +else + args->minalignslop =0 ; + + args->pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, args->fsbno)); + error =xfs_alloc_vextent_this_ag (args); +xfs_perag_put (args->pag);if (error)return error; - }else if (ap->tp->t_flags &XFS_TRANS_LOWMODE ) { -if (xfs_inode_is_filestream (ap->ip)) - args.type =XFS_ALLOCTYPE_FIRST_AG ; -else - args.type =XFS_ALLOCTYPE_START_BNO ; - args.total = args.minlen = ap->minlen; + +if (args->fsbno !=NULLFSBLOCK ) +return 0 ; +/* +* Exact allocation failed. Reset to try an aligned allocation +* according to the original allocation specification. +*/ + args->pag =NULL ; + args->type = atype; + args->fsbno = ap->blkno; + args->alignment = stripe_align; + args->minlen = nextminlen; + args->minalignslop =0 ; }else { - args.type =XFS_ALLOCTYPE_NEAR_BNO ; - args.total = ap->total; - args.minlen = ap->minlen; + args->alignment = stripe_align; + atype = args->type; +/* +* Adjust minlen to try and preserve alignment if we +* can't guarantee an aligned maxlen extent. +*/ +if (blen > args->alignment && + blen <= args->maxlen + args->alignment) + args->minlen = blen - args->alignment; + args->minalignslop =0 ; } - args.minleft = ap->minleft; - args.wasdel = ap->wasdel; - args.resv =XFS_AG_RESV_NONE ; - args.datatype = ap->datatype; + + error =xfs_alloc_vextent (args); +if (error) +return error; + +if (args->fsbno !=NULLFSBLOCK ) +return 0 ;/* -* If we are not low on available data blocks, and the underlying -* logical volume manager is a stripe, and the file offset is zero then -* try to allocate data blocks on stripe unit boundary. NOTE: ap->aeof -* is only set if the allocation length is >= the stripe unit and the -* allocation offset is at the end of file. +* Allocation failed, so turn return the allocation args to their +* original non-aligned state so the caller can proceed on allocation +* failure as if this function was never called. */ -if (!(ap->tp->t_flags &XFS_TRANS_LOWMODE ) && ap->aeof) { -if (!ap->offset) { - args.alignment = stripe_align; - atype = args.type; - isaligned =1 ; -/* -* Adjust minlen to try and preserve alignment if we -* can't guarantee an aligned maxlen extent. -*/ -if (blen > args.alignment && - blen <= args.maxlen + args.alignment) - args.minlen = blen - args.alignment; - args.minalignslop =0 ; - }else { -/* -* First try an exact bno allocation. -* If it fails then do a near or start bno -* allocation with alignment turned on. -*/ - atype = args.type; - args.type =XFS_ALLOCTYPE_THIS_BNO ; - args.alignment =1 ; + args->type = atype; + args->fsbno = ap->blkno; + args->alignment =1 ; +return 0 ; +} -/* -* Compute the minlen+alignment for the -* next case. Set slop so that the value -* of minlen+alignment+slop doesn't go up -* between the calls. -*/ -if (blen > stripe_align && blen <= args.maxlen) - nextminlen = blen - stripe_align; -else - nextminlen = args.minlen; -if (nextminlen + stripe_align > args.minlen +1 ) - args.minalignslop = - nextminlen + stripe_align - - args.minlen -1 ; -else - args.minalignslop =0 ; +static int +xfs_btalloc_nullfb_bestlen ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args, +xfs_extlen_t *blen) +{ +struct xfs_mount *mp = args->mp; +struct xfs_perag *pag; +xfs_agnumber_t agno, startag; +int notinit =0 ; +int error =0 ; - args.pag =xfs_perag_get (mp, -XFS_FSB_TO_AGNO (mp, args.fsbno)); - error =xfs_alloc_vextent_this_ag (&args); -xfs_perag_put (args.pag); -if (error) -return error; + args->type =XFS_ALLOCTYPE_START_BNO ; + args->total = ap->total; -if (args.fsbno !=NULLFSBLOCK ) - goto out_success; -/* -* Exact allocation failed. Now try with alignment -* turned on. -*/ - args.pag =NULL ; - args.type = atype; - args.fsbno = ap->blkno; - args.alignment = stripe_align; - args.minlen = nextminlen; - args.minalignslop =0 ; - isaligned =1 ; - } + startag =XFS_FSB_TO_AGNO (mp, args->fsbno); +if (startag ==NULLAGNUMBER ) + startag =0 ; + + *blen =0 ; +for_each_perag_wrap (mp, startag, agno, pag) { + error =xfs_bmap_longest_free_extent (pag, args->tp, blen, + ¬init); +if (error) +break ; +if (*blen >= args->maxlen) +break ; + } +if (pag) +xfs_perag_rele (pag); + +xfs_bmap_select_minlen (ap, args, blen, notinit); +return 0 ; +} + +static int +xfs_btalloc_nullfb ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args, +int stripe_align) +{ +struct xfs_mount *mp = args->mp; +xfs_extlen_t blen =0 ; +int error; + +/* +* Determine the initial block number we will target for allocation. +*/ +if ((ap->datatype &XFS_ALLOC_USERDATA ) && +xfs_inode_is_filestream (ap->ip)) { +xfs_agnumber_t agno =xfs_filestream_lookup_ag (ap->ip); +if (agno ==NULLAGNUMBER ) + agno =0 ; + ap->blkno =XFS_AGB_TO_FSB (mp, agno,0 ); }else { - args.alignment =1 ; - args.minalignslop =0 ; + ap->blkno =XFS_INO_TO_FSB (mp, ap->ip->i_ino); } +xfs_bmap_adjacent (ap); + args->fsbno = ap->blkno; - error =xfs_alloc_vextent (&args); +/* +* Search for an allocation group with a single extent large enough for +* the request. If one isn't found, then adjust the minimum allocation +* size to the largest space found. +*/ +if ((ap->datatype &XFS_ALLOC_USERDATA ) && +xfs_inode_is_filestream (ap->ip)) + error =xfs_bmap_btalloc_filestreams (ap, args, &blen); +else + error =xfs_btalloc_nullfb_bestlen (ap, args, &blen);if (error)return error; -if (isaligned && args.fsbno ==NULLFSBLOCK ) { -/* -* allocation failed, so turn off alignment and -* try again. -*/ - args.type = atype; - args.fsbno = ap->blkno; - args.alignment =0 ; -if ((error =xfs_alloc_vextent (&args))) +if (ap->aeof) { + error =xfs_btalloc_at_eof (ap, args, blen, stripe_align); +if (error)return error; +if (args->fsbno !=NULLFSBLOCK ) +return 0 ; } -if (args.fsbno ==NULLFSBLOCK && nullfb && - args.minlen > ap->minlen) { - args.minlen = ap->minlen; - args.type =XFS_ALLOCTYPE_START_BNO ; - args.fsbno = ap->blkno; -if ((error =xfs_alloc_vextent (&args))) + + error =xfs_alloc_vextent (args); +if (error) +return error; +if (args->fsbno !=NULLFSBLOCK ) +return 0 ; + +/* +* Try a locality first full filesystem minimum length allocation whilst +* still maintaining necessary total block reservation requirements. +*/ +if (args->minlen > ap->minlen) { + args->minlen = ap->minlen; + args->type =XFS_ALLOCTYPE_START_BNO ; + args->fsbno = ap->blkno; + error =xfs_alloc_vextent (args); +if (error)return error; } -if (args.fsbno ==NULLFSBLOCK && nullfb) { - args.fsbno =0 ; - args.type =XFS_ALLOCTYPE_FIRST_AG ; - args.total = ap->minlen; -if ((error =xfs_alloc_vextent (&args))) +if (args->fsbno !=NULLFSBLOCK ) +return 0 ; + +/* +* We are now critically low on space, so this is a last resort +* allocation attempt: no reserve, no locality, blocking, minimum +* length, full filesystem free space scan. We also indicate to future +* allocations in this transaction that we are critically low on space +* so they don't waste time on allocation modes that are unlikely to +* succeed. +*/ + args->fsbno =0 ; + args->type =XFS_ALLOCTYPE_FIRST_AG ; + args->total = ap->minlen; + error =xfs_alloc_vextent (args); +if (error) +return error; + ap->tp->t_flags |=XFS_TRANS_LOWMODE ; +return 0 ; +} + +/* +* We are near ENOSPC, so try an exhaustive minimum length allocation. If this +* fails, we really are at ENOSPC. +*/ +static int +xfs_btalloc_low_mode ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args) +{ + ap->blkno = ap->tp->t_firstblock; +xfs_bmap_adjacent (ap); + args->fsbno = ap->blkno; + args->total = args->minlen = ap->minlen; +if (xfs_inode_is_filestream (ap->ip)) + args->type =XFS_ALLOCTYPE_FIRST_AG ; +else + args->type =XFS_ALLOCTYPE_START_BNO ; + +return xfs_alloc_vextent (args); +} + +/* +* Attempt to allocate near the current target. We attempt optimal EOF +* allocation, but then if that fails we simply try somewhere near in the same +* AG. If we can't get a block in the same AG, then we fail the allocation. +*/ +static int +xfs_btalloc_near ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args, +int stripe_align) +{ +xfs_extlen_t blen =0 ; +int error; + + ap->blkno = ap->tp->t_firstblock; +xfs_bmap_adjacent (ap); + args->fsbno = ap->blkno; + args->type =XFS_ALLOCTYPE_NEAR_BNO ; + args->total = ap->total; + args->minlen = ap->minlen; + +if (ap->aeof) { + error =xfs_btalloc_at_eof (ap, args, blen, stripe_align); +if (error)return error; - ap->tp->t_flags |=XFS_TRANS_LOWMODE ; +if (args->fsbno !=NULLFSBLOCK ) +return 0 ; } +return xfs_alloc_vextent (args); +} + +STATIC int +xfs_bmap_btalloc ( +struct xfs_bmalloca *ap) +{ +struct xfs_mount *mp = ap->ip->i_mount; +struct xfs_alloc_arg args = { + .tp = ap->tp, + .mp = mp, + .fsbno =NULLFSBLOCK , + .oinfo =XFS_RMAP_OINFO_SKIP_UPDATE , + .minleft = ap->minleft, + .wasdel = ap->wasdel, + .resv =XFS_AG_RESV_NONE , + .datatype = ap->datatype, + .alignment =1 , + .minalignslop =0 , + }; +xfs_fileoff_t orig_offset; +xfs_extlen_t orig_length; +int error; +int stripe_align; + +ASSERT (ap->length); + orig_offset = ap->offset; + orig_length = ap->length; + + stripe_align =xfs_bmap_compute_alignments (ap, &args); + +/* Trim the allocation back to the maximum an AG can fit. */ + args.maxlen =min (ap->length, mp->m_ag_max_usable); + +if (ap->tp->t_firstblock ==NULLFSBLOCK ) { + error =xfs_btalloc_nullfb (ap, &args, stripe_align); + }else if (ap->tp->t_flags &XFS_TRANS_LOWMODE ) { + error =xfs_btalloc_low_mode (ap, &args); + }else { + error =xfs_btalloc_near (ap, &args, stripe_align); + } +if (error) +return error;if (args.fsbno !=NULLFSBLOCK ) { -out_success:xfs_bmap_process_allocated_extent (ap, &args, orig_offset, orig_length); }else {
Signature · 1 line
2.35.1
PATCH 28/50 xfs: use xfs_alloc_vextent_first_ag() where appropriate
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Change obvious callers of single AG allocation to use xfs_alloc_vextent_first_ag(). This gets rid of XFS_ALLOCTYPE_FIRST_AG as the type used within xfs_alloc_vextent_first_ag() during iteration is _THIS_AG. Hence we can remove the setting of args->type from all the callers of _first_ag() and remove the alloctype.
While doing this, pass the allocation target fsb as a parameter rather than encoding it in args->fsbno. This starts the process of making args->fsbno an output only variable rather than input/output.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 26 ++++++++++++++------------ fs/xfs/libxfs/xfs_alloc.h | 10 ++++++++-- fs/xfs/libxfs/xfs_bmap.c | 15 +++++---------- fs/xfs/libxfs/xfs_bmap_btree.c | 4 +--- 4 files changed, 28 insertions(+), 27 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +14 -12
@@ -3186,7 +3186,8 @@ xfs_alloc_read_agf(*/ static int xfs_alloc_vextent_check_args ( -struct xfs_alloc_arg *args) +struct xfs_alloc_arg *args, +xfs_rfsblock_t target) {struct xfs_mount *mp = args->mp;xfs_agblock_t agsize;
@@ -3204,13 +3205,13 @@ xfs_alloc_vextent_check_args( args->maxlen = agsize;if (args->alignment ==0 ) args->alignment =1 ; -ASSERT (XFS_FSB_TO_AGNO (mp, args->fsbno) < mp->m_sb.sb_agcount); -ASSERT (XFS_FSB_TO_AGBNO (mp, args->fsbno) < agsize); +ASSERT (XFS_FSB_TO_AGNO (mp, target) < mp->m_sb.sb_agcount); +ASSERT (XFS_FSB_TO_AGBNO (mp, target) < agsize);ASSERT (args->minlen <= args->maxlen);ASSERT (args->minlen <= agsize);ASSERT (args->mod < args->prod); -if (XFS_FSB_TO_AGNO (mp, args->fsbno) >= mp->m_sb.sb_agcount || -XFS_FSB_TO_AGBNO (mp, args->fsbno) >= agsize || +if (XFS_FSB_TO_AGNO (mp, target) >= mp->m_sb.sb_agcount || +XFS_FSB_TO_AGBNO (mp, target) >= agsize || args->minlen > args->maxlen || args->minlen > agsize || args->mod >= args->prod) { args->fsbno =NULLFSBLOCK ;
@@ -3219,6 +3220,7 @@ xfs_alloc_vextent_check_args( }return 0 ; } +/* * Post-process allocation results to set the allocated block number correctly * for the caller.
@@ -3257,7 +3259,7 @@ xfs_alloc_vextent_this_ag(struct xfs_mount *mp = args->mp;int error; - error =xfs_alloc_vextent_check_args (args); + error =xfs_alloc_vextent_check_args (args, args->fsbno);if (error) {if (error == -ENOSPC )return 0 ;
@@ -3371,7 +3373,7 @@ xfs_alloc_vextent_start_ag(bool bump_rotor = false;int error; - error =xfs_alloc_vextent_check_args (args); + error =xfs_alloc_vextent_check_args (args, args->fsbno);if (error) {if (error == -ENOSPC )return 0 ;
@@ -3412,14 +3414,15 @@ xfs_alloc_vextent_start_ag(* filesystem attempting blocking allocation. This does not wrap or try a second * pass, so will not recurse into AGs lower than indicated by fsbno. */ -static int +int xfs_alloc_vextent_first_ag ( -struct xfs_alloc_arg *args) +struct xfs_alloc_arg *args, +xfs_rfsblock_t target) {struct xfs_mount *mp = args->mp;int error; - error =xfs_alloc_vextent_check_args (args); + error =xfs_alloc_vextent_check_args (args, target);if (error) {if (error == -ENOSPC )return 0 ;
@@ -3427,6 +3430,7 @@ xfs_alloc_vextent_first_ag( } args->type =XFS_ALLOCTYPE_THIS_AG ; + args->fsbno = target; error =xfs_alloc_vextent_iterate_ags (args,XFS_FSB_TO_AGNO (mp, args->fsbno),0 );if (error)
@@ -3455,8 +3459,6 @@ xfs_alloc_vextent(return error;case XFS_ALLOCTYPE_START_BNO :return xfs_alloc_vextent_start_ag (args); -case XFS_ALLOCTYPE_FIRST_AG : -return xfs_alloc_vextent_first_ag (args);default :ASSERT (0 );/* NOTREACHED */
fs/xfs/libxfs/xfs_alloc.h +8 -2
@@ -19,7 +19,6 @@ unsigned int xfs_agfl_size(struct xfs_mount *mp);/* * Freespace allocation types. Argument to xfs_alloc_[v]extent. */ -#define XFS_ALLOCTYPE_FIRST_AG 0x02/* ... start at ag 0 */ #define XFS_ALLOCTYPE_THIS_AG 0x08/* anywhere in this a.g. */ #define XFS_ALLOCTYPE_START_BNO 0x10/* near this block else anywhere */ #define XFS_ALLOCTYPE_NEAR_BNO 0x20/* in this a.g. and near this block */
@@ -29,7 +28,6 @@ unsigned int xfs_agfl_size(struct xfs_mount *mp);typedef unsigned int xfs_alloctype_t ;#define XFS_ALLOC_TYPES \ - { XFS_ALLOCTYPE_FIRST_AG, "FIRST_AG" }, \ { XFS_ALLOCTYPE_THIS_AG, "THIS_AG" }, \ { XFS_ALLOCTYPE_START_BNO, "START_BNO" }, \ { XFS_ALLOCTYPE_NEAR_BNO, "NEAR_BNO" }, \
@@ -130,6 +128,14 @@ xfs_alloc_vextent(*/ int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args); +/* +* Iterate from the AG indicated from args->fsbno through to the end of the +* filesystem attempting blocking allocation. This is for use in last +* resort allocation attempts when everything else has failed. +*/ +int xfs_alloc_vextent_first_ag (struct xfs_alloc_arg *args, +xfs_rfsblock_t target); +/* * Free an extent. */
fs/xfs/libxfs/xfs_bmap.c +5 -10
@@ -3476,9 +3476,7 @@ xfs_bmap_exact_minlen_extent_alloc( ap->blkno = ap->tp->t_firstblock; } - args.fsbno = ap->blkno; args.oinfo =XFS_RMAP_OINFO_SKIP_UPDATE ; - args.type =XFS_ALLOCTYPE_FIRST_AG ; args.minlen = args.maxlen = ap->minlen; args.total = ap->total;
@@ -3490,7 +3488,7 @@ xfs_bmap_exact_minlen_extent_alloc( args.resv =XFS_AG_RESV_NONE ; args.datatype = ap->datatype; - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_first_ag (&args, ap->blkno);if (error)return error;
@@ -3715,10 +3713,8 @@ xfs_btalloc_nullfb(* so they don't waste time on allocation modes that are unlikely to * succeed. */ - args->fsbno =0 ; - args->type =XFS_ALLOCTYPE_FIRST_AG ; args->total = ap->minlen; - error =xfs_alloc_vextent (args); + error =xfs_alloc_vextent_first_ag (args,0 );if (error)return error; ap->tp->t_flags |=XFS_TRANS_LOWMODE ;
@@ -3736,13 +3732,12 @@ xfs_btalloc_low_mode( { ap->blkno = ap->tp->t_firstblock;xfs_bmap_adjacent (ap); - args->fsbno = ap->blkno; args->total = args->minlen = ap->minlen;if (xfs_inode_is_filestream (ap->ip)) - args->type =XFS_ALLOCTYPE_FIRST_AG ; -else - args->type =XFS_ALLOCTYPE_START_BNO ; +return xfs_alloc_vextent_first_ag (args, ap->blkno); + args->fsbno = ap->blkno; + args->type =XFS_ALLOCTYPE_START_BNO ;return xfs_alloc_vextent (args); }
fs/xfs/libxfs/xfs_bmap_btree.c +1 -3
@@ -240,9 +240,7 @@ xfs_bmbt_alloc_block(* satisfy a full btree split. Try again and if * successful activate the lowspace algorithm. */ - args.fsbno =0 ; - args.type =XFS_ALLOCTYPE_FIRST_AG ; - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_first_ag (&args,0 );if (error) goto error0; cur->bc_tp->t_flags |=XFS_TRANS_LOWMODE ;
Signature · 1 line
2.35.1
PATCH 29/50 xfs: use xfs_alloc_vextent_start_bno() where appropriate
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Change obvious callers of single AG allocation to use xfs_alloc_vextent_start_bno(). Callers no long need to specify XFS_ALLOCTYPE_START_BNO, and so the type can be driven inward and removed.
While doing this, also pass the allocation target fsb as a parameter rather than encoding it in args->fsbno.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 34 ++++++++++----------- fs/xfs/libxfs/xfs_alloc.h | 13 ++++++-- fs/xfs/libxfs/xfs_bmap.c | 54 ++++++++++++++++++---------------- fs/xfs/libxfs/xfs_bmap_btree.c | 8 ++--- 4 files changed, 59 insertions(+), 50 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +17 -17
@@ -3192,7 +3192,6 @@ xfs_alloc_vextent_check_args(struct xfs_mount *mp = args->mp;xfs_agblock_t agsize; - args->otype = args->type; args->agbno =NULLAGBLOCK ;/*
@@ -3278,12 +3277,11 @@ xfs_alloc_vextent_this_ag(/* * Iterate all AGs trying to allocate an extent starting from @start_ag. * -* If the -* incoming allocation type is XFS_ALLOCTYPE_NEAR_BNO, it means the allocation -* attempts in @start_agno have locality information. If we fail to allocate in -* that AG, then we revert to anywhere-in-AG for all the other AGs we attempt to -* allocation in as there is no locality optimisation possible for those -* allocations. +* If the incoming allocation type is XFS_ALLOCTYPE_NEAR_BNO, it means the +* allocation attempts in @start_agno have locality information. If we fail to +* allocate in that AG, then we revert to anywhere-in-AG for all the other AGs +* we attempt to allocation in as there is no locality optimisation possible for +* those allocations. * * When we wrap the AG iteration at the end of the filesystem, we have to be * careful not to wrap into AGs below ones we already have locked in the
@@ -3317,7 +3315,7 @@ xfs_alloc_vextent_iterate_ags(trace_xfs_alloc_vextent_loopfailed (args);if (args->agno == start_agno && - args->otype ==XFS_ALLOCTYPE_START_BNO ) + args->otype ==XFS_ALLOCTYPE_NEAR_BNO ) args->type =XFS_ALLOCTYPE_THIS_AG ;/* * For the first allocation, we can try any AG to get
@@ -3344,7 +3342,7 @@ xfs_alloc_vextent_iterate_ags( } flags =0 ; -if (args->otype ==XFS_ALLOCTYPE_START_BNO ) { +if (args->otype ==XFS_ALLOCTYPE_NEAR_BNO ) { args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); args->type =XFS_ALLOCTYPE_NEAR_BNO ; }
@@ -3363,9 +3361,10 @@ xfs_alloc_vextent_iterate_ags(* otherwise will wrap back to the start AG and run a second blocking pass to * the end of the filesystem. */ -static int +int xfs_alloc_vextent_start_ag ( -struct xfs_alloc_arg *args) +struct xfs_alloc_arg *args, +xfs_rfsblock_t target) {struct xfs_mount *mp = args->mp;xfs_agnumber_t start_agno;
@@ -3373,7 +3372,7 @@ xfs_alloc_vextent_start_ag(bool bump_rotor = false;int error; - error =xfs_alloc_vextent_check_args (args, args->fsbno); + error =xfs_alloc_vextent_check_args (args, target);if (error) {if (error == -ENOSPC )return 0 ;
@@ -3382,14 +3381,17 @@ xfs_alloc_vextent_start_ag(if ((args->datatype &XFS_ALLOC_INITIAL_USER_DATA ) &&xfs_is_inode32 (mp)) { - args->fsbno =XFS_AGB_TO_FSB (mp, + target =XFS_AGB_TO_FSB (mp, ((mp->m_agfrotor / rotorstep) % mp->m_sb.sb_agcount),0 ); bump_rotor =1 ; } - start_agno =XFS_FSB_TO_AGNO (mp, args->fsbno); - args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); + + start_agno =XFS_FSB_TO_AGNO (mp, target); + args->agbno =XFS_FSB_TO_AGBNO (mp, target); + args->otype =XFS_ALLOCTYPE_NEAR_BNO ; args->type =XFS_ALLOCTYPE_NEAR_BNO ; + args->fsbno = target; error =xfs_alloc_vextent_iterate_ags (args, start_agno,XFS_ALLOC_FLAG_TRYLOCK );
@@ -3457,8 +3459,6 @@ xfs_alloc_vextent( error =xfs_alloc_vextent_this_ag (args);xfs_perag_put (args->pag);return error; -case XFS_ALLOCTYPE_START_BNO : -return xfs_alloc_vextent_start_ag (args);default :ASSERT (0 );/* NOTREACHED */
fs/xfs/libxfs/xfs_alloc.h +11 -2
@@ -20,7 +20,6 @@ unsigned int xfs_agfl_size(struct xfs_mount *mp);* Freespace allocation types. Argument to xfs_alloc_[v]extent. */ #define XFS_ALLOCTYPE_THIS_AG 0x08/* anywhere in this a.g. */ -#define XFS_ALLOCTYPE_START_BNO 0x10/* near this block else anywhere */ #define XFS_ALLOCTYPE_NEAR_BNO 0x20/* in this a.g. and near this block */ #define XFS_ALLOCTYPE_THIS_BNO 0x40/* at exactly this block */
@@ -29,7 +28,6 @@ typedef unsigned int xfs_alloctype_t;#define XFS_ALLOC_TYPES \ { XFS_ALLOCTYPE_THIS_AG, "THIS_AG" }, \ - { XFS_ALLOCTYPE_START_BNO, "START_BNO" }, \ { XFS_ALLOCTYPE_NEAR_BNO, "NEAR_BNO" }, \ { XFS_ALLOCTYPE_THIS_BNO, "THIS_BNO" }
@@ -128,6 +126,17 @@ xfs_alloc_vextent(*/ int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args); +/* +* Best effort full filesystem allocation scan. +* +* Locality aware allocation will be attempted in the initial AG, but on failure +* non-localised attempts will be made. The AGs are constrained by previous +* allocations in the current transaction. Two passes will be made - the first +* non-blocking, the second blocking. +*/ +int xfs_alloc_vextent_start_ag (struct xfs_alloc_arg *args, +xfs_rfsblock_t target); +/* * Iterate from the AG indicated from args->fsbno through to the end of the * filesystem attempting blocking allocation. This is for use in last
fs/xfs/libxfs/xfs_bmap.c +28 -26
132 lines not on this page · raw message
fs/xfs/libxfs/xfs_bmap_btree.c +3 -5
@@ -216,8 +216,6 @@ xfs_bmbt_alloc_block(return -ENOSPC ;if (args.fsbno ==NULLFSBLOCK ) { - args.fsbno =be64_to_cpu (start->l); - args.type =XFS_ALLOCTYPE_START_BNO ;/* * Make sure there is sufficient room left in the AG to * complete a full tree split for an extent insert. If
@@ -230,7 +228,7 @@ xfs_bmbt_alloc_block(* block allocation here and corrupt the filesystem. */ args.minleft = args.tp->t_blk_res; - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_start_ag (&args,be64_to_cpu (start->l));if (error) goto error0;
@@ -246,8 +244,8 @@ xfs_bmbt_alloc_block( cur->bc_tp->t_flags |=XFS_TRANS_LOWMODE ; } }else if (cur->bc_tp->t_flags &XFS_TRANS_LOWMODE ) { - args.type =XFS_ALLOCTYPE_START_BNO ; - error =xfs_alloc_vextent (&args); + error =xfs_alloc_vextent_start_ag (&args, + cur->bc_tp->t_firstblock); }else { args.type =XFS_ALLOCTYPE_NEAR_BNO ; args.pag = xfs_perag_get(args.mp,
Signature · 1 line
2.35.1
PATCH 30/50 xfs: introduce xfs_alloc_vextent_near_bno()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
The remaining callers of xfs_alloc_vextent() are all doing NEAR_BNO allocations. We can replace that function with a new xfs_alloc_vextent_near_bno() function that does this explicitly.
We also multiplex NEAR_BNO allocations through xfs_alloc_vextent_this_ag via args->type. Replace all of these with direct calls to xfs_alloc_vextent_near_bno(), too.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 41 ++++++++++++++++++------------ fs/xfs/libxfs/xfs_alloc.h | 14 +++++----- fs/xfs/libxfs/xfs_bmap.c | 23 ++++------------- fs/xfs/libxfs/xfs_bmap_btree.c | 7 ++--- fs/xfs/libxfs/xfs_ialloc.c | 27 ++++++++------------ fs/xfs/libxfs/xfs_ialloc_btree.c | 5 ++-- fs/xfs/libxfs/xfs_refcount_btree.c | 7 +++-- 7 files changed, 54 insertions(+), 70 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +25 -16
@@ -3442,29 +3442,38 @@ xfs_alloc_vextent_first_ag( }/* -* Allocate an extent (variable-size). -* Depending on the allocation type, we either look in a single allocation -* group or loop over the allocation groups to find the result. +* Allocate an extent as close to the target as possible. If there are not +* viable candidates in the AG, then fail the allocation. */ int -xfs_alloc_vextent ( -struct xfs_alloc_arg *args) +xfs_alloc_vextent_near_bno ( +struct xfs_alloc_arg *args, +xfs_rfsblock_t target) { +struct xfs_mount *mp = args->mp; +bool need_pag = !args->pag;int error; -switch (args->type) { -case XFS_ALLOCTYPE_NEAR_BNO : - args->pag =xfs_perag_get (args->mp, -XFS_FSB_TO_AGNO (args->mp, args->fsbno)); - error =xfs_alloc_vextent_this_ag (args); -xfs_perag_put (args->pag); + error =xfs_alloc_vextent_check_args (args, target); +if (error) { +if (error == -ENOSPC ) +return 0 ;return error; -default : -ASSERT (0 ); -/* NOTREACHED */ } -/* Should never get here */ -return -EFSCORRUPTED ; + + args->agno =XFS_FSB_TO_AGNO (mp, target); + args->agbno =XFS_FSB_TO_AGBNO (mp, target); + args->type =XFS_ALLOCTYPE_NEAR_BNO ; +if (need_pag) + args->pag =xfs_perag_get (args->mp, args->agno); + error =xfs_alloc_ag_vextent (args); +if (need_pag) +xfs_perag_put (args->pag); +if (error) +return error; + +xfs_alloc_vextent_set_fsbno (args); +return 0 ; }/* Ensure that the freelist is at full capacity. */
fs/xfs/libxfs/xfs_alloc.h +7 -7
@@ -113,19 +113,19 @@ xfs_alloc_log_agf(struct xfs_buf *bp,/* buffer for a.g. freelist header */ uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) */ -/* -* Allocate an extent (variable-size). -*/ -int /* error */ -xfs_alloc_vextent ( -xfs_alloc_arg_t *args);/* allocation argument structure */ -/* * Allocate an extent in the specific AG defined by args->fsbno. If there is no * space in that AG, then the allocation will fail. */ int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args); +/* +* Allocate an extent as close to the target as possible. If there are not +* viable candidates in the AG, then fail the allocation. +*/ +int xfs_alloc_vextent_near_bno (struct xfs_alloc_arg *args, +xfs_rfsblock_t target); +/* * Best effort full filesystem allocation scan. *
fs/xfs/libxfs/xfs_bmap.c +5 -18
@@ -654,11 +654,7 @@ xfs_bmap_extents_to_btree( }else if (tp->t_flags &XFS_TRANS_LOWMODE ) { error =xfs_alloc_vextent_start_ag (&args, tp->t_firstblock); }else { - args.type =XFS_ALLOCTYPE_NEAR_BNO ; - args.fsbno = tp->t_firstblock; - args.pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, args.fsbno)); - error =xfs_alloc_vextent_this_ag (&args); -xfs_perag_put (args.pag); + error =xfs_alloc_vextent_near_bno (&args, tp->t_firstblock); }if (error) goto out_root_realloc;
@@ -811,12 +807,7 @@ xfs_bmap_local_to_extents( error =xfs_alloc_vextent_start_ag (&args,XFS_INO_TO_FSB (args.mp, ip->i_ino)); }else { - args.fsbno = tp->t_firstblock; - args.type =XFS_ALLOCTYPE_NEAR_BNO ; - args.pag =xfs_perag_get (args.mp, -XFS_FSB_TO_AGNO (args.mp, args.fsbno)); - error =xfs_alloc_vextent_this_ag (&args); -xfs_perag_put (args.pag); + error =xfs_alloc_vextent_near_bno (&args, tp->t_firstblock); }if (error) goto done;
@@ -3247,7 +3238,6 @@ xfs_bmap_btalloc_filestreams(int notinit =0 ;int error; - args->type =XFS_ALLOCTYPE_NEAR_BNO ; args->total = ap->total; start_agno =XFS_FSB_TO_AGNO (mp, args->fsbno);
@@ -3583,7 +3573,7 @@ xfs_btalloc_at_eof( }if (ag_only) - error =xfs_alloc_vextent (args); + error =xfs_alloc_vextent_near_bno (args, ap->blkno);else error =xfs_alloc_vextent_start_ag (args, ap->blkno);if (error)
@@ -3664,7 +3654,6 @@ xfs_btalloc_nullfb( ap->blkno =XFS_INO_TO_FSB (mp, ap->ip->i_ino); }xfs_bmap_adjacent (ap); - args->fsbno = ap->blkno;/* * Search for an allocation group with a single extent large enough for
@@ -3688,7 +3677,7 @@ xfs_btalloc_nullfb( }if (is_filestream) - error =xfs_alloc_vextent (args); + error =xfs_alloc_vextent_near_bno (args, ap->blkno);else error =xfs_alloc_vextent_start_ag (args, ap->blkno);if (error)
@@ -3758,8 +3747,6 @@ xfs_btalloc_near( ap->blkno = ap->tp->t_firstblock;xfs_bmap_adjacent (ap); - args->fsbno = ap->blkno; - args->type =XFS_ALLOCTYPE_NEAR_BNO ; args->total = ap->total; args->minlen = ap->minlen;
@@ -3771,7 +3758,7 @@ xfs_btalloc_near(if (args->fsbno !=NULLFSBLOCK )return 0 ; } -return xfs_alloc_vextent (args); +return xfs_alloc_vextent_near_bno (args, ap->blkno); }STATIC int
fs/xfs/libxfs/xfs_bmap_btree.c +2 -5
@@ -247,11 +247,8 @@ xfs_bmbt_alloc_block( error =xfs_alloc_vextent_start_ag (&args, cur->bc_tp->t_firstblock); }else { - args.type =XFS_ALLOCTYPE_NEAR_BNO ; - args.pag =xfs_perag_get (args.mp, -XFS_FSB_TO_AGNO (args.mp, args.fsbno)); - error =xfs_alloc_vextent_this_ag (&args); -xfs_perag_put (args.pag); + error =xfs_alloc_vextent_near_bno (&args, + cur->bc_tp->t_firstblock); }if (error) goto error0;
fs/xfs/libxfs/xfs_ialloc.c +10 -17
@@ -717,23 +717,17 @@ xfs_ialloc_ag_alloc( isaligned =1 ; }else args.alignment = igeo->cluster_align; -/* -* Need to figure out where to allocate the inode blocks. -* Ideally they should be spaced out through the a.g. -* For now, just allocate blocks up front. -*/ - args.agbno =be32_to_cpu (agi->agi_root); - args.fsbno =XFS_AGB_TO_FSB (args.mp, pag->pag_agno, args.agbno);/* * Allocate a fixed-size extent of inodes. */ - args.type =XFS_ALLOCTYPE_NEAR_BNO ; args.prod =1 ;/* * Allow space for the inode btree to split. */ args.minleft = igeo->inobt_maxlevels; - error =xfs_alloc_vextent_this_ag (&args); + error =xfs_alloc_vextent_near_bno (&args, +XFS_AGB_TO_FSB (args.mp, pag->pag_agno, +be32_to_cpu (agi->agi_root)));if (error)return error; }
@@ -743,11 +737,11 @@ xfs_ialloc_ag_alloc(* alignment. */ if (isaligned && args.fsbno ==NULLFSBLOCK ) { - args.type =XFS_ALLOCTYPE_NEAR_BNO ; - args.agbno =be32_to_cpu (agi->agi_root); - args.fsbno =XFS_AGB_TO_FSB (args.mp, pag->pag_agno, args.agbno); args.alignment = igeo->cluster_align; -if ((error =xfs_alloc_vextent (&args))) + error =xfs_alloc_vextent_near_bno (&args, +XFS_AGB_TO_FSB (args.mp, pag->pag_agno, +be32_to_cpu (agi->agi_root))); +if (error)return error; }
@@ -759,9 +753,6 @@ xfs_ialloc_ag_alloc( igeo->ialloc_min_blks < igeo->ialloc_blks && args.fsbno == NULLFSBLOCK) { sparse_alloc: - args.type =XFS_ALLOCTYPE_NEAR_BNO ; - args.agbno =be32_to_cpu (agi->agi_root); - args.fsbno =XFS_AGB_TO_FSB (args.mp, pag->pag_agno, args.agbno); args.alignment = args.mp->m_sb.sb_spino_align; args.prod =1 ;
@@ -783,7 +774,9 @@ xfs_ialloc_ag_alloc( args.mp->m_sb.sb_inoalignmt) - igeo->ialloc_blks; - error =xfs_alloc_vextent_this_ag (&args); + error =xfs_alloc_vextent_near_bno (&args, +XFS_AGB_TO_FSB (args.mp, pag->pag_agno, +be32_to_cpu (agi->agi_root)));if (error)return error;
fs/xfs/libxfs/xfs_ialloc_btree.c +2 -3
@@ -105,14 +105,13 @@ __xfs_inobt_alloc_block( args.mp = cur->bc_mp; args.pag = cur->bc_ag.pag; args.oinfo =XFS_RMAP_OINFO_INOBT ; - args.fsbno =XFS_AGB_TO_FSB (args.mp, cur->bc_ag.pag->pag_agno, sbno); args.minlen =1 ; args.maxlen =1 ; args.prod =1 ; - args.type =XFS_ALLOCTYPE_NEAR_BNO ; args.resv = resv; - error =xfs_alloc_vextent_this_ag (&args); + error =xfs_alloc_vextent_near_bno (&args, +XFS_AGB_TO_FSB (args.mp, args.pag->pag_agno, sbno));if (error)return error;
fs/xfs/libxfs/xfs_refcount_btree.c +3 -4
@@ -67,14 +67,13 @@ xfs_refcountbt_alloc_block( args.tp = cur->bc_tp; args.mp = cur->bc_mp; args.pag = cur->bc_ag.pag; - args.type =XFS_ALLOCTYPE_NEAR_BNO ; - args.fsbno =XFS_AGB_TO_FSB (cur->bc_mp, cur->bc_ag.pag->pag_agno, -xfs_refc_block (args.mp)); args.oinfo =XFS_RMAP_OINFO_REFC ; args.minlen = args.maxlen = args.prod =1 ; args.resv =XFS_AG_RESV_METADATA ; - error =xfs_alloc_vextent_this_ag (&args); + error =xfs_alloc_vextent_near_bno (&args, +XFS_AGB_TO_FSB (args.mp, args.pag->pag_agno, +xfs_refc_block (args.mp)));if (error) goto out_error; trace_xfs_refcountbt_alloc_block(cur->bc_mp, cur->bc_ag.pag->pag_agno,
Signature · 1 line
2.35.1
PATCH 31/50 xfs: introduce xfs_alloc_vextent_exact_bno()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Two of the callers to xfs_alloc_vextent_this_ag() actually want exact block number allocation, not anywhere-in-ag allocation. Split this out from _this_ag() as a first class citizen so no external extent allocation code needs to care about args->type anymore.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.c | 6 ++---- fs/xfs/libxfs/xfs_alloc.c | 41 +++++++++++++++++++++++++++++++++++--- fs/xfs/libxfs/xfs_alloc.h | 13 +++++++++--- fs/xfs/libxfs/xfs_bmap.c | 6 ++---- fs/xfs/libxfs/xfs_ialloc.c | 6 +++--- fs/xfs/scrub/repair.c | 4 +--- 6 files changed, 56 insertions(+), 20 deletions(-)
fs/xfs/libxfs/xfs_ag.c +2 -4
@@ -896,7 +896,6 @@ xfs_ag_shrink_space( .tp = *tpp, .mp = mp, .pag = pag, - .type = XFS_ALLOCTYPE_THIS_BNO, .minlen = delta, .maxlen = delta, .oinfo = XFS_RMAP_OINFO_SKIP_UPDATE,
@@ -928,8 +927,6 @@ xfs_ag_shrink_space(if (delta >= aglen)return -EINVAL ; - args.fsbno =XFS_AGB_TO_FSB (mp, pag->pag_agno, aglen - delta); -/* * Make sure that the last inode cluster cannot overlap with the new * end of the AG, even if it's sparse.
@@ -947,7 +944,8 @@ xfs_ag_shrink_space(return error;/* internal log shouldn't also show up in the free space btrees */ - error =xfs_alloc_vextent_this_ag (&args); + error =xfs_alloc_vextent_exact_bno (&args, +XFS_AGB_TO_FSB (mp, pag->pag_agno, aglen - delta));if (!error && args.agbno ==NULLAGBLOCK ) error = -ENOSPC ;
fs/xfs/libxfs/xfs_alloc.c +38 -3
63 lines not on this page · raw message
fs/xfs/libxfs/xfs_alloc.h +10 -3
@@ -114,10 +114,10 @@ xfs_alloc_log_agf( uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) *//* -* Allocate an extent in the specific AG defined by args->fsbno. If there is no -* space in that AG, then the allocation will fail. +* Allocate an extent anywhere in the specific AG given. If there is no +* space matching the requirements in that AG, then the allocation will fail. */ -int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args); +int xfs_alloc_vextent_this_ag (struct xfs_alloc_arg *args,xfs_agnumber_t agno);/* * Allocate an extent as close to the target as possible. If there are not
@@ -126,6 +126,13 @@ int xfs_alloc_vextent_this_ag(struct xfs_alloc_arg *args);int xfs_alloc_vextent_near_bno (struct xfs_alloc_arg *args,xfs_rfsblock_t target); +/* +* Allocate an extent exactly at the target given. If this is not possible +* then the allocation fails. +*/ +int xfs_alloc_vextent_exact_bno (struct xfs_alloc_arg *args, +xfs_rfsblock_t target); +/* * Best effort full filesystem allocation scan. *
fs/xfs/libxfs/xfs_bmap.c +2 -4
@@ -3523,7 +3523,6 @@ xfs_btalloc_at_eof(xfs_extlen_t nextminlen =0 ; atype = args->type; - args->type =XFS_ALLOCTYPE_THIS_BNO ; args->alignment =1 ;/*
@@ -3541,8 +3540,8 @@ xfs_btalloc_at_eof(else args->minalignslop =0 ; - args->pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, args->fsbno)); - error =xfs_alloc_vextent_this_ag (args); + args->pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, ap->blkno)); + error =xfs_alloc_vextent_exact_bno (args, ap->blkno);xfs_perag_put (args->pag);if (error)return error;
@@ -3555,7 +3554,6 @@ xfs_btalloc_at_eof(*/ args->pag =NULL ; args->type = atype; - args->fsbno = ap->blkno; args->alignment = stripe_align; args->minlen = nextminlen; args->minalignslop =0 ;
fs/xfs/libxfs/xfs_ialloc.c +3 -3
@@ -662,8 +662,6 @@ xfs_ialloc_ag_alloc( goto sparse_alloc;if (likely (newino !=NULLAGINO && (args.agbno <be32_to_cpu (agi->agi_length)))) { - args.fsbno =XFS_AGB_TO_FSB (args.mp, pag->pag_agno, args.agbno); - args.type =XFS_ALLOCTYPE_THIS_BNO ; args.prod =1 ;/*
@@ -684,7 +682,9 @@ xfs_ialloc_ag_alloc(/* Allow space for the inode btree to split. */ args.minleft = igeo->inobt_maxlevels; - error =xfs_alloc_vextent_this_ag (&args); + error =xfs_alloc_vextent_exact_bno (&args, +XFS_AGB_TO_FSB (args.mp, pag->pag_agno, + args.agbno));if (error)return error;
fs/xfs/scrub/repair.c +1 -3
@@ -316,14 +316,12 @@ xrep_alloc_ag_block( args.mp = sc->mp; args.pag = sc->sa.pag; args.oinfo = *oinfo; - args.fsbno =XFS_AGB_TO_FSB (args.mp, sc->sa.pag->pag_agno,0 ); args.minlen =1 ; args.maxlen =1 ; args.prod =1 ; - args.type =XFS_ALLOCTYPE_THIS_AG ; args.resv = resv; - error =xfs_alloc_vextent_this_ag (&args); + error =xfs_alloc_vextent_this_ag (&args, sc->sa.pag->pag_agno);if (error)return error;if (args.fsbno ==NULLFSBLOCK )
Signature · 1 line
2.35.1
PATCH 32/50 xfs: introduce xfs_alloc_vextent_prepare()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Now that we have wrapper functions for each type of allocation we can ask for, we can start unravelling xfs_alloc_ag_vextent(). That is essentially just a prepare stage, the allocation multiplexer and a post-allocation accounting step is the allocation proceeded.
The current xfs_alloc_vextent*() wrappers all have a prepare stage, the allocation operation and a post-allocation accounting step.
We can consolidate this by moving the AG alloc prep code into the wrapper functions, the accounting code in the wrapper accounting functions, and cut out the multiplexer layer entirely.
This patch consolidates the AG preparation stage.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 122 +++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 36 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +86 -36
@@ -1148,31 +1148,8 @@ static intxfs_alloc_ag_vextent ( struct xfs_alloc_arg *args) { -struct xfs_mount *mp = args->mp;int error =0 ; -ASSERT (args->minlen >0 ); -ASSERT (args->maxlen >0 ); -ASSERT (args->minlen <= args->maxlen); -ASSERT (args->mod < args->prod); -ASSERT (args->alignment >0 ); -ASSERT (args->resv !=XFS_AG_RESV_AGFL ); - - - error =xfs_alloc_fix_freelist (args,0 ); -if (error) { -trace_xfs_alloc_vextent_nofix (args); -return error; - } -if (!args->agbp) { -/* cannot allocate in this AG at all */ -trace_xfs_alloc_vextent_noagbp (args); - args->agbno =NULLAGBLOCK ; -return 0 ; - } - args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); - args->wasfromfl =0 ; -/* * Branch to correct routine based on the type. */
@@ -3204,11 +3181,18 @@ xfs_alloc_vextent_check_args( args->maxlen = agsize;if (args->alignment ==0 ) args->alignment =1 ; + +ASSERT (args->minlen >0 ); +ASSERT (args->maxlen >0 ); +ASSERT (args->alignment >0 ); +ASSERT (args->resv !=XFS_AG_RESV_AGFL ); +ASSERT (XFS_FSB_TO_AGNO (mp, target) < mp->m_sb.sb_agcount);ASSERT (XFS_FSB_TO_AGBNO (mp, target) < agsize);ASSERT (args->minlen <= args->maxlen);ASSERT (args->minlen <= agsize);ASSERT (args->mod < args->prod); + if (XFS_FSB_TO_AGNO(mp, target) >= mp->m_sb.sb_agcount || XFS_FSB_TO_AGBNO(mp, target) >= agsize || args->minlen > args->maxlen || args->minlen > agsize ||
@@ -3220,6 +3204,40 @@ xfs_alloc_vextent_check_args(return 0 ; } +/* +* Prepare an AG for allocation. If the AG is not prepared to accept the +* allocation, return failure. +* +* XXX(dgc): The complexity of "need_pag" will go away as all caller paths are +* modified to hold their own perag references. +*/ +static int +xfs_alloc_vextent_prepare_ag ( +struct xfs_alloc_arg *args) +{ +bool need_pag = !args->pag; +int error; + +if (need_pag) + args->pag =xfs_perag_get (args->mp, args->agno); + + error =xfs_alloc_fix_freelist (args,0 ); +if (error) { +trace_xfs_alloc_vextent_nofix (args); +if (need_pag) +xfs_perag_put (args->pag); +return error; + } +if (!args->agbp) { +/* cannot allocate in this AG at all */ +trace_xfs_alloc_vextent_noagbp (args); + args->agbno =NULLAGBLOCK ; +return 0 ; + } + args->wasfromfl =0 ; +return 0 ; +} +/* * Post-process allocation results to set the allocated block number correctly * for the caller.
@@ -3249,7 +3267,8 @@ xfs_alloc_vextent_set_fsbno( }/* -* Allocate within a single AG only. +* Allocate within a single AG only. Caller is expected to hold a +* perag reference in args->pag. */ int xfs_alloc_vextent_this_ag(
@@ -3271,10 +3290,16 @@ xfs_alloc_vextent_this_ag( args->agbno =0 ; args->fsbno = target; args->type =XFS_ALLOCTYPE_THIS_AG ; - error =xfs_alloc_ag_vextent (args); + error =xfs_alloc_vextent_prepare_ag (args);if (error)return error; +if (args->agbp) { + error =xfs_alloc_ag_vextent (args); +if (error) +return error; + } +xfs_alloc_vextent_set_fsbno (args);return 0 ; }
@@ -3312,16 +3337,27 @@ xfs_alloc_vextent_iterate_ags(*/ args->agno = start_agno;for (;;) { - args->pag =xfs_perag_get (mp, args->agno); - error =xfs_alloc_ag_vextent (args); -if (error || args->agbp) + args->pag =xfs_perag_get (args->mp, args->agno); + args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); + error =xfs_alloc_vextent_prepare_ag (args); +if (error)break ; +if (args->agbp) { +/* +* Allocation is supposed to succeed now, so break out +* of the loop regardless of whether we succeed or not. +*/ + error =xfs_alloc_ag_vextent (args); +break ; + } +trace_xfs_alloc_vextent_loopfailed (args);if (args->agno == start_agno && args->otype ==XFS_ALLOCTYPE_NEAR_BNO ) args->type =XFS_ALLOCTYPE_THIS_AG ; +/* * For the first allocation, we can try any AG to get * space. However, if we already have allocated a
@@ -3347,14 +3383,14 @@ xfs_alloc_vextent_iterate_ags( } flags =0 ; -if (args->otype ==XFS_ALLOCTYPE_NEAR_BNO ) { - args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); +if (args->otype ==XFS_ALLOCTYPE_NEAR_BNO ) args->type =XFS_ALLOCTYPE_NEAR_BNO ; - } }xfs_perag_put (args->pag); + args->pag =NULL ; }xfs_perag_put (args->pag); + args->pag =NULL ;return error; }
@@ -3447,7 +3483,8 @@ xfs_alloc_vextent_first_ag( }/* -* Allocate within a single AG only. +* Allocate at the exact block target or fail. Caller is expected to hold a +* perag reference in args->pag. */ int xfs_alloc_vextent_exact_bno(
@@ -3468,10 +3505,17 @@ xfs_alloc_vextent_exact_bno( args->agbno =XFS_FSB_TO_AGBNO (mp, target); args->fsbno = target; args->type =XFS_ALLOCTYPE_THIS_BNO ; - error =xfs_alloc_ag_vextent (args); + + error =xfs_alloc_vextent_prepare_ag (args);if (error)return error; +if (args->agbp) { + error =xfs_alloc_ag_vextent (args); +if (error) +return error; + } +xfs_alloc_vextent_set_fsbno (args);return 0 ; }
@@ -3479,6 +3523,8 @@ xfs_alloc_vextent_exact_bno(/* * Allocate an extent as close to the target as possible. If there are not * viable candidates in the AG, then fail the allocation. +* +* Caller may or may not have a per-ag reference in args->pag. */ int xfs_alloc_vextent_near_bno(
@@ -3499,9 +3545,13 @@ xfs_alloc_vextent_near_bno( args->agno =XFS_FSB_TO_AGNO (mp, target); args->agbno =XFS_FSB_TO_AGBNO (mp, target); args->type =XFS_ALLOCTYPE_NEAR_BNO ; -if (need_pag) - args->pag =xfs_perag_get (args->mp, args->agno); - error =xfs_alloc_ag_vextent (args); + + error =xfs_alloc_vextent_prepare_ag (args); +if (error) +return error; + +if (args->agbp) + error =xfs_alloc_ag_vextent (args);if (need_pag)xfs_perag_put (args->pag);if (error)
Signature · 1 line
2.35.1
PATCH 33/50 xfs: move allocation accounting to xfs_alloc_vextent_set_fsbno()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Move it from xfs_alloc_ag_vextent() so we can get rid of that layer. Rename xfs_alloc_vextent_set_fsbno() to xfs_alloc_vextent_finish() to indicate that it's function is finishing off the allocation that we've run now that it contains much more functionality.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 127 +++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 65 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +62 -65
@@ -1167,36 +1167,6 @@ xfs_alloc_ag_vextent(ASSERT (0 );/* NOTREACHED */ } - -if (error || args->agbno ==NULLAGBLOCK ) -return error; - -ASSERT (args->len >= args->minlen); -ASSERT (args->len <= args->maxlen); -ASSERT (args->agbno % args->alignment ==0 ); - -/* if not file data, insert new block into the reverse map btree */ -if (!xfs_rmap_should_skip_owner_update (&args->oinfo)) { - error =xfs_rmap_alloc (args->tp, args->agbp, args->pag, - args->agbno, args->len, &args->oinfo); -if (error) -return error; - } - -if (!args->wasfromfl) { - error =xfs_alloc_update_counters (args->tp, args->agbp, - -((long )(args->len))); -if (error) -return error; - -ASSERT (!xfs_extent_busy_search (args->mp, args->pag, - args->agbno, args->len)); - } - -xfs_ag_resv_alloc_extent (args->pag, args->resv, args); - -XFS_STATS_INC (args->mp, xs_allocx); -XFS_STATS_ADD (args->mp, xs_allocb, args->len);return error; }
@@ -3239,31 +3209,56 @@ xfs_alloc_vextent_prepare_ag( }/* -* Post-process allocation results to set the allocated block number correctly -* for the caller. +* Post-process allocation results to account for the allocation if it succeed +* and set the allocated block number correctly for the caller. * -* XXX: xfs_alloc_vextent() should really be returning ENOSPC for ENOSPC, not +* XXX: we should really be returning ENOSPC for ENOSPC, not * hiding it behind a "successful" NULLFSBLOCK allocation. */ -static void -xfs_alloc_vextent_set_fsbno ( +static int +xfs_alloc_vextent_finish (struct xfs_alloc_arg *args) { -struct xfs_mount *mp = args->mp; +int error =0 ;/* Allocation failed with ENOSPC if NULLAGBLOCK was returned. */ if (args->agbno ==NULLAGBLOCK ) { args->fsbno =NULLFSBLOCK ; -return ; +return 0 ; } - args->fsbno =XFS_AGB_TO_FSB (mp, args->agno, args->agbno); -#ifdef DEBUG + args->fsbno =XFS_AGB_TO_FSB (args->mp, args->agno, args->agbno); +ASSERT (args->len >= args->minlen);ASSERT (args->len <= args->maxlen);ASSERT (args->agbno % args->alignment ==0 ); -XFS_AG_CHECK_DADDR (mp,XFS_FSB_TO_DADDR (mp, args->fsbno), args->len); -#endif +XFS_AG_CHECK_DADDR (args->mp,XFS_FSB_TO_DADDR (args->mp, args->fsbno), + args->len); + +/* if not file data, insert new block into the reverse map btree */ +if (!xfs_rmap_should_skip_owner_update (&args->oinfo)) { + error =xfs_rmap_alloc (args->tp, args->agbp, args->pag, + args->agbno, args->len, &args->oinfo); +if (error) +return error; + } + +if (!args->wasfromfl) { + error =xfs_alloc_update_counters (args->tp, args->agbp, + -((long )(args->len))); +if (error) +return error; + +ASSERT (!xfs_extent_busy_search (args->mp, args->pag, + args->agbno, args->len)); + } + +xfs_ag_resv_alloc_extent (args->pag, args->resv, args); + +XFS_STATS_INC (args->mp, xs_allocx); +XFS_STATS_ADD (args->mp, xs_allocb, args->len); + +return 0 ; }/*
@@ -3300,8 +3295,7 @@ xfs_alloc_vextent_this_ag(return error; } -xfs_alloc_vextent_set_fsbno (args); -return 0 ; +return xfs_alloc_vextent_finish (args); }/*
@@ -3389,8 +3383,10 @@ xfs_alloc_vextent_iterate_ags(xfs_perag_put (args->pag); args->pag =NULL ; } -xfs_perag_put (args->pag); - args->pag =NULL ; +/* +* On success, perag is left referenced in args for the caller to clean +* up after they've finished the allocation. +*/ return error; }
@@ -3436,8 +3432,12 @@ xfs_alloc_vextent_start_ag( error =xfs_alloc_vextent_iterate_ags (args, start_agno,XFS_ALLOC_FLAG_TRYLOCK ); -if (error) -return error; +if (!error) + error =xfs_alloc_vextent_finish (args); +if (args->pag) { +xfs_perag_put (args->pag); + args->pag =NULL ; + }if (bump_rotor) {if (args->agno == start_agno)
@@ -3448,8 +3448,7 @@ xfs_alloc_vextent_start_ag( (mp->m_sb.sb_agcount * rotorstep); } -xfs_alloc_vextent_set_fsbno (args); -return 0 ; +return error; }/*
@@ -3476,10 +3475,13 @@ xfs_alloc_vextent_first_ag( args->fsbno = target; error =xfs_alloc_vextent_iterate_ags (args,XFS_FSB_TO_AGNO (mp, args->fsbno),0 ); -if (error) -return error; -xfs_alloc_vextent_set_fsbno (args); -return 0 ; +if (!error) + error =xfs_alloc_vextent_finish (args); +if (args->pag) { +xfs_perag_put (args->pag); + args->pag =NULL ; + } +return error; }/*
@@ -3510,14 +3512,11 @@ xfs_alloc_vextent_exact_bno(if (error)return error; -if (args->agbp) { +if (args->agbp) error =xfs_alloc_ag_vextent (args); -if (error) -return error; - } - -xfs_alloc_vextent_set_fsbno (args); -return 0 ; +if (!error) + error =xfs_alloc_vextent_finish (args); +return error; }/*
@@ -3552,13 +3551,11 @@ xfs_alloc_vextent_near_bno(if (args->agbp) error =xfs_alloc_ag_vextent (args); +if (!error) + error =xfs_alloc_vextent_finish (args);if (need_pag)xfs_perag_put (args->pag); -if (error) -return error; - -xfs_alloc_vextent_set_fsbno (args); -return 0 ; +return error; }/* Ensure that the freelist is at full capacity. */
Signature · 1 line
2.35.1
PATCH 34/50 xfs: fold xfs_alloc_ag_vextent() into callers
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
We don't need the multiplexing xfs_alloc_ag_vextent() provided anymore - we can just call the exact/near/size variants directly. This allows us to remove args->type completely and stop using args->fsbno as an input to the allocator algorithms.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 97 ++++++++------------------------------- fs/xfs/libxfs/xfs_alloc.h | 17 ------- fs/xfs/libxfs/xfs_bmap.c | 10 +--- fs/xfs/xfs_trace.h | 8 +--- 4 files changed, 23 insertions(+), 109 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +20 -77
@@ -36,10 +36,6 @@ struct workqueue_struct *xfs_alloc_wq;#define XFSA_FIXUP_BNO_OK 1#define XFSA_FIXUP_CNT_OK 2 -STATIC int xfs_alloc_ag_vextent_exact(xfs_alloc_arg_t *); -STATIC int xfs_alloc_ag_vextent_near(xfs_alloc_arg_t *); -STATIC int xfs_alloc_ag_vextent_size(xfs_alloc_arg_t *); -/* * Size of the AGFL. For CRC-enabled filesystes we steal a couple of slots in * the beginning of the block for a proper header with the location information
@@ -776,8 +772,6 @@ xfs_alloc_cur_setup(int error;int i; -ASSERT (args->alignment ==1 || args->type !=XFS_ALLOCTYPE_THIS_BNO ); - acur->cur_len = args->maxlen; acur->rec_bno =0 ; acur->rec_len =0 ;
@@ -891,7 +885,6 @@ xfs_alloc_cur_check(* We have an aligned record that satisfies minlen and beats or matches * the candidate extent size. Compare locality for near allocation mode. */ -ASSERT (args->type ==XFS_ALLOCTYPE_NEAR_BNO ); diff =xfs_alloc_compute_diff (args->agbno, args->len, args->alignment, args->datatype, bnoa, lena, &bnew);
@@ -1136,40 +1129,6 @@ xfs_alloc_ag_vextent_small(return error; } -/* -* Allocate a variable extent in the allocation group agno. -* Type and bno are used to determine where in the allocation group the -* extent will start. -* Extent's length (returned in *len) will be between minlen and maxlen, -* and of the form k * prod + mod unless there's nothing that large. -* Return the starting a.g. block, or NULLAGBLOCK if we can't do it. -*/ -static int -xfs_alloc_ag_vextent ( -struct xfs_alloc_arg *args) -{ -int error =0 ; - -/* -* Branch to correct routine based on the type. -*/ -switch (args->type) { -case XFS_ALLOCTYPE_THIS_AG : - error =xfs_alloc_ag_vextent_size (args); -break ; -case XFS_ALLOCTYPE_NEAR_BNO : - error =xfs_alloc_ag_vextent_near (args); -break ; -case XFS_ALLOCTYPE_THIS_BNO : - error =xfs_alloc_ag_vextent_exact (args); -break ; -default : -ASSERT (0 ); -/* NOTREACHED */ - } -return error; -} -/* * Allocate a variable extent at exactly agno/bno. * Extent's length (returned in *len) will be between minlen and maxlen,
@@ -1355,7 +1314,6 @@ xfs_alloc_ag_vextent_locality(bool fbinc;ASSERT (acur->len ==0 ); -ASSERT (args->type ==XFS_ALLOCTYPE_NEAR_BNO ); *stat =0 ;
@@ -3140,6 +3098,7 @@ xfs_alloc_vextent_check_args(xfs_agblock_t agsize; args->agbno =NULLAGBLOCK ; + args->fsbno =NULLFSBLOCK ;/* * Just fix this up, for the case where the last a.g. is shorter
@@ -3262,8 +3221,11 @@ xfs_alloc_vextent_finish( }/* -* Allocate within a single AG only. Caller is expected to hold a -* perag reference in args->pag. +* Allocate within a single AG only. This uses a best-fit length algorithm so if +* you need an exact sized allocation without locality constraints, this is the +* fastest way to do it. +* +* Caller is expected to hold a perag reference in args->pag. */ int xfs_alloc_vextent_this_ag(
@@ -3272,9 +3234,8 @@ xfs_alloc_vextent_this_ag( {struct xfs_mount *mp = args->mp;int error; -xfs_rfsblock_t target =XFS_AGB_TO_FSB (mp, agno,0 ); - error =xfs_alloc_vextent_check_args (args, target); + error =xfs_alloc_vextent_check_args (args,XFS_AGB_TO_FSB (mp, agno,0 ));if (error) {if (error == -ENOSPC )return 0 ;
@@ -3283,14 +3244,12 @@ xfs_alloc_vextent_this_ag( args->agno = agno; args->agbno =0 ; - args->fsbno = target; - args->type =XFS_ALLOCTYPE_THIS_AG ; error =xfs_alloc_vextent_prepare_ag (args);if (error)return error;if (args->agbp) { - error =xfs_alloc_ag_vextent (args); + error =xfs_alloc_ag_vextent_size (args);if (error)return error; }
@@ -3320,6 +3279,7 @@ static intxfs_alloc_vextent_iterate_ags ( struct xfs_alloc_arg *args, xfs_agnumber_t start_agno, + xfs_agblock_t target_agbno, uint32_t flags) { struct xfs_mount *mp = args->mp;
@@ -3331,8 +3291,8 @@ xfs_alloc_vextent_iterate_ags(*/ args->agno = start_agno;for (;;) { + args->agbno = target_agbno; args->pag =xfs_perag_get (args->mp, args->agno); - args->agbno =XFS_FSB_TO_AGBNO (mp, args->fsbno); error =xfs_alloc_vextent_prepare_ag (args);if (error)break ;
@@ -3342,16 +3302,15 @@ xfs_alloc_vextent_iterate_ags(* Allocation is supposed to succeed now, so break out * of the loop regardless of whether we succeed or not. */ - error =xfs_alloc_ag_vextent (args); +if (args->agno == start_agno && target_agbno) + error =xfs_alloc_ag_vextent_near (args); +else + error =xfs_alloc_ag_vextent_size (args);break ; }trace_xfs_alloc_vextent_loopfailed (args); -if (args->agno == start_agno && - args->otype ==XFS_ALLOCTYPE_NEAR_BNO ) - args->type =XFS_ALLOCTYPE_THIS_AG ; -/* * For the first allocation, we can try any AG to get * space. However, if we already have allocated a
@@ -3375,10 +3334,7 @@ xfs_alloc_vextent_iterate_ags(trace_xfs_alloc_vextent_allfailed (args);break ; } - flags =0 ; -if (args->otype ==XFS_ALLOCTYPE_NEAR_BNO ) - args->type =XFS_ALLOCTYPE_NEAR_BNO ; }xfs_perag_put (args->pag); args->pag =NULL ;
@@ -3404,8 +3360,8 @@ xfs_alloc_vextent_start_ag( xfs_rfsblock_t target) {struct xfs_mount *mp = args->mp; -xfs_agnumber_t start_agno;xfs_agnumber_t rotorstep = xfs_rotorstep; +xfs_agnumber_t start_agno =XFS_FSB_TO_AGNO (mp, target);bool bump_rotor = false;int error;
@@ -3424,14 +3380,8 @@ xfs_alloc_vextent_start_ag( bump_rotor =1 ; } - start_agno =XFS_FSB_TO_AGNO (mp, target); - args->agbno =XFS_FSB_TO_AGBNO (mp, target); - args->otype =XFS_ALLOCTYPE_NEAR_BNO ; - args->type =XFS_ALLOCTYPE_NEAR_BNO ; - args->fsbno = target; - error =xfs_alloc_vextent_iterate_ags (args, start_agno, -XFS_ALLOC_FLAG_TRYLOCK ); +XFS_FSB_TO_AGBNO (mp, target),XFS_ALLOC_FLAG_TRYLOCK );if (!error) error =xfs_alloc_vextent_finish (args);if (args->pag) {
@@ -3471,10 +3421,8 @@ xfs_alloc_vextent_first_ag(return error; } - args->type =XFS_ALLOCTYPE_THIS_AG ; - args->fsbno = target; - error =xfs_alloc_vextent_iterate_ags (args, -XFS_FSB_TO_AGNO (mp, args->fsbno),0 ); + error =xfs_alloc_vextent_iterate_ags (args, +XFS_FSB_TO_AGNO (mp, target),0 ,0 );if (!error) error =xfs_alloc_vextent_finish (args);if (args->pag) {
@@ -3505,15 +3453,12 @@ xfs_alloc_vextent_exact_bno( args->agno =XFS_FSB_TO_AGNO (mp, target); args->agbno =XFS_FSB_TO_AGBNO (mp, target); - args->fsbno = target; - args->type =XFS_ALLOCTYPE_THIS_BNO ; - error =xfs_alloc_vextent_prepare_ag (args);if (error)return error;if (args->agbp) - error =xfs_alloc_ag_vextent (args); + error =xfs_alloc_ag_vextent_exact (args);if (!error) error =xfs_alloc_vextent_finish (args);return error;
@@ -3543,14 +3488,12 @@ xfs_alloc_vextent_near_bno( args->agno =XFS_FSB_TO_AGNO (mp, target); args->agbno =XFS_FSB_TO_AGBNO (mp, target); - args->type =XFS_ALLOCTYPE_NEAR_BNO ; - error =xfs_alloc_vextent_prepare_ag (args);if (error)return error;if (args->agbp) - error =xfs_alloc_ag_vextent (args); + error =xfs_alloc_ag_vextent_near (args);if (!error) error =xfs_alloc_vextent_finish (args);if (need_pag)
fs/xfs/libxfs/xfs_alloc.h +0 -17
@@ -16,21 +16,6 @@ extern struct workqueue_struct *xfs_alloc_wq;unsigned int xfs_agfl_size (struct xfs_mount *mp); -/* -* Freespace allocation types. Argument to xfs_alloc_[v]extent. -*/ -#define XFS_ALLOCTYPE_THIS_AG 0x08/* anywhere in this a.g. */ -#define XFS_ALLOCTYPE_NEAR_BNO 0x20/* in this a.g. and near this block */ -#define XFS_ALLOCTYPE_THIS_BNO 0x40/* at exactly this block */ - -/* this should become an enum again when the tracing code is fixed */ -typedef unsigned int xfs_alloctype_t ; - -#define XFS_ALLOC_TYPES \ - { XFS_ALLOCTYPE_THIS_AG, "THIS_AG" }, \ - { XFS_ALLOCTYPE_NEAR_BNO, "NEAR_BNO" }, \ - { XFS_ALLOCTYPE_THIS_BNO, "THIS_BNO" } -/* * Flags for xfs_alloc_fix_freelist. */
@@ -64,8 +49,6 @@ typedef struct xfs_alloc_arg {xfs_agblock_t min_agbno;/* set an agbno range for NEAR allocs */ xfs_agblock_t max_agbno;/* ... */ xfs_extlen_t len;/* output: actual size of extent */ -xfs_alloctype_t type;/* allocation type XFS_ALLOCTYPE_... */ -xfs_alloctype_t otype;/* original allocation type */ int datatype;/* mask defining data type treatment */ char wasdel;/* set if allocation was prev delayed */ char wasfromfl;/* set if allocation is from freelist */
fs/xfs/libxfs/xfs_bmap.c +2 -8
@@ -3510,7 +3510,6 @@ xfs_btalloc_at_eof( bool ag_only) {struct xfs_mount *mp = args->mp; -xfs_alloctype_t atype;int error;/*
@@ -3522,14 +3521,12 @@ xfs_btalloc_at_eof(if (ap->offset) {xfs_extlen_t nextminlen =0 ; - atype = args->type; - args->alignment =1 ; -/* * Compute the minlen+alignment for the next case. Set slop so * that the value of minlen+alignment+slop doesn't go up between * the calls. */ + args->alignment =1 ;if (blen > stripe_align && blen <= args->maxlen) nextminlen = blen - stripe_align;else
@@ -3553,17 +3550,15 @@ xfs_btalloc_at_eof(* according to the original allocation specification. */ args->pag =NULL ; - args->type = atype; args->alignment = stripe_align; args->minlen = nextminlen; args->minalignslop =0 ; }else { - args->alignment = stripe_align; - atype = args->type;/* * Adjust minlen to try and preserve alignment if we * can't guarantee an aligned maxlen extent. */ + args->alignment = stripe_align;if (blen > args->alignment && blen <= args->maxlen + args->alignment) args->minlen = blen - args->alignment;
@@ -3585,7 +3580,6 @@ xfs_btalloc_at_eof(* original non-aligned state so the caller can proceed on allocation * failure as if this function was never called. */ - args->type = atype; args->fsbno = ap->blkno; args->alignment =1 ;return 0 ;
fs/xfs/xfs_trace.h +1 -7
@@ -1795,8 +1795,6 @@ DECLARE_EVENT_CLASS(xfs_alloc_class, __field(xfs_extlen_t, alignment) __field(xfs_extlen_t, minalignslop) __field(xfs_extlen_t, len) - __field(short, type) - __field(short, otype) __field(char, wasdel) __field(char, wasfromfl)__field (int, resv)
@@ -1816,8 +1814,6 @@ DECLARE_EVENT_CLASS(xfs_alloc_class, __entry->alignment = args->alignment; __entry->minalignslop = args->minalignslop; __entry->len = args->len; - __entry->type = args->type; - __entry->otype = args->otype; __entry->wasdel = args->wasdel; __entry->wasfromfl = args->wasfromfl; __entry->resv = args->resv;
@@ -1826,7 +1822,7 @@ DECLARE_EVENT_CLASS(xfs_alloc_class, ), TP_printk("dev %d:%d agno 0x%x agbno 0x%x minlen %u maxlen %u mod %u " "prod %u minleft %u total %u alignment %u minalignslop %u " - "len %u type %s otype %s wasdel %d wasfromfl %d resv %d " + "len %u wasdel %d wasfromfl %d resv %d " "datatype 0x%x firstblock 0x%llx", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->agno,
@@ -1840,8 +1836,6 @@ DECLARE_EVENT_CLASS(xfs_alloc_class, __entry->alignment, __entry->minalignslop, __entry->len, -__print_symbolic (__entry->type,XFS_ALLOC_TYPES ), -__print_symbolic (__entry->otype,XFS_ALLOC_TYPES ), __entry->wasdel, __entry->wasfromfl, __entry->resv,
Signature · 1 line
2.35.1
PATCH 35/50 xfs: convert xfs_alloc_vextent_iterate_ags() to use perag walker
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Now that the AG iteration code in the core allocation code has been cleaned up, we can easily convert it to use a for_each_perag..() variant to use active references and skip AGs that it can't get active references on.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_ag.h | 22 ++++++--- fs/xfs/libxfs/xfs_alloc.c | 97 ++++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 54 deletions(-)
fs/xfs/libxfs/xfs_ag.h +15 -7
@@ -244,6 +244,7 @@ xfs_perag_next_wrap(struct xfs_perag *pag, xfs_agnumber_t *agno, xfs_agnumber_t stop_agno, + xfs_agnumber_t restart_agno, xfs_agnumber_t wrap_agno) { struct xfs_mount *mp = pag->pag_mount;
@@ -251,10 +252,11 @@ xfs_perag_next_wrap( *agno = pag->pag_agno +1 ;xfs_perag_rele (pag);while (*agno != stop_agno) { -if (*agno >= wrap_agno) - *agno =0 ; -if (*agno == stop_agno) -break ; +if (*agno >= wrap_agno) { +if (restart_agno >= stop_agno) +break ; + *agno = restart_agno; + } pag =xfs_perag_grab (mp, *agno);if (pag)
@@ -265,14 +267,20 @@ xfs_perag_next_wrap( }/* -* Iterate all AGs from start_agno through wrap_agno, then 0 through +* Iterate all AGs from start_agno through wrap_agno, then restart_agno through * (start_agno - 1). */ -#define for_each_perag_wrap_at (mp, start_agno, wrap_agno, agno, pag) \ +#define for_each_perag_wrap_range (mp, start_agno, restart_agno, wrap_agno, agno, pag) \ for ((agno) = (start_agno), (pag) = xfs_perag_grab((mp), (agno)); \ (pag) != NULL; \ (pag) = xfs_perag_next_wrap((pag), &(agno), (start_agno), \ - (wrap_agno))) + (restart_agno), (wrap_agno))) +/* +* Iterate all AGs from start_agno through wrap_agno, then 0 through +* (start_agno - 1). +*/ +#define for_each_perag_wrap_at (mp, start_agno, wrap_agno, agno, pag) \ + for_each_perag_wrap_range((mp), (start_agno), 0, (wrap_agno), (agno), (pag))/* * Iterate all AGs from start_agno through to the end of the filesystem, then 0
fs/xfs/libxfs/xfs_alloc.c +50 -47
143 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 36/50 xfs: convert trim to use for_each_perag_range
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
To convert it to using active perag references and hence make it shrink safe.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_discard.c | 50 ++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 27 deletions(-)
fs/xfs/xfs_discard.c +23 -27
@@ -21,23 +21,20 @@ STATIC intxfs_trim_extents ( -struct xfs_mount *mp, -xfs_agnumber_t agno, +struct xfs_perag *pag,xfs_daddr_t start,xfs_daddr_t end,xfs_daddr_t minlen,uint64_t *blocks_trimmed) { +struct xfs_mount *mp = pag->pag_mount;struct block_device *bdev = mp->m_ddev_targp->bt_bdev;struct xfs_btree_cur *cur;struct xfs_buf *agbp;struct xfs_agf *agf; -struct xfs_perag *pag;int error;int i; - pag =xfs_perag_get (mp, agno); -/* * Force out the log. This means any transactions that might have freed * space before we take the AGF buffer lock are now on disk, and the
@@ -47,7 +44,7 @@ xfs_trim_extents( error =xfs_alloc_read_agf (pag,NULL ,0 , &agbp);if (error) - goto out_put_perag; +return error; agf = agbp->b_addr; cur =xfs_allocbt_init_cursor (mp,NULL , agbp, pag,XFS_BTNUM_CNT );
@@ -71,10 +68,10 @@ xfs_trim_extents( error =xfs_alloc_get_rec (cur, &fbno, &flen, &i);if (error) - goto out_del_cursor; +break ;if (XFS_IS_CORRUPT (mp, i !=1 )) { error = -EFSCORRUPTED ; - goto out_del_cursor; +break ; }ASSERT (flen <=be32_to_cpu (agf->agf_longest));
@@ -83,15 +80,15 @@ xfs_trim_extents(* the format the range/len variables are supplied in by * userspace. */ - dbno =XFS_AGB_TO_DADDR (mp, agno, fbno); + dbno =XFS_AGB_TO_DADDR (mp, pag->pag_agno, fbno); dlen =XFS_FSB_TO_BB (mp, flen);/* * Too small? Give up. */ if (dlen < minlen) { -trace_xfs_discard_toosmall (mp, agno, fbno, flen); - goto out_del_cursor; +trace_xfs_discard_toosmall (mp, pag->pag_agno, fbno, flen); +break ; }/*
@@ -100,7 +97,7 @@ xfs_trim_extents(* down partially overlapping ranges for now. */ if (dbno + dlen < start || dbno > end) { -trace_xfs_discard_exclude (mp, agno, fbno, flen); +trace_xfs_discard_exclude (mp, pag->pag_agno, fbno, flen); goto next_extent; }
@@ -109,32 +106,30 @@ xfs_trim_extents(* discard and try again the next time. */ if (xfs_extent_busy_search (mp, pag, fbno, flen)) { -trace_xfs_discard_busy (mp, agno, fbno, flen); +trace_xfs_discard_busy (mp, pag->pag_agno, fbno, flen); goto next_extent; } -trace_xfs_discard_extent (mp, agno, fbno, flen); +trace_xfs_discard_extent (mp, pag->pag_agno, fbno, flen); error =blkdev_issue_discard (bdev, dbno, dlen,GFP_NOFS );if (error) - goto out_del_cursor; +break ; *blocks_trimmed += flen; next_extent: error =xfs_btree_decrement (cur,0 , &i);if (error) - goto out_del_cursor; +break ;if (fatal_signal_pending (current)) { error = -ERESTARTSYS ; - goto out_del_cursor; +break ; } } out_del_cursor:xfs_btree_del_cursor (cur, error);xfs_buf_relse (agbp); -out_put_perag: -xfs_perag_put (pag);return error; }
@@ -152,11 +147,12 @@ xfs_ioc_trim(struct xfs_mount *mp, struct fstrim_range __user *urange) { + struct xfs_perag *pag;unsigned int granularity =bdev_discard_granularity (mp->m_ddev_targp->bt_bdev);struct fstrim_range range;xfs_daddr_t start, end, minlen; -xfs_agnumber_t start_agno, end_agno, agno; +xfs_agnumber_t agno;uint64_t blocks_trimmed =0 ;int error, last_error =0 ;
@@ -193,18 +189,18 @@ xfs_ioc_trim( end = start +BTOBBT (range.len) -1 ;if (end >XFS_FSB_TO_BB (mp, mp->m_sb.sb_dblocks) -1 ) - end =XFS_FSB_TO_BB (mp, mp->m_sb.sb_dblocks)-1 ; - - start_agno =xfs_daddr_to_agno (mp, start); - end_agno =xfs_daddr_to_agno (mp, end); + end =XFS_FSB_TO_BB (mp, mp->m_sb.sb_dblocks) -1 ; -for (agno = start_agno; agno <= end_agno; agno++) { - error =xfs_trim_extents (mp, agno, start, end, minlen, + agno =xfs_daddr_to_agno (mp, start); +for_each_perag_range (mp, agno,xfs_daddr_to_agno (mp, end), pag) { + error =xfs_trim_extents (pag, start, end, minlen, &blocks_trimmed);if (error) { last_error = error; -if (error == -ERESTARTSYS ) +if (error == -ERESTARTSYS ) { +xfs_perag_rele (pag);break ; + } } }
Signature · 1 line
2.35.1
PATCH 37/50 xfs: factor out filestreams from xfs_bmap_btalloc_nullfb
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
There's many if (filestreams) {} else {} branches in this function. Split it out into a filestreams specific function so that we can then work directly on cleaning up the filestreams code without impacting the rest of the allocation algorithms.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_bmap.c | 151 ++++++++++++++++++++++----------------- 1 file changed, 87 insertions(+), 64 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +87 -64
@@ -3585,6 +3585,78 @@ xfs_btalloc_at_eof(return 0 ; } +/* +* We have failed multiple allocation attempts so now are in a low space +* allocation situation. Try a locality first full filesystem minimum length +* allocation whilst still maintaining necessary total block reservation +* requirements. +* +* If that fails, we are now critically low on space, so perform a last resort +* allocation attempt: no reserve, no locality, blocking, minimum length, full +* filesystem free space scan. We also indicate to future allocations in this +* transaction that we are critically low on space so they don't waste time on +* allocation modes that are unlikely to succeed. +*/ +static int +xfs_btalloc_low_space ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args) +{ +int error; + +if (args->minlen > ap->minlen) { + args->minlen = ap->minlen; + error =xfs_alloc_vextent_start_ag (args, ap->blkno); +if (error || args->fsbno !=NULLFSBLOCK ) +return error; + } + + args->total = ap->minlen; + error =xfs_alloc_vextent_first_ag (args,0 ); +if (error) +return error; + ap->tp->t_flags |=XFS_TRANS_LOWMODE ; +return 0 ; +} + +static int +xfs_btalloc_filestreams ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args, +int stripe_align) +{ +xfs_agnumber_t agno =xfs_filestream_lookup_ag (ap->ip); +xfs_extlen_t blen =0 ; +int error; + +/* Determine the initial block number we will target for allocation. */ +if (agno ==NULLAGNUMBER ) + agno =0 ; + ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 ); +xfs_bmap_adjacent (ap); + +/* +* Search for an allocation group with a single extent large enough for +* the request. If one isn't found, then adjust the minimum allocation +* size to the largest space found. +*/ + error =xfs_bmap_btalloc_filestreams (ap, args, &blen); +if (error) +return error; + +if (ap->aeof) { + error =xfs_btalloc_at_eof (ap, args, blen, stripe_align, true); +if (error || args->fsbno !=NULLFSBLOCK ) +return error; + } + + error =xfs_alloc_vextent_near_bno (args, ap->blkno); +if (error || args->fsbno !=NULLFSBLOCK ) +return error; + +return xfs_btalloc_low_space (ap, args); +} + static int xfs_btalloc_nullfb_bestlen( struct xfs_bmalloca *ap,
@@ -3625,26 +3697,10 @@ xfs_btalloc_nullfb( struct xfs_alloc_arg *args, int stripe_align) { -struct xfs_mount *mp = args->mp;xfs_extlen_t blen =0 ; -bool is_filestream = false;int error; -if ((ap->datatype &XFS_ALLOC_USERDATA ) && -xfs_inode_is_filestream (ap->ip)) - is_filestream = true; - -/* -* Determine the initial block number we will target for allocation. -*/ -if (is_filestream) { -xfs_agnumber_t agno =xfs_filestream_lookup_ag (ap->ip); -if (agno ==NULLAGNUMBER ) - agno =0 ; - ap->blkno =XFS_AGB_TO_FSB (mp, agno,0 ); - }else { - ap->blkno =XFS_INO_TO_FSB (mp, ap->ip->i_ino); - } + ap->blkno =XFS_INO_TO_FSB (args->mp, ap->ip->i_ino);xfs_bmap_adjacent (ap);/*
@@ -3652,58 +3708,21 @@ xfs_btalloc_nullfb(* the request. If one isn't found, then adjust the minimum allocation * size to the largest space found. */ -if (is_filestream) - error =xfs_bmap_btalloc_filestreams (ap, args, &blen); -else - error =xfs_btalloc_nullfb_bestlen (ap, args, &blen); + error =xfs_btalloc_nullfb_bestlen (ap, args, &blen);if (error)return error;if (ap->aeof) { - error =xfs_btalloc_at_eof (ap, args, blen, stripe_align, - is_filestream); -if (error) + error =xfs_btalloc_at_eof (ap, args, blen, stripe_align, false); +if (error || args->fsbno !=NULLFSBLOCK )return error; -if (args->fsbno !=NULLFSBLOCK ) -return 0 ; } -if (is_filestream) - error =xfs_alloc_vextent_near_bno (args, ap->blkno); -else - error =xfs_alloc_vextent_start_ag (args, ap->blkno); -if (error) + error =xfs_alloc_vextent_start_ag (args, ap->blkno); +if (error || args->fsbno !=NULLFSBLOCK )return error; -if (args->fsbno !=NULLFSBLOCK ) -return 0 ; -/* -* Try a locality first full filesystem minimum length allocation whilst -* still maintaining necessary total block reservation requirements. -*/ -if (args->minlen > ap->minlen) { - args->minlen = ap->minlen; - error =xfs_alloc_vextent_start_ag (args, ap->blkno); -if (error) -return error; - } -if (args->fsbno !=NULLFSBLOCK ) -return 0 ; - -/* -* We are now critically low on space, so this is a last resort -* allocation attempt: no reserve, no locality, blocking, minimum -* length, full filesystem free space scan. We also indicate to future -* allocations in this transaction that we are critically low on space -* so they don't waste time on allocation modes that are unlikely to -* succeed. -*/ - args->total = ap->minlen; - error =xfs_alloc_vextent_first_ag (args,0 ); -if (error) -return error; - ap->tp->t_flags |=XFS_TRANS_LOWMODE ; -return 0 ; +return xfs_btalloc_low_space (ap, args); }/*
@@ -3745,10 +3764,8 @@ xfs_btalloc_near(if (ap->aeof) { error =xfs_btalloc_at_eof (ap, args, blen, stripe_align, true); -if (error) +if (error || args->fsbno !=NULLFSBLOCK )return error; -if (args->fsbno !=NULLFSBLOCK ) -return 0 ; }return xfs_alloc_vextent_near_bno (args, ap->blkno); }
@@ -3785,7 +3802,13 @@ xfs_bmap_btalloc( args.maxlen =min (ap->length, mp->m_ag_max_usable);if (ap->tp->t_firstblock ==NULLFSBLOCK ) { - error =xfs_btalloc_nullfb (ap, &args, stripe_align); +if ((ap->datatype &XFS_ALLOC_USERDATA ) && +xfs_inode_is_filestream (ap->ip)) { + error =xfs_btalloc_filestreams (ap, &args, + stripe_align); + }else { + error =xfs_btalloc_nullfb (ap, &args, stripe_align); + } }else if (ap->tp->t_flags &XFS_TRANS_LOWMODE ) { error =xfs_btalloc_low_mode (ap, &args); }else {
Signature · 1 line
2.35.1
PATCH 38/50 xfs: get rid of notinit from xfs_bmap_longest_free_extent
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
It is only set if reading the AGF gets a EAGAIN error. Just return the EAGAIN error and handle that error in the callers.
This means we can remove the not_init parameter from xfs_bmap_select_minlen(), too, because the use of not_init there is pessimistic. If we can't read the agf, it won't increase blen. Howeverm the only time we actually care whether we checked all the AGFs for contiguous free space is when the best length is less than the minimum allocation length. If not_init is set, then we ignore blen and set the minimum alloc length to the absolute minimum, not the best length we know already is present.
However, if blen is less than the minimum, we're going to ignore it anyway, regardless of whether we scanned all the AGFs or not, so it does not matter if those unchecked AGFs have space in them or not. Hence not_init can go away, because we already know if blen is good from the scanned AGs, or if it is not good enough we ignore it regardless of whether we scanned all the AGs or not.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_bmap.c | 84 +++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 48 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +36 -48
@@ -3170,8 +3170,7 @@ static intxfs_bmap_longest_free_extent ( struct xfs_perag *pag, struct xfs_trans *tp, - xfs_extlen_t *blen, - int *notinit) + xfs_extlen_t *blen) { xfs_extlen_t longest;int error =0 ;
@@ -3179,14 +3178,8 @@ xfs_bmap_longest_free_extent(if (!xfs_perag_initialised_agf (pag)) { error =xfs_alloc_read_agf (pag, tp,XFS_ALLOC_FLAG_TRYLOCK ,NULL ); -if (error) { -/* Couldn't lock the AGF, so skip this AG. */ -if (error == -EAGAIN ) { - *notinit =1 ; - error =0 ; - } +if (error)return error; - } } longest = xfs_alloc_longest_free_extent(pag,
@@ -3198,32 +3191,28 @@ xfs_bmap_longest_free_extent(return 0 ; } -static void +static xfs_extlen_t xfs_bmap_select_minlen (struct xfs_bmalloca *ap,struct xfs_alloc_arg *args, -xfs_extlen_t *blen, -int notinit) +xfs_extlen_t blen) { -if (notinit || *blen < ap->minlen) { -/* -* Since we did a BUF_TRYLOCK above, it is possible that -* there is space for this request. -*/ - args->minlen = ap->minlen; - }else if (*blen < args->maxlen) { -/* -* If the best seen length is less than the request length, -* use the best as the minimum. -*/ - args->minlen = *blen; - }else { -/* -* Otherwise we've seen an extent as big as maxlen, use that -* as the minimum. -*/ - args->minlen = args->maxlen; - } + +/* +* Since we used XFS_ALLOC_FLAG_TRYLOCK in _longest_free_extent(), it is +* possible that there is enough contiguous free space for this request. +*/ +if (blen < ap->minlen) +return ap->minlen; + +/* +* If the best seen length is less than the request length, +* use the best as the minimum, otherwise we've got the maxlen we +* were asked for. +*/ +if (blen < args->maxlen) +return blen; +return args->maxlen; }STATIC int
@@ -3235,7 +3224,6 @@ xfs_bmap_btalloc_filestreams(struct xfs_mount *mp = ap->ip->i_mount;struct xfs_perag *pag;xfs_agnumber_t start_agno; -int notinit =0 ;int error; args->total = ap->total;
@@ -3246,11 +3234,13 @@ xfs_bmap_btalloc_filestreams( pag =xfs_perag_grab (mp, start_agno);if (pag) { - error =xfs_bmap_longest_free_extent (pag, args->tp, blen, - ¬init); + error =xfs_bmap_longest_free_extent (pag, args->tp, blen);xfs_perag_rele (pag); -if (error) -return error; +if (error) { +if (error != -EAGAIN ) +return error; + *blen =0 ; + } }if (*blen < args->maxlen) {
@@ -3266,18 +3256,18 @@ xfs_bmap_btalloc_filestreams(if (!pag) goto out_select; - error =xfs_bmap_longest_free_extent (pag, args->tp, - blen, ¬init); + error =xfs_bmap_longest_free_extent (pag, args->tp, blen);xfs_perag_rele (pag); -if (error) -return error; - +if (error) { +if (error != -EAGAIN ) +return error; + *blen =0 ; + } start_agno = agno; - } out_select: -xfs_bmap_select_minlen (ap, args, blen, notinit); + args->minlen =xfs_bmap_select_minlen (ap, args, *blen);/* * Set the failure fallback case to look in the selected AG as stream
@@ -3666,7 +3656,6 @@ xfs_btalloc_nullfb_bestlen(struct xfs_mount *mp = args->mp;struct xfs_perag *pag;xfs_agnumber_t agno, startag; -int notinit =0 ;int error =0 ; args->total = ap->total;
@@ -3677,9 +3666,8 @@ xfs_btalloc_nullfb_bestlen( *blen =0 ;for_each_perag_wrap (mp, startag, agno, pag) { - error =xfs_bmap_longest_free_extent (pag, args->tp, blen, - ¬init); -if (error) + error =xfs_bmap_longest_free_extent (pag, args->tp, blen); +if (error && error != -EAGAIN )break ;if (*blen >= args->maxlen)break ;
@@ -3687,7 +3675,7 @@ xfs_btalloc_nullfb_bestlen(if (pag)xfs_perag_rele (pag); -xfs_bmap_select_minlen (ap, args, blen, notinit); + args->minlen =xfs_bmap_select_minlen (ap, args, *blen);return 0 ; }
Signature · 1 line
2.35.1
PATCH 39/50 xfs: use xfs_bmap_longest_free_extent() in filestreams
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
The code in xfs_bmap_longest_free_extent() is open coded in xfs_filestream_pick_ag(). Export xfs_bmap_longest_free_extent and call it from the filestreams code instead.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_bmap.h | 2 ++ fs/xfs/xfs_filestream.c | 22 ++++++++-------------- 3 files changed, 11 insertions(+), 15 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -3166,7 +3166,7 @@ xfs_bmap_adjacent(#undef ISVALID } -static int +int xfs_bmap_longest_free_extent( struct xfs_perag *pag, struct xfs_trans *tp,
fs/xfs/libxfs/xfs_bmap.h +2 -0
@@ -168,6 +168,8 @@ static inline bool xfs_bmap_is_written_extent(struct xfs_bmbt_irec *irec)#define xfs_valid_startblock (ip, startblock) \ ((startblock) != 0 || XFS_IS_REALTIME_INODE(ip)) +int xfs_bmap_longest_free_extent (struct xfs_perag *pag, +struct xfs_trans *tp,xfs_extlen_t *blen);void xfs_trim_extent (struct xfs_bmbt_irec *irec,xfs_fileoff_t bno,xfs_filblks_t len);unsigned int xfs_bmap_compute_attr_offset (struct xfs_mount *mp);
fs/xfs/xfs_filestream.c +8 -14
@@ -124,17 +124,14 @@ xfs_filestream_pick_ag(trace_xfs_filestream_scan (mp, ip->i_ino, ag); pag =xfs_perag_get (mp, ag); - -if (!xfs_perag_initialised_agf (pag)) { - err =xfs_alloc_read_agf (pag,NULL , trylock,NULL ); -if (err) { -if (err != -EAGAIN ) { -xfs_perag_put (pag); -return err; - } -/* Couldn't lock the AGF, skip this AG. */ - goto next_ag; - } + longest =0 ; + err =xfs_bmap_longest_free_extent (pag,NULL , &longest); +if (err) { +xfs_perag_put (pag); +if (err != -EAGAIN ) +return err; +/* Couldn't lock the AGF, skip this AG. */ + goto next_ag; }/* Keep track of the AG with the most free blocks. */
@@ -154,9 +151,6 @@ xfs_filestream_pick_ag( goto next_ag; } - longest =xfs_alloc_longest_free_extent (pag, -xfs_alloc_min_freelist (mp, pag), -xfs_ag_resv_needed (pag,XFS_AG_RESV_NONE )); if (((minlen && longest >= minlen) || (!minlen && pag->pagf_freeblks >= minfree)) && (!xfs_perag_prefers_metadata(pag) ||
Signature · 1 line
2.35.1
PATCH 40/50 xfs: move xfs_bmap_btalloc_filestreams() to xfs_filestreams.c
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
xfs_bmap_btalloc_filestreams() calls two filestreams functions to select the AG to allocate from. Both those functions end up in the same selection function that iterates all AGs multiple times. Worst case, xfs_bmap_btalloc_filestreams() can iterate all AGs 4 times just to select the initial AG to allocate in.
Move xfs_bmap_btalloc_filestreams() to fs/xfs/xfs_filestreams.c so that the inefficient abstraction can be greatly simplified and the implementation made more efficient.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_bmap.c | 78 ++-------------------------------------- fs/xfs/xfs_filestream.c | 67 ++++++++++++++++++++++++++++++++-- fs/xfs/xfs_filestream.h | 5 +-- 3 files changed, 71 insertions(+), 79 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +3 -75
@@ -3215,68 +3215,6 @@ xfs_bmap_select_minlen(return args->maxlen; } -STATIC int -xfs_bmap_btalloc_filestreams ( -struct xfs_bmalloca *ap, -struct xfs_alloc_arg *args, -xfs_extlen_t *blen) -{ -struct xfs_mount *mp = ap->ip->i_mount; -struct xfs_perag *pag; -xfs_agnumber_t start_agno; -int error; - - args->total = ap->total; - - start_agno =XFS_FSB_TO_AGNO (mp, args->fsbno); -if (start_agno ==NULLAGNUMBER ) - start_agno =0 ; - - pag =xfs_perag_grab (mp, start_agno); -if (pag) { - error =xfs_bmap_longest_free_extent (pag, args->tp, blen); -xfs_perag_rele (pag); -if (error) { -if (error != -EAGAIN ) -return error; - *blen =0 ; - } - } - -if (*blen < args->maxlen) { -xfs_agnumber_t agno = start_agno; - - error =xfs_filestream_new_ag (ap, &agno); -if (error) -return error; -if (agno ==NULLAGNUMBER ) - goto out_select; - - pag =xfs_perag_grab (mp, agno); -if (!pag) - goto out_select; - - error =xfs_bmap_longest_free_extent (pag, args->tp, blen); -xfs_perag_rele (pag); -if (error) { -if (error != -EAGAIN ) -return error; - *blen =0 ; - } - start_agno = agno; - } - -out_select: - args->minlen =xfs_bmap_select_minlen (ap, args, *blen); - -/* -* Set the failure fallback case to look in the selected AG as stream -* may have moved. -*/ - ap->blkno = args->fsbno =XFS_AGB_TO_FSB (mp, start_agno,0 ); -return 0 ; -} -/* Update all inode and quota accounting for the allocation we just did. */ static void xfs_bmap_btalloc_accounting(
@@ -3615,25 +3553,15 @@ xfs_btalloc_filestreams( struct xfs_alloc_arg *args, int stripe_align) { -xfs_agnumber_t agno =xfs_filestream_lookup_ag (ap->ip);xfs_extlen_t blen =0 ;int error; -/* Determine the initial block number we will target for allocation. */ -if (agno ==NULLAGNUMBER ) - agno =0 ; - ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 ); -xfs_bmap_adjacent (ap); - -/* -* Search for an allocation group with a single extent large enough for -* the request. If one isn't found, then adjust the minimum allocation -* size to the largest space found. -*/ - error =xfs_bmap_btalloc_filestreams (ap, args, &blen); + error =xfs_filestream_select_ag (ap, args, &blen);if (error)return error; + args->minlen =xfs_bmap_select_minlen (ap, args, blen); +if (ap->aeof) { error =xfs_btalloc_at_eof (ap, args, blen, stripe_align, true);if (error || args->fsbno !=NULLFSBLOCK )
fs/xfs/xfs_filestream.c +65 -2
91 lines not on this page · raw message
fs/xfs/xfs_filestream.h +3 -2
@@ -9,13 +9,14 @@struct xfs_mount ;struct xfs_inode ;struct xfs_bmalloca ; +struct xfs_alloc_arg ;int xfs_filestream_mount (struct xfs_mount *mp);void xfs_filestream_unmount (struct xfs_mount *mp);void xfs_filestream_deassociate (struct xfs_inode *ip); -xfs_agnumber_t xfs_filestream_lookup_ag (struct xfs_inode *ip); -int xfs_filestream_new_ag (struct xfs_bmalloca *ap,xfs_agnumber_t *agp);int xfs_filestream_peek_ag (struct xfs_mount *mp,xfs_agnumber_t agno); +int xfs_filestream_select_ag (struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args,xfs_extlen_t *blen);static inline int xfs_inode_is_filestream(
Signature · 1 line
2.35.1
PATCH 41/50 xfs: merge filestream AG lookup into xfs_filestream_select_ag()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
It currently either returns the cached filestream AG or it looks up a new one. It has to be verified on return, which means the returning code then might have to look up a new AG anyway. Merge the initial lookup functionality so that we only need to do a single pick loop on lookup or verification failure.
This does make xfs_filestream_select_ag() messier and I've ignored the long lines, because it's got to get worse before it can get better...
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_filestream.c | 140 +++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 81 deletions(-)
fs/xfs/xfs_filestream.c +59 -81
@@ -258,55 +258,6 @@ xfs_filestream_get_parent(return dir ?XFS_I (dir) :NULL ; } -/* -* Find the right allocation group for a file, either by finding an -* existing file stream or creating a new one. -* -* Returns NULLAGNUMBER in case of an error. -*/ -static xfs_agnumber_t -xfs_filestream_lookup_ag ( -struct xfs_inode *ip) -{ -struct xfs_mount *mp = ip->i_mount; -struct xfs_inode *pip =NULL ; -xfs_agnumber_t startag, ag =NULLAGNUMBER ; -struct xfs_mru_cache_elem *mru; - -ASSERT (S_ISREG (VFS_I (ip)->i_mode)); - - pip =xfs_filestream_get_parent (ip); -if (!pip) -return NULLAGNUMBER ; - - mru =xfs_mru_cache_lookup (mp->m_filestream, pip->i_ino); -if (mru) { - ag = container_of(mru, struct xfs_fstrm_item, mru)->ag; -xfs_mru_cache_done (mp->m_filestream); - -trace_xfs_filestream_lookup (mp, ip->i_ino, ag); - goto out; - } - -/* -* Set the starting AG using the rotor for inode32, otherwise -* use the directory inode's AG. -*/ -if (xfs_is_inode32 (mp)) { -xfs_agnumber_t rotorstep = xfs_rotorstep; - startag = (mp->m_agfrotor / rotorstep) % mp->m_sb.sb_agcount; - mp->m_agfrotor = (mp->m_agfrotor +1 ) % - (mp->m_sb.sb_agcount * rotorstep); - }else - startag =XFS_INO_TO_AGNO (mp, pip->i_ino); - -if (xfs_filestream_pick_ag (pip, startag, &ag,0 ,0 )) - ag =NULLAGNUMBER ; -out: -xfs_irele (pip); -return ag; -} -/* * Pick a new allocation group for the current file and its file stream. *
@@ -372,52 +323,79 @@ xfs_filestream_select_ag( {struct xfs_mount *mp = ap->ip->i_mount;struct xfs_perag *pag; -xfs_agnumber_t start_agno =xfs_filestream_lookup_ag (ap->ip); +struct xfs_inode *pip =NULL ; +xfs_agnumber_t agno =NULLAGNUMBER ; +struct xfs_mru_cache_elem *mru;int error; -/* Determine the initial block number we will target for allocation. */ -if (start_agno ==NULLAGNUMBER ) - start_agno =0 ; - ap->blkno =XFS_AGB_TO_FSB (args->mp, start_agno,0 ); -xfs_bmap_adjacent (ap); args->total = ap->total; + *blen =0 ; - pag =xfs_perag_grab (mp, start_agno); -if (pag) { - error =xfs_bmap_longest_free_extent (pag, args->tp, blen); -xfs_perag_rele (pag); -if (error) { -if (error != -EAGAIN ) -return error; - *blen =0 ; - } + pip =xfs_filestream_get_parent (ap->ip); +if (!pip) { + agno =0 ; + goto new_ag; } -if (*blen < args->maxlen) { -xfs_agnumber_t agno = start_agno; + mru =xfs_mru_cache_lookup (mp->m_filestream, pip->i_ino); +if (mru) { + agno = container_of(mru, struct xfs_fstrm_item, mru)->ag; +xfs_mru_cache_done (mp->m_filestream); - error =xfs_filestream_new_ag (ap, &agno); -if (error) -return error; -if (agno ==NULLAGNUMBER ) - goto out_select; +trace_xfs_filestream_lookup (mp, ap->ip->i_ino, start_agno); +xfs_irele (pip); + + ap->blkno =XFS_AGB_TO_FSB (args->mp, start_agno,0 ); +xfs_bmap_adjacent (ap); pag =xfs_perag_grab (mp, agno); -if (!pag) +if (pag) { + error =xfs_bmap_longest_free_extent (pag, args->tp, blen); +xfs_perag_rele (pag); +if (error) { +if (error != -EAGAIN ) +return error; + *blen =0 ; + } + } +if (*blen >= args->maxlen) goto out_select; + }else if (xfs_is_inode32 (mp)) { +xfs_agnumber_t rotorstep = xfs_rotorstep; + agno = (mp->m_agfrotor / rotorstep) % + mp->m_sb.sb_agcount; + mp->m_agfrotor = (mp->m_agfrotor +1 ) % + (mp->m_sb.sb_agcount * rotorstep); +xfs_irele (pip); + }else { + agno =XFS_INO_TO_AGNO (mp, pip->i_ino); +xfs_irele (pip); + } - error =xfs_bmap_longest_free_extent (pag, args->tp, blen); -xfs_perag_rele (pag); -if (error) { -if (error != -EAGAIN ) -return error; - *blen =0 ; - } - start_agno = agno; +new_ag: + ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 ); +xfs_bmap_adjacent (ap); + + error =xfs_filestream_new_ag (ap, &agno); +if (error) +return error; +if (agno ==NULLAGNUMBER ) + goto out_select; + + pag =xfs_perag_grab (mp, agno); +if (!pag) + goto out_select; + + error =xfs_bmap_longest_free_extent (pag, args->tp, blen); +xfs_perag_rele (pag); +if (error) { +if (error != -EAGAIN ) +return error; + *blen =0 ; } out_select: - ap->blkno =XFS_AGB_TO_FSB (mp, start_agno,0 ); + ap->blkno =XFS_AGB_TO_FSB (mp, agno,0 );return 0 ; }
Signature · 1 line
2.35.1
PATCH 42/50 xfs: merge new filestream AG selection into xfs_filestream_select_ag()
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
This is largely a wrapper around xfs_filestream_pick_ag() that repeats a lot of the lookups that we just merged back into xfs_filestream_select_ag() from the lookup code. Merge the xfs_filestream_new_ag() code back into _select_ag() to get rid of all the unnecessary logic.
Indeed, this makes it obvious that if we have no parent inode, the filestreams allocator always selects AG 0 regardless of whether it is fit for purpose or not.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_filestream.c | 120 +++++++++++++++------------------------- 1 file changed, 46 insertions(+), 74 deletions(-)
fs/xfs/xfs_filestream.c +46 -74
@@ -98,16 +98,18 @@ xfs_fstrm_free_func(static int xfs_filestream_pick_ag (struct xfs_inode *ip, -xfs_agnumber_t startag,xfs_agnumber_t *agp,int flags, -xfs_extlen_t minlen) +xfs_extlen_t *longest) {struct xfs_mount *mp = ip->i_mount;struct xfs_fstrm_item *item;struct xfs_perag *pag; -xfs_extlen_t longest, free =0 , minfree, maxfree =0 ; -xfs_agnumber_t ag, max_ag =NULLAGNUMBER ; +xfs_extlen_t minlen = *longest; +xfs_extlen_t free =0 , minfree, maxfree =0 ; +xfs_agnumber_t startag = *agp; +xfs_agnumber_t ag = startag; +xfs_agnumber_t max_ag =NULLAGNUMBER ;int err, trylock, nscan;ASSERT (S_ISDIR (VFS_I (ip)->i_mode));
@@ -115,7 +117,6 @@ xfs_filestream_pick_ag(/* 2% of an AG's blocks must be free for it to be chosen. */ minfree = mp->m_sb.sb_agblocks /50 ; - ag = startag; *agp =NULLAGNUMBER ;/* For the first pass, don't sleep trying to init the per-AG. */
@@ -125,8 +126,8 @@ xfs_filestream_pick_ag(trace_xfs_filestream_scan (mp, ip->i_ino, ag); pag =xfs_perag_get (mp, ag); - longest =0 ; - err =xfs_bmap_longest_free_extent (pag,NULL , &longest); + *longest =0 ; + err =xfs_bmap_longest_free_extent (pag,NULL , longest);if (err) {xfs_perag_put (pag);if (err != -EAGAIN )
@@ -152,7 +153,7 @@ xfs_filestream_pick_ag( goto next_ag; } - if (((minlen && longest >= minlen) || + if (((minlen && *longest >= minlen) || (!minlen && pag->pagf_freeblks >= minfree)) && (!xfs_perag_prefers_metadata(pag) || !(flags & XFS_PICK_USERDATA) ||
@@ -258,58 +259,6 @@ xfs_filestream_get_parent(return dir ?XFS_I (dir) :NULL ; } -/* -* Pick a new allocation group for the current file and its file stream. -* -* This is called when the allocator can't find a suitable extent in the -* current AG, and we have to move the stream into a new AG with more space. -*/ -static int -xfs_filestream_new_ag ( -struct xfs_bmalloca *ap, -xfs_agnumber_t *agp) -{ -struct xfs_inode *ip = ap->ip, *pip; -struct xfs_mount *mp = ip->i_mount; -xfs_extlen_t minlen = ap->length; -xfs_agnumber_t startag =0 ; -int flags =0 ; -int err =0 ; -struct xfs_mru_cache_elem *mru; - - *agp =NULLAGNUMBER ; - - pip =xfs_filestream_get_parent (ip); -if (!pip) - goto exit; - - mru =xfs_mru_cache_remove (mp->m_filestream, pip->i_ino); -if (mru) { -struct xfs_fstrm_item *item = - container_of(mru, struct xfs_fstrm_item, mru); - startag = (item->ag +1 ) % mp->m_sb.sb_agcount; - } - -if (ap->datatype &XFS_ALLOC_USERDATA ) - flags |=XFS_PICK_USERDATA ; -if (ap->tp->t_flags &XFS_TRANS_LOWMODE ) - flags |=XFS_PICK_LOWSPACE ; - - err =xfs_filestream_pick_ag (pip, startag, agp, flags, minlen); - -/* -* Only free the item here so we skip over the old AG earlier. -*/ -if (mru) -xfs_fstrm_free_func (mp, mru); - -xfs_irele (pip); -exit: -if (*agp ==NULLAGNUMBER ) - *agp =0 ; -return err; -} -/* * Search for an allocation group with a single extent large enough for * the request. If one isn't found, then adjust the minimum allocation
@@ -326,6 +275,7 @@ xfs_filestream_select_ag(struct xfs_inode *pip =NULL ;xfs_agnumber_t agno =NULLAGNUMBER ;struct xfs_mru_cache_elem *mru; +int flags =0 ;int error; args->total = ap->total;
@@ -334,18 +284,18 @@ xfs_filestream_select_ag( pip =xfs_filestream_get_parent (ap->ip);if (!pip) { agno =0 ; - goto new_ag; + goto out_select; } mru =xfs_mru_cache_lookup (mp->m_filestream, pip->i_ino);if (mru) { agno = container_of(mru, struct xfs_fstrm_item, mru)->ag;xfs_mru_cache_done (mp->m_filestream); + mru =NULL ; -trace_xfs_filestream_lookup (mp, ap->ip->i_ino, start_agno); -xfs_irele (pip); +trace_xfs_filestream_lookup (mp, ap->ip->i_ino, agno); - ap->blkno =XFS_AGB_TO_FSB (args->mp, start_agno,0 ); + ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 );xfs_bmap_adjacent (ap); pag =xfs_perag_grab (mp, agno);
@@ -354,7 +304,7 @@ xfs_filestream_select_ag(xfs_perag_rele (pag);if (error) {if (error != -EAGAIN ) -return error; + goto out_error; *blen =0 ; } }
@@ -366,37 +316,59 @@ xfs_filestream_select_ag( mp->m_sb.sb_agcount; mp->m_agfrotor = (mp->m_agfrotor +1 ) % (mp->m_sb.sb_agcount * rotorstep); -xfs_irele (pip); }else { agno =XFS_INO_TO_AGNO (mp, pip->i_ino); -xfs_irele (pip); } -new_ag: +/* Changing parent AG association now, so remove the existing one. */ + mru =xfs_mru_cache_remove (mp->m_filestream, pip->i_ino); +if (mru) { +struct xfs_fstrm_item *item = + container_of(mru, struct xfs_fstrm_item, mru); + agno = (item->ag +1 ) % mp->m_sb.sb_agcount; + } ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 );xfs_bmap_adjacent (ap); - error =xfs_filestream_new_ag (ap, &agno); +if (ap->datatype &XFS_ALLOC_USERDATA ) + flags |=XFS_PICK_USERDATA ; +if (ap->tp->t_flags &XFS_TRANS_LOWMODE ) + flags |=XFS_PICK_LOWSPACE ; + + *blen = ap->length; + error =xfs_filestream_pick_ag (pip, &agno, flags, blen);if (error) -return error; -if (agno ==NULLAGNUMBER ) - goto out_select; + goto out_error; +if (agno ==NULLAGNUMBER ) { + agno =0 ; + goto out_irele; + } pag =xfs_perag_grab (mp, agno);if (!pag) - goto out_select; + goto out_irele; error =xfs_bmap_longest_free_extent (pag, args->tp, blen);xfs_perag_rele (pag);if (error) {if (error != -EAGAIN ) -return error; + goto out_error; *blen =0 ; } +out_irele: +if (mru) +xfs_fstrm_free_func (mp, mru); +xfs_irele (pip); out_select: ap->blkno =XFS_AGB_TO_FSB (mp, agno,0 );return 0 ; +out_error: +if (mru) +xfs_fstrm_free_func (mp, mru); +xfs_irele (pip); +return error; + }void
Signature · 1 line
2.35.1
PATCH 43/50 xfs: remove xfs_filestream_select_ag() longest extent check
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Picking a new AG checks the longest free extent in the AG is valid, so there's no need to repeat the check in xfs_filestream_select_ag(). Remove it.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_filestream.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-)
fs/xfs/xfs_filestream.c +3 -19
@@ -341,32 +341,16 @@ xfs_filestream_select_ag( goto out_error;if (agno ==NULLAGNUMBER ) { agno =0 ; - goto out_irele; - } - - pag =xfs_perag_grab (mp, agno); -if (!pag) - goto out_irele; - - error =xfs_bmap_longest_free_extent (pag, args->tp, blen); -xfs_perag_rele (pag); -if (error) { -if (error != -EAGAIN ) - goto out_error; *blen =0 ; } -out_irele: -if (mru) -xfs_fstrm_free_func (mp, mru); -xfs_irele (pip); -out_select: - ap->blkno =XFS_AGB_TO_FSB (mp, agno,0 ); -return 0 ; out_error:if (mru)xfs_fstrm_free_func (mp, mru);xfs_irele (pip); +out_select: +if (!error) + ap->blkno =XFS_AGB_TO_FSB (mp, agno,0 );return error; }
Signature · 1 line
2.35.1
PATCH 44/50 xfs: factor out MRU hit case in xfs_filestream_select_ag
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Because it now stands out like a sore thumb and factoring out this special case will simplify xfs_filestream_select_ag() again.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_filestream.c | 127 ++++++++++++++++++++++++---------------- 1 file changed, 78 insertions(+), 49 deletions(-)
fs/xfs/xfs_filestream.c +78 -49
@@ -260,73 +260,106 @@ xfs_filestream_get_parent( }/* -* Search for an allocation group with a single extent large enough for -* the request. If one isn't found, then adjust the minimum allocation -* size to the largest space found. +* Lookup the mru cache for an existing association. If one exists and we can +* use it, return with the agno and blen indicating that the allocation will +* proceed with that association. +* +* If we have no association, or we cannot use the current one and have to +* destroy it, return with blen = 0 and agno pointing at the next agno to try. */ int -xfs_filestream_select_ag ( +xfs_filestream_select_ag_mru (struct xfs_bmalloca *ap,struct xfs_alloc_arg *args, +struct xfs_inode *pip, +xfs_agnumber_t *agno,xfs_extlen_t *blen) {struct xfs_mount *mp = ap->ip->i_mount;struct xfs_perag *pag; -struct xfs_inode *pip =NULL ; -xfs_agnumber_t agno =NULLAGNUMBER ;struct xfs_mru_cache_elem *mru; -int flags =0 ;int error; - args->total = ap->total; *blen =0 ; + mru =xfs_mru_cache_lookup (mp->m_filestream, pip->i_ino); +if (!mru) + goto out_default_agno; - pip =xfs_filestream_get_parent (ap->ip); -if (!pip) { - agno =0 ; - goto out_select; + *agno = container_of(mru, struct xfs_fstrm_item, mru)->ag; +xfs_mru_cache_done (mp->m_filestream); + +trace_xfs_filestream_lookup (mp, ap->ip->i_ino, *agno); + + ap->blkno =XFS_AGB_TO_FSB (args->mp, *agno,0 ); +xfs_bmap_adjacent (ap); + + pag =xfs_perag_grab (mp, *agno); +if (!pag) + goto out_default_agno; + + error =xfs_bmap_longest_free_extent (pag, args->tp, blen); +xfs_perag_rele (pag); +if (error) { +if (error != -EAGAIN ) +return error; + *blen =0 ; } - mru =xfs_mru_cache_lookup (mp->m_filestream, pip->i_ino); +if (*blen >= args->maxlen) +return 0 ; + +/* Changing parent AG association now, so remove the existing one. */ + mru =xfs_mru_cache_remove (mp->m_filestream, pip->i_ino);if (mru) { - agno = container_of(mru, struct xfs_fstrm_item, mru)->ag; -xfs_mru_cache_done (mp->m_filestream); - mru =NULL ; - -trace_xfs_filestream_lookup (mp, ap->ip->i_ino, agno); - - ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 ); -xfs_bmap_adjacent (ap); - - pag =xfs_perag_grab (mp, agno); -if (pag) { - error =xfs_bmap_longest_free_extent (pag, args->tp, blen); -xfs_perag_rele (pag); -if (error) { -if (error != -EAGAIN ) - goto out_error; - *blen =0 ; - } - } -if (*blen >= args->maxlen) - goto out_select; - }else if (xfs_is_inode32 (mp)) { +struct xfs_fstrm_item *item = + container_of(mru, struct xfs_fstrm_item, mru); + *agno = (item->ag +1 ) % mp->m_sb.sb_agcount; +xfs_fstrm_free_func (mp, mru); +return 0 ; + } + +out_default_agno: +if (xfs_is_inode32 (mp)) {xfs_agnumber_t rotorstep = xfs_rotorstep; - agno = (mp->m_agfrotor / rotorstep) % + *agno = (mp->m_agfrotor / rotorstep) % mp->m_sb.sb_agcount; mp->m_agfrotor = (mp->m_agfrotor +1 ) % (mp->m_sb.sb_agcount * rotorstep); - }else { - agno =XFS_INO_TO_AGNO (mp, pip->i_ino); +return 0 ; } + *agno =XFS_INO_TO_AGNO (mp, pip->i_ino); +return 0 ; -/* Changing parent AG association now, so remove the existing one. */ - mru =xfs_mru_cache_remove (mp->m_filestream, pip->i_ino); -if (mru) { -struct xfs_fstrm_item *item = - container_of(mru, struct xfs_fstrm_item, mru); - agno = (item->ag +1 ) % mp->m_sb.sb_agcount; +} + +/* +* Search for an allocation group with a single extent large enough for +* the request. If one isn't found, then adjust the minimum allocation +* size to the largest space found. +*/ +int +xfs_filestream_select_ag ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args, +xfs_extlen_t *blen) +{ +struct xfs_mount *mp = ap->ip->i_mount; +struct xfs_inode *pip =NULL ; +xfs_agnumber_t agno; +int flags =0 ; +int error; + + args->total = ap->total; + pip =xfs_filestream_get_parent (ap->ip); +if (!pip) { + agno =0 ; + goto out_select; } + + error =xfs_filestream_select_ag_mru (ap, args, pip, &agno, blen); +if (error || *blen >= args->maxlen) + goto out_rele; + ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 );xfs_bmap_adjacent (ap);
@@ -337,16 +370,12 @@ xfs_filestream_select_ag( *blen = ap->length; error =xfs_filestream_pick_ag (pip, &agno, flags, blen); -if (error) - goto out_error;if (agno ==NULLAGNUMBER ) { agno =0 ; *blen =0 ; } -out_error: -if (mru) -xfs_fstrm_free_func (mp, mru); +out_rele:xfs_irele (pip); out_select:if (!error)
Signature · 1 line
2.35.1
PATCH 45/50 xfs: track an active perag reference in filestreams
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Rather than just track the agno of the reference, track a referenced perag pointer instead. This will allow active filestreams to prevent AGs from going away until the filestreams have been torn down.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_filestream.c | 99 ++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 56 deletions(-)
fs/xfs/xfs_filestream.c +43 -56
@@ -23,7 +23,7 @@struct xfs_fstrm_item {struct xfs_mru_cache_elem mru; -xfs_agnumber_t ag;/* AG in use for this directory */ +struct xfs_perag *pag;/* AG in use for this directory */ };enum xfs_fstrm_alloc {
@@ -50,43 +50,18 @@ xfs_filestream_peek_ag(return ret; } -static int -xfs_filestream_get_ag ( -xfs_mount_t *mp, -xfs_agnumber_t agno) -{ -struct xfs_perag *pag; -int ret; - - pag =xfs_perag_get (mp, agno); - ret =atomic_inc_return (&pag->pagf_fstrms); -xfs_perag_put (pag); -return ret; -} - -static void -xfs_filestream_put_ag ( -xfs_mount_t *mp, -xfs_agnumber_t agno) -{ -struct xfs_perag *pag; - - pag =xfs_perag_get (mp, agno); -atomic_dec (&pag->pagf_fstrms); -xfs_perag_put (pag); -} -static void xfs_fstrm_free_func (void *data,struct xfs_mru_cache_elem *mru) { -struct xfs_mount *mp = data;struct xfs_fstrm_item *item = container_of(mru, struct xfs_fstrm_item, mru); +struct xfs_perag *pag = item->pag; -xfs_filestream_put_ag (mp, item->ag); -trace_xfs_filestream_free (mp, mru->key, item->ag); +trace_xfs_filestream_free (pag->pag_mount, mru->key, pag->pag_agno); +atomic_dec (&pag->pagf_fstrms); +xfs_perag_rele (pag);kmem_free (item); }
@@ -105,11 +80,11 @@ xfs_filestream_pick_ag(struct xfs_mount *mp = ip->i_mount;struct xfs_fstrm_item *item;struct xfs_perag *pag; +struct xfs_perag *max_pag =NULL ;xfs_extlen_t minlen = *longest;xfs_extlen_t free =0 , minfree, maxfree =0 ;xfs_agnumber_t startag = *agp;xfs_agnumber_t ag = startag; -xfs_agnumber_t max_ag =NULLAGNUMBER ;int err, trylock, nscan;ASSERT (S_ISDIR (VFS_I (ip)->i_mode));
@@ -125,13 +100,16 @@ xfs_filestream_pick_ag(for (nscan =0 ;1 ; nscan++) {trace_xfs_filestream_scan (mp, ip->i_ino, ag); - pag =xfs_perag_get (mp, ag); + err =0 ; + pag =xfs_perag_grab (mp, ag); +if (!pag) + goto next_ag; *longest =0 ; err =xfs_bmap_longest_free_extent (pag,NULL , longest);if (err) { -xfs_perag_put (pag); +xfs_perag_rele (pag);if (err != -EAGAIN ) -return err; +break ;/* Couldn't lock the AGF, skip this AG. */ goto next_ag; }
@@ -139,7 +117,10 @@ xfs_filestream_pick_ag(/* Keep track of the AG with the most free blocks. */ if (pag->pagf_freeblks > maxfree) { maxfree = pag->pagf_freeblks; - max_ag = ag; +if (max_pag) +xfs_perag_rele (max_pag); +atomic_inc (&pag->pag_active_ref); + max_pag = pag; }/*
@@ -148,8 +129,9 @@ xfs_filestream_pick_ag(* loop, and it guards against two filestreams being established * in the same AG as each other. */ -if (xfs_filestream_get_ag (mp, ag) >1 ) { -xfs_filestream_put_ag (mp, ag); +if (atomic_inc_return (&pag->pagf_fstrms) >1 ) { +atomic_dec (&pag->pagf_fstrms); +xfs_perag_rele (pag); goto next_ag; }
@@ -161,15 +143,12 @@ xfs_filestream_pick_ag(/* Break out, retaining the reference on the AG. */ free = pag->pagf_freeblks; -xfs_perag_put (pag); - *agp = ag;break ; }/* Drop the reference on this AG, it's not usable. */ -xfs_filestream_put_ag (mp, ag); +atomic_dec (&pag->pagf_fstrms); next_ag: -xfs_perag_put (pag);/* Move to the next AG, wrapping to AG 0 if necessary. */ if (++ag >= mp->m_sb.sb_agcount) ag =0 ;
@@ -194,10 +173,10 @@ xfs_filestream_pick_ag(* Take the AG with the most free space, regardless of whether * it's already in use by another filestream. */ -if (max_ag !=NULLAGNUMBER ) { -xfs_filestream_get_ag (mp, max_ag); +if (max_pag) { + pag = max_pag; +atomic_inc (&pag->pagf_fstrms); free = maxfree; - *agp = max_ag;break ; }
@@ -207,17 +186,26 @@ xfs_filestream_pick_ag(return 0 ; } -trace_xfs_filestream_pick (ip, *agp, free, nscan); +trace_xfs_filestream_pick (ip, pag ? pag->pag_agno :NULLAGNUMBER , + free, nscan); + +if (max_pag) +xfs_perag_rele (max_pag); -if (*agp ==NULLAGNUMBER ) +if (err) +return err; + +if (!pag) { + *agp =NULLAGNUMBER ;return 0 ; + } err = -ENOMEM ; item =kmem_alloc (sizeof (*item),KM_MAYFAIL );if (!item) goto out_put_ag; - item->ag = *agp; + item->pag = pag; err =xfs_mru_cache_insert (mp->m_filestream, ip->i_ino, &item->mru);if (err) {
@@ -226,12 +214,14 @@ xfs_filestream_pick_ag( goto out_free_item; } + *agp = pag->pag_agno;return 0 ; out_free_item:kmem_free (item); out_put_ag: -xfs_filestream_put_ag (mp, *agp); +atomic_dec (&pag->pagf_fstrms); +xfs_perag_rele (pag);return err; }
@@ -285,26 +275,23 @@ xfs_filestream_select_ag_mru(if (!mru) goto out_default_agno; - *agno = container_of(mru, struct xfs_fstrm_item, mru)->ag; + pag = container_of(mru, struct xfs_fstrm_item, mru)->pag;xfs_mru_cache_done (mp->m_filestream); -trace_xfs_filestream_lookup (mp, ap->ip->i_ino, *agno); +trace_xfs_filestream_lookup (mp, ap->ip->i_ino, pag->pag_agno); - ap->blkno =XFS_AGB_TO_FSB (args->mp, *agno,0 ); + ap->blkno =XFS_AGB_TO_FSB (args->mp, pag->pag_agno,0 );xfs_bmap_adjacent (ap); - pag =xfs_perag_grab (mp, *agno); -if (!pag) - goto out_default_agno; error =xfs_bmap_longest_free_extent (pag, args->tp, blen); -xfs_perag_rele (pag);if (error) {if (error != -EAGAIN )return error; *blen =0 ; } + *agno = pag->pag_agno;if (*blen >= args->maxlen)return 0 ;
@@ -313,7 +300,7 @@ xfs_filestream_select_ag_mru(if (mru) {struct xfs_fstrm_item *item = container_of(mru, struct xfs_fstrm_item, mru); - *agno = (item->ag +1 ) % mp->m_sb.sb_agcount; + *agno = (item->pag->pag_agno +1 ) % mp->m_sb.sb_agcount;xfs_fstrm_free_func (mp, mru);return 0 ; }
Signature · 1 line
2.35.1
PATCH 46/50 xfs: use for_each_perag_wrap in xfs_filestream_pick_ag
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
xfs_filestream_pick_ag() is now ready to rework to use for_each_perag_wrap() for iterating the perags during the AG selection scan.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_filestream.c | 101 ++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 60 deletions(-)
fs/xfs/xfs_filestream.c +41 -60
@@ -83,9 +83,9 @@ xfs_filestream_pick_ag(struct xfs_perag *max_pag =NULL ;xfs_extlen_t minlen = *longest;xfs_extlen_t free =0 , minfree, maxfree =0 ; -xfs_agnumber_t startag = *agp; -xfs_agnumber_t ag = startag; -int err, trylock, nscan; +xfs_agnumber_t start_agno = *agp; +xfs_agnumber_t agno; +int err, trylock;ASSERT (S_ISDIR (VFS_I (ip)->i_mode));
@@ -97,13 +97,9 @@ xfs_filestream_pick_ag(/* For the first pass, don't sleep trying to init the per-AG. */ trylock =XFS_ALLOC_FLAG_TRYLOCK ; -for (nscan =0 ;1 ; nscan++) { -trace_xfs_filestream_scan (mp, ip->i_ino, ag); - - err =0 ; - pag =xfs_perag_grab (mp, ag); -if (!pag) - goto next_ag; +restart: +for_each_perag_wrap (mp, start_agno, agno, pag) { +trace_xfs_filestream_scan (mp, ip->i_ino, agno); *longest =0 ; err =xfs_bmap_longest_free_extent (pag,NULL , longest);if (err) {
@@ -111,6 +107,7 @@ xfs_filestream_pick_ag(if (err != -EAGAIN )break ;/* Couldn't lock the AGF, skip this AG. */ + err =0 ; goto next_ag; }
@@ -129,77 +126,61 @@ xfs_filestream_pick_ag(* loop, and it guards against two filestreams being established * in the same AG as each other. */ -if (atomic_inc_return (&pag->pagf_fstrms) >1 ) { -atomic_dec (&pag->pagf_fstrms); -xfs_perag_rele (pag); - goto next_ag; - } - -if (((minlen && *longest >= minlen) || - (!minlen && pag->pagf_freeblks >= minfree)) && - (!xfs_perag_prefers_metadata (pag) || - !(flags &XFS_PICK_USERDATA ) || - (flags &XFS_PICK_LOWSPACE ))) { - -/* Break out, retaining the reference on the AG. */ - free = pag->pagf_freeblks; -break ; +if (atomic_inc_return (&pag->pagf_fstrms) <=1 ) { +if (((minlen && *longest >= minlen) || + (!minlen && pag->pagf_freeblks >= minfree)) && + (!xfs_perag_prefers_metadata (pag) || + !(flags &XFS_PICK_USERDATA ) || + (flags &XFS_PICK_LOWSPACE ))) { +/* Break out, retaining the reference on the AG. */ + free = pag->pagf_freeblks; +break ; + } }/* Drop the reference on this AG, it's not usable. */ atomic_dec (&pag->pagf_fstrms); -next_ag: -/* Move to the next AG, wrapping to AG 0 if necessary. */ -if (++ag >= mp->m_sb.sb_agcount) - ag =0 ; + } -/* If a full pass of the AGs hasn't been done yet, continue. */ -if (ag != startag) -continue ; +if (err) { +xfs_perag_rele (pag); +if (max_pag) +xfs_perag_rele (max_pag); +return err; + } +if (!pag) {/* Allow sleeping in xfs_alloc_read_agf() on the 2nd pass. */ -if (trylock !=0 ) { +if (trylock) { trylock =0 ; -continue ; + goto restart; }/* Finally, if lowspace wasn't set, set it for the 3rd pass. */ if (!(flags &XFS_PICK_LOWSPACE )) { flags |=XFS_PICK_LOWSPACE ; -continue ; + goto restart; }/* -* Take the AG with the most free space, regardless of whether -* it's already in use by another filestream. +* No unassociated AGs are available, so select the AG with the +* most free space, regardless of whether it's already in use by +* another filestream. It none suit, return NULLAGNUMBER. */ -if (max_pag) { - pag = max_pag; -atomic_inc (&pag->pagf_fstrms); - free = maxfree; -break ; +if (!max_pag) { + *agp =NULLAGNUMBER ; +trace_xfs_filestream_pick (ip, *agp, free,0 ); +return 0 ; } - -/* take AG 0 if none matched */ -trace_xfs_filestream_pick (ip, *agp, free, nscan); - *agp =0 ; -return 0 ; - } - -trace_xfs_filestream_pick (ip, pag ? pag->pag_agno :NULLAGNUMBER , - free, nscan); - -if (max_pag) + pag = max_pag; + free = maxfree; +atomic_inc (&pag->pagf_fstrms); + }else if (max_pag) {xfs_perag_rele (max_pag); - -if (err) -return err; - -if (!pag) { - *agp =NULLAGNUMBER ; -return 0 ; } +trace_xfs_filestream_pick (ip, pag->pag_agno, free,0 ); + err = -ENOMEM ; item =kmem_alloc (sizeof (*item),KM_MAYFAIL );if (!item)
Signature · 1 line
2.35.1
PATCH 47/50 xfs: pass perag to filestreams tracing
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Pass perags instead of raw ag numbers, avoiding the need for the special peek function for the tracing code.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_filestream.c | 29 +++++------------------------ fs/xfs/xfs_filestream.h | 1 - fs/xfs/xfs_trace.h | 37 ++++++++++++++++++++----------------- 3 files changed, 25 insertions(+), 42 deletions(-)
fs/xfs/xfs_filestream.c +5 -24
@@ -31,25 +31,6 @@ enum xfs_fstrm_alloc { XFS_PICK_LOWSPACE = 2, }; -/* -* Allocation group filestream associations are tracked with per-ag atomic -* counters. These counters allow xfs_filestream_pick_ag() to tell whether a -* particular AG already has active filestreams associated with it. -*/ -int -xfs_filestream_peek_ag ( -xfs_mount_t *mp, -xfs_agnumber_t agno) -{ -struct xfs_perag *pag; -int ret; - - pag =xfs_perag_get (mp, agno); - ret =atomic_read (&pag->pagf_fstrms); -xfs_perag_put (pag); -return ret; -} - static void xfs_fstrm_free_func( void *data,
@@ -59,7 +40,7 @@ xfs_fstrm_free_func( container_of(mru, struct xfs_fstrm_item, mru);struct xfs_perag *pag = item->pag; -trace_xfs_filestream_free (pag->pag_mount, mru->key, pag->pag_agno); +trace_xfs_filestream_free (pag, mru->key);atomic_dec (&pag->pagf_fstrms);xfs_perag_rele (pag);
@@ -99,7 +80,7 @@ xfs_filestream_pick_ag( restart:for_each_perag_wrap (mp, start_agno, agno, pag) { -trace_xfs_filestream_scan (mp, ip->i_ino, agno); +trace_xfs_filestream_scan (pag, ip->i_ino); *longest =0 ; err =xfs_bmap_longest_free_extent (pag,NULL , longest);if (err) {
@@ -169,7 +150,7 @@ xfs_filestream_pick_ag(*/ if (!max_pag) { *agp =NULLAGNUMBER ; -trace_xfs_filestream_pick (ip, *agp, free,0 ); +trace_xfs_filestream_pick (ip,NULL , free);return 0 ; } pag = max_pag;
@@ -179,7 +160,7 @@ xfs_filestream_pick_ag(xfs_perag_rele (max_pag); } -trace_xfs_filestream_pick (ip, pag->pag_agno, free,0 ); +trace_xfs_filestream_pick (ip, pag, free); err = -ENOMEM ; item =kmem_alloc (sizeof (*item),KM_MAYFAIL );
@@ -259,7 +240,7 @@ xfs_filestream_select_ag_mru( pag = container_of(mru, struct xfs_fstrm_item, mru)->pag;xfs_mru_cache_done (mp->m_filestream); -trace_xfs_filestream_lookup (mp, ap->ip->i_ino, pag->pag_agno); +trace_xfs_filestream_lookup (pag, ap->ip->i_ino); ap->blkno =XFS_AGB_TO_FSB (args->mp, pag->pag_agno,0 );xfs_bmap_adjacent (ap);
fs/xfs/xfs_filestream.h +0 -1
@@ -14,7 +14,6 @@ struct xfs_alloc_arg;int xfs_filestream_mount (struct xfs_mount *mp);void xfs_filestream_unmount (struct xfs_mount *mp);void xfs_filestream_deassociate (struct xfs_inode *ip); -int xfs_filestream_peek_ag (struct xfs_mount *mp,xfs_agnumber_t agno);int xfs_filestream_select_ag (struct xfs_bmalloca *ap,struct xfs_alloc_arg *args,xfs_extlen_t *blen);
fs/xfs/xfs_trace.h +20 -17
@@ -74,6 +74,7 @@ struct xfs_inobt_rec_incore;union xfs_btree_ptr ;struct xfs_dqtrx ;struct xfs_icwalk ; +struct xfs_perag ;#define XFS_ATTR_FILTER_FLAGS \ { XFS_ATTR_ROOT, "ROOT" }, \
@@ -637,8 +638,8 @@ DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold_release);DEFINE_BUF_ITEM_EVENT (xfs_trans_binval); DECLARE_EVENT_CLASS(xfs_filestream_class, - TP_PROTO(struct xfs_mount *mp, xfs_ino_t ino, xfs_agnumber_t agno), - TP_ARGS(mp, ino, agno), + TP_PROTO(struct xfs_perag *pag, xfs_ino_t ino), + TP_ARGS(pag, ino), TP_STRUCT__entry( __field(dev_t, dev) __field(xfs_ino_t, ino)
@@ -646,10 +647,10 @@ DECLARE_EVENT_CLASS(xfs_filestream_class,__field (int, streams) ),TP_fast_assign ( - __entry->dev = mp->m_super->s_dev; + __entry->dev = pag->pag_mount->m_super->s_dev; __entry->ino = ino; - __entry->agno = agno; - __entry->streams =xfs_filestream_peek_ag (mp, agno); + __entry->agno = pag->pag_agno; + __entry->streams =atomic_read (&pag->pagf_fstrms); ), TP_printk("dev %d:%d ino 0x%llx agno 0x%x streams %d", MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -659,39 +660,41 @@ DECLARE_EVENT_CLASS(xfs_filestream_class, )#define DEFINE_FILESTREAM_EVENT (name) \ DEFINE_EVENT(xfs_filestream_class, name, \ - TP_PROTO(struct xfs_mount *mp, xfs_ino_t ino, xfs_agnumber_t agno), \ - TP_ARGS(mp, ino, agno)) + TP_PROTO(struct xfs_perag *pag, xfs_ino_t ino), \ + TP_ARGS(pag, ino))DEFINE_FILESTREAM_EVENT (xfs_filestream_free);DEFINE_FILESTREAM_EVENT (xfs_filestream_lookup);DEFINE_FILESTREAM_EVENT (xfs_filestream_scan);TRACE_EVENT (xfs_filestream_pick, - TP_PROTO(struct xfs_inode *ip, xfs_agnumber_t agno, - xfs_extlen_t free, int nscan), -TP_ARGS (ip, agno, free, nscan), + TP_PROTO(struct xfs_inode *ip, struct xfs_perag *pag, + xfs_extlen_t free), +TP_ARGS (ip, pag, free),TP_STRUCT__entry ( __field(dev_t, dev) __field(xfs_ino_t, ino) __field(xfs_agnumber_t, agno) __field(int, streams)__field (xfs_extlen_t, free) -__field (int, nscan) ),TP_fast_assign ( __entry->dev = VFS_I(ip)->i_sb->s_dev; __entry->ino = ip->i_ino; - __entry->agno = agno; - __entry->streams = xfs_filestream_peek_ag(ip->i_mount, agno); + if (pag) { + __entry->agno = pag->pag_agno; + __entry->streams = atomic_read(&pag->pagf_fstrms); + } else { + __entry->agno = NULLAGNUMBER; + __entry->streams = 0; + } __entry->free = free; - __entry->nscan = nscan; ), -TP_printk ("dev %d:%d ino 0x%llx agno 0x%x streams %d free %d nscan %d" , +TP_printk ("dev %d:%d ino 0x%llx agno 0x%x streams %d free %d" ,MAJOR (__entry->dev),MINOR (__entry->dev), __entry->ino, __entry->agno, __entry->streams, - __entry->free, - __entry->nscan) + __entry->free) ); DECLARE_EVENT_CLASS(xfs_lock_class,
Signature · 1 line
2.35.1
PATCH 48/50 xfs: return a referenced perag from filestreams allocator
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Now that the filestreams AG selection tracks active perags, we need to return an active perag to the core allocator code. This is because the file allocation the filestreams code will run are AG specific allocations and so need to pin the AG until the allocations complete.
We cannot rely on the filestreams item reference to do this - the filestreams association can be torn down at any time, hence we need to have a separate reference for the allocation process to pin the AG after it has been selected.
This means there is some perag juggling in allocation failure fallback paths as they will do all AG scans in the case the AG specific allocation fails. Hence we need to track the perag reference that the filestream allocator returned to make sure we don't leak it on repeated allocation failure.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_bmap.c | 33 ++++++++++++++------ fs/xfs/xfs_filestream.c | 65 ++++++++++++++++++++++++++-------------- 2 files changed, 66 insertions(+), 32 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +24 -9
@@ -3438,6 +3438,7 @@ xfs_btalloc_at_eof( bool ag_only) {struct xfs_mount *mp = args->mp; +struct xfs_perag *caller_pag = args->pag;int error;/*
@@ -3465,9 +3466,11 @@ xfs_btalloc_at_eof(else args->minalignslop =0 ; - args->pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, ap->blkno)); +if (!caller_pag) + args->pag =xfs_perag_get (mp,XFS_FSB_TO_AGNO (mp, ap->blkno)); error =xfs_alloc_vextent_exact_bno (args, ap->blkno); -xfs_perag_put (args->pag); +if (!caller_pag) +xfs_perag_put (args->pag);if (error)return error;
@@ -3493,10 +3496,13 @@ xfs_btalloc_at_eof( args->minalignslop =0 ; } -if (ag_only) +if (ag_only) { error =xfs_alloc_vextent_near_bno (args, ap->blkno); -else + }else { + args->pag =NULL ; error =xfs_alloc_vextent_start_ag (args, ap->blkno); + args->pag = caller_pag; + }if (error)return error;
@@ -3559,16 +3565,25 @@ xfs_btalloc_filestreams( error =xfs_filestream_select_ag (ap, args, &blen);if (error)return error; +ASSERT (args->pag); args->minlen =xfs_bmap_select_minlen (ap, args, blen); -if (ap->aeof) { +if (ap->aeof) error =xfs_btalloc_at_eof (ap, args, blen, stripe_align, true); -if (error || args->fsbno !=NULLFSBLOCK ) -return error; - } - error =xfs_alloc_vextent_near_bno (args, ap->blkno); +if (!error && args->fsbno ==NULLFSBLOCK ) + error =xfs_alloc_vextent_near_bno (args, ap->blkno); + +/* +* We are now done with the perag reference for the filestreams +* association provided by xfs_filestream_select_ag(). Release it now as +* we've either succeeded, had a fatal error or we are out of space and +* need to do a full filesystem scan for free space which will take it's +* own references. +*/ +xfs_perag_rele (args->pag); + args->pag =NULL ;if (error || args->fsbno !=NULLFSBLOCK )return error;
fs/xfs/xfs_filestream.c +42 -23
140 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 49/50 xfs: refactor the filestreams allocator pick functions
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Now that the filestreams allocator is largely rewritten, restructure the main entry point and pick function to seperate out the different operations cleanly. The MRU lookup function should not handle the start AG selection on MRU lookup failure, and nor should the pick function handle building the association that is inserted into the MRU.
This leaves the filestreams allocator fairly clean and easy to understand, returning to the caller with an active perag reference and a target block to allocate at.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/xfs_filestream.c | 219 ++++++++++++++++++++-------------------- fs/xfs/xfs_trace.h | 9 +- 2 files changed, 116 insertions(+), 112 deletions(-)
fs/xfs/xfs_filestream.c +112 -107
@@ -48,19 +48,19 @@ xfs_fstrm_free_func( }/* -* Scan the AGs starting at startag looking for an AG that isn't in use and has -* at least minlen blocks free. +* Scan the AGs starting at start_agno looking for an AG that isn't in use and +* has at least minlen blocks free. If no AG is found to match the allocation +* requirements, pick the AG with the most free space in it. */ static int xfs_filestream_pick_ag (struct xfs_alloc_arg *args, -struct xfs_inode *ip, +xfs_ino_t pino,xfs_agnumber_t start_agno,int flags,xfs_extlen_t *longest) { -struct xfs_mount *mp = ip->i_mount; -struct xfs_fstrm_item *item; +struct xfs_mount *mp = args->mp;struct xfs_perag *pag;struct xfs_perag *max_pag =NULL ;xfs_extlen_t minlen = *longest;
@@ -68,8 +68,6 @@ xfs_filestream_pick_ag(xfs_agnumber_t agno;int err, trylock; -ASSERT (S_ISDIR (VFS_I (ip)->i_mode)); -/* 2% of an AG's blocks must be free for it to be chosen. */ minfree = mp->m_sb.sb_agblocks /50 ;
@@ -78,7 +76,7 @@ xfs_filestream_pick_ag( restart:for_each_perag_wrap (mp, start_agno, agno, pag) { -trace_xfs_filestream_scan (pag, ip->i_ino); +trace_xfs_filestream_scan (pag, pino); *longest =0 ; err =xfs_bmap_longest_free_extent (pag,NULL , longest);if (err) {
@@ -87,7 +85,7 @@ xfs_filestream_pick_ag(break ;/* Couldn't lock the AGF, skip this AG. */ err =0 ; - goto next_ag; +continue ; }/* Keep track of the AG with the most free blocks. */
@@ -148,9 +146,9 @@ xfs_filestream_pick_ag(* grab. */ if (!max_pag) { -for_each_perag_wrap (mp, start_agno, agno, pag) +for_each_perag_wrap (args->mp,0 , start_agno, args->pag)break ; -atomic_inc (&pag->pagf_fstrms); +atomic_inc (&args->pag->pagf_fstrms); *longest =0 ; }else { pag = max_pag;
@@ -161,44 +159,10 @@ xfs_filestream_pick_ag(xfs_perag_rele (max_pag); } -trace_xfs_filestream_pick (ip, pag, free); - - err = -ENOMEM ; - item =kmem_alloc (sizeof (*item),KM_MAYFAIL ); -if (!item) - goto out_put_ag; - - -/* -* We are going to use this perag now, so take another ref to it for the -* allocation context returned to the caller. If we raced to create and -* insert the filestreams item into the MRU (-EEXIST), then we still -* keep this reference but free the item reference we gained above. On -* any other failure, we have to drop both. -*/ -atomic_inc (&pag->pag_active_ref); - item->pag = pag; +trace_xfs_filestream_pick (pag, pino, free); args->pag = pag; - - err =xfs_mru_cache_insert (mp->m_filestream, ip->i_ino, &item->mru); -if (err) { -if (err == -EEXIST ) { - err =0 ; - }else { -xfs_perag_rele (args->pag); - args->pag =NULL ; - } - goto out_free_item; - } -return 0 ; -out_free_item: -kmem_free (item); -out_put_ag: -atomic_dec (&pag->pagf_fstrms); -xfs_perag_rele (pag); -return err; } static struct xfs_inode *
@@ -227,29 +191,29 @@ xfs_filestream_get_parent(/* * Lookup the mru cache for an existing association. If one exists and we can -* use it, return with the agno and blen indicating that the allocation will -* proceed with that association. +* use it, return with an active perag reference indicating that the allocation +* will proceed with that association. * * If we have no association, or we cannot use the current one and have to -* destroy it, return with blen = 0 and agno pointing at the next agno to try. +* destroy it, return with longest = 0 to tell the caller to create a new +* association. */ -int -xfs_filestream_select_ag_mru ( +static int +xfs_filestream_lookup_association (struct xfs_bmalloca *ap,struct xfs_alloc_arg *args, -struct xfs_inode *pip, -xfs_agnumber_t *agno, -xfs_extlen_t *blen) +xfs_ino_t pino, +xfs_extlen_t *longest) { -struct xfs_mount *mp = ap->ip->i_mount; +struct xfs_mount *mp = args->mp;struct xfs_perag *pag;struct xfs_mru_cache_elem *mru;int error; - *blen =0 ; - mru =xfs_mru_cache_lookup (mp->m_filestream, pip->i_ino); + *longest =0 ; + mru =xfs_mru_cache_lookup (mp->m_filestream, pino);if (!mru) - goto out_default_agno; +return 0 ;/* * Grab the pag and take an extra active reference for the caller whilst
@@ -266,86 +230,127 @@ xfs_filestream_select_ag_mru( ap->blkno =XFS_AGB_TO_FSB (args->mp, pag->pag_agno,0 );xfs_bmap_adjacent (ap); - error =xfs_bmap_longest_free_extent (pag, args->tp, blen); -if (error) { + error =xfs_bmap_longest_free_extent (pag, args->tp, longest); +if (error == -EAGAIN ) + error =0 ; +if (*longest < args->maxlen) {/* We aren't going to use this perag */ + *longest =0 ;xfs_perag_rele (pag); -if (error != -EAGAIN ) -return error; - *blen =0 ; +return error; } -if (*blen >= args->maxlen) { - args->pag = pag; -return 0 ; - } + args->pag = pag; +return 0 ; +} + +static int +xfs_filestream_create_association ( +struct xfs_bmalloca *ap, +struct xfs_alloc_arg *args, +xfs_ino_t pino, +xfs_extlen_t *longest) +{ +struct xfs_mount *mp = args->mp; +struct xfs_mru_cache_elem *mru; +struct xfs_fstrm_item *item; +xfs_agnumber_t agno =XFS_INO_TO_AGNO (mp, pino); +int flags =0 ; +int error;/* Changing parent AG association now, so remove the existing one. */ -xfs_perag_rele (pag); - mru =xfs_mru_cache_remove (mp->m_filestream, pip->i_ino); + mru =xfs_mru_cache_remove (mp->m_filestream, pino);if (mru) {struct xfs_fstrm_item *item = container_of(mru, struct xfs_fstrm_item, mru); - *agno = (item->pag->pag_agno +1 ) % mp->m_sb.sb_agcount; -xfs_fstrm_free_func (mp, mru); -return 0 ; - } -out_default_agno: -if (xfs_is_inode32 (mp)) { + agno = (item->pag->pag_agno +1 ) % mp->m_sb.sb_agcount; +xfs_fstrm_free_func (mp, mru); + }else if (xfs_is_inode32 (mp)) {xfs_agnumber_t rotorstep = xfs_rotorstep; - *agno = (mp->m_agfrotor / rotorstep) % - mp->m_sb.sb_agcount; + + agno = (mp->m_agfrotor / rotorstep) % mp->m_sb.sb_agcount; mp->m_agfrotor = (mp->m_agfrotor +1 ) % (mp->m_sb.sb_agcount * rotorstep); -return 0 ; } - *agno =XFS_INO_TO_AGNO (mp, pip->i_ino); + + ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 ); +xfs_bmap_adjacent (ap); + +if (ap->datatype &XFS_ALLOC_USERDATA ) + flags |=XFS_PICK_USERDATA ; +if (ap->tp->t_flags &XFS_TRANS_LOWMODE ) + flags |=XFS_PICK_LOWSPACE ; + + *longest = ap->length; + error =xfs_filestream_pick_ag (args, pino, agno, flags, longest); +if (error) +return error; + +/* +* We are going to use this perag now, so create an assoication for it. +* xfs_filestream_pick_ag() has already bumped the perag fstrms counter +* for us, so all we need to do here is take another active reference to +* the perag for the cached association. +* +* If we fail to store the association, we need to drop the fstrms +* counter as well as drop the perag reference we take here for the +* item. We do not need to return an error for this failure - as long as +* we return a referenced AG, the allocation can still go ahead just +* fine. +*/ + item =kmem_alloc (sizeof (*item),KM_MAYFAIL ); +if (!item) + goto out_put_fstrms; + +atomic_inc (&args->pag->pag_active_ref); + item->pag = args->pag; + error =xfs_mru_cache_insert (mp->m_filestream, pino, &item->mru); +if (error) + goto out_free_item;return 0 ; +out_free_item: +xfs_perag_rele (item->pag); +kmem_free (item); +out_put_fstrms: +atomic_dec (&args->pag->pagf_fstrms); +return 0 ; }/* * Search for an allocation group with a single extent large enough for -* the request. If one isn't found, then adjust the minimum allocation -* size to the largest space found. +* the request. First we look for an existing association and use that if it +* is found. Otherwise, we create a new association by selecting an AG that fits +* the allocation criteria. +* +* We return with a referenced perag in args->pag to indicate which AG we are +* allocating into or an error with no references held. */ int xfs_filestream_select_ag (struct xfs_bmalloca *ap,struct xfs_alloc_arg *args, -xfs_extlen_t *blen) +xfs_extlen_t *longest) { -struct xfs_mount *mp = ap->ip->i_mount; -struct xfs_inode *pip =NULL ; -xfs_agnumber_t agno; -int flags =0 ; -int error; +struct xfs_mount *mp = args->mp; +struct xfs_inode *pip; +xfs_ino_t ino =0 ; +int error =0 ; + *longest =0 ; args->total = ap->total; pip =xfs_filestream_get_parent (ap->ip); -if (!pip) { - agno =0 ; - goto out_select; +if (pip) { + ino = pip->i_ino; + error =xfs_filestream_lookup_association (ap, args, ino, + longest); +xfs_irele (pip); } - error =xfs_filestream_select_ag_mru (ap, args, pip, &agno, blen); -if (error || *blen >= args->maxlen) - goto out_rele; - - ap->blkno =XFS_AGB_TO_FSB (args->mp, agno,0 ); -xfs_bmap_adjacent (ap); - -if (ap->datatype &XFS_ALLOC_USERDATA ) - flags |=XFS_PICK_USERDATA ; -if (ap->tp->t_flags &XFS_TRANS_LOWMODE ) - flags |=XFS_PICK_LOWSPACE ; - - *blen = ap->length; - error =xfs_filestream_pick_ag (args, pip, agno, flags, blen); -out_rele: -xfs_irele (pip); -out_select: +if (!error && *longest < args->maxlen) + error =xfs_filestream_create_association (ap, args, ino, + longest);if (!error) ap->blkno =XFS_AGB_TO_FSB (mp, args->pag->pag_agno,0 );return error;
fs/xfs/xfs_trace.h +4 -5
@@ -667,9 +667,8 @@ DEFINE_FILESTREAM_EVENT(xfs_filestream_lookup);DEFINE_FILESTREAM_EVENT (xfs_filestream_scan); TRACE_EVENT(xfs_filestream_pick, - TP_PROTO(struct xfs_inode *ip, struct xfs_perag *pag, - xfs_extlen_t free), - TP_ARGS(ip, pag, free), + TP_PROTO(struct xfs_perag *pag, xfs_ino_t ino, xfs_extlen_t free), + TP_ARGS(pag, ino, free), TP_STRUCT__entry( __field(dev_t, dev) __field(xfs_ino_t, ino)
@@ -678,8 +677,8 @@ TRACE_EVENT(xfs_filestream_pick,__field (xfs_extlen_t, free) ),TP_fast_assign ( - __entry->dev = VFS_I(ip)->i_sb->s_dev; - __entry->ino = ip->i_ino; + __entry->dev = pag->pag_mount->m_super->s_dev; + __entry->ino = ino;if (pag) { __entry->agno = pag->pag_agno; __entry->streams =atomic_read (&pag->pagf_fstrms);
Signature · 1 line
2.35.1
PATCH 50/50 xfs: fix low space alloc deadlock
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
This is fixing a g/476 AGF ABBA deadlock that occurs reliably with this patchset so far. Allocation is attempted in AG 2, which has no space, then AG 3 which fails with "nominleft" search error. THis then returns to the caller with AGF 3 still locked, and the caller then does a retry with more restricted allocation criteria. This then starts again at AG 2, which then deadlocks because it's the wrong AGF locking order.
What I can't work out is how the existing TOT code isn't hitting this every time g/476 is run. I can't see where it unlocks AGF 3, nor can I see how it avoids the out of order locking on nospace retries. So this looks like a pre-existing bug, but it takes this allocator rework to expose it?
More work investigation needed here.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/libxfs/xfs_alloc.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_alloc.c +20 -1
@@ -3332,8 +3332,27 @@ xfs_alloc_vextent_iterate_ags( args->pag =NULL ;return error; } -if (args->agbp) +if (args->agbp) { +/* +* XXX: this looks like a pre-existing bug. alloc_size fails +* because of nominleft, and we return here with the AGF locked +* with args->agbno == NULLAGBLOCK If this happens with any AG +* higher than the start_agno, if the caller then tries to allocate +* again with more restricted parameters, we try locking from +* start_agno again and we deadlock because we've already got a +* higher AGF locked. Hence we need to drop the AGF lock if +* we failed to allocate here. g/476 triggers this reliably. +*/ +if (args->agbno ==NULLAGBLOCK ) { +/* +* XXX: This is not a reliable workaround if the AGF was +* modified! +*/ +xfs_trans_brelse (args->tp, args->agbp); + args->agbp =NULL ; + }return 0 ; + }/* * We didn't find an AG we can alloation from. If we were given
Signature · 1 line
2.35.1
Quoted 6 lines · Dave Chinner
This series starts by driving the perag down into the AGI, AGF and AGFL access routines and unifies the perag structure initialisation with the high level AG header read functions. This largely replaces the xfs_mount/agno pair that is passed to all these functions with a perag, and in most places we already have a perag ready to pass in.
Btw, one neat thing would be versions of helpers like XFS_AG_DADDR and XFS_AGB_TO_FSB that take the pag structure instead of the mp/agno pair.
Quoted 11 lines · Christoph Hellwig
Quoted 6 lines · Dave Chinner
This series starts by driving the perag down into the AGI, AGF and AGFL access routines and unifies the perag structure initialisation with the high level AG header read functions. This largely replaces the xfs_mount/agno pair that is passed to all these functions with a perag, and in most places we already have a perag ready to pass in.
Btw, one neat thing would be versions of helpers like
XFS_AG_DADDRandXFS_AGB_TO_FSBthat take the pag structure instead of the mp/agno pair.
*nod*
Yeah, that's something I'm trying to work towards by driving more geometry information into the perag. I haven't tried to do the bigger conversions yet because the perag isn't widely used enough yet, and it's likely that there will be additional complexities with the userspace code I haven't realised yet. Getting the allocation code to pass around referenced perags is a big part of getting there, but there's still plenty more to do before I think I'll be able to tackle cleaning up the many unit conversion macros we have.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]