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

Commit 0a9633fa authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: add helpers to deal with transaction allocation and rolling 



For repairs, we need to reserve at least as many blocks as we think
we're going to need to rebuild the data structure, and we're going to
need some helpers to roll transactions while maintaining locks on the AG
headers so that other threads cannot wander into the middle of a repair.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
parent 51863d7d

fs/xfs/scrub/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ xfs_scrub_setup_inode_bmap( 
	}



	/* Got the inode, lock it and we're ready to go. */

	error = xfs_scrub_trans_alloc(sc);

	error = xfs_scrub_trans_alloc(sc, 0);

	if (error)

		goto out;

	sc->ilock_flags |= XFS_ILOCK_EXCL;

fs/xfs/scrub/common.c

+18 −3
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "scrub/common.h"

#include "scrub/trace.h"

#include "scrub/btree.h"

#include "scrub/repair.h"



/* Common code for the metadata scrubbers. */
@@ -590,11 +591,22 @@ xfs_scrub_perag_get( 
/*

 * Grab an empty transaction so that we can re-grab locked buffers if

 * one of our btrees turns out to be cyclic.

 *

 * If we're going to repair something, we need to ask for the largest possible

 * log reservation so that we can handle the worst case scenario for metadata

 * updates while rebuilding a metadata item.  We also need to reserve as many

 * blocks in the head transaction as we think we're going to need to rebuild

 * the metadata object.

 */

int

xfs_scrub_trans_alloc(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub_context	*sc,

	uint				resblks)

{

	if (sc->sm->sm_flags & XFS_SCRUB_IFLAG_REPAIR)

		return xfs_trans_alloc(sc->mp, &M_RES(sc->mp)->tr_itruncate,

				resblks, 0, 0, &sc->tp);



	return xfs_trans_alloc_empty(sc->mp, &sc->tp);

}
@@ -604,7 +616,10 @@ xfs_scrub_setup_fs( 
	struct xfs_scrub_context	*sc,

	struct xfs_inode		*ip)

{

	return xfs_scrub_trans_alloc(sc);

	uint				resblks;



	resblks = xfs_repair_calc_ag_resblks(sc);

	return xfs_scrub_trans_alloc(sc, resblks);

}



/* Set us up with AG headers and btree cursors. */
@@ -734,7 +749,7 @@ xfs_scrub_setup_inode_contents( 
	/* Got the inode, lock it and we're ready to go. */

	sc->ilock_flags = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL;

	xfs_ilock(sc->ip, sc->ilock_flags);

	error = xfs_scrub_trans_alloc(sc);

	error = xfs_scrub_trans_alloc(sc, resblks);

	if (error)

		goto out;

	sc->ilock_flags |= XFS_ILOCK_EXCL;

fs/xfs/scrub/common.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ xfs_scrub_should_terminate( 
	return false;

}



int xfs_scrub_trans_alloc(struct xfs_scrub_context *sc);

int xfs_scrub_trans_alloc(struct xfs_scrub_context *sc, uint resblks);

bool xfs_scrub_process_error(struct xfs_scrub_context *sc, xfs_agnumber_t agno,

		xfs_agblock_t bno, int *error);

bool xfs_scrub_fblock_process_error(struct xfs_scrub_context *sc, int whichfork,

fs/xfs/scrub/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ xfs_scrub_setup_inode( 
		break;

	case -EFSCORRUPTED:

	case -EFSBADCRC:

		return xfs_scrub_trans_alloc(sc);

		return xfs_scrub_trans_alloc(sc, 0);

	default:

		return error;

	}
@@ -75,7 +75,7 @@ xfs_scrub_setup_inode( 
	/* Got the inode, lock it and we're ready to go. */

	sc->ilock_flags = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL;

	xfs_ilock(sc->ip, sc->ilock_flags);

	error = xfs_scrub_trans_alloc(sc);

	error = xfs_scrub_trans_alloc(sc, 0);

	if (error)

		goto out;

	sc->ilock_flags |= XFS_ILOCK_EXCL;

fs/xfs/scrub/repair.c

+160 −0
Original line number Diff line number Diff line
@@ -128,3 +128,163 @@ xfs_repair_probe( 


	return 0;

}



/*

 * Roll a transaction, keeping the AG headers locked and reinitializing

 * the btree cursors.

 */

int

xfs_repair_roll_ag_trans(

	struct xfs_scrub_context	*sc)

{

	int				error;



	/* Keep the AG header buffers locked so we can keep going. */

	xfs_trans_bhold(sc->tp, sc->sa.agi_bp);

	xfs_trans_bhold(sc->tp, sc->sa.agf_bp);

	xfs_trans_bhold(sc->tp, sc->sa.agfl_bp);



	/* Roll the transaction. */

	error = xfs_trans_roll(&sc->tp);

	if (error)

		goto out_release;



	/* Join AG headers to the new transaction. */

	xfs_trans_bjoin(sc->tp, sc->sa.agi_bp);

	xfs_trans_bjoin(sc->tp, sc->sa.agf_bp);

	xfs_trans_bjoin(sc->tp, sc->sa.agfl_bp);



	return 0;



out_release:

	/*

	 * Rolling failed, so release the hold on the buffers.  The

	 * buffers will be released during teardown on our way out

	 * of the kernel.

	 */

	xfs_trans_bhold_release(sc->tp, sc->sa.agi_bp);

	xfs_trans_bhold_release(sc->tp, sc->sa.agf_bp);

	xfs_trans_bhold_release(sc->tp, sc->sa.agfl_bp);



	return error;

}



/*

 * Does the given AG have enough space to rebuild a btree?  Neither AG

 * reservation can be critical, and we must have enough space (factoring

 * in AG reservations) to construct a whole btree.

 */

bool

xfs_repair_ag_has_space(

	struct xfs_perag		*pag,

	xfs_extlen_t			nr_blocks,

	enum xfs_ag_resv_type		type)

{

	return  !xfs_ag_resv_critical(pag, XFS_AG_RESV_RMAPBT) &&

		!xfs_ag_resv_critical(pag, XFS_AG_RESV_METADATA) &&

		pag->pagf_freeblks > xfs_ag_resv_needed(pag, type) + nr_blocks;

}



/*

 * Figure out how many blocks to reserve for an AG repair.  We calculate the

 * worst case estimate for the number of blocks we'd need to rebuild one of

 * any type of per-AG btree.

 */

xfs_extlen_t

xfs_repair_calc_ag_resblks(

	struct xfs_scrub_context	*sc)

{

	struct xfs_mount		*mp = sc->mp;

	struct xfs_scrub_metadata	*sm = sc->sm;

	struct xfs_perag		*pag;

	struct xfs_buf			*bp;

	xfs_agino_t			icount = 0;

	xfs_extlen_t			aglen = 0;

	xfs_extlen_t			usedlen;

	xfs_extlen_t			freelen;

	xfs_extlen_t			bnobt_sz;

	xfs_extlen_t			inobt_sz;

	xfs_extlen_t			rmapbt_sz;

	xfs_extlen_t			refcbt_sz;

	int				error;



	if (!(sm->sm_flags & XFS_SCRUB_IFLAG_REPAIR))

		return 0;



	/* Use in-core counters if possible. */

	pag = xfs_perag_get(mp, sm->sm_agno);

	if (pag->pagi_init)

		icount = pag->pagi_count;



	/*

	 * Otherwise try to get the actual counters from disk; if not, make

	 * some worst case assumptions.

	 */

	if (icount == 0) {

		error = xfs_ialloc_read_agi(mp, NULL, sm->sm_agno, &bp);

		if (error) {

			icount = mp->m_sb.sb_agblocks / mp->m_sb.sb_inopblock;

		} else {

			icount = pag->pagi_count;

			xfs_buf_relse(bp);

		}

	}



	/* Now grab the block counters from the AGF. */

	error = xfs_alloc_read_agf(mp, NULL, sm->sm_agno, 0, &bp);

	if (error) {

		aglen = mp->m_sb.sb_agblocks;

		freelen = aglen;

		usedlen = aglen;

	} else {

		aglen = be32_to_cpu(XFS_BUF_TO_AGF(bp)->agf_length);

		freelen = pag->pagf_freeblks;

		usedlen = aglen - freelen;

		xfs_buf_relse(bp);

	}

	xfs_perag_put(pag);



	trace_xfs_repair_calc_ag_resblks(mp, sm->sm_agno, icount, aglen,

			freelen, usedlen);



	/*

	 * Figure out how many blocks we'd need worst case to rebuild

	 * each type of btree.  Note that we can only rebuild the

	 * bnobt/cntbt or inobt/finobt as pairs.

	 */

	bnobt_sz = 2 * xfs_allocbt_calc_size(mp, freelen);

	if (xfs_sb_version_hassparseinodes(&mp->m_sb))

		inobt_sz = xfs_iallocbt_calc_size(mp, icount /

				XFS_INODES_PER_HOLEMASK_BIT);

	else

		inobt_sz = xfs_iallocbt_calc_size(mp, icount /

				XFS_INODES_PER_CHUNK);

	if (xfs_sb_version_hasfinobt(&mp->m_sb))

		inobt_sz *= 2;

	if (xfs_sb_version_hasreflink(&mp->m_sb))

		refcbt_sz = xfs_refcountbt_calc_size(mp, usedlen);

	else

		refcbt_sz = 0;

	if (xfs_sb_version_hasrmapbt(&mp->m_sb)) {

		/*

		 * Guess how many blocks we need to rebuild the rmapbt.

		 * For non-reflink filesystems we can't have more records than

		 * used blocks.  However, with reflink it's possible to have

		 * more than one rmap record per AG block.  We don't know how

		 * many rmaps there could be in the AG, so we start off with

		 * what we hope is an generous over-estimation.

		 */

		if (xfs_sb_version_hasreflink(&mp->m_sb))

			rmapbt_sz = xfs_rmapbt_calc_size(mp,

					(unsigned long long)aglen * 2);

		else

			rmapbt_sz = xfs_rmapbt_calc_size(mp, usedlen);

	} else {

		rmapbt_sz = 0;

	}



	trace_xfs_repair_calc_ag_resblks_btsize(mp, sm->sm_agno, bnobt_sz,

			inobt_sz, rmapbt_sz, refcbt_sz);



	return max(max(bnobt_sz, inobt_sz), max(rmapbt_sz, refcbt_sz));

}