From patchwork Sat Dec 23 00:44:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10131297 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 DA9546056E for ; Sat, 23 Dec 2017 00:44:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC42A2A24E for ; Sat, 23 Dec 2017 00:44:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0F372A256; Sat, 23 Dec 2017 00:44:28 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BBEC2A258 for ; Sat, 23 Dec 2017 00:44:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757132AbdLWAo1 (ORCPT ); Fri, 22 Dec 2017 19:44:27 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:60008 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757127AbdLWAo1 (ORCPT ); Fri, 22 Dec 2017 19:44:27 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBN0gDht097220 for ; Sat, 23 Dec 2017 00:44:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2017-10-26; bh=cYSOTdwORRnCUKF8svb8FsAnIlE8OO9f2haYR1Cr7V4=; b=DXngxKTvE1VMcGaUYLUz48zX1BvZFNT8Pw5w5pQIthFHo5fu5zQlHTk9iCcx0JUrimFp pKx/o2rNgBQmMPjbfl5Nyaf6/Jiky+eihiZ01T5RVIlVWRY3J8mPZtFSmQFe7y9sOe2H xWobv95+dhLQ63s1iEPoW/75n8BERsVBQsX0NukkGHT4B5k33MULvUP3gg7kPM3SV6FN oZ6PZCT889w1yUG/8lqQaoDW54b7WXpltHQBbqkNPYn9OCmjIdT+VsFPDpg45DNcaVEU 10gXb0+juK+66rlwp+LCHW3pbOSCN9E13d2quIarVASNkpCU+uB+N1aGOMNoP3r/SJ+e sg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2f1ct0r0ej-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 23 Dec 2017 00:44:26 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vBN0iPXO031145 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Sat, 23 Dec 2017 00:44:25 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id vBN0iPHE028339 for ; Sat, 23 Dec 2017 00:44:25 GMT Received: from localhost (/10.159.131.46) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 22 Dec 2017 16:44:25 -0800 Subject: [PATCH 15/21] xfs: cross-reference bnobt records with cntbt From: "Darrick J. Wong" To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Fri, 22 Dec 2017 16:44:24 -0800 Message-ID: <151398986464.18741.745289369411639057.stgit@magnolia> In-Reply-To: <151398977028.18741.12031215574014508438.stgit@magnolia> References: <151398977028.18741.12031215574014508438.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8753 signatures=668650 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=942 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712230008 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Scrub should make sure that each bnobt record has a corresponding cntbt record. Signed-off-by: Darrick J. Wong --- fs/xfs/scrub/agheader.c | 26 ++++++++++++++++++++++++++ fs/xfs/scrub/alloc.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) -- 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/scrub/agheader.c b/fs/xfs/scrub/agheader.c index 3bb0f96..e87022f 100644 --- a/fs/xfs/scrub/agheader.c +++ b/fs/xfs/scrub/agheader.c @@ -444,6 +444,7 @@ xfs_scrub_agf_xref( struct xfs_btree_cur **pcur; xfs_agblock_t bno; xfs_extlen_t blocks; + int have; int error; bno = XFS_AGF_BLOCK(mp); @@ -465,6 +466,31 @@ xfs_scrub_agf_xref( xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agf_bp); } + /* Cross-reference with the cntbt. */ + pcur = &sc->sa.cnt_cur; + while (*pcur) { + xfs_agblock_t agbno; + + /* Any freespace at all? */ + error = xfs_alloc_lookup_le(*pcur, 0, -1U, &have); + if (!xfs_scrub_should_xref(sc, &error, pcur)) + break; + if (!have) { + if (agf->agf_freeblks != be32_to_cpu(0)) + xfs_scrub_block_xref_set_corrupt(sc, + sc->sa.agf_bp); + break; + } + + /* Check agf_longest */ + error = xfs_alloc_get_rec(*pcur, &agbno, &blocks, &have); + if (!xfs_scrub_should_xref(sc, &error, pcur)) + break; + if (!have || blocks != be32_to_cpu(agf->agf_longest)) + xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agf_bp); + break; + } + /* scrub teardown will take care of sc->sa for us */ } diff --git a/fs/xfs/scrub/alloc.c b/fs/xfs/scrub/alloc.c index 3d6f8cc..9a28e3d 100644 --- a/fs/xfs/scrub/alloc.c +++ b/fs/xfs/scrub/alloc.c @@ -31,6 +31,7 @@ #include "xfs_sb.h" #include "xfs_alloc.h" #include "xfs_rmap.h" +#include "xfs_alloc.h" #include "scrub/xfs_scrub.h" #include "scrub/scrub.h" #include "scrub/common.h" @@ -57,6 +58,42 @@ xfs_scrub_allocbt_xref( xfs_agblock_t bno, xfs_extlen_t len) { + struct xfs_btree_cur **pcur; + struct xfs_scrub_ag *psa = &sc->sa; + xfs_agblock_t fbno; + xfs_extlen_t flen; + int has_otherrec; + int error; + + /* + * Ensure there's a corresponding cntbt/bnobt record matching + * this bnobt/cntbt record, respectively. + */ + if (sc->sm->sm_type == XFS_SCRUB_TYPE_BNOBT) + pcur = &psa->cnt_cur; + else + pcur = &psa->bno_cur; + while (*pcur) { + error = xfs_alloc_lookup_le(*pcur, bno, len, &has_otherrec); + if (!xfs_scrub_should_xref(sc, &error, pcur)) + break; + if (!has_otherrec) { + xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0); + break; + } + + error = xfs_alloc_get_rec(*pcur, &fbno, &flen, &has_otherrec); + if (!xfs_scrub_should_xref(sc, &error, pcur)) + break; + if (!has_otherrec) { + xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0); + break; + } + + if (fbno != bno || flen != len) + xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0); + break; + } } /* Scrub a bnobt/cntbt record. */