Commit 2d6ca832 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: Pre-calculate per-AG agino geometry 



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	1482185	 329588	    572	1812345	 1ba779	(TOTALS)
after	1481937	 329588	    572	1812097	 1ba681	(TOTALS)

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 0800169e

fs/xfs/libxfs/xfs_ag.c

+39 −0
Original line number Diff line number Diff line
@@ -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);
@@ -968,6 +1005,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 −3
Original line number Diff line number Diff line
@@ -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"
@@ -41,14 +42,12 @@ xfs_inode_buf_verify( 
	bool		readahead)

{

	struct xfs_mount *mp = bp->b_mount;

	xfs_agnumber_t	agno;

	int		i;

	int		ni;



	/*

	 * Validate the magic number and version of every inode in the buffer

	 */

	agno = xfs_daddr_to_agno(mp, xfs_buf_daddr(bp));

	ni = XFS_BB_TO_FSB(mp, bp->b_length) * mp->m_sb.sb_inopblock;

	for (i = 0; i < ni; i++) {

		struct xfs_dinode	*dip;
@@ -59,7 +58,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_types.c

+5 −50
Original line number Diff line number Diff line
@@ -73,40 +73,12 @@ xfs_verify_fsbext( 
		XFS_FSB_TO_AGNO(mp, fsbno + len - 1);

}



/* Calculate the first and last possible inode number in an AG. */

inline void

xfs_agino_range(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno,

	xfs_agino_t		*first,

	xfs_agino_t		*last)

{

	xfs_agblock_t		bno;

	xfs_agblock_t		eoag;



	eoag = xfs_ag_block_count(mp, agno);



	/*

	 * 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;

}



/*

 * Verify that an AG inode number pointer neither points outside the AG

 * nor points at static metadata.

 */

inline bool

xfs_verify_agino(

static inline bool

xfs_verify_agno_agino(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno,

	xfs_agino_t		agino)
@@ -118,19 +90,6 @@ xfs_verify_agino( 
	return agino >= first && agino <= last;

}



/*

 * Verify that an AG inode number pointer neither points outside the AG

 * nor points at static metadata, or is NULLAGINO.

 */

bool

xfs_verify_agino_or_null(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno,

	xfs_agino_t		agino)

{

	return agino == NULLAGINO || xfs_verify_agino(mp, agno, agino);

}



/*

 * Verify that an FS inode number pointer neither points outside the

 * filesystem nor points at static AG metadata.
@@ -147,7 +106,7 @@ xfs_verify_ino( 
		return false;

	if (XFS_AGINO_TO_INO(mp, agno, agino) != ino)

		return false;

	return xfs_verify_agino(mp, agno, agino);

	return xfs_verify_agno_agino(mp, agno, agino);

}



/* Is this an internal inode number? */
@@ -217,12 +176,8 @@ xfs_icount_range( 
	/* root, rtbitmap, rtsum all live in the first chunk */

	*min = XFS_INODES_PER_CHUNK;



	for_each_perag(mp, agno, pag) {

		xfs_agino_t	first, last;



		xfs_agino_range(mp, agno, &first, &last);

		nr_inos += last - first + 1;

	}

	for_each_perag(mp, agno, pag)

		nr_inos += pag->agino_max - pag->agino_min + 1;

	*max = nr_inos;

}