[22/61] xfs: move xfs_perag_get/put to xfs_ag.[ch]

Message ID	163174731479.350433.9205532969441344322.stgit@magnolia (mailing list archive)
State	Accepted
Headers	show Return-Path: <linux-xfs-owner@kernel.org> Subject: [PATCH 22/61] xfs: move xfs_perag_get/put to xfs_ag.[ch] 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:08:34 -0700 Message-ID: <163174731479.350433.9205532969441344322.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/libxfs/xfs_ag.c b/libxfs/xfs_ag.c index b94ad5c3..46e78b0e 100644 --- a/libxfs/xfs_ag.c +++ b/libxfs/xfs_ag.c @@ -26,6 +26,141 @@ #include "xfs_defer.h" #include "xfs_log_format.h" #include "xfs_trans.h" +#include "xfs_trace.h" + +/* + * Passive reference counting access wrappers to the perag structures. If the + * per-ag structure is to be freed, the freeing code is responsible for cleaning + * up objects with passive references before freeing the structure. This is + * things like cached buffers. + */ +struct xfs_perag * +xfs_perag_get( + struct xfs_mount *mp, + 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) { + ASSERT(atomic_read(&pag->pag_ref) >= 0); + ref = atomic_inc_return(&pag->pag_ref); + } + rcu_read_unlock(); + trace_xfs_perag_get(mp, agno, ref, _RET_IP_); + return pag; +} + +/* + * search from @first to find the next perag with the given tag set. + */ +struct xfs_perag * +xfs_perag_get_tag( + struct xfs_mount *mp, + xfs_agnumber_t first, + int tag) +{ + struct xfs_perag *pag; + int found; + int ref; + + 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; + } + ref = atomic_inc_return(&pag->pag_ref); + rcu_read_unlock(); + trace_xfs_perag_get_tag(mp, pag->pag_agno, ref, _RET_IP_); + return pag; +} + +void +xfs_perag_put( + struct xfs_perag *pag) +{ + int ref; + + 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_); +} + +/* + * xfs_initialize_perag_data + * + * Read in each per-ag structure so we can count up the number of + * allocated inodes, free inodes and used filesystem blocks as this + * information is no longer persistent in the superblock. Once we have + * this information, write it into the in-core superblock structure. + */ +int +xfs_initialize_perag_data( + struct xfs_mount *mp, + xfs_agnumber_t agcount) +{ + xfs_agnumber_t index; + xfs_perag_t *pag; + xfs_sb_t *sbp = &mp->m_sb; + uint64_t ifree = 0; + uint64_t ialloc = 0; + uint64_t bfree = 0; + uint64_t bfreelst = 0; + uint64_t btree = 0; + uint64_t fdblocks; + int error = 0; + + 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. + */ + error = xfs_alloc_pagf_init(mp, NULL, index, 0); + if (error) + return error; + + error = xfs_ialloc_pagi_init(mp, NULL, index); + if (error) + return error; + pag = xfs_perag_get(mp, index); + ifree += pag->pagi_freecount; + ialloc += pag->pagi_count; + bfree += pag->pagf_freeblks; + bfreelst += pag->pagf_flcount; + btree += pag->pagf_btreeblks; + xfs_perag_put(pag); + } + fdblocks = bfree + bfreelst + btree; + + /* + * If the new summary counts are obviously incorrect, fail the + * mount operation because that implies the AGFs are also corrupt. + * Clear FS_COUNTERS so that we don't unmount with a dirty log, which + * will prevent xfs_repair from fixing anything. + */ + if (fdblocks > sbp->sb_dblocks || ifree > ialloc) { + xfs_alert(mp, "AGF corruption. Please run xfs_repair."); + error = -EFSCORRUPTED; + goto out; + } + + /* Overwrite incore superblock counters with just-read data */ + spin_lock(&mp->m_sb_lock); + sbp->sb_ifree = ifree; + sbp->sb_icount = ialloc; + sbp->sb_fdblocks = fdblocks; + spin_unlock(&mp->m_sb_lock); + + xfs_reinit_percpu_counters(mp); +out: + xfs_fs_mark_healthy(mp, XFS_SICK_FS_COUNTERS); + return error; +} static int xfs_get_aghdr_buf( diff --git a/libxfs/xfs_ag.h b/libxfs/xfs_ag.h index 4535de1d..cb1bd1c0 100644 --- a/libxfs/xfs_ag.h +++ b/libxfs/xfs_ag.h @@ -9,6 +9,16 @@ struct xfs_mount; struct xfs_trans; +struct xfs_perag; + +/* + * perag get/put wrappers for ref counting + */ +int xfs_initialize_perag_data(struct xfs_mount *, xfs_agnumber_t); +struct xfs_perag *xfs_perag_get(struct xfs_mount *, xfs_agnumber_t); +struct xfs_perag *xfs_perag_get_tag(struct xfs_mount *, xfs_agnumber_t, + int tag); +void xfs_perag_put(struct xfs_perag *pag); struct aghdr_init_data { /* per ag data */ diff --git a/libxfs/xfs_ag_resv.c b/libxfs/xfs_ag_resv.c index 7d426d08..34ab68c0 100644 --- a/libxfs/xfs_ag_resv.c +++ b/libxfs/xfs_ag_resv.c @@ -18,7 +18,7 @@ #include "xfs_btree.h" #include "xfs_refcount_btree.h" #include "xfs_ialloc_btree.h" -#include "xfs_sb.h" +#include "xfs_ag.h" #include "xfs_ag_resv.h" /* diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index 300a91f8..37f10751 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -10,7 +10,6 @@ #include "xfs_shared.h" #include "xfs_trans_resv.h" #include "xfs_bit.h" -#include "xfs_sb.h" #include "xfs_mount.h" #include "xfs_defer.h" #include "xfs_btree.h" @@ -20,6 +19,7 @@ #include "xfs_errortag.h" #include "xfs_trace.h" #include "xfs_trans.h" +#include "xfs_ag.h" #include "xfs_ag_resv.h" #include "xfs_bmap.h" diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c index 4611ed0f..fa1d3a0f 100644 --- a/libxfs/xfs_alloc_btree.c +++ b/libxfs/xfs_alloc_btree.c @@ -9,7 +9,6 @@ #include "xfs_format.h" #include "xfs_log_format.h" #include "xfs_trans_resv.h" -#include "xfs_sb.h" #include "xfs_mount.h" #include "xfs_btree.h" #include "xfs_btree_staging.h" @@ -17,6 +16,7 @@ #include "xfs_alloc.h" #include "xfs_trace.h" #include "xfs_trans.h" +#include "xfs_ag.h" STATIC struct xfs_btree_cur * diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c index 08600ea8..1df9d63f 100644 --- a/libxfs/xfs_attr_leaf.c +++ b/libxfs/xfs_attr_leaf.c @@ -24,6 +24,7 @@ #include "xfs_attr_leaf.h" #include "xfs_trace.h" #include "xfs_dir2.h" +#include "xfs_ag.h" /* diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 1c8706a7..0809922e 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -26,6 +26,7 @@ #include "xfs_attr_leaf.h" #include "xfs_quota_defs.h" #include "xfs_rmap.h" +#include "xfs_ag.h" #include "xfs_ag_resv.h" #include "xfs_refcount.h" diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c index b1646a35..745daafb 100644 --- a/libxfs/xfs_ialloc.c +++ b/libxfs/xfs_ialloc.c @@ -10,7 +10,6 @@ #include "xfs_log_format.h" #include "xfs_trans_resv.h" #include "xfs_bit.h" -#include "xfs_sb.h" #include "xfs_mount.h" #include "xfs_inode.h" #include "xfs_btree.h" @@ -22,6 +21,7 @@ #include "xfs_trans.h" #include "xfs_trace.h" #include "xfs_rmap.h" +#include "xfs_ag.h" /* * Lookup a record by ino in the btree given by cur. diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c index eb48197b..5344b282 100644 --- a/libxfs/xfs_refcount_btree.c +++ b/libxfs/xfs_refcount_btree.c @@ -9,7 +9,6 @@ #include "xfs_format.h" #include "xfs_log_format.h" #include "xfs_trans_resv.h" -#include "xfs_sb.h" #include "xfs_mount.h" #include "xfs_btree.h" #include "xfs_btree_staging.h" @@ -19,6 +18,7 @@ #include "xfs_trans.h" #include "xfs_bit.h" #include "xfs_rmap.h" +#include "xfs_ag.h" static struct xfs_btree_cur * xfs_refcountbt_dup_cursor( diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c index 263ef27b..631c62c0 100644 --- a/libxfs/xfs_rmap.c +++ b/libxfs/xfs_rmap.c @@ -20,6 +20,7 @@ #include "xfs_trace.h" #include "xfs_errortag.h" #include "xfs_inode.h" +#include "xfs_ag.h" /* * Lookup the first record less than or equal to [bno, len, owner, offset] diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c index 9e9858e6..bcbe9833 100644 --- a/libxfs/xfs_rmap_btree.c +++ b/libxfs/xfs_rmap_btree.c @@ -9,7 +9,6 @@ #include "xfs_format.h" #include "xfs_log_format.h" #include "xfs_trans_resv.h" -#include "xfs_sb.h" #include "xfs_mount.h" #include "xfs_trans.h" #include "xfs_alloc.h" @@ -18,6 +17,7 @@ #include "xfs_rmap.h" #include "xfs_rmap_btree.h" #include "xfs_trace.h" +#include "xfs_ag.h" #include "xfs_ag_resv.h" /* diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c index 345635aa..ec08fd13 100644 --- a/libxfs/xfs_sb.c +++ b/libxfs/xfs_sb.c @@ -27,67 +27,6 @@ * Physical superblock buffer manipulations. Shared with libxfs in userspace. */ -/* - * Reference counting access wrappers to the perag structures. - * Because we never free per-ag structures, the only thing we - * have to protect against changes is the tree structure itself. - */ -struct xfs_perag * -xfs_perag_get( - struct xfs_mount *mp, - 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) { - ASSERT(atomic_read(&pag->pag_ref) >= 0); - ref = atomic_inc_return(&pag->pag_ref); - } - rcu_read_unlock(); - trace_xfs_perag_get(mp, agno, ref, _RET_IP_); - return pag; -} - -/* - * search from @first to find the next perag with the given tag set. - */ -struct xfs_perag * -xfs_perag_get_tag( - struct xfs_mount *mp, - xfs_agnumber_t first, - int tag) -{ - struct xfs_perag *pag; - int found; - int ref; - - 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; - } - ref = atomic_inc_return(&pag->pag_ref); - rcu_read_unlock(); - trace_xfs_perag_get_tag(mp, pag->pag_agno, ref, _RET_IP_); - return pag; -} - -void -xfs_perag_put( - struct xfs_perag *pag) -{ - int ref; - - 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_); -} - /* Check all the superblock fields we care about when reading one in. */ STATIC int xfs_validate_sb_read( @@ -838,78 +777,6 @@ xfs_sb_mount_common( mp->m_ag_max_usable = xfs_alloc_ag_max_usable(mp); } -/* - * xfs_initialize_perag_data - * - * Read in each per-ag structure so we can count up the number of - * allocated inodes, free inodes and used filesystem blocks as this - * information is no longer persistent in the superblock. Once we have - * this information, write it into the in-core superblock structure. - */ -int -xfs_initialize_perag_data( - struct xfs_mount *mp, - xfs_agnumber_t agcount) -{ - xfs_agnumber_t index; - xfs_perag_t *pag; - xfs_sb_t *sbp = &mp->m_sb; - uint64_t ifree = 0; - uint64_t ialloc = 0; - uint64_t bfree = 0; - uint64_t bfreelst = 0; - uint64_t btree = 0; - uint64_t fdblocks; - int error = 0; - - 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. - */ - error = xfs_alloc_pagf_init(mp, NULL, index, 0); - if (error) - return error; - - error = xfs_ialloc_pagi_init(mp, NULL, index); - if (error) - return error; - pag = xfs_perag_get(mp, index); - ifree += pag->pagi_freecount; - ialloc += pag->pagi_count; - bfree += pag->pagf_freeblks; - bfreelst += pag->pagf_flcount; - btree += pag->pagf_btreeblks; - xfs_perag_put(pag); - } - fdblocks = bfree + bfreelst + btree; - - /* - * If the new summary counts are obviously incorrect, fail the - * mount operation because that implies the AGFs are also corrupt. - * Clear FS_COUNTERS so that we don't unmount with a dirty log, which - * will prevent xfs_repair from fixing anything. - */ - if (fdblocks > sbp->sb_dblocks || ifree > ialloc) { - xfs_alert(mp, "AGF corruption. Please run xfs_repair."); - error = -EFSCORRUPTED; - goto out; - } - - /* Overwrite incore superblock counters with just-read data */ - spin_lock(&mp->m_sb_lock); - sbp->sb_ifree = ifree; - sbp->sb_icount = ialloc; - sbp->sb_fdblocks = fdblocks; - spin_unlock(&mp->m_sb_lock); - - xfs_reinit_percpu_counters(mp); -out: - xfs_fs_mark_healthy(mp, XFS_SICK_FS_COUNTERS); - return error; -} - /* * xfs_log_sb() can be used to copy arbitrary changes to the in-core superblock * into the superblock buffer to be logged. It does not provide the higher diff --git a/libxfs/xfs_sb.h b/libxfs/xfs_sb.h index f79f9dc6..0c1602d9 100644 --- a/libxfs/xfs_sb.h +++ b/libxfs/xfs_sb.h @@ -13,15 +13,6 @@ struct xfs_trans; struct xfs_fsop_geom; struct xfs_perag; -/* - * perag get/put wrappers for ref counting - */ -extern struct xfs_perag *xfs_perag_get(struct xfs_mount *, xfs_agnumber_t); -extern struct xfs_perag *xfs_perag_get_tag(struct xfs_mount *, xfs_agnumber_t, - int tag); -extern void xfs_perag_put(struct xfs_perag *pag); -extern int xfs_initialize_perag_data(struct xfs_mount *, xfs_agnumber_t); - extern void xfs_log_sb(struct xfs_trans *tp); extern int xfs_sync_sb(struct xfs_mount *mp, bool wait); extern int xfs_sync_sb_buf(struct xfs_mount *mp);

[22/61] xfs: move xfs_perag_get/put to xfs_ag.[ch]

Commit Message

Patch