From patchwork Sat Dec 3 01:40:25 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: 9486617 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 BFD68325413 for ; Fri, 2 Dec 2016 19:39:38 -0600 (CST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759487AbcLCBkc (ORCPT ); Fri, 2 Dec 2016 20:40:32 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:23814 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759149AbcLCBkc (ORCPT ); Fri, 2 Dec 2016 20:40:32 -0500 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uB31eU2L021715 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 3 Dec 2016 01:40:30 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id uB31eTDg015838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 Dec 2016 01:40:30 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id uB31eRiA007124; Sat, 3 Dec 2016 01:40:28 GMT Received: from localhost (/24.21.211.40) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Dec 2016 17:40:26 -0800 Subject: [PATCH 47/55] xfs: repair free space btrees From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Fri, 02 Dec 2016 17:40:25 -0800 Message-ID: <148072922579.12995.18184814661031242248.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: userv0021.oracle.com [156.151.31.71] Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Rebuild the free space btrees from the gaps in the rmap btree. Signed-off-by: Darrick J. Wong --- fs/xfs/repair/alloc.c | 364 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/repair/common.c | 4 - fs/xfs/repair/common.h | 1 3 files changed, 367 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/repair/alloc.c b/fs/xfs/repair/alloc.c index a295607..6dc6745 100644 --- a/fs/xfs/repair/alloc.c +++ b/fs/xfs/repair/alloc.c @@ -32,7 +32,9 @@ #include "xfs_sb.h" #include "xfs_rmap.h" #include "xfs_alloc.h" +#include "xfs_alloc_btree.h" #include "xfs_ialloc.h" +#include "xfs_rmap_btree.h" #include "xfs_refcount.h" #include "repair/common.h" #include "repair/btree.h" @@ -163,3 +165,365 @@ xfs_scrub_cntbt( { return xfs_scrub_allocbt(sc, XFS_BTNUM_CNT); } + +/* Free space btree repair. */ + +struct xfs_repair_alloc_extent { + struct list_head list; + xfs_agblock_t bno; + xfs_extlen_t len; +}; + +struct xfs_repair_alloc { + struct list_head extlist; + struct list_head btlist; /* OWN_AG blocks */ + struct list_head nobtlist; /* rmapbt/agfl blocks */ + xfs_agblock_t next_bno; + uint64_t nr_records; +}; + +/* Record extents that aren't in use from gaps in the rmap records. */ +STATIC int +xfs_repair_alloc_extent_fn( + struct xfs_btree_cur *cur, + struct xfs_rmap_irec *rec, + void *priv) +{ + struct xfs_repair_alloc *ra = priv; + struct xfs_repair_alloc_extent *rae; + struct xfs_buf *bp; + struct xfs_mount *mp = cur->bc_mp; + xfs_fsblock_t fsb; + int i; + int error; + + /* Record all the OWN_AG blocks... */ + if (rec->rm_owner == XFS_RMAP_OWN_AG) { + fsb = XFS_AGB_TO_FSB(cur->bc_mp, cur->bc_private.a.agno, + rec->rm_startblock); + error = xfs_repair_collect_btree_extent(cur->bc_mp, + &ra->btlist, fsb, rec->rm_blockcount); + if (error) + return error; + } + + /* ...and all the rmapbt blocks... */ + for (i = 0; i < cur->bc_nlevels && cur->bc_ptrs[i] == 1; i++) { + xfs_btree_get_block(cur, i, &bp); + if (!bp) + continue; + fsb = XFS_DADDR_TO_FSB(cur->bc_mp, bp->b_bn); + error = xfs_repair_collect_btree_extent(cur->bc_mp, + &ra->nobtlist, fsb, 1); + if (error) + return error; + } + + /* ...and all the free space. */ + if (rec->rm_startblock > ra->next_bno) { + trace_xfs_repair_alloc_extent_fn(mp, cur->bc_private.a.agno, + rec->rm_startblock, rec->rm_blockcount, + rec->rm_owner, rec->rm_offset, rec->rm_flags); + + rae = kmem_alloc(sizeof(*rae), KM_NOFS); + if (!rae) + return -ENOMEM; + INIT_LIST_HEAD(&rae->list); + rae->bno = ra->next_bno; + rae->len = rec->rm_startblock - ra->next_bno; + list_add_tail(&rae->list, &ra->extlist); + ra->nr_records++; + } + ra->next_bno = max_t(xfs_agblock_t, ra->next_bno, + rec->rm_startblock + rec->rm_blockcount); + return 0; +} + +/* Find the longest free extent in the list. */ +static struct xfs_repair_alloc_extent * +xfs_repair_allocbt_get_longest( + struct xfs_repair_alloc *ra) +{ + struct xfs_repair_alloc_extent *rae; + struct xfs_repair_alloc_extent *longest = NULL; + + list_for_each_entry(rae, &ra->extlist, list) + if (!longest || rae->len > longest->len) + longest = rae; + return longest; +} + +/* Collect an AGFL block for the not-to-release list. */ +static int +xfs_repair_collect_agfl_block( + struct xfs_scrub_context *sc, + xfs_agblock_t bno, + void *data) +{ + struct xfs_repair_alloc *ra = data; + xfs_fsblock_t fsb; + + fsb = XFS_AGB_TO_FSB(sc->tp->t_mountp, sc->sa.agno, bno); + return xfs_repair_collect_btree_extent(sc->tp->t_mountp, + &ra->nobtlist, fsb, 1); +} + +/* Compare two btree extents. */ +static int +xfs_repair_allocbt_extent_cmp( + void *priv, + struct list_head *a, + struct list_head *b) +{ + struct xfs_repair_alloc_extent *ap; + struct xfs_repair_alloc_extent *bp; + + ap = container_of(a, struct xfs_repair_alloc_extent, list); + bp = container_of(b, struct xfs_repair_alloc_extent, list); + + if (ap->bno > bp->bno) + return 1; + else if (ap->bno < bp->bno) + return -1; + return 0; +} + +/* Put an extent onto the free list. */ +STATIC int +xfs_repair_allocbt_free_extent( + struct xfs_scrub_context *sc, + xfs_fsblock_t fsbno, + xfs_extlen_t len, + struct xfs_owner_info *oinfo) +{ + int error; + + error = xfs_free_extent(sc->tp, fsbno, len, oinfo, 0); + if (error) + return error; + error = xfs_repair_roll_ag_trans(sc); + if (error) + return error; + return xfs_mod_fdblocks(sc->tp->t_mountp, -(int64_t)len, false); +} + +/* Repair the freespace btrees for some AG. */ +int +xfs_repair_allocbt( + struct xfs_scrub_context *sc) +{ + struct xfs_repair_alloc ra; + struct xfs_owner_info oinfo; + struct xfs_mount *mp = sc->tp->t_mountp; + struct xfs_btree_cur *cur = NULL; + struct xfs_repair_alloc_extent *longest; + struct xfs_repair_alloc_extent *rae; + struct xfs_repair_alloc_extent *n; + struct xfs_perag *pag; + struct xfs_agf *agf; + struct xfs_buf *bp; + xfs_fsblock_t bnofsb; + xfs_fsblock_t cntfsb; + xfs_extlen_t oldf; + xfs_extlen_t nr_blocks; + xfs_agblock_t agend; + int error; + + /* We require the rmapbt to rebuild anything. */ + if (!xfs_sb_version_hasrmapbt(&mp->m_sb)) + return -EOPNOTSUPP; + + /* + * Collect all reverse mappings for free extents, and the rmapbt + * blocks. We can discover the rmapbt blocks completely from a + * query_all handler because there are always rmapbt entries. + * (One cannot use on query_all to visit all of a btree's blocks + * unless that btree is guaranteed to have at least one entry.) + */ + INIT_LIST_HEAD(&ra.extlist); + INIT_LIST_HEAD(&ra.btlist); + INIT_LIST_HEAD(&ra.nobtlist); + ra.next_bno = 0; + ra.nr_records = 0; + cur = xfs_rmapbt_init_cursor(mp, sc->tp, sc->sa.agf_bp, sc->sa.agno); + error = xfs_rmap_query_all(cur, xfs_repair_alloc_extent_fn, &ra); + if (error) + goto out; + xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR); + cur = NULL; + + /* Insert a record for space between the last rmap and EOAG. */ + agf = XFS_BUF_TO_AGF(sc->sa.agf_bp); + agend = be32_to_cpu(agf->agf_length); + if (ra.next_bno < agend) { + rae = kmem_alloc(sizeof(*rae), KM_NOFS); + if (!rae) { + error = -ENOMEM; + goto out; + } + INIT_LIST_HEAD(&rae->list); + rae->bno = ra.next_bno; + rae->len = agend - ra.next_bno; + list_add_tail(&rae->list, &ra.extlist); + ra.nr_records++; + } + + /* Collect all the AGFL blocks. */ + error = xfs_scrub_walk_agfl(sc, xfs_repair_collect_agfl_block, &ra); + if (error) + goto out; + + /* Do we actually have enough space to do this? */ + pag = xfs_perag_get(mp, sc->sa.agno); + nr_blocks = 2 * xfs_allocbt_calc_size(mp, ra.nr_records); + if (!xfs_repair_ag_has_space(pag, nr_blocks, XFS_AG_RESV_NONE)) { + xfs_perag_put(pag); + error = -ENOSPC; + goto out; + } + xfs_perag_put(pag); + + /* Allocate new bnobt root. */ + longest = xfs_repair_allocbt_get_longest(&ra); + if (longest == NULL) { + error = -ENOSPC; + goto out; + } + bnofsb = XFS_AGB_TO_FSB(mp, sc->sa.agno, longest->bno); + longest->bno++; + longest->len--; + + /* Allocate new cntbt root. */ + if (longest->len == 0) { + list_del(&longest->list); + kmem_free(longest); + longest = xfs_repair_allocbt_get_longest(&ra); + if (longest == NULL) { + error = -ENOSPC; + goto out; + } + } + cntfsb = XFS_AGB_TO_FSB(mp, sc->sa.agno, longest->bno); + longest->bno++; + longest->len--; + if (longest->len == 0) { + list_del(&longest->list); + kmem_free(longest); + longest = xfs_repair_allocbt_get_longest(&ra); + } + + agf = XFS_BUF_TO_AGF(sc->sa.agf_bp); + /* Initialize new bnobt root. */ + error = xfs_repair_init_btblock(sc, bnofsb, &bp, XFS_ABTB_CRC_MAGIC, + &xfs_allocbt_buf_ops); + if (error) + goto out; + agf->agf_roots[XFS_BTNUM_BNOi] = + cpu_to_be32(XFS_FSB_TO_AGBNO(mp, bnofsb)); + agf->agf_levels[XFS_BTNUM_BNOi] = cpu_to_be32(1); + + /* Initialize new cntbt root. */ + error = xfs_repair_init_btblock(sc, cntfsb, &bp, XFS_ABTC_CRC_MAGIC, + &xfs_allocbt_buf_ops); + if (error) + goto out; + agf->agf_roots[XFS_BTNUM_CNTi] = + cpu_to_be32(XFS_FSB_TO_AGBNO(mp, cntfsb)); + agf->agf_levels[XFS_BTNUM_CNTi] = cpu_to_be32(1); + + /* + * Since we're abandoning the old bnobt/cntbt, we have to + * decrease fdblocks by the # of blocks in those trees. + * btreeblks counts the non-root blocks of the free space + * and rmap btrees. Do this before resetting the AGF counters. + */ + pag = xfs_perag_get(mp, sc->sa.agno); + oldf = pag->pagf_btreeblks + 2; + oldf -= (be32_to_cpu(agf->agf_rmap_blocks) - 1); + error = xfs_mod_fdblocks(mp, -(int64_t)oldf, false); + if (error) { + xfs_perag_put(pag); + goto out; + } + + /* Reset the perag info. */ + pag->pagf_btreeblks = be32_to_cpu(agf->agf_rmap_blocks) - 1; + pag->pagf_freeblks = 0; + pag->pagf_longest = 0; + pag->pagf_levels[XFS_BTNUM_BNOi] = + be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]); + pag->pagf_levels[XFS_BTNUM_CNTi] = + be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]); + + /* Now reset the AGF counters. */ + agf->agf_btreeblks = cpu_to_be32(pag->pagf_btreeblks); + agf->agf_freeblks = cpu_to_be32(pag->pagf_freeblks); + agf->agf_longest = cpu_to_be32(pag->pagf_longest); + xfs_perag_put(pag); + xfs_alloc_log_agf(sc->tp, sc->sa.agf_bp, + XFS_AGF_ROOTS | XFS_AGF_LEVELS | XFS_AGF_BTREEBLKS | + XFS_AGF_LONGEST | XFS_AGF_FREEBLKS); + error = xfs_repair_roll_ag_trans(sc); + if (error) + goto out; + + /* + * Insert the longest free extent in case it's necessary to + * refresh the AGFL with multiple blocks. + */ + xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_UNKNOWN); + if (longest && longest->len == 0) { + error = xfs_repair_allocbt_free_extent(sc, + XFS_AGB_TO_FSB(mp, sc->sa.agno, longest->bno), + longest->len, &oinfo); + if (error) + goto out; + list_del(&longest->list); + kmem_free(longest); + } + + /* Insert records into the new btrees. */ + list_sort(NULL, &ra.extlist, xfs_repair_allocbt_extent_cmp); + list_for_each_entry_safe(rae, n, &ra.extlist, list) { + error = xfs_repair_allocbt_free_extent(sc, + XFS_AGB_TO_FSB(mp, sc->sa.agno, rae->bno), + rae->len, &oinfo); + if (error) + goto out; + list_del(&rae->list); + kmem_free(rae); + } + + /* Add rmap records for the btree roots */ + xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_AG); + error = xfs_rmap_alloc(sc->tp, sc->sa.agf_bp, sc->sa.agno, + XFS_FSB_TO_AGBNO(mp, bnofsb), 1, &oinfo); + if (error) + goto out; + error = xfs_rmap_alloc(sc->tp, sc->sa.agf_bp, sc->sa.agno, + XFS_FSB_TO_AGBNO(mp, cntfsb), 1, &oinfo); + if (error) + goto out; + + /* Free all the OWN_AG blocks that are not in the rmapbt/agfl. */ + error = xfs_repair_subtract_extents(mp, &ra.btlist, &ra.nobtlist); + if (error) + goto out; + xfs_repair_cancel_btree_extents(sc, &ra.nobtlist); + error = xfs_repair_reap_btree_extents(sc, &ra.btlist, &oinfo, + XFS_AG_RESV_NONE); + if (error) + goto out; + + return 0; +out: + xfs_repair_cancel_btree_extents(sc, &ra.btlist); + xfs_repair_cancel_btree_extents(sc, &ra.nobtlist); + if (cur) + xfs_btree_del_cursor(cur, XFS_BTREE_ERROR); + list_for_each_entry_safe(rae, n, &ra.extlist, list) { + list_del(&rae->list); + kmem_free(rae); + } + return error; +} diff --git a/fs/xfs/repair/common.c b/fs/xfs/repair/common.c index 1f3bf95..07134c9 100644 --- a/fs/xfs/repair/common.c +++ b/fs/xfs/repair/common.c @@ -1006,8 +1006,8 @@ static const struct xfs_scrub_meta_fns meta_scrub_fns[] = { {xfs_scrub_setup_ag, xfs_scrub_agf, xfs_repair_agf, NULL}, {xfs_scrub_setup_ag, xfs_scrub_agfl, xfs_repair_agfl, NULL}, {xfs_scrub_setup_ag, xfs_scrub_agi, xfs_repair_agi, NULL}, - {xfs_scrub_setup_ag_header, xfs_scrub_bnobt, NULL, NULL}, - {xfs_scrub_setup_ag_header, xfs_scrub_cntbt, NULL, NULL}, + {xfs_scrub_setup_ag_header, xfs_scrub_bnobt, xfs_repair_allocbt, NULL}, + {xfs_scrub_setup_ag_header, xfs_scrub_cntbt, xfs_repair_allocbt, NULL}, {xfs_scrub_setup_ag_header, xfs_scrub_inobt, NULL, NULL}, {xfs_scrub_setup_ag_header, xfs_scrub_finobt, NULL, xfs_sb_version_hasfinobt}, {xfs_scrub_setup_ag_header, xfs_scrub_rmapbt, NULL, xfs_sb_version_hasrmapbt}, diff --git a/fs/xfs/repair/common.h b/fs/xfs/repair/common.h index 5adac6a..158a002 100644 --- a/fs/xfs/repair/common.h +++ b/fs/xfs/repair/common.h @@ -284,5 +284,6 @@ int xfs_repair_superblock(struct xfs_scrub_context *sc); int xfs_repair_agf(struct xfs_scrub_context *sc); int xfs_repair_agfl(struct xfs_scrub_context *sc); int xfs_repair_agi(struct xfs_scrub_context *sc); +int xfs_repair_allocbt(struct xfs_scrub_context *sc); #endif /* __XFS_REPAIR_COMMON_H__ */