From patchwork Tue Oct 30 18:03:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10661361 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C3F017DF for ; Tue, 30 Oct 2018 18:03:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87D2B2624C for ; Tue, 30 Oct 2018 18:03:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BDD12858F; Tue, 30 Oct 2018 18:03:46 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 226202880C for ; Tue, 30 Oct 2018 18:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727547AbeJaC6O (ORCPT ); Tue, 30 Oct 2018 22:58:14 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:43406 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726501AbeJaC6O (ORCPT ); Tue, 30 Oct 2018 22:58:14 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9UHreDw092529; Tue, 30 Oct 2018 18:03:43 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-2018-07-02; bh=CnTZBpJOdBCDQrXowa/mr+hpRc9uOT6FKIDjlGNB8zg=; b=0S3m4wFuWQd6DjBasJlrDgMuAfnBJpehgGtwx5fxb9abVhwNcWVBmH0p2bbbDyPP4ubn 5OR/eu00dPj/7qLXqk9AKSXxvO25FpO7QmHoPaRT402IfUXlVXjKVweBrgpNI7MdgW28 m1KpPFha0AB3K2jBkLDD+t0OUb9BeTvrFTe+mgSnS+DEW3JDTKcYGu/kbRufWVii7X3W C0YIPbCk9vAoiilCmhbQloU5Reovz+xDfvywg3VF5XjB/87aF5Q7+oFlZmyckDyOb5uL xj/E3nX+1o/h++jaC9GheWkm2mNDY/zftgZKGsNWb4DoZwazlNDvqHg80N33kh9dwO0g pw== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2ncgnqx55d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Oct 2018 18:03:42 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9UI3aHV003360 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Oct 2018 18:03:37 GMT Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w9UI3aKg005991; Tue, 30 Oct 2018 18:03:36 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 30 Oct 2018 11:03:36 -0700 Subject: [PATCH 2/3] xfs: test repair regression of dir w/ single leafn block From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 30 Oct 2018 11:03:35 -0700 Message-ID: <154092261507.14882.18255990570055324009.stgit@magnolia> In-Reply-To: <154092260885.14882.10714249211090490549.stgit@magnolia> References: <154092260885.14882.10714249211090490549.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9062 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810300152 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 Signed-off-by: Darrick J. Wong --- tests/xfs/1421 | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1421.out | 7 +++++ tests/xfs/group | 1 + 3 files changed, 78 insertions(+) create mode 100644 tests/xfs/1421 create mode 100644 tests/xfs/1421.out diff --git a/tests/xfs/1421 b/tests/xfs/1421 new file mode 100644 index 00000000..a63705bb --- /dev/null +++ b/tests/xfs/1421 @@ -0,0 +1,70 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 1421 +# +# Test for two related regressions -- first, check that repair doesn't +# repeatedly rebuild directories with a single leafn block; and check that +# repair also doesn't crash when it hits a corrupt da btree with a zero before +# pointer. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 7 15 + +_cleanup() +{ + cd / + rm -rf $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/populate +. ./common/fuzzy + +# real QA test starts here +_supported_os Linux +_supported_fs xfs +_require_scratch_xfs_fuzz_fields + +echo "Format and populate" +_scratch_populate_cached nofill > $seqres.full 2>&1 + +filter_nbrepair() { + grep rebuilding | sed -e 's/directory inode [0-9]*/directory inode XXX/g' +} + +run_repair() { + _scratch_xfs_repair > $tmp.repair 2>&1 + cat $tmp.repair >> $seqres.full + cat $tmp.repair | filter_nbrepair +} + +echo "Check leafn rebuilds" +run_repair +run_repair + +echo "Fuzz nbtree[0].before to zero" +_scratch_mount +inum=$(stat -c '%i' $SCRATCH_MNT/S_IFDIR.FMT_NODE) +blk_sz=$(_get_block_size $SCRATCH_MNT) +_scratch_unmount +leaf_offset=$(( (2 ** 35) / blk_sz )) +_scratch_xfs_fuzz_metadata_field "nbtree[0].before" "zeroes" "inode ${inum}" "dblock ${leaf_offset}" >> $seqres.full + +echo "Check nbtree[0].before repair" +run_repair +run_repair + +# success, all done +echo Done +status=0 +exit diff --git a/tests/xfs/1421.out b/tests/xfs/1421.out new file mode 100644 index 00000000..69711ab0 --- /dev/null +++ b/tests/xfs/1421.out @@ -0,0 +1,7 @@ +QA output created by 1421 +Format and populate +Check leafn rebuilds +Fuzz nbtree[0].before to zero +Check nbtree[0].before repair +rebuilding directory inode XXX +Done diff --git a/tests/xfs/group b/tests/xfs/group index de66378f..4b0552b9 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -492,3 +492,4 @@ 492 auto quick fuzz 493 auto quick fuzz 734 auto quick +1421 auto quick repair