Skip to content

L
linux
Commit 0800169e authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files
Options

xfs: Pre-calculate per-AG agbno geometry 

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	1483006	 329588	    572	1813166	 1baaae	(TOTALS)
after	1482185	 329588	    572	1812345	 1ba779	(TOTALS)

This rework reduces the binary size by ~820 bytes, indicating
that much less work is being done to bounds check the agbno values
against on per-ag geometry information.
Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent cec7bb7d
Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 82 deletions
fs/xfs/libxfs/xfs_ag.c
View file @ 0800169e
...@@ -201,10 +201,35 @@ xfs_free_perag( ...@@ -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 int
xfs_initialize_perag( xfs_initialize_perag(
struct xfs_mount *mp, struct xfs_mount *mp,
xfs_agnumber_t agcount, xfs_agnumber_t agcount,
xfs_rfsblock_t dblocks,
xfs_agnumber_t *maxagi) xfs_agnumber_t *maxagi)
{ {
struct xfs_perag *pag; struct xfs_perag *pag;
...@@ -270,6 +295,13 @@ xfs_initialize_perag( ...@@ -270,6 +295,13 @@ xfs_initialize_perag(
/* first new pag is fully initialized */ /* first new pag is fully initialized */
if (first_initialised == NULLAGNUMBER) if (first_initialised == NULLAGNUMBER)
first_initialised = index; 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); index = xfs_set_inode_alloc(mp, agcount);
...@@ -927,10 +959,16 @@ xfs_ag_extend_space( ...@@ -927,10 +959,16 @@ xfs_ag_extend_space(
if (error) if (error)
return 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), be32_to_cpu(agf->agf_length) - len),
len, &XFS_RMAP_OINFO_SKIP_UPDATE, len, &XFS_RMAP_OINFO_SKIP_UPDATE,
XFS_AG_RESV_NONE); 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. */ /* Retrieve AG geometry. */
......
fs/xfs/libxfs/xfs_ag.h
View file @ 0800169e
...@@ -67,6 +67,10 @@ struct xfs_perag { ...@@ -67,6 +67,10 @@ struct xfs_perag {
/* for rcu-safe freeing */ /* for rcu-safe freeing */
struct rcu_head rcu_head; struct rcu_head rcu_head;
/* Precalculated geometry info */
xfs_agblock_t block_count;
xfs_agblock_t min_block;
#ifdef __KERNEL__ #ifdef __KERNEL__
/* -- kernel only structures below this line -- */ /* -- kernel only structures below this line -- */
...@@ -107,7 +111,7 @@ struct xfs_perag { ...@@ -107,7 +111,7 @@ struct xfs_perag {
}; };
int xfs_initialize_perag(struct xfs_mount *mp, xfs_agnumber_t agcount, 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); int xfs_initialize_perag_data(struct xfs_mount *mp, xfs_agnumber_t agno);
void xfs_free_perag(struct xfs_mount *mp); 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, ...@@ -116,6 +120,21 @@ struct xfs_perag *xfs_perag_get_tag(struct xfs_mount *mp, xfs_agnumber_t agno,
unsigned int tag); unsigned int tag);
void xfs_perag_put(struct xfs_perag *pag); 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 * Perag iteration APIs
*/ */
......
fs/xfs/libxfs/xfs_alloc.c
View file @ 0800169e
...@@ -248,7 +248,7 @@ xfs_alloc_get_rec( ...@@ -248,7 +248,7 @@ xfs_alloc_get_rec(
int *stat) /* output: success/failure */ int *stat) /* output: success/failure */
{ {
struct xfs_mount *mp = cur->bc_mp; 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; union xfs_btree_rec *rec;
int error; int error;
...@@ -263,11 +263,11 @@ xfs_alloc_get_rec( ...@@ -263,11 +263,11 @@ xfs_alloc_get_rec(
goto out_bad_rec; goto out_bad_rec;
/* check for valid extent range, including overflow */ /* check for valid extent range, including overflow */
if (!xfs_verify_agbno(mp, agno, *bno)) if (!xfs_verify_agbno(pag, *bno))
goto out_bad_rec; goto out_bad_rec;
if (*bno > *bno + *len) if (*bno > *bno + *len)
goto out_bad_rec; 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; goto out_bad_rec;
return 0; return 0;
...@@ -275,7 +275,8 @@ xfs_alloc_get_rec( ...@@ -275,7 +275,8 @@ xfs_alloc_get_rec(
out_bad_rec: out_bad_rec:
xfs_warn(mp, xfs_warn(mp,
"%s Freespace BTree record corruption in AG %d detected!", "%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, xfs_warn(mp,
"start block 0x%x block count 0x%x", *bno, *len); "start block 0x%x block count 0x%x", *bno, *len);
return -EFSCORRUPTED; return -EFSCORRUPTED;
......
fs/xfs/libxfs/xfs_btree.c
View file @ 0800169e
...@@ -91,10 +91,9 @@ xfs_btree_check_lblock_siblings( ...@@ -91,10 +91,9 @@ xfs_btree_check_lblock_siblings(
static inline xfs_failaddr_t static inline xfs_failaddr_t
xfs_btree_check_sblock_siblings( xfs_btree_check_sblock_siblings(
struct xfs_mount *mp, struct xfs_perag *pag,
struct xfs_btree_cur *cur, struct xfs_btree_cur *cur,
int level, int level,
xfs_agnumber_t agno,
xfs_agblock_t agbno, xfs_agblock_t agbno,
__be32 dsibling) __be32 dsibling)
{ {
...@@ -110,7 +109,7 @@ xfs_btree_check_sblock_siblings( ...@@ -110,7 +109,7 @@ xfs_btree_check_sblock_siblings(
if (!xfs_btree_check_sptr(cur, sibling, level + 1)) if (!xfs_btree_check_sptr(cur, sibling, level + 1))
return __this_address; return __this_address;
} else { } else {
if (!xfs_verify_agbno(mp, agno, sibling)) if (!xfs_verify_agbno(pag, sibling))
return __this_address; return __this_address;
} }
return NULL; return NULL;
...@@ -195,11 +194,11 @@ __xfs_btree_check_sblock( ...@@ -195,11 +194,11 @@ __xfs_btree_check_sblock(
struct xfs_buf *bp) struct xfs_buf *bp)
{ {
struct xfs_mount *mp = cur->bc_mp; struct xfs_mount *mp = cur->bc_mp;
struct xfs_perag *pag = cur->bc_ag.pag;
xfs_btnum_t btnum = cur->bc_btnum; xfs_btnum_t btnum = cur->bc_btnum;
int crc = xfs_has_crc(mp); int crc = xfs_has_crc(mp);
xfs_failaddr_t fa; xfs_failaddr_t fa;
xfs_agblock_t agbno = NULLAGBLOCK; xfs_agblock_t agbno = NULLAGBLOCK;
xfs_agnumber_t agno = NULLAGNUMBER;
if (crc) { if (crc) {
if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid)) if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))
...@@ -217,16 +216,14 @@ __xfs_btree_check_sblock( ...@@ -217,16 +216,14 @@ __xfs_btree_check_sblock(
cur->bc_ops->get_maxrecs(cur, level)) cur->bc_ops->get_maxrecs(cur, level))
return __this_address; return __this_address;
if (bp) { if (bp)
agbno = xfs_daddr_to_agbno(mp, xfs_buf_daddr(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); block->bb_u.s.bb_leftsib);
if (!fa) if (!fa)
fa = xfs_btree_check_sblock_siblings(mp, cur, level, agno, fa = xfs_btree_check_sblock_siblings(pag, cur, level, agbno,
agbno, block->bb_u.s.bb_rightsib); block->bb_u.s.bb_rightsib);
return fa; return fa;
} }
...@@ -288,7 +285,7 @@ xfs_btree_check_sptr( ...@@ -288,7 +285,7 @@ xfs_btree_check_sptr(
{ {
if (level <= 0) if (level <= 0)
return false; 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( ...@@ -4595,7 +4592,6 @@ xfs_btree_sblock_verify(
{ {
struct xfs_mount *mp = bp->b_mount; struct xfs_mount *mp = bp->b_mount;
struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp);
xfs_agnumber_t agno;
xfs_agblock_t agbno; xfs_agblock_t agbno;
xfs_failaddr_t fa; xfs_failaddr_t fa;
...@@ -4604,12 +4600,11 @@ xfs_btree_sblock_verify( ...@@ -4604,12 +4600,11 @@ xfs_btree_sblock_verify(
return __this_address; return __this_address;
/* sibling pointer verification */ /* sibling pointer verification */
agno = xfs_daddr_to_agno(mp, xfs_buf_daddr(bp));
agbno = xfs_daddr_to_agbno(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); block->bb_u.s.bb_leftsib);
if (!fa) 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); block->bb_u.s.bb_rightsib);
return fa; return fa;
} }
......
fs/xfs/libxfs/xfs_refcount.c
View file @ 0800169e
...@@ -111,7 +111,7 @@ xfs_refcount_get_rec( ...@@ -111,7 +111,7 @@ xfs_refcount_get_rec(
int *stat) int *stat)
{ {
struct xfs_mount *mp = cur->bc_mp; 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; union xfs_btree_rec *rec;
int error; int error;
xfs_agblock_t realstart; xfs_agblock_t realstart;
...@@ -121,8 +121,6 @@ xfs_refcount_get_rec( ...@@ -121,8 +121,6 @@ xfs_refcount_get_rec(
return error; return error;
xfs_refcount_btrec_to_irec(rec, irec); xfs_refcount_btrec_to_irec(rec, irec);
agno = cur->bc_ag.pag->pag_agno;
if (irec->rc_blockcount == 0 || irec->rc_blockcount > MAXREFCEXTLEN) if (irec->rc_blockcount == 0 || irec->rc_blockcount > MAXREFCEXTLEN)
goto out_bad_rec; goto out_bad_rec;
...@@ -137,22 +135,23 @@ xfs_refcount_get_rec( ...@@ -137,22 +135,23 @@ xfs_refcount_get_rec(
} }
/* check for valid extent range, including overflow */ /* check for valid extent range, including overflow */
if (!xfs_verify_agbno(mp, agno, realstart)) if (!xfs_verify_agbno(pag, realstart))
goto out_bad_rec; goto out_bad_rec;
if (realstart > realstart + irec->rc_blockcount) if (realstart > realstart + irec->rc_blockcount)
goto out_bad_rec; 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; goto out_bad_rec;
if (irec->rc_refcount == 0 || irec->rc_refcount > MAXREFCOUNT) if (irec->rc_refcount == 0 || irec->rc_refcount > MAXREFCOUNT)
goto out_bad_rec; 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; return 0;
out_bad_rec: out_bad_rec:
xfs_warn(mp, 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, xfs_warn(mp,
"Start block 0x%x, block count 0x%x, references 0x%x", "Start block 0x%x, block count 0x%x, references 0x%x",
irec->rc_startblock, irec->rc_blockcount, irec->rc_refcount); irec->rc_startblock, irec->rc_blockcount, irec->rc_refcount);
......
fs/xfs/libxfs/xfs_rmap.c
View file @ 0800169e
...@@ -215,7 +215,7 @@ xfs_rmap_get_rec( ...@@ -215,7 +215,7 @@ xfs_rmap_get_rec(
int *stat) int *stat)
{ {
struct xfs_mount *mp = cur->bc_mp; 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; union xfs_btree_rec *rec;
int error; int error;
...@@ -235,12 +235,12 @@ xfs_rmap_get_rec( ...@@ -235,12 +235,12 @@ xfs_rmap_get_rec(
goto out_bad_rec; goto out_bad_rec;
} else { } else {
/* check for valid extent range, including overflow */ /* 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; goto out_bad_rec;
if (irec->rm_startblock > if (irec->rm_startblock >
irec->rm_startblock + irec->rm_blockcount) irec->rm_startblock + irec->rm_blockcount)
goto out_bad_rec; goto out_bad_rec;
if (!xfs_verify_agbno(mp, agno, if (!xfs_verify_agbno(pag,
irec->rm_startblock + irec->rm_blockcount - 1)) irec->rm_startblock + irec->rm_blockcount - 1))
goto out_bad_rec; goto out_bad_rec;
} }
...@@ -254,7 +254,7 @@ xfs_rmap_get_rec( ...@@ -254,7 +254,7 @@ xfs_rmap_get_rec(
out_bad_rec: out_bad_rec:
xfs_warn(mp, xfs_warn(mp,
"Reverse Mapping BTree record corruption in AG %d detected!", "Reverse Mapping BTree record corruption in AG %d detected!",
agno); pag->pag_agno);
xfs_warn(mp, xfs_warn(mp,
"Owner 0x%llx, flags 0x%x, start block 0x%x block count 0x%x", "Owner 0x%llx, flags 0x%x, start block 0x%x block count 0x%x",
irec->rm_owner, irec->rm_flags, irec->rm_startblock, irec->rm_owner, irec->rm_flags, irec->rm_startblock,
......
fs/xfs/libxfs/xfs_types.c
View file @ 0800169e
...@@ -13,25 +13,13 @@ ...@@ -13,25 +13,13 @@
#include "xfs_mount.h" #include "xfs_mount.h"
#include "xfs_ag.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 * Verify that an AG block number pointer neither points outside the AG
* nor points at static metadata. * nor points at static metadata.
*/ */
inline bool static inline bool
xfs_verify_agbno( xfs_verify_agno_agbno(
struct xfs_mount *mp, struct xfs_mount *mp,
xfs_agnumber_t agno, xfs_agnumber_t agno,
xfs_agblock_t agbno) xfs_agblock_t agbno)
...@@ -59,7 +47,7 @@ xfs_verify_fsbno( ...@@ -59,7 +47,7 @@ xfs_verify_fsbno(
if (agno >= mp->m_sb.sb_agcount) if (agno >= mp->m_sb.sb_agcount)
return false; 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
View file @ 0800169e
...@@ -179,9 +179,6 @@ enum xfs_ag_resv_type { ...@@ -179,9 +179,6 @@ enum xfs_ag_resv_type {
*/ */
struct xfs_mount; 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_fsbno(struct xfs_mount *mp, xfs_fsblock_t fsbno);
bool xfs_verify_fsbext(struct xfs_mount *mp, xfs_fsblock_t fsbno, bool xfs_verify_fsbext(struct xfs_mount *mp, xfs_fsblock_t fsbno,
xfs_fsblock_t len); xfs_fsblock_t len);
......
fs/xfs/scrub/agheader.c
View file @ 0800169e
...@@ -541,16 +541,16 @@ xchk_agf( ...@@ -541,16 +541,16 @@ xchk_agf(
/* Check the AG length */ /* Check the AG length */
eoag = be32_to_cpu(agf->agf_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); xchk_block_set_corrupt(sc, sc->sa.agf_bp);
/* Check the AGF btree roots and levels */ /* Check the AGF btree roots and levels */
agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]); 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); xchk_block_set_corrupt(sc, sc->sa.agf_bp);
agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]); 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); xchk_block_set_corrupt(sc, sc->sa.agf_bp);
level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]); level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]);
...@@ -563,7 +563,7 @@ xchk_agf( ...@@ -563,7 +563,7 @@ xchk_agf(
if (xfs_has_rmapbt(mp)) { if (xfs_has_rmapbt(mp)) {
agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_RMAP]); 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); xchk_block_set_corrupt(sc, sc->sa.agf_bp);
level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]); level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]);
...@@ -573,7 +573,7 @@ xchk_agf( ...@@ -573,7 +573,7 @@ xchk_agf(
if (xfs_has_reflink(mp)) { if (xfs_has_reflink(mp)) {
agbno = be32_to_cpu(agf->agf_refcount_root); 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); xchk_block_set_corrupt(sc, sc->sa.agf_bp);
level = be32_to_cpu(agf->agf_refcount_level); level = be32_to_cpu(agf->agf_refcount_level);
...@@ -639,9 +639,8 @@ xchk_agfl_block( ...@@ -639,9 +639,8 @@ xchk_agfl_block(
{ {
struct xchk_agfl_info *sai = priv; struct xchk_agfl_info *sai = priv;
struct xfs_scrub *sc = sai->sc; 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->nr_entries < sai->sz_entries)
sai->entries[sai->nr_entries++] = agbno; sai->entries[sai->nr_entries++] = agbno;
else else
...@@ -871,12 +870,12 @@ xchk_agi( ...@@ -871,12 +870,12 @@ xchk_agi(
/* Check the AG length */ /* Check the AG length */
eoag = be32_to_cpu(agi->agi_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); xchk_block_set_corrupt(sc, sc->sa.agi_bp);
/* Check btree roots and levels */ /* Check btree roots and levels */
agbno = be32_to_cpu(agi->agi_root); 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); xchk_block_set_corrupt(sc, sc->sa.agi_bp);
level = be32_to_cpu(agi->agi_level); level = be32_to_cpu(agi->agi_level);
...@@ -885,7 +884,7 @@ xchk_agi( ...@@ -885,7 +884,7 @@ xchk_agi(
if (xfs_has_finobt(mp)) { if (xfs_has_finobt(mp)) {
agbno = be32_to_cpu(agi->agi_free_root); 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); xchk_block_set_corrupt(sc, sc->sa.agi_bp);
level = be32_to_cpu(agi->agi_free_level); level = be32_to_cpu(agi->agi_free_level);
......
fs/xfs/scrub/agheader_repair.c
View file @ 0800169e
...@@ -106,7 +106,7 @@ xrep_agf_check_agfl_block( ...@@ -106,7 +106,7 @@ xrep_agf_check_agfl_block(
{ {
struct xfs_scrub *sc = priv; 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 -EFSCORRUPTED;
return 0; return 0;
} }
...@@ -130,10 +130,7 @@ xrep_check_btree_root( ...@@ -130,10 +130,7 @@ xrep_check_btree_root(
struct xfs_scrub *sc, struct xfs_scrub *sc,
struct xrep_find_ag_btree *fab) struct xrep_find_ag_btree *fab)
{ {
struct xfs_mount *mp = sc->mp; return xfs_verify_agbno(sc->sa.pag, fab->root) &&
xfs_agnumber_t agno = sc->sm->sm_agno;
return xfs_verify_agbno(mp, agno, fab->root) &&
fab->height <= fab->maxlevels; fab->height <= fab->maxlevels;
} }
......
fs/xfs/scrub/alloc.c
View file @ 0800169e
...@@ -93,8 +93,7 @@ xchk_allocbt_rec( ...@@ -93,8 +93,7 @@ xchk_allocbt_rec(
struct xchk_btree *bs, struct xchk_btree *bs,
const union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
struct xfs_mount *mp = bs->cur->bc_mp; struct xfs_perag *pag = bs->cur->bc_ag.pag;
xfs_agnumber_t agno = bs->cur->bc_ag.pag->pag_agno;
xfs_agblock_t bno; xfs_agblock_t bno;
xfs_extlen_t len; xfs_extlen_t len;
...@@ -102,8 +101,8 @@ xchk_allocbt_rec( ...@@ -102,8 +101,8 @@ xchk_allocbt_rec(
len = be32_to_cpu(rec->alloc.ar_blockcount); len = be32_to_cpu(rec->alloc.ar_blockcount);
if (bno + len <= bno || if (bno + len <= bno ||
!xfs_verify_agbno(mp, agno, bno) || !xfs_verify_agbno(pag, bno) ||
!xfs_verify_agbno(mp, agno, bno + len - 1)) !xfs_verify_agbno(pag, bno + len - 1))
xchk_btree_set_corrupt(bs->sc, bs->cur, 0); xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
xchk_allocbt_xref(bs->sc, bno, len); xchk_allocbt_xref(bs->sc, bno, len);
......
fs/xfs/scrub/ialloc.c
View file @ 0800169e
...@@ -104,13 +104,13 @@ xchk_iallocbt_chunk( ...@@ -104,13 +104,13 @@ xchk_iallocbt_chunk(
xfs_extlen_t len) xfs_extlen_t len)
{ {
struct xfs_mount *mp = bs->cur->bc_mp; 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_agblock_t bno;
bno = XFS_AGINO_TO_AGBNO(mp, agino); bno = XFS_AGINO_TO_AGBNO(mp, agino);
if (bno + len <= bno || if (bno + len <= bno ||
!xfs_verify_agbno(mp, agno, bno) || !xfs_verify_agbno(pag, bno) ||
!xfs_verify_agbno(mp, agno, bno + len - 1)) !xfs_verify_agbno(pag, bno + len - 1))
xchk_btree_set_corrupt(bs->sc, bs->cur, 0); xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
xchk_iallocbt_chunk_xref(bs->sc, irec, agino, bno, len); xchk_iallocbt_chunk_xref(bs->sc, irec, agino, bno, len);
......
fs/xfs/scrub/refcount.c
View file @ 0800169e
...@@ -332,9 +332,8 @@ xchk_refcountbt_rec( ...@@ -332,9 +332,8 @@ xchk_refcountbt_rec(
struct xchk_btree *bs, struct xchk_btree *bs,
const union xfs_btree_rec *rec) const union xfs_btree_rec *rec)
{ {
struct xfs_mount *mp = bs->cur->bc_mp;
xfs_agblock_t *cow_blocks = bs->private; 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_agblock_t bno;
xfs_extlen_t len; xfs_extlen_t len;
xfs_nlink_t refcount; xfs_nlink_t refcount;
...@@ -354,8 +353,8 @@ xchk_refcountbt_rec( ...@@ -354,8 +353,8 @@ xchk_refcountbt_rec(
/* Check the extent. */ /* Check the extent. */
bno &= ~XFS_REFC_COW_START; bno &= ~XFS_REFC_COW_START;
if (bno + len <= bno || if (bno + len <= bno ||
!xfs_verify_agbno(mp, agno, bno) || !xfs_verify_agbno(pag, bno) ||
!xfs_verify_agbno(mp, agno, bno + len - 1)) !xfs_verify_agbno(pag, bno + len - 1))
xchk_btree_set_corrupt(bs->sc, bs->cur, 0); xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
if (refcount == 0) if (refcount == 0)
......
fs/xfs/scrub/rmap.c
View file @ 0800169e
...@@ -92,7 +92,7 @@ xchk_rmapbt_rec( ...@@ -92,7 +92,7 @@ xchk_rmapbt_rec(
{ {
struct xfs_mount *mp = bs->cur->bc_mp; struct xfs_mount *mp = bs->cur->bc_mp;
struct xfs_rmap_irec irec; 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 non_inode;
bool is_unwritten; bool is_unwritten;
bool is_bmbt; bool is_bmbt;
...@@ -121,8 +121,8 @@ xchk_rmapbt_rec( ...@@ -121,8 +121,8 @@ xchk_rmapbt_rec(
* Otherwise we must point somewhere past the static metadata * Otherwise we must point somewhere past the static metadata
* but before the end of the FS. Run the regular check. * but before the end of the FS. Run the regular check.
*/ */
if (!xfs_verify_agbno(mp, agno, irec.rm_startblock) || if (!xfs_verify_agbno(pag, irec.rm_startblock) ||
!xfs_verify_agbno(mp, agno, irec.rm_startblock + !xfs_verify_agbno(pag, irec.rm_startblock +
irec.rm_blockcount - 1)) irec.rm_blockcount - 1))
xchk_btree_set_corrupt(bs->sc, bs->cur, 0); xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
} }
......
fs/xfs/xfs_fsops.c
View file @ 0800169e
...@@ -132,7 +132,7 @@ xfs_growfs_data_private( ...@@ -132,7 +132,7 @@ xfs_growfs_data_private(
oagcount = mp->m_sb.sb_agcount; oagcount = mp->m_sb.sb_agcount;
/* allocate the new per-ag structures */ /* allocate the new per-ag structures */
if (nagcount > oagcount) { if (nagcount > oagcount) {
error = xfs_initialize_perag(mp, nagcount, &nagimax); error = xfs_initialize_perag(mp, nagcount, nb, &nagimax);
if (error) if (error)
return error; return error;
} else if (nagcount < oagcount) { } else if (nagcount < oagcount) {
......
fs/xfs/xfs_log_recover.c
View file @ 0800169e
...@@ -3313,7 +3313,8 @@ xlog_do_recover( ...@@ -3313,7 +3313,8 @@ xlog_do_recover(
/* re-initialise in-core superblock and geometry structures */ /* re-initialise in-core superblock and geometry structures */
mp->m_features |= xfs_sb_version_to_features(sbp); mp->m_features |= xfs_sb_version_to_features(sbp);
xfs_reinit_percpu_counters(mp); 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) { if (error) {
xfs_warn(mp, "Failed post-recovery per-ag init: %d", error); xfs_warn(mp, "Failed post-recovery per-ag init: %d", error);
return error; return error;
......
fs/xfs/xfs_mount.c
View file @ 0800169e
...@@ -778,7 +778,8 @@ xfs_mountfs( ...@@ -778,7 +778,8 @@ xfs_mountfs(
/* /*
* Allocate and initialize the per-ag data. * 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) { if (error) {
xfs_warn(mp, "Failed per-ag init: %d", error); xfs_warn(mp, "Failed per-ag init: %d", error);
goto out_free_dir; goto out_free_dir;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7