From patchwork Wed Oct 18 23:38:01 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: 10015597 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 655D6600CC for ; Wed, 18 Oct 2017 23:38:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5641A28C2A for ; Wed, 18 Oct 2017 23:38:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B3B828C2D; Wed, 18 Oct 2017 23:38:12 +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.9 required=2.0 tests=BAYES_00, 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 24AD828C2B for ; Wed, 18 Oct 2017 23:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbdJRXiI (ORCPT ); Wed, 18 Oct 2017 19:38:08 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:38786 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751349AbdJRXiF (ORCPT ); Wed, 18 Oct 2017 19:38:05 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v9INc3KX010596 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Oct 2017 23:38:03 GMT 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 v9INc3Hk002344 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Oct 2017 23:38:03 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v9INc3Aq025543; Wed, 18 Oct 2017 23:38:03 GMT Received: from localhost (/73.25.142.12) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 18 Oct 2017 16:38:02 -0700 Subject: [PATCH 5/5] xfs: test that we don't leak inodes and dquots during failed cow recovery From: "Darrick J. Wong" To: eguan@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Wed, 18 Oct 2017 16:38:01 -0700 Message-ID: <150836988161.27213.1026779864928908354.stgit@magnolia> In-Reply-To: <150836985024.27213.3715197937819365388.stgit@magnolia> References: <150836985024.27213.3715197937819365388.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: aserv0021.oracle.com [141.146.126.233] 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 Add a couple of tests to check that we don't leak inodes or dquots if CoW recovery fails and therefore the mount fails. Signed-off-by: Darrick J. Wong --- common/rc | 1 tests/xfs/703 | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/703.out | 9 ++++ tests/xfs/704 | 90 +++++++++++++++++++++++++++++++++++++++++++ tests/xfs/704.out | 5 ++ tests/xfs/705 | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/705.out | 9 ++++ tests/xfs/group | 3 + 8 files changed, 335 insertions(+) create mode 100755 tests/xfs/703 create mode 100644 tests/xfs/703.out create mode 100755 tests/xfs/704 create mode 100644 tests/xfs/704.out create mode 100755 tests/xfs/705 create mode 100644 tests/xfs/705.out -- 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/common/rc b/common/rc index 83aaced..fe68d67 100644 --- a/common/rc +++ b/common/rc @@ -3324,6 +3324,7 @@ _check_dmesg() -e "(INFO|ERR): suspicious RCU usage" \ -e "INFO: possible circular locking dependency detected" \ -e "general protection fault:" \ + -e "BUG .* remaining" \ $seqres.dmesg if [ $? -eq 0 ]; then _dump_err "_check_dmesg: something found in dmesg (see $seqres.dmesg)" diff --git a/tests/xfs/703 b/tests/xfs/703 new file mode 100755 index 0000000..f29b843 --- /dev/null +++ b/tests/xfs/703 @@ -0,0 +1,112 @@ +#! /bin/bash +# FS QA Test No. 703 +# +# Ensure that we don't leak quota inodes when CoW recovery fails. +# +# Use xfs_fsr to inject bmap redo items in the log for a linked file and +# an unlinked file; enable quota so that we always mount with the quota +# inodes; and then corrupt the refcount btree to ensure that the CoW +# garbage collection (and therefore the mount) fail. +# +# On a subsequent mount attempt, we should be able to replay the bmap +# items for the linked and unlinked files without prematurely truncating +# the unlinked inode and without leaking the linked inode, and we should +# be able to release the quota inodes when we're aborting the mount. We +# also should not leak dquots. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017, Oracle and/or its affiliates. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- + +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 15 + +_cleanup() +{ + cd / + rm -rf "$tmp".* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr +. ./common/reflink +. ./common/inject +. ./common/quota + +# real QA test starts here +_supported_os Linux +_supported_fs xfs +_require_quota +_require_scratch_reflink +_require_cp_reflink +_require_command "$XFS_FSR_PROG" "xfs_fsr" +_require_xfs_io_error_injection "bmap_finish_one" +_require_xfs_scratch_rmapbt + +rm -f "$seqres.full" + +echo "Format and mount" +_scratch_mkfs > "$seqres.full" 2>&1 +_scratch_mount -o noquota >> "$seqres.full" 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +blksz=65536 +blks=3 +mkdir "$testdir" + +echo "Create a many-block file" +_pwrite_byte 0x62 0 $((blksz * blks)) $testdir/file1 >> $seqres.full +_pwrite_byte 0x63 0 $blksz $testdir/file2 >> $seqres.full +_reflink_range $testdir/file2 0 $testdir/file1 $blksz $blksz >> $seqres.full +_scratch_cycle_mount noquota + +echo "Inject error" +_scratch_inject_error "bmap_finish_one" + +echo "Defrag the file" +$XFS_FSR_PROG -v -d $testdir/file1 >> $seqres.full 2>&1 + +echo "FS should be shut down, touch will fail" +touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch + +echo "Remount to replay log" | tee /dev/ttyprintk +_scratch_unmount +_scratch_dump_log >> $seqres.full +_scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c 'fuzz -d recs[1].startblock ones' >> $seqres.full +_scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c p >> $seqres.full + +# Suddenly enable quota to test if we can leak the quotacheck dquots! +_scratch_mount -o quota >> $seqres.full 2>&1 +_scratch_unmount 2> /dev/null +rm -f ${RESULT_DIR}/require_scratch + +echo "See if we leak" +_test_unmount +rmmod xfs +_test_mount +_check_dmesg + +# success, all done +status=0 +exit diff --git a/tests/xfs/703.out b/tests/xfs/703.out new file mode 100644 index 0000000..d811880 --- /dev/null +++ b/tests/xfs/703.out @@ -0,0 +1,9 @@ +QA output created by 703 +Format and mount +Create a many-block file +Inject error +Defrag the file +FS should be shut down, touch will fail +touch: cannot touch 'SCRATCH_MNT/badfs': Input/output error +Remount to replay log +See if we leak diff --git a/tests/xfs/704 b/tests/xfs/704 new file mode 100755 index 0000000..6d272e1 --- /dev/null +++ b/tests/xfs/704 @@ -0,0 +1,90 @@ +#! /bin/bash +# FS QA Test No. 704 +# +# Ensure that we don't leak dquots when CoW recovery fails. +# +# Corrupt the refcount btree to ensure that the CoW garbage collection +# (and therefore the mount) fail. +# +# On a subsequent mount attempt, we should be able to release the quota +# inodes when we're aborting the mount. We also should not leak dquots. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017, Oracle and/or its affiliates. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- + +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 15 + +_cleanup() +{ + cd / + rm -rf "$tmp".* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr +. ./common/reflink +. ./common/quota + +# real QA test starts here +_supported_os Linux +_supported_fs xfs +_require_quota +_require_scratch_reflink +_require_cp_reflink + +rm -f "$seqres.full" + +echo "Format and mount" +_scratch_mkfs > "$seqres.full" 2>&1 +_scratch_mount -o quota >> "$seqres.full" 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +blksz=65536 +blks=3 +mkdir "$testdir" + +echo "Create a many-block file" +_pwrite_byte 0x62 0 $((blksz * blks)) $testdir/file1 >> $seqres.full +_pwrite_byte 0x63 0 $blksz $testdir/file2 >> $seqres.full +_reflink_range $testdir/file2 0 $testdir/file1 $blksz $blksz >> $seqres.full + +echo "Remount to check recovery" | tee /dev/ttyprintk +_scratch_unmount +_scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c 'fuzz -d recs[1].startblock ones' >> $seqres.full +_scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c p >> $seqres.full +_scratch_mount -o quota >> $seqres.full 2>&1 +_scratch_unmount 2> /dev/null +rm -f ${RESULT_DIR}/require_scratch + +echo "See if we leak" +_test_unmount +rmmod xfs +_test_mount +_check_dmesg + +# success, all done +status=0 +exit diff --git a/tests/xfs/704.out b/tests/xfs/704.out new file mode 100644 index 0000000..b237b2d --- /dev/null +++ b/tests/xfs/704.out @@ -0,0 +1,5 @@ +QA output created by 704 +Format and mount +Create a many-block file +Remount to check recovery +See if we leak diff --git a/tests/xfs/705 b/tests/xfs/705 new file mode 100755 index 0000000..752a54b --- /dev/null +++ b/tests/xfs/705 @@ -0,0 +1,106 @@ +#! /bin/bash +# FS QA Test No. 705 +# +# Ensure that we don't leak inodes when CoW recovery fails. +# +# Use xfs_fsr to inject bmap redo items in the log for a linked file and +# an unlinked file; and then corrupt the refcount btree to ensure that +# the CoW garbage collection (and therefore the mount) fail. +# +# On a subsequent mount attempt, we should be able to replay the bmap +# items for the linked and unlinked files without prematurely truncating +# the unlinked inode and without leaking the linked inode, and we should +# be able to release all the inodes when we're aborting the mount. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017, Oracle and/or its affiliates. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- + +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 15 + +_cleanup() +{ + cd / + rm -rf "$tmp".* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr +. ./common/reflink +. ./common/inject + +# real QA test starts here +_supported_os Linux +_supported_fs xfs +_require_scratch_reflink +_require_cp_reflink +_require_command "$XFS_FSR_PROG" "xfs_fsr" +_require_xfs_io_error_injection "bmap_finish_one" +_require_xfs_scratch_rmapbt + +rm -f "$seqres.full" + +echo "Format and mount" +_scratch_mkfs > "$seqres.full" 2>&1 +_scratch_mount -o noquota >> "$seqres.full" 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +blksz=65536 +blks=3 +mkdir "$testdir" + +echo "Create a many-block file" +_pwrite_byte 0x62 0 $((blksz * blks)) $testdir/file1 >> $seqres.full +_pwrite_byte 0x63 0 $blksz $testdir/file2 >> $seqres.full +_reflink_range $testdir/file2 0 $testdir/file1 $blksz $blksz >> $seqres.full +_scratch_cycle_mount noquota + +echo "Inject error" +_scratch_inject_error "bmap_finish_one" + +echo "Defrag the file" +$XFS_FSR_PROG -v -d $testdir/file1 >> $seqres.full 2>&1 + +echo "FS should be shut down, touch will fail" +touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch + +echo "Remount to replay log" | tee /dev/ttyprintk +_scratch_unmount +_scratch_dump_log >> $seqres.full +_scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c 'fuzz -d recs[1].startblock ones' >> $seqres.full +_scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c p >> $seqres.full +_scratch_mount -o noquota >> $seqres.full 2>&1 +_scratch_unmount 2> /dev/null +rm -f ${RESULT_DIR}/require_scratch + +echo "See if we leak" +_test_unmount +rmmod xfs +_test_mount +_check_dmesg + +# success, all done +status=0 +exit diff --git a/tests/xfs/705.out b/tests/xfs/705.out new file mode 100644 index 0000000..0bcd9ab --- /dev/null +++ b/tests/xfs/705.out @@ -0,0 +1,9 @@ +QA output created by 705 +Format and mount +Create a many-block file +Inject error +Defrag the file +FS should be shut down, touch will fail +touch: cannot touch 'SCRATCH_MNT/badfs': Input/output error +Remount to replay log +See if we leak diff --git a/tests/xfs/group b/tests/xfs/group index b439842..e56666b 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -431,3 +431,6 @@ 431 auto quick dangerous 432 auto quick dir metadata 433 auto quick attr +703 auto quick clone fsr +704 auto quick clone +705 auto quick clone fsr