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

Commit 2e6f2756 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: cross-reference inode btrees during scrub 



Cross-reference the inode btrees with the other metadata when we
scrub the filesystem.

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

fs/xfs/scrub/agheader.c

+27 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ xfs_scrub_superblock_xref( 
		return;



	xfs_scrub_xref_is_used_space(sc, agbno, 1);

	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);



	/* scrub teardown will take care of sc->sa for us */

}
@@ -507,6 +508,7 @@ xfs_scrub_agf_xref( 
	xfs_scrub_xref_is_used_space(sc, agbno, 1);

	xfs_scrub_agf_xref_freeblks(sc);

	xfs_scrub_agf_xref_cntbt(sc);

	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);



	/* scrub teardown will take care of sc->sa for us */

}
@@ -612,6 +614,7 @@ xfs_scrub_agfl_block_xref( 
		return;



	xfs_scrub_xref_is_used_space(sc, agbno, 1);

	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);

}



/* Scrub an AGFL block. */
@@ -666,6 +669,7 @@ xfs_scrub_agfl_xref( 
		return;



	xfs_scrub_xref_is_used_space(sc, agbno, 1);

	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);



	/*

	 * Scrub teardown will take care of sc->sa for us.  Leave sc->sa
@@ -740,6 +744,27 @@ xfs_scrub_agfl( 


/* AGI */



/* Check agi_count/agi_freecount */

static inline void

xfs_scrub_agi_xref_icounts(

	struct xfs_scrub_context	*sc)

{

	struct xfs_agi			*agi = XFS_BUF_TO_AGI(sc->sa.agi_bp);

	xfs_agino_t			icount;

	xfs_agino_t			freecount;

	int				error;



	if (!sc->sa.ino_cur)

		return;



	error = xfs_ialloc_count_inodes(sc->sa.ino_cur, &icount, &freecount);

	if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.ino_cur))

		return;

	if (be32_to_cpu(agi->agi_count) != icount ||

	    be32_to_cpu(agi->agi_freecount) != freecount)

		xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agi_bp);

}



/* Cross-reference with the other btrees. */

STATIC void

xfs_scrub_agi_xref(
@@ -759,6 +784,8 @@ xfs_scrub_agi_xref( 
		return;



	xfs_scrub_xref_is_used_space(sc, agbno, 1);

	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);

	xfs_scrub_agi_xref_icounts(sc);



	/* scrub teardown will take care of sc->sa for us */

}

fs/xfs/scrub/alloc.c

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ xfs_scrub_allocbt_xref( 
		return;



	xfs_scrub_allocbt_xref_other(sc, agbno, len);

	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, len);

}



/* Scrub a bnobt/cntbt record. */

fs/xfs/scrub/bmap.c

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ xfs_scrub_bmap_extent_xref( 
		return;



	xfs_scrub_xref_is_used_space(info->sc, agbno, len);

	xfs_scrub_xref_is_not_inode_chunk(info->sc, agbno, len);



	xfs_scrub_ag_free(info->sc, &info->sc->sa);

}

fs/xfs/scrub/ialloc.c

+73 −0
Original line number Diff line number Diff line
@@ -58,6 +58,35 @@ xfs_scrub_setup_ag_iallocbt( 


/* Inode btree scrubber. */



/*

 * If we're checking the finobt, cross-reference with the inobt.

 * Otherwise we're checking the inobt; if there is an finobt, make sure

 * we have a record or not depending on freecount.

 */

static inline void

xfs_scrub_iallocbt_chunk_xref_other(

	struct xfs_scrub_context	*sc,

	struct xfs_inobt_rec_incore	*irec,

	xfs_agino_t			agino)

{

	struct xfs_btree_cur		**pcur;

	bool				has_irec;

	int				error;



	if (sc->sm->sm_type == XFS_SCRUB_TYPE_FINOBT)

		pcur = &sc->sa.ino_cur;

	else

		pcur = &sc->sa.fino_cur;

	if (!(*pcur))

		return;

	error = xfs_ialloc_has_inode_record(*pcur, agino, agino, &has_irec);

	if (!xfs_scrub_should_check_xref(sc, &error, pcur))

		return;

	if (((irec->ir_freecount > 0 && !has_irec) ||

	     (irec->ir_freecount == 0 && has_irec)))

		xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0);

}



/* Cross-reference with the other btrees. */

STATIC void

xfs_scrub_iallocbt_chunk_xref(
@@ -71,6 +100,7 @@ xfs_scrub_iallocbt_chunk_xref( 
		return;



	xfs_scrub_xref_is_used_space(sc, agbno, len);

	xfs_scrub_iallocbt_chunk_xref_other(sc, irec, agino);

}



/* Is this chunk worth checking? */
@@ -352,3 +382,46 @@ xfs_scrub_finobt( 
{

	return xfs_scrub_iallocbt(sc, XFS_BTNUM_FINO);

}



/* See if an inode btree has (or doesn't have) an inode chunk record. */

static inline void

xfs_scrub_xref_inode_check(

	struct xfs_scrub_context	*sc,

	xfs_agblock_t			agbno,

	xfs_extlen_t			len,

	struct xfs_btree_cur		**icur,

	bool				should_have_inodes)

{

	bool				has_inodes;

	int				error;



	if (!(*icur))

		return;



	error = xfs_ialloc_has_inodes_at_extent(*icur, agbno, len, &has_inodes);

	if (!xfs_scrub_should_check_xref(sc, &error, icur))

		return;

	if (has_inodes != should_have_inodes)

		xfs_scrub_btree_xref_set_corrupt(sc, *icur, 0);

}



/* xref check that the extent is not covered by inodes */

void

xfs_scrub_xref_is_not_inode_chunk(

	struct xfs_scrub_context	*sc,

	xfs_agblock_t			agbno,

	xfs_extlen_t			len)

{

	xfs_scrub_xref_inode_check(sc, agbno, len, &sc->sa.ino_cur, false);

	xfs_scrub_xref_inode_check(sc, agbno, len, &sc->sa.fino_cur, false);

}



/* xref check that the extent is covered by inodes */

void

xfs_scrub_xref_is_inode_chunk(

	struct xfs_scrub_context	*sc,

	xfs_agblock_t			agbno,

	xfs_extlen_t			len)

{

	xfs_scrub_xref_inode_check(sc, agbno, len, &sc->sa.ino_cur, true);

}

fs/xfs/scrub/inode.c

+49 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "scrub/xfs_scrub.h"

#include "scrub/scrub.h"

#include "scrub/common.h"

#include "scrub/btree.h"

#include "scrub/trace.h"



/*
@@ -577,6 +578,53 @@ xfs_scrub_inode_map_raw( 
	return error;

}



/*

 * Make sure the finobt doesn't think this inode is free.

 * We don't have to check the inobt ourselves because we got the inode via

 * IGET_UNTRUSTED, which checks the inobt for us.

 */

static void

xfs_scrub_inode_xref_finobt(

	struct xfs_scrub_context	*sc,

	xfs_ino_t			ino)

{

	struct xfs_inobt_rec_incore	rec;

	xfs_agino_t			agino;

	int				has_record;

	int				error;



	if (!sc->sa.fino_cur)

		return;



	agino = XFS_INO_TO_AGINO(sc->mp, ino);



	/*

	 * Try to get the finobt record.  If we can't get it, then we're

	 * in good shape.

	 */

	error = xfs_inobt_lookup(sc->sa.fino_cur, agino, XFS_LOOKUP_LE,

			&has_record);

	if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.fino_cur) ||

	    !has_record)

		return;



	error = xfs_inobt_get_rec(sc->sa.fino_cur, &rec, &has_record);

	if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.fino_cur) ||

	    !has_record)

		return;



	/*

	 * Otherwise, make sure this record either doesn't cover this inode,

	 * or that it does but it's marked present.

	 */

	if (rec.ir_startino > agino ||

	    rec.ir_startino + XFS_INODES_PER_CHUNK <= agino)

		return;



	if (rec.ir_free & XFS_INOBT_MASK(agino - rec.ir_startino))

		xfs_scrub_btree_xref_set_corrupt(sc, sc->sa.fino_cur, 0);

}



/* Cross-reference with the other btrees. */

STATIC void

xfs_scrub_inode_xref(
@@ -599,6 +647,7 @@ xfs_scrub_inode_xref( 
		return;



	xfs_scrub_xref_is_used_space(sc, agbno, 1);

	xfs_scrub_inode_xref_finobt(sc, ino);



	xfs_scrub_ag_free(sc, &sc->sa);

}