Commit 52548852 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

xfs: rmap btree requires more reserved free space 



Originally-From: Dave Chinner <dchinner@redhat.com>

The rmap btree is allocated from the AGFL, which means we have to
ensure ENOSPC is reported to userspace before we run out of free
space in each AG. The last allocation in an AG can cause a full
height rmap btree split, and that means we have to reserve at least
this many blocks *in each AG* to be placed on the AGFL at ENOSPC.
Update the various space calculation functions to handle this.

Also, because the macros are now executing conditional code and are
called quite frequently, convert them to functions that initialise
variables in the struct xfs_mount, use the new variables everywhere
and document the calculations better.

[darrick.wong@oracle.com: don't reserve blocks if !rmap]
[dchinner@redhat.com: update m_ag_max_usable after growfs]

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent fa30f03c

fs/xfs/libxfs/xfs_alloc.c

+69 −0
Original line number Diff line number Diff line
@@ -62,6 +62,70 @@ xfs_prealloc_blocks( 
	return XFS_IBT_BLOCK(mp) + 1;

}



/*

 * In order to avoid ENOSPC-related deadlock caused by out-of-order locking of

 * AGF buffer (PV 947395), we place constraints on the relationship among

 * actual allocations for data blocks, freelist blocks, and potential file data

 * bmap btree blocks. However, these restrictions may result in no actual space

 * allocated for a delayed extent, for example, a data block in a certain AG is

 * allocated but there is no additional block for the additional bmap btree

 * block due to a split of the bmap btree of the file. The result of this may

 * lead to an infinite loop when the file gets flushed to disk and all delayed

 * extents need to be actually allocated. To get around this, we explicitly set

 * aside a few blocks which will not be reserved in delayed allocation.

 *

 * When rmap is disabled, we need to reserve 4 fsbs _per AG_ for the freelist

 * and 4 more to handle a potential split of the file's bmap btree.

 *

 * When rmap is enabled, we must also be able to handle two rmap btree inserts

 * to record both the file data extent and a new bmbt block.  The bmbt block

 * might not be in the same AG as the file data extent.  In the worst case

 * the bmap btree splits multiple levels and all the new blocks come from

 * different AGs, so set aside enough to handle rmap btree splits in all AGs.

 */

unsigned int

xfs_alloc_set_aside(

	struct xfs_mount	*mp)

{

	unsigned int		blocks;



	blocks = 4 + (mp->m_sb.sb_agcount * XFS_ALLOC_AGFL_RESERVE);

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

		blocks += mp->m_sb.sb_agcount * mp->m_rmap_maxlevels;

	return blocks;

}



/*

 * When deciding how much space to allocate out of an AG, we limit the

 * allocation maximum size to the size the AG. However, we cannot use all the

 * blocks in the AG - some are permanently used by metadata. These

 * blocks are generally:

 *	- the AG superblock, AGF, AGI and AGFL

 *	- the AGF (bno and cnt) and AGI btree root blocks, and optionally

 *	  the AGI free inode and rmap btree root blocks.

 *	- blocks on the AGFL according to xfs_alloc_set_aside() limits

 *	- the rmapbt root block

 *

 * The AG headers are sector sized, so the amount of space they take up is

 * dependent on filesystem geometry. The others are all single blocks.

 */

unsigned int

xfs_alloc_ag_max_usable(

	struct xfs_mount	*mp)

{

	unsigned int		blocks;



	blocks = XFS_BB_TO_FSB(mp, XFS_FSS_TO_BB(mp, 4)); /* ag headers */

	blocks += XFS_ALLOC_AGFL_RESERVE;

	blocks += 3;			/* AGF, AGI btree root blocks */

	if (xfs_sb_version_hasfinobt(&mp->m_sb))

		blocks++;		/* finobt root block */

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

		blocks++; 		/* rmap root block */



	return mp->m_sb.sb_agblocks - blocks;

}



/*

 * Lookup the record equal to [bno, len] in the btree given by cur.

 */
@@ -1904,6 +1968,11 @@ xfs_alloc_min_freelist( 
	/* space needed by-size freespace btree */

	min_free += min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_CNTi] + 1,

				       mp->m_ag_maxlevels);

	/* space needed reverse mapping used space btree */

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

		min_free += min_t(unsigned int,

				  pag->pagf_levels[XFS_BTNUM_RMAPi] + 1,

				  mp->m_rmap_maxlevels);



	return min_free;

}

fs/xfs/libxfs/xfs_alloc.h

+5 −36
Original line number Diff line number Diff line
@@ -55,42 +55,6 @@ typedef unsigned int xfs_alloctype_t; 
#define	XFS_ALLOC_FLAG_TRYLOCK	0x00000001  /* use trylock for buffer locking */

#define	XFS_ALLOC_FLAG_FREEING	0x00000002  /* indicate caller is freeing extents*/



/*

 * In order to avoid ENOSPC-related deadlock caused by

 * out-of-order locking of AGF buffer (PV 947395), we place

 * constraints on the relationship among actual allocations for

 * data blocks, freelist blocks, and potential file data bmap

 * btree blocks. However, these restrictions may result in no

 * actual space allocated for a delayed extent, for example, a data

 * block in a certain AG is allocated but there is no additional

 * block for the additional bmap btree block due to a split of the

 * bmap btree of the file. The result of this may lead to an

 * infinite loop in xfssyncd when the file gets flushed to disk and

 * all delayed extents need to be actually allocated. To get around

 * this, we explicitly set aside a few blocks which will not be

 * reserved in delayed allocation. Considering the minimum number of

 * needed freelist blocks is 4 fsbs _per AG_, a potential split of file's bmap

 * btree requires 1 fsb, so we set the number of set-aside blocks

 * to 4 + 4*agcount.

 */

#define XFS_ALLOC_SET_ASIDE(mp)  (4 + ((mp)->m_sb.sb_agcount * 4))



/*

 * When deciding how much space to allocate out of an AG, we limit the

 * allocation maximum size to the size the AG. However, we cannot use all the

 * blocks in the AG - some are permanently used by metadata. These

 * blocks are generally:

 *	- the AG superblock, AGF, AGI and AGFL

 *	- the AGF (bno and cnt) and AGI btree root blocks

 *	- 4 blocks on the AGFL according to XFS_ALLOC_SET_ASIDE() limits

 *

 * The AG headers are sector sized, so the amount of space they take up is

 * dependent on filesystem geometry. The others are all single blocks.

 */

#define XFS_ALLOC_AG_MAX_USABLE(mp)	\

	((mp)->m_sb.sb_agblocks - XFS_BB_TO_FSB(mp, XFS_FSS_TO_BB(mp, 4)) - 7)





/*

 * Argument structure for xfs_alloc routines.

 * This is turned into a structure to avoid having 20 arguments passed
@@ -133,6 +97,11 @@ typedef struct xfs_alloc_arg { 
#define XFS_ALLOC_INITIAL_USER_DATA	(1 << 1)/* special case start of file */

#define XFS_ALLOC_USERDATA_ZERO		(1 << 2)/* zero extent on allocation */



/* freespace limit calculations */

#define XFS_ALLOC_AGFL_RESERVE	4

unsigned int xfs_alloc_set_aside(struct xfs_mount *mp);

unsigned int xfs_alloc_ag_max_usable(struct xfs_mount *mp);



xfs_extlen_t xfs_alloc_longest_free_extent(struct xfs_mount *mp,

		struct xfs_perag *pag, xfs_extlen_t need);

unsigned int xfs_alloc_min_freelist(struct xfs_mount *mp,

fs/xfs/libxfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -3674,7 +3674,7 @@ xfs_bmap_btalloc( 
	xfs_rmap_skip_owner_update(&args.oinfo);



	/* Trim the allocation back to the maximum an AG can fit. */

	args.maxlen = MIN(ap->length, XFS_ALLOC_AG_MAX_USABLE(mp));

	args.maxlen = MIN(ap->length, mp->m_ag_max_usable);

	args.firstblock = *ap->firstblock;

	blen = 0;

	if (nullfb) {

fs/xfs/libxfs/xfs_sb.c

+2 −0
Original line number Diff line number Diff line
@@ -745,6 +745,8 @@ xfs_sb_mount_common( 
		mp->m_ialloc_min_blks = sbp->sb_spino_align;

	else

		mp->m_ialloc_min_blks = mp->m_ialloc_blks;

	mp->m_alloc_set_aside = xfs_alloc_set_aside(mp);

	mp->m_ag_max_usable = xfs_alloc_ag_max_usable(mp);

}



/*

fs/xfs/xfs_discard.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ xfs_ioc_trim( 
	 * matter as trimming blocks is an advisory interface.

	 */

	if (range.start >= XFS_FSB_TO_B(mp, mp->m_sb.sb_dblocks) ||

	    range.minlen > XFS_FSB_TO_B(mp, XFS_ALLOC_AG_MAX_USABLE(mp)) ||

	    range.minlen > XFS_FSB_TO_B(mp, mp->m_ag_max_usable) ||

	    range.len < mp->m_sb.sb_blocksize)

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE