From patchwork Tue Oct 30 18:03:28 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: 10661357 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 747C61751 for ; Tue, 30 Oct 2018 18:03:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D16A28047 for ; Tue, 30 Oct 2018 18:03:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F95E28B51; Tue, 30 Oct 2018 18:03:34 +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 0DBEF28047 for ; Tue, 30 Oct 2018 18:03:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727008AbeJaC6C (ORCPT ); Tue, 30 Oct 2018 22:58:02 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:52602 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726549AbeJaC6C (ORCPT ); Tue, 30 Oct 2018 22:58:02 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9UHrdfC138100; Tue, 30 Oct 2018 18:03:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=9A7cgzKHO3nefs/9GNyfedK3ZAXpgF/sTjmW5C4fXDU=; b=cyfm51vJudK+gxhHxQzDA9nTNtHkEYBMF9vPkSte14+c1Y0AXpTPmytIgiDD1ZIk6SP2 ppWH41+jFmuh/SoTCUiV5axnrzGEEdnHFa9MK6lWGiwqHjeOdC3jajeJqWIEJeG3k2jP QMmCCki0r1EtowiPY9GsaSHdnOuXas+ynV1yjP7tkHF7r5wxeGnxTlf4g+WZD6fB95se RH5gkQozPLp6GFC3ddgIHGrRWxUW90BYUi7nm9fM2HY0VqG0wk4NoBIQpO2iiagFKKJO ema1j+CTAgMKz/oeXfrk5q6T2AgEqmhyjFqpfKQXlo/QYj8mAWgNDD3NfaGrb9oLXZC+ fg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2nducm2tqu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Oct 2018 18:03:30 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9UI3UgX009573 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Oct 2018 18:03:30 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w9UI3Uho005923; Tue, 30 Oct 2018 18:03:30 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 30 Oct 2018 11:03:29 -0700 Subject: [PATCH 1/3] populate: create leafn dir when populating xfs filesystem 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:28 -0700 Message-ID: <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=875 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 We've had some problems lately with directories containing a single leafn directory. It turns out that the populate script doesn't create these, so teach it to do so. Signed-off-by: Darrick J. Wong --- common/populate | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/common/populate b/common/populate index 8c08f516..610425f9 100644 --- a/common/populate +++ b/common/populate @@ -136,6 +136,12 @@ _scratch_xfs_populate() { _scratch_mount blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" + crc="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep crc= | sed -e 's/^.*crc=//g' -e 's/\([0-9]*\).*$/\1/g')" + if [ $crc -eq 1 ]; then + leaf_hdr_size=64 + else + leaf_hdr_size=16 + fi leaf_lblk="$((32 * 1073741824 / blksz))" node_lblk="$((64 * 1073741824 / blksz))" @@ -171,6 +177,10 @@ _scratch_xfs_populate() { echo "+ leaf dir" __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_LEAF" "$((dblksz / 12))" + # - LEAFN + echo "+ leafn dir" + __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_LEAFN" "$(( ((dblksz - leaf_hdr_size) / 8) - 3 ))" + # - NODE echo "+ node dir" __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_NODE" "$((16 * dblksz / 40))" true @@ -433,6 +443,9 @@ __populate_check_xfs_dir() { "leaf") (test "${datab}" -eq 1 && test "${leafb}" -eq 1 && test "${freeb}" -eq 0) || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}" ;; + "leafn") + _scratch_xfs_db -x -c "inode ${inode}" -c "dblock ${leaf_lblk}" -c "p lhdr.info.hdr.magic" | egrep -q '(0x3dff|0xd2ff)' || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}" + ;; "node"|"btree") (test "${datab}" -eq 1 && test "${leafb}" -eq 1 && test "${freeb}" -eq 1) || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}" ;; @@ -508,6 +521,7 @@ _scratch_xfs_populate_check() { inline_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_INLINE")" block_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_BLOCK")" leaf_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_LEAF")" + leafn_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_LEAFN")" node_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_NODE")" btree_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_BTREE")" local_slink="$(__populate_find_inode "${SCRATCH_MNT}/S_IFLNK.FMT_LOCAL")" @@ -533,6 +547,7 @@ _scratch_xfs_populate_check() { __populate_check_xfs_dir "${inline_dir}" "inline" __populate_check_xfs_dir "${block_dir}" "block" __populate_check_xfs_dir "${leaf_dir}" "leaf" + __populate_check_xfs_dir "${leafn_dir}" "leafn" __populate_check_xfs_dir "${node_dir}" "node" __populate_check_xfs_dir "${btree_dir}" "btree" __populate_check_xfs_dformat "${btree_dir}" "btree" 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 From patchwork Tue Oct 30 18:03:41 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: 10661365 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 86F171734 for ; Tue, 30 Oct 2018 18:03:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 812982624C for ; Tue, 30 Oct 2018 18:03:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 756C0284BD; Tue, 30 Oct 2018 18:03:47 +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 E211928047 for ; Tue, 30 Oct 2018 18:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727703AbeJaC6P (ORCPT ); Tue, 30 Oct 2018 22:58:15 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:36084 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726549AbeJaC6P (ORCPT ); Tue, 30 Oct 2018 22:58:15 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9UHrg8u140638; Tue, 30 Oct 2018 18:03:44 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=QEAOqcs9IkJlqHJQ7Gl7TVwQ3PDDMEySyTWl/weFl6E=; b=itTU02cyn+Qu6elPt0IDR2FG5o+QUpmGN1LC/B/8DGNxdkmiLF9jLxTawSYSCwzufymJ oqWCG3cnEW2AL9sh4UYgTR902Br3Zdd0CCJNe3vwcfBdB8RcLdeOmoydYvlc+YY54wqL +S5nKafsEnSGfj6T6Ubqp5X3AJog+rZfLYy4e/ecZR46qz9R51vvYOX6PkY7twlnVE1P xvxuqkzFCxMvp8HdbRV/YTXKJKgF6xA2ZIzC/wXOm3EG/NIBLo69s143CV2fK4OMgTYA o74Bgz1rJnKIRIwX1hfB1fJB7t7RRJeCM9Rpi7/cbrta5oWFrU07yuMrj4ZNmSXC/BFD dA== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2120.oracle.com with ESMTP id 2ncfypx5pc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Oct 2018 18:03:44 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9UI3hMR003690 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Oct 2018 18:03:43 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w9UI3gJi027162; Tue, 30 Oct 2018 18:03:43 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 30 Oct 2018 11:03:42 -0700 Subject: [PATCH 3/3] xfs: fuzz directories containing single leafn blocks 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:41 -0700 Message-ID: <154092262132.14882.9439371379100909096.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 Test scrub, repair, and metadata verifiers on directories containing fuzzed single-leafn blocks. Signed-off-by: Darrick J. Wong --- tests/xfs/1422 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1422.out | 5 +++++ tests/xfs/1423 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1423.out | 5 +++++ tests/xfs/1424 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1424.out | 5 +++++ tests/xfs/group | 3 +++ 7 files changed, 174 insertions(+) create mode 100755 tests/xfs/1422 create mode 100644 tests/xfs/1422.out create mode 100755 tests/xfs/1423 create mode 100644 tests/xfs/1423.out create mode 100755 tests/xfs/1424 create mode 100644 tests/xfs/1424.out diff --git a/tests/xfs/1422 b/tests/xfs/1422 new file mode 100755 index 00000000..cd2cbc2a --- /dev/null +++ b/tests/xfs/1422 @@ -0,0 +1,52 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 1422 +# +# Populate a XFS filesystem and fuzz every single-leafn-format dir block field. +# Use xfs_repair to fix the corruption. +# +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 + +echo "Find single-leafn-format dir block" +_scratch_mount +inum=$(stat -c '%i' $SCRATCH_MNT/S_IFDIR.FMT_LEAFN) +blk_sz=$(_get_block_size $SCRATCH_MNT) +_scratch_unmount + +leaf_offset=$(( (2 ** 35) / blk_sz )) +echo "Fuzz single-leafn-format dir block" +_scratch_xfs_fuzz_metadata '' 'offline' "inode ${inum}" "dblock ${leaf_offset}" >> $seqres.full +echo "Done fuzzing single-leafn-format dir block" + +# success, all done +status=0 +exit diff --git a/tests/xfs/1422.out b/tests/xfs/1422.out new file mode 100644 index 00000000..76cb50a5 --- /dev/null +++ b/tests/xfs/1422.out @@ -0,0 +1,5 @@ +QA output created by 1422 +Format and populate +Find single-leafn-format dir block +Fuzz single-leafn-format dir block +Done fuzzing single-leafn-format dir block diff --git a/tests/xfs/1423 b/tests/xfs/1423 new file mode 100755 index 00000000..3220264f --- /dev/null +++ b/tests/xfs/1423 @@ -0,0 +1,52 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 1423 +# +# Populate a XFS filesystem and fuzz every single-leafn-format dir block field. +# Use xfs_scrub to fix the corruption. +# +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 + +echo "Find single-leafn-format dir block" +_scratch_mount +inum=$(stat -c '%i' $SCRATCH_MNT/S_IFDIR.FMT_LEAFN) +blk_sz=$(_get_block_size $SCRATCH_MNT) +_scratch_unmount + +leaf_offset=$(( (2 ** 35) / blk_sz )) +echo "Fuzz single-leafn-format dir block" +_scratch_xfs_fuzz_metadata '' 'online' "inode ${inum}" "dblock ${leaf_offset}" >> $seqres.full +echo "Done fuzzing single-leafn-format dir block" + +# success, all done +status=0 +exit diff --git a/tests/xfs/1423.out b/tests/xfs/1423.out new file mode 100644 index 00000000..bca6d99d --- /dev/null +++ b/tests/xfs/1423.out @@ -0,0 +1,5 @@ +QA output created by 1423 +Format and populate +Find single-leafn-format dir block +Fuzz single-leafn-format dir block +Done fuzzing single-leafn-format dir block diff --git a/tests/xfs/1424 b/tests/xfs/1424 new file mode 100755 index 00000000..c8666f5d --- /dev/null +++ b/tests/xfs/1424 @@ -0,0 +1,52 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 1424 +# +# Populate a XFS filesystem and fuzz every single-leafn-format dir block field. +# Do not fix the filesystem, to test metadata verifiers. +# +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 + +echo "Find single-leafn-format dir block" +_scratch_mount +inum=$(stat -c '%i' $SCRATCH_MNT/S_IFDIR.FMT_LEAFN) +blk_sz=$(_get_block_size $SCRATCH_MNT) +_scratch_unmount + +leaf_offset=$(( (2 ** 35) / blk_sz )) +echo "Fuzz single-leafn-format dir block" +_scratch_xfs_fuzz_metadata '' 'none' "inode ${inum}" "dblock ${leaf_offset}" >> $seqres.full +echo "Done fuzzing single-leafn-format dir block" + +# success, all done +status=0 +exit diff --git a/tests/xfs/1424.out b/tests/xfs/1424.out new file mode 100644 index 00000000..50d09f48 --- /dev/null +++ b/tests/xfs/1424.out @@ -0,0 +1,5 @@ +QA output created by 1424 +Format and populate +Find single-leafn-format dir block +Fuzz single-leafn-format dir block +Done fuzzing single-leafn-format dir block diff --git a/tests/xfs/group b/tests/xfs/group index 4b0552b9..b3afe31a 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -493,3 +493,6 @@ 493 auto quick fuzz 734 auto quick 1421 auto quick repair +1422 dangerous_fuzzers dangerous_scrub dangerous_repair +1423 dangerous_fuzzers dangerous_scrub dangerous_online_repair +1424 dangerous_fuzzers dangerous_norepair