Re: [PATCH 12/22] xfs: scrub refcount btrees

Allison Henderson
2017-07-23T17:25:51Z

This one looks fine to me, it is pretty much as it was in v7.
Reviewed by: Allison Henderson <allison.henderson@oracle.com>

On 7/20/2017 9:39 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Plumb in the pieces necessary to check the refcount btree. If rmap is
> available, check the reference count by performing an interval query
> against the rmapbt.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/Makefile | 1
> fs/xfs/libxfs/xfs_fs.h | 3 +
> fs/xfs/scrub/common.c | 5 ++
> fs/xfs/scrub/common.h | 2 +
> fs/xfs/scrub/refcount.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++
> fs/xfs/xfs_trace.h | 3 +
> 6 files changed, 108 insertions(+), 2 deletions(-)
> create mode 100644 fs/xfs/scrub/refcount.c
>
>
> diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
> index 5fe0c8e..1b1972b 100644
> --- a/fs/xfs/Makefile
> +++ b/fs/xfs/Makefile
> @@ -146,6 +146,7 @@ xfs-y += $(addprefix scrub/, \
> common.o \
> ialloc.o \
> metabufs.o \
> + refcount.o \
> rmap.o \
> )
> endif
> diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
> index 24db73a..3253de9 100644
> --- a/fs/xfs/libxfs/xfs_fs.h
> +++ b/fs/xfs/libxfs/xfs_fs.h
> @@ -492,7 +492,8 @@ struct xfs_scrub_metadata {
> #define XFS_SCRUB_TYPE_INOBT 8 /* inode btree */
> #define XFS_SCRUB_TYPE_FINOBT 9 /* free inode btree */
> #define XFS_SCRUB_TYPE_RMAPBT 10 /* reverse mapping btree */
> -#define XFS_SCRUB_TYPE_MAX 10
> +#define XFS_SCRUB_TYPE_REFCNTBT 11 /* reference count btree */
> +#define XFS_SCRUB_TYPE_MAX 11
>
> /* i: repair this metadata */
> #define XFS_SCRUB_FLAG_REPAIR (1 << 0)
> diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
> index dfa5fc5..71a980e 100644
> --- a/fs/xfs/scrub/common.c
> +++ b/fs/xfs/scrub/common.c
> @@ -730,6 +730,11 @@ static const struct xfs_scrub_meta_fns meta_scrub_fns[] = {
> .scrub = xfs_scrub_rmapbt,
> .has = xfs_sb_version_hasrmapbt,
> },
> + { /* refcountbt */
> + .setup = xfs_scrub_setup_ag_refcountbt,
> + .scrub = xfs_scrub_refcountbt,
> + .has = xfs_sb_version_hasreflink,
> + },
> };
>
> /* Dispatch metadata scrubbing. */
> diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h
> index 8fbd19b..1f9ba8c6 100644
> --- a/fs/xfs/scrub/common.h
> +++ b/fs/xfs/scrub/common.h
> @@ -212,6 +212,7 @@ SETUP_FN(xfs_scrub_setup_ag_header);
> SETUP_FN(xfs_scrub_setup_ag_allocbt);
> SETUP_FN(xfs_scrub_setup_ag_iallocbt);
> SETUP_FN(xfs_scrub_setup_ag_rmapbt);
> +SETUP_FN(xfs_scrub_setup_ag_refcountbt);
> #undef SETUP_FN
>
> /* Metadata scrubbers */
> @@ -228,6 +229,7 @@ SCRUB_FN(xfs_scrub_cntbt);
> SCRUB_FN(xfs_scrub_inobt);
> SCRUB_FN(xfs_scrub_finobt);
> SCRUB_FN(xfs_scrub_rmapbt);
> +SCRUB_FN(xfs_scrub_refcountbt);
> #undef SCRUB_FN
>
> #endif /* __XFS_REPAIR_COMMON_H__ */
> diff --git a/fs/xfs/scrub/refcount.c b/fs/xfs/scrub/refcount.c
> new file mode 100644
> index 0000000..fcc72c5
> --- /dev/null
> +++ b/fs/xfs/scrub/refcount.c
> @@ -0,0 +1,96 @@
> +/*
> + * Copyright (C) 2017 Oracle. All Rights Reserved.
> + *
> + * Author: Darrick J. Wong <darrick.wong@oracle.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it would be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
> + */
> +#include "xfs.h"
> +#include "xfs_fs.h"
> +#include "xfs_shared.h"
> +#include "xfs_format.h"
> +#include "xfs_trans_resv.h"
> +#include "xfs_mount.h"
> +#include "xfs_defer.h"
> +#include "xfs_btree.h"
> +#include "xfs_bit.h"
> +#include "xfs_log_format.h"
> +#include "xfs_trans.h"
> +#include "xfs_trace.h"
> +#include "xfs_sb.h"
> +#include "xfs_rmap.h"
> +#include "scrub/common.h"
> +#include "scrub/btree.h"
> +
> +/*
> + * Set us up to scrub reference count btrees.
> + */
> +int
> +xfs_scrub_setup_ag_refcountbt(
> + struct xfs_scrub_context *sc,
> + struct xfs_inode *ip)
> +{
> + return xfs_scrub_setup_ag_btree(sc, ip, false);
> +}
> +
> +/* Reference count btree scrubber. */
> +
> +/* Scrub a refcountbt record. */
> +STATIC int
> +xfs_scrub_refcountbt_helper(
> + struct xfs_scrub_btree *bs,
> + union xfs_btree_rec *rec)
> +{
> + struct xfs_mount *mp = bs->cur->bc_mp;
> + struct xfs_agf *agf;
> + struct xfs_refcount_irec irec;
> + xfs_agblock_t eoag;
> + bool has_cowflag;
> + int error = 0;
> +
> + irec.rc_startblock = be32_to_cpu(rec->refc.rc_startblock);
> + irec.rc_blockcount = be32_to_cpu(rec->refc.rc_blockcount);
> + irec.rc_refcount = be32_to_cpu(rec->refc.rc_refcount);
> + agf = XFS_BUF_TO_AGF(bs->sc->sa.agf_bp);
> + eoag = be32_to_cpu(agf->agf_length);
> +
> + has_cowflag = !!(irec.rc_startblock & XFS_REFC_COW_START);
> + XFS_SCRUB_BTREC_CHECK(bs, (irec.rc_refcount == 1 && has_cowflag) ||
> + (irec.rc_refcount != 1 && !has_cowflag));
> + irec.rc_startblock &= ~XFS_REFC_COW_START;
> + XFS_SCRUB_BTREC_CHECK(bs, irec.rc_startblock < mp->m_sb.sb_agblocks);
> + XFS_SCRUB_BTREC_CHECK(bs, irec.rc_startblock < eoag);
> + XFS_SCRUB_BTREC_CHECK(bs, irec.rc_startblock < irec.rc_startblock +
> + irec.rc_blockcount);
> + XFS_SCRUB_BTREC_CHECK(bs, (unsigned long long)irec.rc_startblock +
> + irec.rc_blockcount <= mp->m_sb.sb_agblocks);
> + XFS_SCRUB_BTREC_CHECK(bs, (unsigned long long)irec.rc_startblock +
> + irec.rc_blockcount <= eoag);
> + XFS_SCRUB_BTREC_CHECK(bs, irec.rc_refcount >= 1);
> +
> + return error;
> +}
> +
> +/* Scrub the refcount btree for some AG. */
> +int
> +xfs_scrub_refcountbt(
> + struct xfs_scrub_context *sc)
> +{
> + struct xfs_owner_info oinfo;
> +
> + xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_REFC);
> + return xfs_scrub_btree(sc, sc->sa.refc_cur, xfs_scrub_refcountbt_helper,
> + &oinfo, NULL);
> +}
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 3996cb8..6c0281b 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -3322,7 +3322,8 @@ DEFINE_GETFSMAP_EVENT(xfs_getfsmap_mapping);
> { XFS_SCRUB_TYPE_CNTBT, "cntbt" }, \
> { XFS_SCRUB_TYPE_INOBT, "inobt" }, \
> { XFS_SCRUB_TYPE_FINOBT, "finobt" }, \
> - { XFS_SCRUB_TYPE_RMAPBT, "rmapbt" }
> + { XFS_SCRUB_TYPE_RMAPBT, "rmapbt" }, \
> + { XFS_SCRUB_TYPE_REFCNTBT, "refcountbt" }
> DECLARE_EVENT_CLASS(xfs_scrub_class,
> TP_PROTO(struct xfs_inode *ip, struct xfs_scrub_metadata *sm,
> int error),
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>