From patchwork Fri Aug 26 00:01:26 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: 9300701 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E1B0607D8 for ; Fri, 26 Aug 2016 00:01:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CD1629298 for ; Fri, 26 Aug 2016 00:01:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6145C292AB; Fri, 26 Aug 2016 00:01:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E1DE829298 for ; Fri, 26 Aug 2016 00:01:49 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id CD282849C; Thu, 25 Aug 2016 19:01:41 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id D8795849A for ; Thu, 25 Aug 2016 19:01:39 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id 3F2E6AC002 for ; Thu, 25 Aug 2016 17:01:39 -0700 (PDT) X-ASG-Debug-ID: 1472169696-0bf57c55b21c84a0001-NocioJ Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by cuda.sgi.com with ESMTP id 3T5cLnenXXqyvl65 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 25 Aug 2016 17:01:37 -0700 (PDT) X-Barracuda-Envelope-From: darrick.wong@oracle.com X-Barracuda-Effective-Source-IP: userp1040.oracle.com[156.151.31.81] X-Barracuda-Apparent-Source-IP: 156.151.31.81 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u7Q01YRF007866 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 26 Aug 2016 00:01:35 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u7Q01YrF031497 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 26 Aug 2016 00:01:34 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u7Q01Swd023632; Fri, 26 Aug 2016 00:01:33 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 25 Aug 2016 17:01:28 -0700 Subject: [PATCH 26/29] xfs_repair: check existing realtime rmapbt entries against observed rmaps From: "Darrick J. Wong" X-ASG-Orig-Subj: [PATCH 26/29] xfs_repair: check existing realtime rmapbt entries against observed rmaps To: david@fromorbit.com, darrick.wong@oracle.com Date: Thu, 25 Aug 2016 17:01:26 -0700 Message-ID: <147216968687.7022.9876273075739424824.stgit@birch.djwong.org> In-Reply-To: <147216950911.7022.438115723996286926.stgit@birch.djwong.org> References: <147216950911.7022.438115723996286926.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] X-Barracuda-Connect: userp1040.oracle.com[156.151.31.81] X-Barracuda-Start-Time: 1472169697 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.176.15:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 2710 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, UNPARSEABLE_RELAY X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.32328 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.00 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Cc: linux-xfs@vger.kernel.org, xfs@oss.sgi.com X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP Once we've finished collecting reverse mapping observations from the metadata scan, check those observations against the realtime rmap btree (particularly if we're in -n mode) to detect rtrmapbt problems. Signed-off-by: Darrick J. Wong --- repair/rmap.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/repair/rmap.c b/repair/rmap.c index 37da251..d6a75d7 100644 --- a/repair/rmap.c +++ b/repair/rmap.c @@ -1008,6 +1008,7 @@ rmaps_verify_btree( struct xfs_rmap_irec *rm_rec; struct xfs_rmap_irec tmp; struct xfs_perag *pag; /* per allocation group data */ + struct xfs_inode *ip = NULL; if (!xfs_sb_version_hasrmapbt(&mp->m_sb)) return 0; @@ -1016,22 +1017,47 @@ rmaps_verify_btree( do_warn(_("would rebuild corrupt rmap btrees.\n")); return 0; } + if (agno == NULLAGNUMBER && mp->m_sb.sb_rblocks == 0) { + if (rmap_record_count(mp, NULLAGNUMBER) != 0) { + do_error(_("realtime extents but no rtdev?\n")); + return -EFSCORRUPTED; + } + return 0; + } - /* Create cursors to refcount structures */ + /* Create cursors to rmap structures */ error = rmap_init_cursor(agno, &rm_cur); if (error) return error; - error = -libxfs_alloc_read_agf(mp, NULL, agno, 0, &agbp); - if (error) - goto err; + if (agno == NULLAGNUMBER) { + if (mp->m_sb.sb_rrmapino == 0 || + mp->m_sb.sb_rrmapino == NULLFSINO) { + do_warn( +_("garbage in sb_rrmapino, not checking realtime rmaps\n")); + goto err; + } - /* Leave the per-ag data "uninitialized" since we rewrite it later */ - pag = libxfs_perag_get(mp, agno); - pag->pagf_init = 0; - libxfs_perag_put(pag); + error = -libxfs_iget(mp, NULL, mp->m_sb.sb_rrmapino, 0, &ip, 0); + if (error) { + do_warn(_("%d - couldn't iget rtrmap inode.\n"), + error); + goto err; + } + mp->m_rrmapip = ip; + bt_cur = libxfs_rtrmapbt_init_cursor(mp, NULL, mp->m_rrmapip); + } else { + error = -libxfs_alloc_read_agf(mp, NULL, agno, 0, &agbp); + if (error) + goto err; + + /* Leave the per-ag data "uninitialized" since we rewrite it later */ + pag = libxfs_perag_get(mp, agno); + pag->pagf_init = 0; + libxfs_perag_put(pag); - bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, agno); + bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, agno); + } if (!bt_cur) { error = -ENOMEM; goto err; @@ -1107,6 +1133,10 @@ err: libxfs_btree_del_cursor(bt_cur, XFS_BTREE_NOERROR); if (agbp) libxfs_putbuf(agbp); + if (ip) { + IRELE(mp->m_rrmapip); + mp->m_rrmapip = NULL; + } free_slab_cursor(&rm_cur); return 0; }