[32/61] xfs: convert rmap btree cursor to using a perag

Message ID	163174736937.350433.4596074225370842445.stgit@magnolia (mailing list archive)
State	Accepted
Headers	show Return-Path: <linux-xfs-owner@kernel.org> Subject: [PATCH 32/61] xfs: convert rmap btree cursor to using a perag From: "Darrick J. Wong" <djwong@kernel.org> To: sandeen@sandeen.net, djwong@kernel.org Cc: Dave Chinner <dchinner@redhat.com>, Brian Foster <bfoster@redhat.com>, linux-xfs@vger.kernel.org Date: Wed, 15 Sep 2021 16:09:29 -0700 Message-ID: <163174736937.350433.4596074225370842445.stgit@magnolia> In-Reply-To: <163174719429.350433.8562606396437219220.stgit@magnolia> References: <163174719429.350433.8562606396437219220.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	xfs: sync libxfs with 5.14 \| expand [PATCHSET,00/61] xfs: sync libxfs with 5.14 [01/61] mkfs: move mkfs/proto.c declarations to mkfs/proto.h [02/61] libfrog: move topology.[ch] to libxfs [03/61] libfrog: create header file for mocked-up kernel data structures [04/61] libxfs: port xfs_set_inode_alloc from the kernel [05/61] libxfs: fix whitespace inconsistencies with kernel [06/61] xfs: Fix fall-through warnings for Clang [07/61] misc: convert utilities to use "fallthrough;" [08/61] xfs: use xfs_buf_alloc_pages for uncached buffers [09/61] xfs: Reverse apply 72b97ea40d [10/61] xfs: Add xfs_attr_node_remove_name [11/61] xfs: Refactor xfs_attr_set_shortform [12/61] xfs: Separate xfs_attr_node_addname and xfs_attr_node_addname_clear_incomplete [13/61] xfs: Add helper xfs_attr_node_addname_find_attr [14/61] xfs: Hoist xfs_attr_node_addname [15/61] xfs: Hoist xfs_attr_leaf_addname [16/61] xfs: Hoist node transaction handling [17/61] xfs: Add delay ready attr remove routines [18/61] xfs: Add delay ready attr set routines [19/61] xfs: Remove xfs_attr_rmtval_set [20/61] xfs: Clean up xfs_attr_node_addname_clear_incomplete [21/61] xfs: clean up open-coded fs block unit conversions [22/61] xfs: move xfs_perag_get/put to xfs_ag.[ch] [23/61] xfs: move perag structure and setup to libxfs/xfs_ag.[ch] [24/61] xfs: make for_each_perag... a first class citizen [25/61] xfs: convert raw ag walks to use for_each_perag [26/61] xfs: convert xfs_iwalk to use perag references [27/61] xfs: convert secondary superblock walk to use perags [28/61] xfs: pass perags through to the busy extent code [29/61] xfs: push perags through the ag reservation callouts [30/61] xfs: pass perags around in fsmap data dev functions [31/61] xfs: add a perag to the btree cursor [32/61] xfs: convert rmap btree cursor to using a perag [33/61] xfs: convert refcount btree cursor to use perags [34/61] xfs: convert allocbt cursors to use perags [35/61] xfs: use perag for ialloc btree cursors [36/61] xfs: remove agno from btree cursor [37/61] xfs: simplify xfs_dialloc_select_ag() return values [38/61] xfs: collapse AG selection for inode allocation [39/61] xfs: get rid of xfs_dir_ialloc() [40/61] xfs: inode allocation can use a single perag instance [41/61] xfs: clean up and simplify xfs_dialloc() [42/61] xfs: use perag through unlink processing [43/61] xfs: remove xfs_perag_t [44/61] xfs: sort variable alphabetically to avoid repeated declaration [45/61] xfs: Remove redundant assignment to busy [46/61] xfs: mark xfs_bmap_set_attrforkoff static [47/61] xfs: fix radix tree tag signs [48/61] xfs: drop the AGI being passed to xfs_check_agi_freecount [49/61] xfs: Fix default ASSERT in xfs_attr_set_iter [50/61] xfs: Make attr name schemes consistent [51/61] xfs: perag may be null in xfs_imap() [52/61] xfs: log stripe roundoff is a property of the log [53/61] xfs: xfs_log_force_lsn isn't passed a LSN [54/61] xfs: fix endianness issue in xfs_ag_shrink_space [55/61] xfs: Initialize error in xfs_attr_remove_iter [56/61] xfs: Fix multiple fall-through warnings for Clang [57/61] xfs: check for sparse inode clusters that cross new EOAG when shrinking [58/61] xfs: correct the narrative around misaligned rtinherit/extszinherit dirs [59/61] xfs: logging the on disk inode LSN can make it go backwards [60/61] xfs_db: convert the agresv command to use for_each_perag [61/61] mkfs: warn about V4 deprecation when creating new V4 filesystems

diff --git a/db/fsmap.c b/db/fsmap.c index 5973f0d6..65e9f1ba 100644 --- a/db/fsmap.c +++ b/db/fsmap.c @@ -74,8 +74,7 @@ fsmap( return; } - bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, - pag->pag_agno, pag); + bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, pag); if (!bt_cur) { libxfs_buf_relse(agbp); libxfs_perag_put(pag); diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c index 1027bc7b..1db6a65b 100644 --- a/libxfs/xfs_ag.c +++ b/libxfs/xfs_ag.c @@ -913,7 +913,7 @@ 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, id->agno, + error = xfs_rmap_free(tp, bp, bp->b_pag, be32_to_cpu(agf->agf_length) - len, len, &XFS_RMAP_OINFO_SKIP_UPDATE); if (error) diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index dfe0a9ce..199c7fae 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -1088,7 +1088,7 @@ xfs_alloc_ag_vextent_small( * If we're feeding an AGFL block to something that doesn't live in the * free space, we need to clear out the OWN_AG rmap. */ - error = xfs_rmap_free(args->tp, args->agbp, args->agno, fbno, 1, + error = xfs_rmap_free(args->tp, args->agbp, args->pag, fbno, 1, &XFS_RMAP_OINFO_AG); if (error) goto error; @@ -1165,7 +1165,7 @@ xfs_alloc_ag_vextent( /* 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->agno, + error = xfs_rmap_alloc(args->tp, args->agbp, args->pag, args->agbno, args->len, &args->oinfo); if (error) return error; @@ -1895,12 +1895,13 @@ xfs_free_ag_extent( int haveright; /* have a right neighbor */ int i; int error; + struct xfs_perag *pag = agbp->b_pag; bno_cur = cnt_cur = NULL; mp = tp->t_mountp; if (!xfs_rmap_should_skip_owner_update(oinfo)) { - error = xfs_rmap_free(tp, agbp, agno, bno, len, oinfo); + error = xfs_rmap_free(tp, agbp, pag, bno, len, oinfo); if (error) goto error0; } diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c index e61de3b2..f0621ca5 100644 --- a/libxfs/xfs_rmap.c +++ b/libxfs/xfs_rmap.c @@ -695,7 +695,7 @@ int xfs_rmap_free( struct xfs_trans *tp, struct xfs_buf *agbp, - xfs_agnumber_t agno, + struct xfs_perag *pag, xfs_agblock_t bno, xfs_extlen_t len, const struct xfs_owner_info *oinfo) @@ -707,7 +707,7 @@ xfs_rmap_free( if (!xfs_sb_version_hasrmapbt(&mp->m_sb)) return 0; - cur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno, NULL); + cur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag); error = xfs_rmap_unmap(cur, bno, len, false, oinfo); @@ -949,7 +949,7 @@ int xfs_rmap_alloc( struct xfs_trans *tp, struct xfs_buf *agbp, - xfs_agnumber_t agno, + struct xfs_perag *pag, xfs_agblock_t bno, xfs_extlen_t len, const struct xfs_owner_info *oinfo) @@ -961,7 +961,7 @@ xfs_rmap_alloc( if (!xfs_sb_version_hasrmapbt(&mp->m_sb)) return 0; - cur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno, NULL); + cur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag); error = xfs_rmap_map(cur, bno, len, false, oinfo); xfs_btree_del_cursor(cur, error); @@ -2407,7 +2407,7 @@ xfs_rmap_finish_one( goto out_drop; } - rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag->pag_agno, pag); + rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag); } *pcur = rcur; diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h index abe63340..f2423cf7 100644 --- a/libxfs/xfs_rmap.h +++ b/libxfs/xfs_rmap.h @@ -6,6 +6,8 @@ #ifndef __XFS_RMAP_H__ #define __XFS_RMAP_H__ +struct xfs_perag; + static inline void xfs_rmap_ino_bmbt_owner( struct xfs_owner_info *oi, @@ -113,10 +115,10 @@ xfs_owner_info_pack( } int xfs_rmap_alloc(struct xfs_trans *tp, struct xfs_buf *agbp, - xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len, + struct xfs_perag *pag, xfs_agblock_t bno, xfs_extlen_t len, const struct xfs_owner_info *oinfo); int xfs_rmap_free(struct xfs_trans *tp, struct xfs_buf *agbp, - xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len, + struct xfs_perag *pag, xfs_agblock_t bno, xfs_extlen_t len, const struct xfs_owner_info *oinfo); int xfs_rmap_lookup_le(struct xfs_btree_cur *cur, xfs_agblock_t bno, diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c index bed2f381..7f71d355 100644 --- a/libxfs/xfs_rmap_btree.c +++ b/libxfs/xfs_rmap_btree.c @@ -50,7 +50,7 @@ xfs_rmapbt_dup_cursor( struct xfs_btree_cur *cur) { return xfs_rmapbt_init_cursor(cur->bc_mp, cur->bc_tp, - cur->bc_ag.agbp, cur->bc_ag.agno, cur->bc_ag.pag); + cur->bc_ag.agbp, cur->bc_ag.pag); } STATIC void @@ -62,13 +62,12 @@ xfs_rmapbt_set_root( struct xfs_buf *agbp = cur->bc_ag.agbp; struct xfs_agf *agf = agbp->b_addr; int btnum = cur->bc_btnum; - struct xfs_perag *pag = agbp->b_pag; ASSERT(ptr->s != 0); agf->agf_roots[btnum] = ptr->s; be32_add_cpu(&agf->agf_levels[btnum], inc); - pag->pagf_levels[btnum] += inc; + cur->bc_ag.pag->pagf_levels[btnum] += inc; xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS); } @@ -82,6 +81,7 @@ xfs_rmapbt_alloc_block( { struct xfs_buf *agbp = cur->bc_ag.agbp; struct xfs_agf *agf = agbp->b_addr; + struct xfs_perag *pag = cur->bc_ag.pag; int error; xfs_agblock_t bno; @@ -91,20 +91,19 @@ xfs_rmapbt_alloc_block( if (error) return error; - trace_xfs_rmapbt_alloc_block(cur->bc_mp, cur->bc_ag.agno, - bno, 1); + trace_xfs_rmapbt_alloc_block(cur->bc_mp, pag->pag_agno, bno, 1); if (bno == NULLAGBLOCK) { *stat = 0; return 0; } - xfs_extent_busy_reuse(cur->bc_mp, agbp->b_pag, bno, 1, false); + xfs_extent_busy_reuse(cur->bc_mp, pag, bno, 1, false); new->s = cpu_to_be32(bno); be32_add_cpu(&agf->agf_rmap_blocks, 1); xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS); - xfs_ag_resv_rmapbt_alloc(cur->bc_mp, cur->bc_ag.agno); + xfs_ag_resv_rmapbt_alloc(cur->bc_mp, pag->pag_agno); *stat = 1; return 0; @@ -117,12 +116,12 @@ xfs_rmapbt_free_block( { struct xfs_buf *agbp = cur->bc_ag.agbp; struct xfs_agf *agf = agbp->b_addr; - struct xfs_perag *pag; + struct xfs_perag *pag = cur->bc_ag.pag; xfs_agblock_t bno; int error; bno = xfs_daddr_to_agbno(cur->bc_mp, XFS_BUF_ADDR(bp)); - trace_xfs_rmapbt_free_block(cur->bc_mp, cur->bc_ag.agno, + trace_xfs_rmapbt_free_block(cur->bc_mp, pag->pag_agno, bno, 1); be32_add_cpu(&agf->agf_rmap_blocks, -1); xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS); @@ -130,7 +129,6 @@ xfs_rmapbt_free_block( if (error) return error; - pag = cur->bc_ag.agbp->b_pag; xfs_extent_busy_insert(cur->bc_tp, pag, bno, 1, XFS_EXTENT_BUSY_SKIP_DISCARD); @@ -212,7 +210,7 @@ xfs_rmapbt_init_ptr_from_cur( { struct xfs_agf *agf = cur->bc_ag.agbp->b_addr; - ASSERT(cur->bc_ag.agno == be32_to_cpu(agf->agf_seqno)); + ASSERT(cur->bc_ag.pag->pag_agno == be32_to_cpu(agf->agf_seqno)); ptr->s = agf->agf_roots[cur->bc_btnum]; } @@ -447,7 +445,6 @@ static struct xfs_btree_cur * xfs_rmapbt_init_common( struct xfs_mount *mp, struct xfs_trans *tp, - xfs_agnumber_t agno, struct xfs_perag *pag) { struct xfs_btree_cur *cur; @@ -460,13 +457,12 @@ xfs_rmapbt_init_common( cur->bc_flags = XFS_BTREE_CRC_BLOCKS | XFS_BTREE_OVERLAPPING; cur->bc_blocklog = mp->m_sb.sb_blocklog; cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_rmap_2); - cur->bc_ag.agno = agno; cur->bc_ops = &xfs_rmapbt_ops; - if (pag) { - /* take a reference for the cursor */ - atomic_inc(&pag->pag_ref); - } + + /* take a reference for the cursor */ + atomic_inc(&pag->pag_ref); cur->bc_ag.pag = pag; + cur->bc_ag.agno = pag->pag_agno; return cur; } @@ -477,13 +473,12 @@ xfs_rmapbt_init_cursor( struct xfs_mount *mp, struct xfs_trans *tp, struct xfs_buf *agbp, - xfs_agnumber_t agno, struct xfs_perag *pag) { struct xfs_agf *agf = agbp->b_addr; struct xfs_btree_cur *cur; - cur = xfs_rmapbt_init_common(mp, tp, agno, pag); + cur = xfs_rmapbt_init_common(mp, tp, pag); cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]); cur->bc_ag.agbp = agbp; return cur; @@ -494,11 +489,11 @@ struct xfs_btree_cur * xfs_rmapbt_stage_cursor( struct xfs_mount *mp, struct xbtree_afakeroot *afake, - xfs_agnumber_t agno) + struct xfs_perag *pag) { struct xfs_btree_cur *cur; - cur = xfs_rmapbt_init_common(mp, NULL, agno, NULL); + cur = xfs_rmapbt_init_common(mp, NULL, pag); xfs_btree_stage_afakeroot(cur, afake); return cur; } diff --git a/libxfs/xfs_rmap_btree.h b/libxfs/xfs_rmap_btree.h index b036470a..f2eee657 100644 --- a/libxfs/xfs_rmap_btree.h +++ b/libxfs/xfs_rmap_btree.h @@ -43,9 +43,9 @@ struct xbtree_afakeroot; struct xfs_btree_cur *xfs_rmapbt_init_cursor(struct xfs_mount *mp, struct xfs_trans *tp, struct xfs_buf *bp, - xfs_agnumber_t agno, struct xfs_perag *pag); + struct xfs_perag *pag); struct xfs_btree_cur *xfs_rmapbt_stage_cursor(struct xfs_mount *mp, - struct xbtree_afakeroot *afake, xfs_agnumber_t agno); + struct xbtree_afakeroot *afake, struct xfs_perag *pag); void xfs_rmapbt_commit_staged_btree(struct xfs_btree_cur *cur, struct xfs_trans *tp, struct xfs_buf *agbp); int xfs_rmapbt_maxrecs(int blocklen, int leaf); diff --git a/repair/agbtree.c b/repair/agbtree.c index cc066f2e..d1b35b69 100644 --- a/repair/agbtree.c +++ b/repair/agbtree.c @@ -574,17 +574,18 @@ get_rmapbt_record( void init_rmapbt_cursor( struct repair_ctx *sc, - xfs_agnumber_t agno, + struct xfs_perag *pag, unsigned int free_space, struct bt_rebuild *btr) { + xfs_agnumber_t agno = pag->pag_agno; int error; if (!xfs_sb_version_hasrmapbt(&sc->mp->m_sb)) return; init_rebuild(sc, &XFS_RMAP_OINFO_AG, free_space, btr); - btr->cur = libxfs_rmapbt_stage_cursor(sc->mp, &btr->newbt.afake, agno); + btr->cur = libxfs_rmapbt_stage_cursor(sc->mp, &btr->newbt.afake, pag); btr->bload.get_record = get_rmapbt_record; btr->bload.claim_block = rebuild_claim_block; diff --git a/repair/agbtree.h b/repair/agbtree.h index d8095d20..88b07738 100644 --- a/repair/agbtree.h +++ b/repair/agbtree.h @@ -49,7 +49,7 @@ void init_ino_cursors(struct repair_ctx *sc, xfs_agnumber_t agno, void build_inode_btrees(struct repair_ctx *sc, xfs_agnumber_t agno, struct bt_rebuild *btr_ino, struct bt_rebuild *btr_fino); -void init_rmapbt_cursor(struct repair_ctx *sc, xfs_agnumber_t agno, +void init_rmapbt_cursor(struct repair_ctx *sc, struct xfs_perag *pag, unsigned int free_space, struct bt_rebuild *btr); void build_rmap_tree(struct repair_ctx *sc, xfs_agnumber_t agno, struct bt_rebuild *btr); diff --git a/repair/phase5.c b/repair/phase5.c index fcdf757c..0cdcf710 100644 --- a/repair/phase5.c +++ b/repair/phase5.c @@ -433,7 +433,7 @@ keep_fsinos(xfs_mount_t *mp) static void phase5_func( struct xfs_mount *mp, - xfs_agnumber_t agno, + struct xfs_perag *pag, struct bitmap *lost_blocks) { struct repair_ctx sc = { .mp = mp, }; @@ -443,6 +443,7 @@ phase5_func( struct bt_rebuild btr_fino; struct bt_rebuild btr_rmap; struct bt_rebuild btr_refc; + xfs_agnumber_t agno = pag->pag_agno; int extra_blocks = 0; uint num_freeblocks; xfs_agblock_t num_extents; @@ -476,7 +477,7 @@ _("unable to rebuild AG %u. Not enough free space in on-disk AG.\n"), init_ino_cursors(&sc, agno, num_freeblocks, &sb_icount_ag[agno], &sb_ifree_ag[agno], &btr_ino, &btr_fino); - init_rmapbt_cursor(&sc, agno, num_freeblocks, &btr_rmap); + init_rmapbt_cursor(&sc, pag, num_freeblocks, &btr_rmap); init_refc_cursor(&sc, agno, num_freeblocks, &btr_refc); @@ -605,6 +606,7 @@ void phase5(xfs_mount_t *mp) { struct bitmap *lost_blocks = NULL; + struct xfs_perag *pag; xfs_agnumber_t agno; int error; @@ -651,8 +653,8 @@ phase5(xfs_mount_t *mp) if (error) do_error(_("cannot alloc lost block bitmap\n")); - for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) - phase5_func(mp, agno, lost_blocks); + for_each_perag(mp, agno, pag) + phase5_func(mp, pag, lost_blocks); print_final_rpt(); diff --git a/repair/rmap.c b/repair/rmap.c index 2ffa27c8..5670c6a0 100644 --- a/repair/rmap.c +++ b/repair/rmap.c @@ -545,6 +545,7 @@ rmap_store_ag_btree_rec( rm_rec = pop_slab_cursor(rm_cur); while (rm_rec) { struct xfs_owner_info oinfo = {}; + struct xfs_perag *pag; error = -libxfs_trans_alloc_rollable(mp, 16, &tp); if (error) @@ -556,8 +557,10 @@ rmap_store_ag_btree_rec( ASSERT(XFS_RMAP_NON_INODE_OWNER(rm_rec->rm_owner)); oinfo.oi_owner = rm_rec->rm_owner; - error = -libxfs_rmap_alloc(tp, agbp, agno, rm_rec->rm_startblock, + pag = libxfs_perag_get(mp, agno); + error = -libxfs_rmap_alloc(tp, agbp, pag, rm_rec->rm_startblock, rm_rec->rm_blockcount, &oinfo); + libxfs_perag_put(pag); if (error) goto err_trans; @@ -1006,7 +1009,7 @@ rmaps_verify_btree( pag = libxfs_perag_get(mp, agno); pag->pagf_init = 0; - bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, agno, pag); + bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, pag); if (!bt_cur) { error = -ENOMEM; goto err;

[32/61] xfs: convert rmap btree cursor to using a perag

Commit Message

Patch