Commit 826053db authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

Merge tag 'intents-perag-refs-6.4_2023-04-11' of... 

Merge tag 'intents-perag-refs-6.4_2023-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux

 into guilt/xfs-for-next

xfs: make intent items take a perag reference [v24.5]

Now that we've cleaned up some code warts in the deferred work item
processing code, let's make intent items take an active perag reference
from their creation until they are finally freed by the defer ops
machinery.  This change facilitates the scrub drain in the next patchset
and will make it easier for the future AG removal code to detect a busy
AG in need of quiescing.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parents bed25d80 00e7b3ba

fs/xfs/libxfs/xfs_ag.c

+2 −4
Original line number Diff line number Diff line
@@ -1043,10 +1043,8 @@ xfs_ag_extend_space( 
	if (error)

		return error;



	error = xfs_free_extent(tp, XFS_AGB_TO_FSB(pag->pag_mount, pag->pag_agno,

					be32_to_cpu(agf->agf_length) - len),

				len, &XFS_RMAP_OINFO_SKIP_UPDATE,

				XFS_AG_RESV_NONE);

	error = xfs_free_extent(tp, pag, be32_to_cpu(agf->agf_length) - len,

			len, &XFS_RMAP_OINFO_SKIP_UPDATE, XFS_AG_RESV_NONE);

	if (error)

		return error;

fs/xfs/libxfs/xfs_alloc.c

+10 −12
Original line number Diff line number Diff line
@@ -2405,6 +2405,7 @@ xfs_defer_agfl_block( 


	trace_xfs_agfl_free_defer(mp, agno, 0, agbno, 1);



	xfs_extent_free_get_group(mp, xefi);

	xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_AGFL_FREE, &xefi->xefi_list);

}
@@ -2421,8 +2422,8 @@ __xfs_free_extent_later( 
	bool				skip_discard)

{

	struct xfs_extent_free_item	*xefi;

#ifdef DEBUG

	struct xfs_mount		*mp = tp->t_mountp;

#ifdef DEBUG

	xfs_agnumber_t			agno;

	xfs_agblock_t			agbno;
@@ -2456,9 +2457,11 @@ __xfs_free_extent_later( 
	} else {

		xefi->xefi_owner = XFS_RMAP_OWN_NULL;

	}

	trace_xfs_bmap_free_defer(tp->t_mountp,

	trace_xfs_bmap_free_defer(mp,

			XFS_FSB_TO_AGNO(tp->t_mountp, bno), 0,

			XFS_FSB_TO_AGBNO(tp->t_mountp, bno), len);



	xfs_extent_free_get_group(mp, xefi);

	xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &xefi->xefi_list);

}
@@ -3596,7 +3599,8 @@ xfs_free_extent_fix_freelist( 
int

__xfs_free_extent(

	struct xfs_trans		*tp,

	xfs_fsblock_t			bno,

	struct xfs_perag		*pag,

	xfs_agblock_t			agbno,

	xfs_extlen_t			len,

	const struct xfs_owner_info	*oinfo,

	enum xfs_ag_resv_type		type,
@@ -3604,12 +3608,9 @@ __xfs_free_extent( 
{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_buf			*agbp;

	xfs_agnumber_t			agno = XFS_FSB_TO_AGNO(mp, bno);

	xfs_agblock_t			agbno = XFS_FSB_TO_AGBNO(mp, bno);

	struct xfs_agf			*agf;

	int				error;

	unsigned int			busy_flags = 0;

	struct xfs_perag		*pag;



	ASSERT(len != 0);

	ASSERT(type != XFS_AG_RESV_AGFL);
@@ -3618,10 +3619,9 @@ __xfs_free_extent( 
			XFS_ERRTAG_FREE_EXTENT))

		return -EIO;



	pag = xfs_perag_get(mp, agno);

	error = xfs_free_extent_fix_freelist(tp, pag, &agbp);

	if (error)

		goto err;

		return error;

	agf = agbp->b_addr;



	if (XFS_IS_CORRUPT(mp, agbno >= mp->m_sb.sb_agblocks)) {
@@ -3635,20 +3635,18 @@ __xfs_free_extent( 
		goto err_release;

	}



	error = xfs_free_ag_extent(tp, agbp, agno, agbno, len, oinfo, type);

	error = xfs_free_ag_extent(tp, agbp, pag->pag_agno, agbno, len, oinfo,

			type);

	if (error)

		goto err_release;



	if (skip_discard)

		busy_flags |= XFS_EXTENT_BUSY_SKIP_DISCARD;

	xfs_extent_busy_insert(tp, pag, agbno, len, busy_flags);

	xfs_perag_put(pag);

	return 0;



err_release:

	xfs_trans_brelse(tp, agbp);

err:

	xfs_perag_put(pag);

	return error;

}

fs/xfs/libxfs/xfs_alloc.h

+9 −3
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ int xfs_alloc_vextent_first_ag(struct xfs_alloc_arg *args, 
int				/* error */

__xfs_free_extent(

	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_fsblock_t		bno,	/* starting block number of extent */

	struct xfs_perag	*pag,

	xfs_agblock_t		agbno,

	xfs_extlen_t		len,	/* length of extent */

	const struct xfs_owner_info	*oinfo,	/* extent owner */

	enum xfs_ag_resv_type	type,	/* block reservation type */
@@ -150,12 +151,13 @@ __xfs_free_extent( 
static inline int

xfs_free_extent(

	struct xfs_trans	*tp,

	xfs_fsblock_t		bno,

	struct xfs_perag	*pag,

	xfs_agblock_t		agbno,

	xfs_extlen_t		len,

	const struct xfs_owner_info	*oinfo,

	enum xfs_ag_resv_type	type)

{

	return __xfs_free_extent(tp, bno, len, oinfo, type, false);

	return __xfs_free_extent(tp, pag, agbno, len, oinfo, type, false);

}



int				/* error */
@@ -235,9 +237,13 @@ struct xfs_extent_free_item { 
	uint64_t		xefi_owner;

	xfs_fsblock_t		xefi_startblock;/* starting fs block number */

	xfs_extlen_t		xefi_blockcount;/* number of blocks in extent */

	struct xfs_perag	*xefi_pag;

	unsigned int		xefi_flags;

};



void xfs_extent_free_get_group(struct xfs_mount *mp,

		struct xfs_extent_free_item *xefi);



#define XFS_EFI_SKIP_DISCARD	(1U << 0) /* don't issue discard */

#define XFS_EFI_ATTR_FORK	(1U << 1) /* freeing attr fork block */

#define XFS_EFI_BMBT_BLOCK	(1U << 2) /* freeing bmap btree block */

fs/xfs/libxfs/xfs_bmap.c

+1 −0
Original line number Diff line number Diff line
@@ -6081,6 +6081,7 @@ __xfs_bmap_add( 
	bi->bi_whichfork = whichfork;

	bi->bi_bmap = *bmap;



	xfs_bmap_update_get_group(tp->t_mountp, bi);

	xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_BMAP, &bi->bi_list);

	return 0;

}

fs/xfs/libxfs/xfs_bmap.h

+4 −0
Original line number Diff line number Diff line
@@ -238,9 +238,13 @@ struct xfs_bmap_intent { 
	enum xfs_bmap_intent_type		bi_type;

	int					bi_whichfork;

	struct xfs_inode			*bi_owner;

	struct xfs_perag			*bi_pag;

	struct xfs_bmbt_irec			bi_bmap;

};



void xfs_bmap_update_get_group(struct xfs_mount *mp,

		struct xfs_bmap_intent *bi);



int	xfs_bmap_finish_one(struct xfs_trans *tp, struct xfs_bmap_intent *bi);

void	xfs_bmap_map_extent(struct xfs_trans *tp, struct xfs_inode *ip,

		struct xfs_bmbt_irec *imap);