From patchwork Sat Dec 3 01:37:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9486575 X-Mozilla-Keys: nonjunk Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sandeen.net X-Spam-Level: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 X-Spam-HP: BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_HI=-5,RP_MATCHES_RCVD=-0.1,UNPARSEABLE_RELAY=0.001, URIBL_BLOCKED=0.001 X-Original-To: sandeen@sandeen.net Delivered-To: sandeen@sandeen.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by sandeen.net (Postfix) with ESMTP id 109FA5FCC97 for ; Fri, 2 Dec 2016 19:36:55 -0600 (CST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932211AbcLCBhs (ORCPT ); Fri, 2 Dec 2016 20:37:48 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:19403 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758474AbcLCBhj (ORCPT ); Fri, 2 Dec 2016 20:37:39 -0500 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uB31bNP0017000 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 Dec 2016 01:37:23 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id uB31bMBO010352 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 Dec 2016 01:37:23 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uB31bMxP022473; Sat, 3 Dec 2016 01:37:22 GMT Received: from localhost (/24.21.211.40) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Dec 2016 17:37:22 -0800 Subject: [PATCH 20/55] xfs: scrub AGF and AGFL From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Fri, 02 Dec 2016 17:37:21 -0800 Message-ID: <148072904131.12995.9561275989427584558.stgit@birch.djwong.org> In-Reply-To: <148072891404.12995.15510849192837089093.stgit@birch.djwong.org> References: <148072891404.12995.15510849192837089093.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Check the block references in the AGF and AGFL headers to make sure they make sense. Signed-off-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_fs.h | 4 + fs/xfs/repair/agheader.c | 227 ++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/repair/common.c | 83 +++++++++++++++++ fs/xfs/repair/common.h | 8 ++ fs/xfs/xfs_trace.h | 4 + 5 files changed, 324 insertions(+), 2 deletions(-) -- 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 diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h index e176147..fd2649f 100644 --- a/fs/xfs/libxfs/xfs_fs.h +++ b/fs/xfs/libxfs/xfs_fs.h @@ -576,7 +576,9 @@ struct xfs_scrub_metadata { */ #define XFS_SCRUB_TYPE_TEST 0 /* dummy to test ioctl */ #define XFS_SCRUB_TYPE_SB 1 /* superblock */ -#define XFS_SCRUB_TYPE_MAX 1 +#define XFS_SCRUB_TYPE_AGF 2 /* AG free header */ +#define XFS_SCRUB_TYPE_AGFL 3 /* AG free list */ +#define XFS_SCRUB_TYPE_MAX 3 #define XFS_SCRUB_FLAG_REPAIR 0x1 /* i: repair this metadata */ #define XFS_SCRUB_FLAG_CORRUPT 0x2 /* o: needs repair */ diff --git a/fs/xfs/repair/agheader.c b/fs/xfs/repair/agheader.c index 64d987d..b8cb094 100644 --- a/fs/xfs/repair/agheader.c +++ b/fs/xfs/repair/agheader.c @@ -32,6 +32,72 @@ #include "xfs_sb.h" #include "repair/common.h" +/* Find the size of the AG, in blocks. */ +static inline xfs_agblock_t +xfs_scrub_ag_blocks( + struct xfs_mount *mp, + xfs_agnumber_t agno) +{ + ASSERT(agno < mp->m_sb.sb_agcount); + + if (agno < mp->m_sb.sb_agcount - 1) + return mp->m_sb.sb_agblocks; + return mp->m_sb.sb_dblocks - (agno * mp->m_sb.sb_agblocks); +} + +/* Walk all the blocks in the AGFL. */ +int +xfs_scrub_walk_agfl( + struct xfs_scrub_context *sc, + int (*fn)(struct xfs_scrub_context *, + xfs_agblock_t bno, void *), + void *priv) +{ + struct xfs_agf *agf; + __be32 *agfl_bno; + struct xfs_mount *mp = sc->tp->t_mountp; + unsigned int flfirst; + unsigned int fllast; + int i; + int error; + + agf = XFS_BUF_TO_AGF(sc->sa.agf_bp); + agfl_bno = XFS_BUF_TO_AGFL_BNO(mp, sc->sa.agfl_bp); + flfirst = be32_to_cpu(agf->agf_flfirst); + fllast = be32_to_cpu(agf->agf_fllast); + + /* Skip an empty AGFL. */ + if (agf->agf_flcount == cpu_to_be32(0)) + return 0; + + /* first to last is a consecutive list. */ + if (fllast >= flfirst) { + for (i = flfirst; i <= fllast; i++) { + error = fn(sc, be32_to_cpu(agfl_bno[i]), priv); + if (error) + return error; + } + + return 0; + } + + /* first to the end */ + for (i = flfirst; i < XFS_AGFL_SIZE(mp); i++) { + error = fn(sc, be32_to_cpu(agfl_bno[i]), priv); + if (error) + return error; + } + + /* the start to last. */ + for (i = 0; i <= fllast; i++) { + error = fn(sc, be32_to_cpu(agfl_bno[i]), priv); + if (error) + return error; + } + + return 0; +} + /* Superblock */ #define XFS_SCRUB_SB_CHECK(fs_ok) \ @@ -171,3 +237,164 @@ xfs_scrub_superblock( } #undef XFS_SCRUB_SB_OP_ERROR_GOTO #undef XFS_SCRUB_SB_CHECK + +/* AGF */ + +#define XFS_SCRUB_AGF_CHECK(fs_ok) \ + XFS_SCRUB_CHECK(sc, sc->sa.agf_bp, "AGF", fs_ok) +#define XFS_SCRUB_AGF_OP_ERROR_GOTO(error, label) \ + XFS_SCRUB_OP_ERROR_GOTO(sc, sc->sm->sm_agno, \ + XFS_AGF_BLOCK(sc->tp->t_mountp), "AGF", error, label) +/* Scrub the AGF. */ +int +xfs_scrub_agf( + struct xfs_scrub_context *sc) +{ + struct xfs_mount *mp = sc->tp->t_mountp; + struct xfs_agf *agf; + xfs_daddr_t daddr; + xfs_daddr_t eofs; + xfs_agnumber_t agno; + xfs_agblock_t agbno; + xfs_agblock_t eoag; + xfs_agblock_t agfl_first; + xfs_agblock_t agfl_last; + xfs_agblock_t agfl_count; + xfs_agblock_t fl_count; + int level; + int error = 0; + + agno = sc->sm->sm_agno; + error = xfs_scrub_load_ag_headers(sc, agno, XFS_SCRUB_TYPE_AGF); + XFS_SCRUB_AGF_OP_ERROR_GOTO(&error, out); + + agf = XFS_BUF_TO_AGF(sc->sa.agf_bp); + eofs = XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks); + + /* Check the AG length */ + eoag = be32_to_cpu(agf->agf_length); + XFS_SCRUB_AGF_CHECK(eoag == xfs_scrub_ag_blocks(mp, agno)); + + /* Check the AGF btree roots and levels */ + agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]); + daddr = XFS_AGB_TO_DADDR(mp, agno, agbno); + XFS_SCRUB_AGF_CHECK(agbno > XFS_AGI_BLOCK(mp)); + XFS_SCRUB_AGF_CHECK(agbno < mp->m_sb.sb_agblocks); + XFS_SCRUB_AGF_CHECK(agbno < eoag); + XFS_SCRUB_AGF_CHECK(daddr < eofs); + + agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]); + daddr = XFS_AGB_TO_DADDR(mp, agno, agbno); + XFS_SCRUB_AGF_CHECK(agbno > XFS_AGI_BLOCK(mp)); + XFS_SCRUB_AGF_CHECK(agbno < mp->m_sb.sb_agblocks); + XFS_SCRUB_AGF_CHECK(agbno < eoag); + XFS_SCRUB_AGF_CHECK(daddr < eofs); + + level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]); + XFS_SCRUB_AGF_CHECK(level > 0); + XFS_SCRUB_AGF_CHECK(level <= XFS_BTREE_MAXLEVELS); + + level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]); + XFS_SCRUB_AGF_CHECK(level > 0); + XFS_SCRUB_AGF_CHECK(level <= XFS_BTREE_MAXLEVELS); + + if (xfs_sb_version_hasrmapbt(&mp->m_sb)) { + agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_RMAP]); + daddr = XFS_AGB_TO_DADDR(mp, agno, agbno); + XFS_SCRUB_AGF_CHECK(agbno > XFS_AGI_BLOCK(mp)); + XFS_SCRUB_AGF_CHECK(agbno < mp->m_sb.sb_agblocks); + XFS_SCRUB_AGF_CHECK(agbno < eoag); + XFS_SCRUB_AGF_CHECK(daddr < eofs); + + level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]); + XFS_SCRUB_AGF_CHECK(level > 0); + XFS_SCRUB_AGF_CHECK(level <= XFS_BTREE_MAXLEVELS); + } + + if (xfs_sb_version_hasreflink(&mp->m_sb)) { + agbno = be32_to_cpu(agf->agf_refcount_root); + daddr = XFS_AGB_TO_DADDR(mp, agno, agbno); + XFS_SCRUB_AGF_CHECK(agbno > XFS_AGI_BLOCK(mp)); + XFS_SCRUB_AGF_CHECK(agbno < mp->m_sb.sb_agblocks); + XFS_SCRUB_AGF_CHECK(agbno < eoag); + XFS_SCRUB_AGF_CHECK(daddr < eofs); + + level = be32_to_cpu(agf->agf_refcount_level); + XFS_SCRUB_AGF_CHECK(level > 0); + XFS_SCRUB_AGF_CHECK(level <= XFS_BTREE_MAXLEVELS); + } + + /* Check the AGFL counters */ + agfl_first = be32_to_cpu(agf->agf_flfirst); + agfl_last = be32_to_cpu(agf->agf_fllast); + agfl_count = be32_to_cpu(agf->agf_flcount); + if (agfl_last > agfl_first) + fl_count = agfl_last - agfl_first + 1; + else + fl_count = XFS_AGFL_SIZE(mp) - agfl_first + agfl_last + 1; + XFS_SCRUB_AGF_CHECK(agfl_count == 0 || fl_count == agfl_count); + +out: + return error; +} +#undef XFS_SCRUB_AGF_OP_ERROR_GOTO +#undef XFS_SCRUB_AGF_CHECK + +/* AGFL */ + +#define XFS_SCRUB_AGFL_CHECK(fs_ok) \ + XFS_SCRUB_CHECK(sc, sc->sa.agfl_bp, "AGFL", fs_ok) +struct xfs_scrub_agfl { + xfs_agblock_t eoag; + xfs_daddr_t eofs; +}; + +/* Scrub an AGFL block. */ +STATIC int +xfs_scrub_agfl_block( + struct xfs_scrub_context *sc, + xfs_agblock_t agbno, + void *priv) +{ + struct xfs_mount *mp = sc->tp->t_mountp; + xfs_agnumber_t agno = sc->sa.agno; + struct xfs_scrub_agfl *sagfl = priv; + + XFS_SCRUB_AGFL_CHECK(agbno > XFS_AGI_BLOCK(mp)); + XFS_SCRUB_AGFL_CHECK(XFS_AGB_TO_DADDR(mp, agno, agbno) < sagfl->eofs); + XFS_SCRUB_AGFL_CHECK(agbno < mp->m_sb.sb_agblocks); + XFS_SCRUB_AGFL_CHECK(agbno < sagfl->eoag); + + return 0; +} + +#define XFS_SCRUB_AGFL_OP_ERROR_GOTO(error, label) \ + XFS_SCRUB_OP_ERROR_GOTO(sc, sc->sm->sm_agno, \ + XFS_AGFL_BLOCK(sc->tp->t_mountp), "AGFL", error, label) +/* Scrub the AGFL. */ +int +xfs_scrub_agfl( + struct xfs_scrub_context *sc) +{ + struct xfs_scrub_agfl sagfl; + struct xfs_mount *mp = sc->tp->t_mountp; + struct xfs_agf *agf; + int error; + + error = xfs_scrub_load_ag_headers(sc, sc->sm->sm_agno, + XFS_SCRUB_TYPE_AGFL); + XFS_SCRUB_AGFL_OP_ERROR_GOTO(&error, out); + if (!sc->sa.agf_bp) + return -EFSCORRUPTED; + + agf = XFS_BUF_TO_AGF(sc->sa.agf_bp); + sagfl.eofs = XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks); + sagfl.eoag = be32_to_cpu(agf->agf_length); + + /* Check the blocks in the AGFL. */ + return xfs_scrub_walk_agfl(sc, xfs_scrub_agfl_block, &sagfl); +out: + return error; +} +#undef XFS_SCRUB_AGFL_OP_ERROR_GOTO +#undef XFS_SCRUB_AGFL_CHECK diff --git a/fs/xfs/repair/common.c b/fs/xfs/repair/common.c index 698a2e0..5b3df3d 100644 --- a/fs/xfs/repair/common.c +++ b/fs/xfs/repair/common.c @@ -602,6 +602,87 @@ xfs_scrub_setup_ag( return xfs_scrub_setup(sc, ip, sm, retry_deadlocked); } +/* + * Load and verify an AG header for further AG header examination. + * If this header is not the target of the examination, don't return + * the buffer if a runtime or verifier error occurs. + */ +STATIC int +xfs_scrub_load_ag_header( + struct xfs_scrub_context *sc, + xfs_daddr_t daddr, + struct xfs_buf **bpp, + const struct xfs_buf_ops *ops, + bool is_target) +{ + struct xfs_mount *mp = sc->tp->t_mountp; + int error; + + *bpp = NULL; + error = xfs_trans_read_buf(mp, sc->tp, mp->m_ddev_targp, + XFS_AG_DADDR(mp, sc->sa.agno, daddr), + XFS_FSS_TO_BB(mp, 1), 0, bpp, ops); + return is_target ? error : 0; +} + +/* + * Load as many of the AG headers and btree cursors as we can for an + * examination and cross-reference of an AG header. + */ +int +xfs_scrub_load_ag_headers( + struct xfs_scrub_context *sc, + xfs_agnumber_t agno, + unsigned int type) +{ + struct xfs_mount *mp = sc->tp->t_mountp; + int error; + + ASSERT(type == XFS_SCRUB_TYPE_AGF || type == XFS_SCRUB_TYPE_AGFL); + memset(&sc->sa, 0, sizeof(sc->sa)); + sc->sa.agno = agno; + + error = xfs_scrub_load_ag_header(sc, XFS_AGI_DADDR(mp), + &sc->sa.agi_bp, &xfs_agi_buf_ops, false); + if (error) + return error; + + error = xfs_scrub_load_ag_header(sc, XFS_AGF_DADDR(mp), + &sc->sa.agf_bp, &xfs_agf_buf_ops, + type == XFS_SCRUB_TYPE_AGF); + if (error) + return error; + + error = xfs_scrub_load_ag_header(sc, XFS_AGFL_DADDR(mp), + &sc->sa.agfl_bp, &xfs_agfl_buf_ops, + type == XFS_SCRUB_TYPE_AGFL); + if (error) + return error; + + return 0; +} + +/* Set us up with AG headers and btree cursors. */ +STATIC int +xfs_scrub_setup_ag_header( + struct xfs_scrub_context *sc, + struct xfs_inode *ip, + struct xfs_scrub_metadata *sm, + bool retry_deadlocked) +{ + int error; + + error = xfs_scrub_setup_ag(sc, ip, sm, retry_deadlocked); + if (error) + goto out; + + error = xfs_scrub_ag_init(sc, sm->sm_agno, &sc->sa); + if (error) + xfs_trans_cancel(sc->tp); +out: + return error; +} + /* Scrubbing dispatch. */ struct xfs_scrub_meta_fns { @@ -615,6 +696,8 @@ struct xfs_scrub_meta_fns { static const struct xfs_scrub_meta_fns meta_scrub_fns[] = { {xfs_scrub_setup, xfs_scrub_dummy, NULL, NULL}, {xfs_scrub_setup_ag, xfs_scrub_superblock, NULL, NULL}, + {xfs_scrub_setup_ag, xfs_scrub_agf, NULL, NULL}, + {xfs_scrub_setup_ag, xfs_scrub_agfl, NULL, NULL}, }; /* Dispatch metadata scrubbing. */ diff --git a/fs/xfs/repair/common.h b/fs/xfs/repair/common.h index 09ce63f..62ab9dd 100644 --- a/fs/xfs/repair/common.h +++ b/fs/xfs/repair/common.h @@ -185,9 +185,17 @@ int xfs_scrub_ag_init(struct xfs_scrub_context *sc, xfs_agnumber_t agno, struct xfs_scrub_ag *sa); int xfs_scrub_ag_btcur_init(struct xfs_scrub_context *sc, struct xfs_scrub_ag *sa); +int xfs_scrub_load_ag_headers(struct xfs_scrub_context *sc, xfs_agnumber_t agno, + unsigned int type); +int xfs_scrub_walk_agfl(struct xfs_scrub_context *sc, + int (*fn)(struct xfs_scrub_context *, xfs_agblock_t bno, + void *), + void *priv); /* Metadata scrubbers */ int xfs_scrub_superblock(struct xfs_scrub_context *sc); +int xfs_scrub_agf(struct xfs_scrub_context *sc); +int xfs_scrub_agfl(struct xfs_scrub_context *sc); #endif /* __XFS_REPAIR_COMMON_H__ */ diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index a930c7f..5ca10a8 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -3463,7 +3463,9 @@ DEFINE_GETFSMAP_EVENT(xfs_getfsmap_mapping); /* scrub */ #define XFS_SCRUB_TYPE_DESC \ { XFS_SCRUB_TYPE_TEST, "dummy" }, \ - { XFS_SCRUB_TYPE_SB, "superblock" } + { XFS_SCRUB_TYPE_SB, "superblock" }, \ + { XFS_SCRUB_TYPE_AGF, "AGF" }, \ + { XFS_SCRUB_TYPE_AGFL, "AGFL" } DECLARE_EVENT_CLASS(xfs_scrub_class, TP_PROTO(struct xfs_inode *ip, int type, xfs_agnumber_t agno, xfs_ino_t inum, unsigned int gen, unsigned int flags,