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

xfs: create a new buf_ops pointer to verify structure metadata 



Expose all metadata structure buffer verifier functions via buf_ops.
These will be used by the online scrub mechanism to look for problems
with buffers that are already sitting around in memory.

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

fs/xfs/libxfs/xfs_alloc.c

+17 −6
Original line number Diff line number Diff line
@@ -528,6 +528,15 @@ xfs_agfl_verify( 
	struct xfs_agfl	*agfl = XFS_BUF_TO_AGFL(bp);

	int		i;



	/*

	 * There is no verification of non-crc AGFLs because mkfs does not

	 * initialise the AGFL to zero or NULL. Hence the only valid part of the

	 * AGFL is what the AGF says is active. We can't get to the AGF, so we

	 * can't verify just those entries are valid.

	 */

	if (!xfs_sb_version_hascrc(&mp->m_sb))

		return NULL;



	if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))

		return __this_address;

	if (be32_to_cpu(agfl->agfl_magicnum) != XFS_AGFL_MAGIC)
@@ -605,6 +614,7 @@ const struct xfs_buf_ops xfs_agfl_buf_ops = { 
	.name = "xfs_agfl",

	.verify_read = xfs_agfl_read_verify,

	.verify_write = xfs_agfl_write_verify,

	.verify_struct = xfs_agfl_verify,

};



/*
@@ -2402,9 +2412,9 @@ xfs_alloc_put_freelist( 


static xfs_failaddr_t

xfs_agf_verify(

	struct xfs_mount *mp,

	struct xfs_buf		*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(bp);



	if (xfs_sb_version_hascrc(&mp->m_sb)) {
@@ -2467,7 +2477,7 @@ xfs_agf_read_verify( 
	    !xfs_buf_verify_cksum(bp, XFS_AGF_CRC_OFF))

		xfs_verifier_error(bp, -EFSBADCRC, __this_address);

	else {

		fa = xfs_agf_verify(mp, bp);

		fa = xfs_agf_verify(bp);

		if (XFS_TEST_ERROR(fa, mp, XFS_ERRTAG_ALLOC_READ_AGF))

			xfs_verifier_error(bp, -EFSCORRUPTED, fa);

	}
@@ -2481,7 +2491,7 @@ xfs_agf_write_verify( 
	struct xfs_buf_log_item	*bip = bp->b_fspriv;

	xfs_failaddr_t		fa;



	fa = xfs_agf_verify(mp, bp);

	fa = xfs_agf_verify(bp);

	if (fa) {

		xfs_verifier_error(bp, -EFSCORRUPTED, fa);

		return;
@@ -2500,6 +2510,7 @@ const struct xfs_buf_ops xfs_agf_buf_ops = { 
	.name = "xfs_agf",

	.verify_read = xfs_agf_read_verify,

	.verify_write = xfs_agf_write_verify,

	.verify_struct = xfs_agf_verify,

};



/*

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ const struct xfs_buf_ops xfs_allocbt_buf_ops = { 
	.name = "xfs_allocbt",

	.verify_read = xfs_allocbt_read_verify,

	.verify_write = xfs_allocbt_write_verify,

	.verify_struct = xfs_allocbt_verify,

};

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ const struct xfs_buf_ops xfs_attr3_leaf_buf_ops = { 
	.name = "xfs_attr3_leaf",

	.verify_read = xfs_attr3_leaf_read_verify,

	.verify_write = xfs_attr3_leaf_write_verify,

	.verify_struct = xfs_attr3_leaf_verify,

};



int

fs/xfs/libxfs/xfs_attr_remote.c

+43 −15
Original line number Diff line number Diff line
@@ -116,20 +116,21 @@ xfs_attr3_rmt_verify( 
	return NULL;

}



static void

xfs_attr3_rmt_read_verify(

	struct xfs_buf	*bp)

static int

__xfs_attr3_rmt_read_verify(

	struct xfs_buf	*bp,

	bool		check_crc,

	xfs_failaddr_t	*failaddr)

{

	struct xfs_mount *mp = bp->b_target->bt_mount;

	char		*ptr;

	xfs_failaddr_t	fa;

	int		len;

	xfs_daddr_t	bno;

	int		blksize = mp->m_attr_geo->blksize;



	/* no verification of non-crc buffers */

	if (!xfs_sb_version_hascrc(&mp->m_sb))

		return;

		return 0;



	ptr = bp->b_addr;

	bno = bp->b_bn;
@@ -137,22 +138,48 @@ xfs_attr3_rmt_read_verify( 
	ASSERT(len >= blksize);



	while (len > 0) {

		if (!xfs_verify_cksum(ptr, blksize, XFS_ATTR3_RMT_CRC_OFF)) {

			xfs_verifier_error(bp, -EFSBADCRC, __this_address);

			return;

		}

		fa = xfs_attr3_rmt_verify(mp, ptr, blksize, bno);

		if (fa) {

			xfs_verifier_error(bp, -EFSCORRUPTED, fa);

			break;

		if (check_crc &&

		    !xfs_verify_cksum(ptr, blksize, XFS_ATTR3_RMT_CRC_OFF)) {

			*failaddr = __this_address;

			return -EFSBADCRC;

		}

		*failaddr = xfs_attr3_rmt_verify(mp, ptr, blksize, bno);

		if (*failaddr)

			return -EFSCORRUPTED;

		len -= blksize;

		ptr += blksize;

		bno += BTOBB(blksize);

	}



	if (len != 0)

		xfs_verifier_error(bp, -EFSCORRUPTED, __this_address);

	if (len != 0) {

		*failaddr = __this_address;

		return -EFSCORRUPTED;

	}



	return 0;

}



static void

xfs_attr3_rmt_read_verify(

	struct xfs_buf	*bp)

{

	xfs_failaddr_t	fa;

	int		error;



	error = __xfs_attr3_rmt_read_verify(bp, true, &fa);

	if (error)

		xfs_verifier_error(bp, error, fa);

}



static xfs_failaddr_t

xfs_attr3_rmt_verify_struct(

	struct xfs_buf	*bp)

{

	xfs_failaddr_t	fa;

	int		error;



	error = __xfs_attr3_rmt_read_verify(bp, false, &fa);

	return error ? fa : NULL;

}



static void
@@ -207,6 +234,7 @@ const struct xfs_buf_ops xfs_attr3_rmt_buf_ops = { 
	.name = "xfs_attr3_rmt",

	.verify_read = xfs_attr3_rmt_read_verify,

	.verify_write = xfs_attr3_rmt_write_verify,

	.verify_struct = xfs_attr3_rmt_verify_struct,

};



STATIC int

fs/xfs/libxfs/xfs_bmap_btree.c

+1 −0
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ const struct xfs_buf_ops xfs_bmbt_buf_ops = { 
	.name = "xfs_bmbt",

	.verify_read = xfs_bmbt_read_verify,

	.verify_write = xfs_bmbt_write_verify,

	.verify_struct = xfs_bmbt_verify,

};