Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b877e3d3 authored by Lachlan McIlroy's avatar Lachlan McIlroy Committed by Niv Sardi
Browse files

[XFS] Restore the lowspace extent allocator algorithm 



When free space is running low the extent allocator may choose to allocate
an extent from an AG without leaving sufficient space for a btree split
when inserting the new extent (see where xfs_bmap_btalloc() sets minleft
to 0). In this case the allocator will enable the lowspace algorithm which
is supposed to allow further allocations (such as btree splits and
newroots) to allocate from sequential AGs. This algorithm has been broken
for a long time and this patch restores its behaviour.

SGI-PV: 983338

SGI-Modid: xfs-linux-melb:xfs-kern:31358a

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
parent 4ddd8bb1

fs/xfs/xfs_bmap.h

+12 −1
Original line number Diff line number Diff line
@@ -54,12 +54,23 @@ typedef struct xfs_bmap_free_item 


/*

 * Header for free extent list.

 *

 * xbf_low is used by the allocator to activate the lowspace algorithm -

 * when free space is running low the extent allocator may choose to

 * allocate an extent from an AG without leaving sufficient space for

 * a btree split when inserting the new extent.  In this case the allocator

 * will enable the lowspace algorithm which is supposed to allow further

 * allocations (such as btree splits and newroots) to allocate from

 * sequential AGs.  In order to avoid locking AGs out of order the lowspace

 * algorithm will start searching for free space from AG 0.  If the correct

 * transaction reservations have been made then this algorithm will eventually

 * find all the space it needs.

 */

typedef	struct xfs_bmap_free

{

	xfs_bmap_free_item_t	*xbf_first;	/* list of to-be-free extents */

	int			xbf_count;	/* count of items on list */

	int			xbf_low;	/* kludge: alloc in low mode */

	int			xbf_low;	/* alloc in low mode */

} xfs_bmap_free_t;



#define	XFS_BMAP_MAX_NMAP	4

fs/xfs/xfs_bmap_btree.c

+6 −2
Original line number Diff line number Diff line
@@ -1509,7 +1509,9 @@ xfs_bmbt_split( 
		 * block allocation here and corrupt the filesystem.

		 */

		args.minleft = xfs_trans_get_block_res(args.tp);

	} else

	} else if (cur->bc_private.b.flist->xbf_low)

		args.type = XFS_ALLOCTYPE_START_BNO;

	else

		args.type = XFS_ALLOCTYPE_NEAR_BNO;

	args.mod = args.alignment = args.total = args.isfl =

		args.userdata = args.minalignslop = 0;
@@ -2237,7 +2239,9 @@ xfs_bmbt_newroot( 
#endif

		args.fsbno = be64_to_cpu(*pp);

		args.type = XFS_ALLOCTYPE_START_BNO;

	} else

	} else if (cur->bc_private.b.flist->xbf_low)

		args.type = XFS_ALLOCTYPE_START_BNO;

	else

		args.type = XFS_ALLOCTYPE_NEAR_BNO;

	if ((error = xfs_alloc_vextent(&args))) {

		XFS_BMBT_TRACE_CURSOR(cur, ERROR);