Commit 7ac2ff8b authored by Dave Chinner's avatar Dave Chinner
Browse files

xfs: perags need atomic operational state 



We currently don't have any flags or operational state in the
xfs_perag except for the pagf_init and pagi_init flags. And the
agflreset flag. Oh, there's also the pagf_metadata and pagi_inodeok
flags, too.

For controlling per-ag operations, we are going to need some atomic
state flags. Hence add an opstate field similar to what we already
have in the mount and log, and convert all these state flags across
to atomic bit operations.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 20a5eab4

fs/xfs/libxfs/xfs_ag.h

+22 −5
Original line number Diff line number Diff line
@@ -35,13 +35,9 @@ struct xfs_perag { 
	atomic_t	pag_ref;	/* passive reference count */

	atomic_t	pag_active_ref;	/* active reference count */

	wait_queue_head_t pag_active_wq;/* woken active_ref falls to zero */

	char		pagf_init;	/* this agf's entry is initialized */

	char		pagi_init;	/* this agi's entry is initialized */

	char		pagf_metadata;	/* the agf is preferred to be metadata */

	char		pagi_inodeok;	/* The agi is ok for inodes */

	unsigned long	pag_opstate;

	uint8_t		pagf_levels[XFS_BTNUM_AGF];

					/* # of levels in bno & cnt btree */

	bool		pagf_agflreset; /* agfl requires reset before use */

	uint32_t	pagf_flcount;	/* count of blocks in freelist */

	xfs_extlen_t	pagf_freeblks;	/* total free blocks */

	xfs_extlen_t	pagf_longest;	/* longest free space */
@@ -108,6 +104,27 @@ struct xfs_perag { 
#endif /* __KERNEL__ */

};



/*

 * Per-AG operational state. These are atomic flag bits.

 */

#define XFS_AGSTATE_AGF_INIT		0

#define XFS_AGSTATE_AGI_INIT		1

#define XFS_AGSTATE_PREFERS_METADATA	2

#define XFS_AGSTATE_ALLOWS_INODES	3

#define XFS_AGSTATE_AGFL_NEEDS_RESET	4



#define __XFS_AG_OPSTATE(name, NAME) \

static inline bool xfs_perag_ ## name (struct xfs_perag *pag) \

{ \

	return test_bit(XFS_AGSTATE_ ## NAME, &pag->pag_opstate); \

}



__XFS_AG_OPSTATE(initialised_agf, AGF_INIT)

__XFS_AG_OPSTATE(initialised_agi, AGI_INIT)

__XFS_AG_OPSTATE(prefers_metadata, PREFERS_METADATA)

__XFS_AG_OPSTATE(allows_inodes, ALLOWS_INODES)

__XFS_AG_OPSTATE(agfl_needs_reset, AGFL_NEEDS_RESET)



int xfs_initialize_perag(struct xfs_mount *mp, xfs_agnumber_t agcount,

			xfs_rfsblock_t dcount, xfs_agnumber_t *maxagi);

int xfs_initialize_perag_data(struct xfs_mount *mp, xfs_agnumber_t agno);

fs/xfs/libxfs/xfs_alloc.c

+13 −10
Original line number Diff line number Diff line
@@ -2435,7 +2435,7 @@ xfs_agfl_reset( 
	struct xfs_mount	*mp = tp->t_mountp;

	struct xfs_agf		*agf = agbp->b_addr;



	ASSERT(pag->pagf_agflreset);

	ASSERT(xfs_perag_agfl_needs_reset(pag));

	trace_xfs_agfl_reset(mp, agf, 0, _RET_IP_);



	xfs_warn(mp,
@@ -2450,7 +2450,7 @@ xfs_agfl_reset( 
				    XFS_AGF_FLCOUNT);



	pag->pagf_flcount = 0;

	pag->pagf_agflreset = false;

	clear_bit(XFS_AGSTATE_AGFL_NEEDS_RESET, &pag->pag_opstate);

}



/*
@@ -2605,7 +2605,7 @@ xfs_alloc_fix_freelist( 
	/* deferred ops (AGFL block frees) require permanent transactions */

	ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);



	if (!pag->pagf_init) {

	if (!xfs_perag_initialised_agf(pag)) {

		error = xfs_alloc_read_agf(pag, tp, flags, &agbp);

		if (error) {

			/* Couldn't lock the AGF so skip this AG. */
@@ -2620,7 +2620,8 @@ xfs_alloc_fix_freelist( 
	 * somewhere else if we are not being asked to try harder at this

	 * point

	 */

	if (pag->pagf_metadata && (args->datatype & XFS_ALLOC_USERDATA) &&

	if (xfs_perag_prefers_metadata(pag) &&

	    (args->datatype & XFS_ALLOC_USERDATA) &&

	    (flags & XFS_ALLOC_FLAG_TRYLOCK)) {

		ASSERT(!(flags & XFS_ALLOC_FLAG_FREEING));

		goto out_agbp_relse;
@@ -2646,7 +2647,7 @@ xfs_alloc_fix_freelist( 
	}



	/* reset a padding mismatched agfl before final free space check */

	if (pag->pagf_agflreset)

	if (xfs_perag_agfl_needs_reset(pag))

		xfs_agfl_reset(tp, agbp, pag);



	/* If there isn't enough total space or single-extent, reject it. */
@@ -2803,7 +2804,7 @@ xfs_alloc_get_freelist( 
	if (be32_to_cpu(agf->agf_flfirst) == xfs_agfl_size(mp))

		agf->agf_flfirst = 0;



	ASSERT(!pag->pagf_agflreset);

	ASSERT(!xfs_perag_agfl_needs_reset(pag));

	be32_add_cpu(&agf->agf_flcount, -1);

	pag->pagf_flcount--;
@@ -2892,7 +2893,7 @@ xfs_alloc_put_freelist( 
	if (be32_to_cpu(agf->agf_fllast) == xfs_agfl_size(mp))

		agf->agf_fllast = 0;



	ASSERT(!pag->pagf_agflreset);

	ASSERT(!xfs_perag_agfl_needs_reset(pag));

	be32_add_cpu(&agf->agf_flcount, 1);

	pag->pagf_flcount++;
@@ -3099,7 +3100,7 @@ xfs_alloc_read_agf( 
		return error;



	agf = agfbp->b_addr;

	if (!pag->pagf_init) {

	if (!xfs_perag_initialised_agf(pag)) {

		pag->pagf_freeblks = be32_to_cpu(agf->agf_freeblks);

		pag->pagf_btreeblks = be32_to_cpu(agf->agf_btreeblks);

		pag->pagf_flcount = be32_to_cpu(agf->agf_flcount);
@@ -3111,8 +3112,8 @@ xfs_alloc_read_agf( 
		pag->pagf_levels[XFS_BTNUM_RMAPi] =

			be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAPi]);

		pag->pagf_refcount_level = be32_to_cpu(agf->agf_refcount_level);

		pag->pagf_init = 1;

		pag->pagf_agflreset = xfs_agfl_needs_reset(pag->pag_mount, agf);

		if (xfs_agfl_needs_reset(pag->pag_mount, agf))

			set_bit(XFS_AGSTATE_AGFL_NEEDS_RESET, &pag->pag_opstate);



		/*

		 * Update the in-core allocbt counter. Filter out the rmapbt
@@ -3127,6 +3128,8 @@ xfs_alloc_read_agf( 
		if (allocbt_blks > 0)

			atomic64_add(allocbt_blks,

					&pag->pag_mount->m_allocbt_blks);



		set_bit(XFS_AGSTATE_AGF_INIT, &pag->pag_opstate);

	}

#ifdef DEBUG

	else if (!xfs_is_shutdown(pag->pag_mount)) {

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ xfs_allocbt_verify( 
	level = be16_to_cpu(block->bb_level);

	if (bp->b_ops->magic[0] == cpu_to_be32(XFS_ABTC_MAGIC))

		btnum = XFS_BTNUM_CNTi;

	if (pag && pag->pagf_init) {

	if (pag && xfs_perag_initialised_agf(pag)) {

		if (level >= pag->pagf_levels[btnum])

			return __this_address;

	} else if (level >= mp->m_alloc_maxlevels)

fs/xfs/libxfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -3147,7 +3147,7 @@ xfs_bmap_longest_free_extent( 
	int			error = 0;



	pag = xfs_perag_get(mp, ag);

	if (!pag->pagf_init) {

	if (!xfs_perag_initialised_agf(pag)) {

		error = xfs_alloc_read_agf(pag, tp, XFS_ALLOC_FLAG_TRYLOCK,

				NULL);

		if (error) {

fs/xfs/libxfs/xfs_ialloc.c

+7 −7
Original line number Diff line number Diff line
@@ -998,8 +998,8 @@ xfs_dialloc_ag_inobt( 
	int			i, j;

	int			searchdistance = 10;



	ASSERT(pag->pagi_init);

	ASSERT(pag->pagi_inodeok);

	ASSERT(xfs_perag_initialised_agi(pag));

	ASSERT(xfs_perag_allows_inodes(pag));

	ASSERT(pag->pagi_freecount > 0);



 restart_pagno:
@@ -1592,10 +1592,10 @@ xfs_dialloc_good_ag( 


	if (!pag)

		return false;

	if (!pag->pagi_inodeok)

	if (!xfs_perag_allows_inodes(pag))

		return false;



	if (!pag->pagi_init) {

	if (!xfs_perag_initialised_agi(pag)) {

		error = xfs_ialloc_read_agi(pag, tp, NULL);

		if (error)

			return false;
@@ -1606,7 +1606,7 @@ xfs_dialloc_good_ag( 
	if (!ok_alloc)

		return false;



	if (!pag->pagf_init) {

	if (!xfs_perag_initialised_agf(pag)) {

		error = xfs_alloc_read_agf(pag, tp, flags, NULL);

		if (error)

			return false;
@@ -2603,10 +2603,10 @@ xfs_ialloc_read_agi( 
		return error;



	agi = agibp->b_addr;

	if (!pag->pagi_init) {

	if (!xfs_perag_initialised_agi(pag)) {

		pag->pagi_freecount = be32_to_cpu(agi->agi_freecount);

		pag->pagi_count = be32_to_cpu(agi->agi_count);

		pag->pagi_init = 1;

		set_bit(XFS_AGSTATE_AGI_INIT, &pag->pag_opstate);

	}



	/*