From patchwork Fri Oct 5 00:19:14 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: 10627061 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 92FBB14BD for ; Fri, 5 Oct 2018 00:19:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 850A1292FD for ; Fri, 5 Oct 2018 00:19:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 791BE29301; Fri, 5 Oct 2018 00:19:20 +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 21604292FD for ; Fri, 5 Oct 2018 00:19:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727526AbeJEHPT (ORCPT ); Fri, 5 Oct 2018 03:15:19 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:53020 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726038AbeJEHPT (ORCPT ); Fri, 5 Oct 2018 03:15:19 -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 w950IZYF011833; Fri, 5 Oct 2018 00:19:17 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=2m3cPwsFSXWbvi/8myUCmEGc1b5ZrdcRspVAYU9p3D4=; b=EHF+ep1ADoSI3uTxIfhdd83/rYHZv1SOJgy2MT9fof1hyQq0YRzsQF3M8ZQzvhL7jWNr PkYJdUZ1eA9h8pDPSv+kIeb8JCYMPqwSraezt7C63YAAMbsoAqRKdmI4/fjpTYw2EpqB 1qytHFqRf0hWY+KZvv2aGEp8YI0I54waQ6WhO5b/Ps9SwyBuifnZ6WzzJOaPfuQ2xZh+ XRvUNXizUycTnI7NzY3gQ5S/UH4fO92DeFtkGuJxgT+65PFD3cOQRDAwqfzy1mbNDbPu UYpY2TKd0eyNHH3U42yrkCcbaEapTT5D1tbKs/O8g2Aw1t6jOOLMbc0UWFJvvknnMoLK 6Q== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2mt0tu7key-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 05 Oct 2018 00:19:17 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w950JFAI028389 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Oct 2018 00:19:16 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 w950JF9e008257; Fri, 5 Oct 2018 00:19:15 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 05 Oct 2018 00:19:15 +0000 Subject: [PATCH 1/6] generic: add bfoster's alternate reproducer From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 04 Oct 2018 17:19:14 -0700 Message-ID: <153869875404.26648.4736407885559502992.stgit@magnolia> In-Reply-To: <153869874763.26648.516233620615833277.stgit@magnolia> References: <153869874763.26648.516233620615833277.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9036 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=873 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810050002 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Add Brian Foster's alternate reproducer code for the mread-after-eof problem so that we increase the chances that either this or generic/499 will catch the problem. Signed-off-by: Darrick J. Wong --- tests/generic/707 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/707.out | 2 ++ tests/generic/group | 1 + 3 files changed, 58 insertions(+) create mode 100755 tests/generic/707 create mode 100644 tests/generic/707.out diff --git a/tests/generic/707 b/tests/generic/707 new file mode 100755 index 00000000..74193c55 --- /dev/null +++ b/tests/generic/707 @@ -0,0 +1,55 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 707 +# +# Test a specific sequence of fsx operations that causes an mmap read past +# eof to return nonzero contents. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/punch + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_scratch +_require_xfs_io_command "fcollapse" +_require_xfs_io_command "fzero" + +rm -f $seqres.full + +_scratch_mkfs_sized $((1024 * 1024 * 100)) >>$seqres.full 2>&1 +_scratch_mount + +$XFS_IO_PROG -fc "pwrite 0 100m" -c fsync $SCRATCH_MNT/file >>$seqres.full 2>&1 +rm -f $SCRATCH_MNT/file + +cat >> $tmp.fsxops << ENDL +truncate 0x0 0x1f0d6 0x380e1 +write 0x1ad87 0x6c99 0x180d6 +zero_range 0x14426 0xd3aa 0x21a20 keep_size +mapread 0x1f69a 0x2386 0x21a20 +ENDL + +victim=$SCRATCH_MNT/a +touch $victim +$here/ltp/fsx --replay-ops $tmp.fsxops $victim > $tmp.output 2>&1 || cat $tmp.output + +echo "Silence is golden" +status=0 +exit diff --git a/tests/generic/707.out b/tests/generic/707.out new file mode 100644 index 00000000..8e57a1d8 --- /dev/null +++ b/tests/generic/707.out @@ -0,0 +1,2 @@ +QA output created by 707 +Silence is golden diff --git a/tests/generic/group b/tests/generic/group index 4da0e188..06b062e1 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -508,3 +508,4 @@ 503 auto quick dax punch collapse zero 504 auto quick locks 505 shutdown auto quick metadata +707 auto quick rw collapse zero From patchwork Fri Oct 5 00:19:20 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: 10627067 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 EC3E913BB for ; Fri, 5 Oct 2018 00:19:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD4E6292FD for ; Fri, 5 Oct 2018 00:19:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8230292FF; Fri, 5 Oct 2018 00:19:32 +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 F2A212930F for ; Fri, 5 Oct 2018 00:19:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727536AbeJEHPb (ORCPT ); Fri, 5 Oct 2018 03:15:31 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:56252 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726038AbeJEHPb (ORCPT ); Fri, 5 Oct 2018 03:15:31 -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 w950JB1x178608; Fri, 5 Oct 2018 00:19:28 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=Brok3g4L1ihiKwrP/2mHS0BHbPhyCINB68uAbS0m9rA=; b=4mKcuaG08b3xxqKnwMwCj5nZyywCbMxd2tDAu8l3EXiW8S1vrx1qnRziX1KEMu4BHNh2 Zjdu1WHS+qvY7dv101LedgbXi+D6/AplmZX0cp6E+IwIR636Uj7MFmFMUiT6gUlFBCKu umSDkXwT6lWCmSk18EqwpSo+oIh1lXZY5pU8CCjIfVkOmgh566bjfIsEUcQZ3fWrzGV5 985xm/pUzbS7CzpH+arYGLnwQvXlOtmw85PLgvbke/Q5tOczpOhRuCVZolBNLD1XW9ky 2gKbpLnrrrPDgvcV8a8nVF5/vy7RSVoF6xSYgLCZkS7cpQUmR9hGX0P1cGntUBPeZMq2 Uw== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2mt21rfgx9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 05 Oct 2018 00:19:28 +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 w950JMrM004413 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Oct 2018 00:19:22 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w950JLeq008335; Fri, 5 Oct 2018 00:19:22 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 05 Oct 2018 00:19:21 +0000 Subject: [PATCH 2/6] xfs: test mount time summary counter check and fix From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 04 Oct 2018 17:19:20 -0700 Message-ID: <153869876040.26648.11302951509500617148.stgit@magnolia> In-Reply-To: <153869874763.26648.516233620615833277.stgit@magnolia> References: <153869874763.26648.516233620615833277.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9036 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 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-1810050002 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Tests to ensure that the xfs mount code can detect obviously bad fs summary counters at mount time and fix them. Signed-off-by: Darrick J. Wong --- tests/xfs/722 | 58 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/722.out | 4 +++ tests/xfs/723 | 58 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/723.out | 4 +++ tests/xfs/724 | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/724.out | 4 +++ tests/xfs/group | 3 ++ 7 files changed, 197 insertions(+) create mode 100755 tests/xfs/722 create mode 100644 tests/xfs/722.out create mode 100755 tests/xfs/723 create mode 100644 tests/xfs/723.out create mode 100755 tests/xfs/724 create mode 100644 tests/xfs/724.out diff --git a/tests/xfs/722 b/tests/xfs/722 new file mode 100755 index 00000000..1012bd58 --- /dev/null +++ b/tests/xfs/722 @@ -0,0 +1,58 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle. All Rights Reserved. +# +# FS QA Test 722 +# +# Test detection & fixing of bad summary block counts at mount time. +# +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 -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_scratch + +echo "Format and mount" +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount >> $seqres.full 2>&1 +echo "test file" > $SCRATCH_MNT/testfile + +echo "Fuzz fdblocks" +_scratch_unmount +dblocks=$(_scratch_xfs_get_metadata_field dblocks 'sb 0') +_scratch_xfs_set_metadata_field fdblocks $((dblocks * 2)) 'sb 0' > $seqres.full 2>&1 + +echo "Detection and Correction" +_scratch_mount >> $seqres.full 2>&1 +avail=$(stat -c '%a' -f $SCRATCH_MNT) +total=$(stat -c '%b' -f $SCRATCH_MNT) +echo "avail: $avail" >> $seqres.full +echo "total: $total" >> $seqres.full +test "$avail" -gt "$total" && echo "free space bad: $avail > $total" + +# success, all done +status=0 +exit diff --git a/tests/xfs/722.out b/tests/xfs/722.out new file mode 100644 index 00000000..8d1327b7 --- /dev/null +++ b/tests/xfs/722.out @@ -0,0 +1,4 @@ +QA output created by 722 +Format and mount +Fuzz fdblocks +Detection and Correction diff --git a/tests/xfs/723 b/tests/xfs/723 new file mode 100755 index 00000000..c068e496 --- /dev/null +++ b/tests/xfs/723 @@ -0,0 +1,58 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle. All Rights Reserved. +# +# FS QA Test 723 +# +# Test detection & fixing of bad summary inode counts at mount time. +# +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 -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_scratch + +echo "Format and mount" +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount >> $seqres.full 2>&1 +echo "test file" > $SCRATCH_MNT/testfile + +echo "Fuzz ifree" +_scratch_unmount +icount=$(_scratch_xfs_get_metadata_field icount 'sb 0') +_scratch_xfs_set_metadata_field ifree $((icount * 2)) 'sb 0' > $seqres.full 2>&1 + +echo "Detection and Correction" +_scratch_mount >> $seqres.full 2>&1 +avail=$(stat -c '%d' -f $SCRATCH_MNT) +total=$(stat -c '%c' -f $SCRATCH_MNT) +echo "avail: $avail" >> $seqres.full +echo "total: $total" >> $seqres.full +test "$avail" -gt "$total" && echo "free inodes bad: $avail > $total" + +# success, all done +status=0 +exit diff --git a/tests/xfs/723.out b/tests/xfs/723.out new file mode 100644 index 00000000..e825855a --- /dev/null +++ b/tests/xfs/723.out @@ -0,0 +1,4 @@ +QA output created by 723 +Format and mount +Fuzz ifree +Detection and Correction diff --git a/tests/xfs/724 b/tests/xfs/724 new file mode 100755 index 00000000..f5e44fb6 --- /dev/null +++ b/tests/xfs/724 @@ -0,0 +1,66 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle. All Rights Reserved. +# +# FS QA Test 724 +# +# Test detection & fixing of bad summary block counts at mount time. +# Corrupt the AGFs to test mount failure when mount-fixing fails. +# +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 -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_scratch_nocheck + +echo "Format and mount" +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount >> $seqres.full 2>&1 +echo "test file" > $SCRATCH_MNT/testfile + +echo "Fuzz fdblocks and btreeblks" +_scratch_unmount +dblocks=$(_scratch_xfs_get_metadata_field dblocks 'sb 0') +_scratch_xfs_set_metadata_field fdblocks $((dblocks * 2)) 'sb 0' > $seqres.full 2>&1 + +aglen=$(_scratch_xfs_get_metadata_field length 'agf 0') +_scratch_xfs_set_metadata_field btreeblks $aglen 'agf 0' > $seqres.full 2>&1 + +echo "Detection and Correction" +if _try_scratch_mount >> $seqres.full 2>&1; then + echo "mount should have failed" + avail=$(stat -c '%a' -f $SCRATCH_MNT) + total=$(stat -c '%b' -f $SCRATCH_MNT) + echo "avail: $avail" >> $seqres.full + echo "total: $total" >> $seqres.full + test "$avail" -gt "$total" && echo "free space bad: $avail > $total" + _scratch_unmount +fi +_scratch_xfs_repair -n >> $seqres.full 2>&1 && echo "repair didn't find fuzz?" + +# success, all done +status=0 +exit diff --git a/tests/xfs/724.out b/tests/xfs/724.out new file mode 100644 index 00000000..6571f9ed --- /dev/null +++ b/tests/xfs/724.out @@ -0,0 +1,4 @@ +QA output created by 724 +Format and mount +Fuzz fdblocks and btreeblks +Detection and Correction diff --git a/tests/xfs/group b/tests/xfs/group index 821bf2ac..28074f07 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -488,3 +488,6 @@ 488 dangerous_fuzzers dangerous_norepair 489 dangerous_fuzzers dangerous_norepair 490 auto quick +722 auto quick fuzz +723 auto quick fuzz +724 auto quick fuzz From patchwork Fri Oct 5 00:19:26 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: 10627073 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 ED3381926 for ; Fri, 5 Oct 2018 00:19:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF693292FD for ; Fri, 5 Oct 2018 00:19:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3D2B29301; Fri, 5 Oct 2018 00:19:37 +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 91BEC292FD for ; Fri, 5 Oct 2018 00:19:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727551AbeJEHPh (ORCPT ); Fri, 5 Oct 2018 03:15:37 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:53298 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726038AbeJEHPh (ORCPT ); Fri, 5 Oct 2018 03:15:37 -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 w950JY5b012334; Fri, 5 Oct 2018 00:19:34 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=OTfSOYTrp5qzQ2AxAJFohGWpTSraA72VZT8zy1Gaq8w=; b=X0XH2+jSUTfvintBzKQ4BwXeV2pBWmBTgHO/aM33222yVe8CJmR3+nbmWJUzTUZNJ6JZ PS+yOiHQW66tPulPWO+T0FMDE+x+EUJEeDP/T5nbQfF2twACTALt+dSSB9o/riPqgYel nYe1duu8zfzkgxWqb87XX5NpkIN7ulHIkGT+0KCVhpCbVHiydS/ZBU98RAWbaTIggS0V BJdd1EyVxNgz4Tu6vr69HGcWnZpfkuX8xDaMD7arljeQBjCUlq8laLheUDIi6fDk90Jr l3L/iE8d2PWfUwu0zOYfi0cS2pZE6NxdxAS29jRIf60huwTx+FT5lgdRYr7x73qWeVu8 ww== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2mt0tu7kfn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 05 Oct 2018 00:19:34 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w950JSk6016159 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Oct 2018 00:19:28 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w950JSnC032233; Fri, 5 Oct 2018 00:19:28 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 05 Oct 2018 00:19:27 +0000 Subject: [PATCH 3/6] xfs/189: skip 'barrier' mount option test on newer kernels From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 04 Oct 2018 17:19:26 -0700 Message-ID: <153869876687.26648.3788433504474045378.stgit@magnolia> In-Reply-To: <153869874763.26648.516233620615833277.stgit@magnolia> References: <153869874763.26648.516233620615833277.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9036 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=773 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810050002 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Starting in Linux 4.19 the 'barrier' and 'nobarrier' mount options were removed. If mount complains about a bad option when we remount with 'barrier', just skip the test. Signed-off-by: Darrick J. Wong --- tests/xfs/189 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/xfs/189 b/tests/xfs/189 index c1c52a22..2a2682ef 100755 --- a/tests/xfs/189 +++ b/tests/xfs/189 @@ -165,7 +165,19 @@ _test_remount_barrier() echo # mention barrier explicitly even if it's currently the default just to be sure - _try_scratch_mount -o barrier + _try_scratch_mount -o barrier > $tmp.barriermount 2>&1 + + # If the kernel doesn't recognize 'barrier' as a mount option then + # just fake the output. The barrier option was removed in 4.19. + if grep -q "bad option" $tmp.barriermount; then + cat << ENDL +SCRATCH_DEV on SCRATCH_MNT type xfs (rw) +SCRATCH_DEV on SCRATCH_MNT type xfs (rw,nobarrier) +SCRATCH_DEV on SCRATCH_MNT type xfs (rw) +ENDL + return + fi + [ $? -eq 0 ] || echo "mount failed unexpectedly!" _check_mount rw From patchwork Fri Oct 5 00:19:33 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: 10627079 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 C862E1926 for ; Fri, 5 Oct 2018 00:19:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAC2B292FD for ; Fri, 5 Oct 2018 00:19:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEC3629301; Fri, 5 Oct 2018 00:19:43 +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 6AEF9292FD for ; Fri, 5 Oct 2018 00:19:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727564AbeJEHPn (ORCPT ); Fri, 5 Oct 2018 03:15:43 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:56414 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726038AbeJEHPn (ORCPT ); Fri, 5 Oct 2018 03:15:43 -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 w950JeD5179011; Fri, 5 Oct 2018 00:19:40 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=JjIXCO9y0z2w1NFGAOSESk+TrgIEmCz5t/NI0GebQr4=; b=zPhSOcfVeH9tSG9t5XL3126ltf5VN+FTjKVCOVAo3tJf/LJersP3XURxPsq/0gh9fpDz 4s01M83Y1vZmpGMxhJsP654pReTcd7SesA804IVFNseDyqMJp0kW2f5RCqEwCM8tHSA8 QWXB0A+r8stLb6fiYwaaxQe1i+OrhmlyNsk/SDJP3W/8ot0z3U1AdSb1MlzeXb7yZE/x meun5M6bmKY+FrLLfmj4xS7DqPHGnF1xrhJwTW7tUeFOWNaulFhlYVN/wmbNHYqrgE1C EU4eUcw8xq+oyPTN4Utz2MxPc8a/phA6zN5Imyqhw5obyok2uBxthGbZ5IJdrqZOsQNY 0g== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2mt21rfgxk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 05 Oct 2018 00:19:40 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w950JYD3004850 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Oct 2018 00:19:34 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w950JYYF030420; Fri, 5 Oct 2018 00:19:34 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 05 Oct 2018 00:19:34 +0000 Subject: [PATCH 4/6] xfs/270: use _scratch_xfs_set_metadata_field to fuzz rocompat bits From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 04 Oct 2018 17:19:33 -0700 Message-ID: <153869877319.26648.6762297729048228417.stgit@magnolia> In-Reply-To: <153869874763.26648.516233620615833277.stgit@magnolia> References: <153869874763.26648.516233620615833277.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9036 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=756 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810050002 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Use the helper to set the metadata field so that we can bypass write verifier checks. Signed-off-by: Darrick J. Wong Reviewed-by: Xiao Yang --- tests/xfs/270 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/xfs/270 b/tests/xfs/270 index da66bc33..fb72ba7c 100755 --- a/tests/xfs/270 +++ b/tests/xfs/270 @@ -44,8 +44,8 @@ _scratch_mkfs_xfs >>$seqres.full 2>&1 # set the highest bit of features_ro_compat, use it as an unknown # feature bit. If one day this bit become known feature, please # change this case. -$XFS_DB_PROG -x -c "sb 0" -c "write -d features_ro_compat $((2**31))" \ - $SCRATCH_DEV | grep -v "Allowing write of corrupted data" +_scratch_xfs_set_metadata_field "features_ro_compat" "$((2**31))" "sb 0" | \ + grep 'features_ro_compat' # rw mount with unknown ro-compat feature should fail echo "rw mount test" From patchwork Fri Oct 5 00:19:39 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: 10627083 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 D27F2175A for ; Fri, 5 Oct 2018 00:19:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4FF1292FD for ; Fri, 5 Oct 2018 00:19:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B911029308; Fri, 5 Oct 2018 00:19:45 +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 6FE6D29301 for ; Fri, 5 Oct 2018 00:19:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727576AbeJEHPp (ORCPT ); Fri, 5 Oct 2018 03:15:45 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:53414 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726038AbeJEHPo (ORCPT ); Fri, 5 Oct 2018 03:15:44 -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 w950IZ9A011832; Fri, 5 Oct 2018 00:19:41 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=0bt/fmCFqhNkDIHtlpG8I+XOH/dsZRELvl98UzH8UvM=; b=C2vz+yDRGiHYwNDHoCivR2pCJwqjL3otSnxE35dTgVOll8mOAEU7iJcbE3hZV8Kn1c0Q A6v1MGwL3iHJlZI+gQVbofCybZ+mqTu2Nm3yUk39OR6Fvyl9Pv1HwVL/rW2soxQvQjEF RVoKbzhe0Xv5Hcw7VFxQ1ib199abBcMVTQ/4qMq1MyujG6jSRcPFMwq2+s9kvHtnvx2F 3L5RCNc2l8V0H2LLu+ac/m1CeLCP9IVJsVMagTp00sE2rAGPUPmPn12L8eof0Ght8lJm ois+ofDoFu1fvpIJpoDWt8szMMwMomXqrXCxcosR3l94LZnDn1Kl6mKp87DiQcAVAHv6 og== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2mt0tu7kfs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 05 Oct 2018 00:19:41 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w950JfAn016802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Oct 2018 00:19:41 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w950Jeul009042; Fri, 5 Oct 2018 00:19:41 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 04 Oct 2018 17:19:40 -0700 Subject: [PATCH 5/6] xfs/288: shut up verifier error From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 04 Oct 2018 17:19:39 -0700 Message-ID: <153869877948.26648.4238107405182797711.stgit@magnolia> In-Reply-To: <153869874763.26648.516233620615833277.stgit@magnolia> References: <153869874763.26648.516233620615833277.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9036 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=744 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810050002 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Ignore the verifier errors when we fuzz hdr.count to zero. Signed-off-by: Darrick J. Wong --- tests/xfs/288 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xfs/288 b/tests/xfs/288 index c6821909..13ba3057 100755 --- a/tests/xfs/288 +++ b/tests/xfs/288 @@ -62,7 +62,7 @@ _scratch_xfs_set_metadata_field "hdr.count" "0" \ # verify current xfs_db write command can set hdr.count to 0. Old xfsprogs # can't do that on v5 filesystems. count=$(_scratch_xfs_get_metadata_field "hdr.count" \ - "inode $inum" "ablock 0") + "inode $inum" "ablock 0" 2> /dev/null) if [ "$count" != "0" ]; then _notrun "xfs_db can't set attr hdr.count to 0" fi From patchwork Fri Oct 5 00:19:45 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: 10627091 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 2B1EB1926 for ; Fri, 5 Oct 2018 00:19:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D4FD292FD for ; Fri, 5 Oct 2018 00:19:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 118AC292FF; Fri, 5 Oct 2018 00:19:54 +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 2753C29301 for ; Fri, 5 Oct 2018 00:19:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727581AbeJEHPx (ORCPT ); Fri, 5 Oct 2018 03:15:53 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:52060 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727557AbeJEHPx (ORCPT ); Fri, 5 Oct 2018 03:15:53 -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 w950Ib0J029338; Fri, 5 Oct 2018 00:19:48 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=qMPeFiwGgkbbuYMoQH2tkNYJY+dvhKerE8CucvIlZw0=; b=aaCVBO/seNnHK0ZtgqnsTmst5ko0ct9RkrJg1m+rgoeTmjALHcw5jHInbvtrImxOUcac a5sWVy0bU85R4Sk/CyPY6ueHqQ044WGUAYH5YxDa1sinp6zCIbBSC/BgAY7ynX783PcW BX1MPfg0+2pCHfZVBxhpj1epzSHx5LrmrNuSQT6LpiF3fyxV8R2dkKkkp4S95zvfNWMo Qq+v6xgL8NZu0f3/rLr6vCYr+NJNU0OgzFu58a8ple2FnzdY41LUbqt7tHHW2KgmjnnO DFKrpWdQur4Bra9OS54kuHmp5zHU6k7w4jNnuFvSrLg0KRHdZ0EUBLyLU+NTW0aOxX25 Tg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2120.oracle.com with ESMTP id 2mt1bqfhx5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 05 Oct 2018 00:19:48 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w950Jlqf005670 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Oct 2018 00:19:47 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w950JlIS030505; Fri, 5 Oct 2018 00:19:47 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 05 Oct 2018 00:19:46 +0000 Subject: [PATCH 6/6] generic: test reflink side effects From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 04 Oct 2018 17:19:45 -0700 Message-ID: <153869878588.26648.667247878682671113.stgit@magnolia> In-Reply-To: <153869874763.26648.516233620615833277.stgit@magnolia> References: <153869874763.26648.516233620615833277.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9036 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 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-1810050002 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Test that ctime gets updated and suid is cleared when we reflink. Ensure we can't reflink about RLIMIT_FSIZE. Signed-off-by: Darrick J. Wong --- tests/generic/934 | 63 ++++++++++++++++++++++++++++++++++++++ tests/generic/934.out | 2 + tests/generic/935 | 48 +++++++++++++++++++++++++++++ tests/generic/935.out | 2 + tests/generic/936 | 70 ++++++++++++++++++++++++++++++++++++++++++ tests/generic/936.out | 5 +++ tests/generic/937 | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/937.out | 12 +++++++ tests/generic/group | 4 ++ 9 files changed, 287 insertions(+) create mode 100755 tests/generic/934 create mode 100644 tests/generic/934.out create mode 100755 tests/generic/935 create mode 100644 tests/generic/935.out create mode 100755 tests/generic/936 create mode 100644 tests/generic/936.out create mode 100755 tests/generic/937 create mode 100644 tests/generic/937.out diff --git a/tests/generic/934 b/tests/generic/934 new file mode 100755 index 00000000..ec7ad092 --- /dev/null +++ b/tests/generic/934 @@ -0,0 +1,63 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 934 +# +# Ensure that ctime is updated and capabilities are cleared when reflinking. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_scratch_reflink +_require_command "$GETCAP_PROG" getcap +_require_command "$SETCAP_PROG" setcap + +rm -f $seqres.full + +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount + +$XFS_IO_PROG -f -c "pwrite -S 0x18 0 1m" $SCRATCH_MNT/foo >>$seqres.full +$XFS_IO_PROG -f -c "pwrite -S 0x20 0 1m" $SCRATCH_MNT/bar >>$seqres.full + +$SETCAP_PROG cap_setgid,cap_setuid+ep $SCRATCH_MNT/bar + +before_cap="$($GETCAP_PROG -v $SCRATCH_MNT/bar)" +before_ctime="$(stat -c '%z' $SCRATCH_MNT/bar)" + +sleep 1 + +$XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo" $SCRATCH_MNT/bar >> $seqres.full 2>&1 +#trace-cmd record -p function_graph -l 'file_remove_privs' -g 'file_remove_privs' $XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo" $SCRATCH_MNT/bar >> $seqres.full 2>&1 + +after_cap="$($GETCAP_PROG -v $SCRATCH_MNT/bar)" +after_ctime="$(stat -c '%z' $SCRATCH_MNT/bar)" + +echo "$before_cap $before_ctime" >> $seqres.full +echo "$after_cap $after_ctime" >> $seqres.full + +test "$before_cap" != "$after_cap" || echo "Expected capabilities to drop." +test "$before_ctime" != "$after_ctime" || echo "Expected ctime to change." + +echo Silence is golden. +status=0 +exit diff --git a/tests/generic/934.out b/tests/generic/934.out new file mode 100644 index 00000000..98f0bb3f --- /dev/null +++ b/tests/generic/934.out @@ -0,0 +1,2 @@ +QA output created by 934 +Silence is golden. diff --git a/tests/generic/935 b/tests/generic/935 new file mode 100755 index 00000000..3b0eaa95 --- /dev/null +++ b/tests/generic/935 @@ -0,0 +1,48 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 935 +# +# Ensure that file size resource limits are respected when reflinking. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_scratch_reflink + +rm -f $seqres.full + +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount + +chmod a+rwx $SCRATCH_MNT +$XFS_IO_PROG -f -c "pwrite -S 0x18 0 1m" $SCRATCH_MNT/foo >>$seqres.full +su -s/bin/bash - $qa_user -c "ulimit -f 64 ; $XFS_IO_PROG -f -c \"reflink $SCRATCH_MNT/foo\" $SCRATCH_MNT/bar" >> $seqres.full 2>&1 + +sz="$(stat -c '%s' $SCRATCH_MNT/bar)" +if [ "$sz" -ne 0 ] && [ "$sz" -ne 65536 ]; then + echo "Oddball file size $sz??" +fi + +echo Silence is golden. +status=0 +exit diff --git a/tests/generic/935.out b/tests/generic/935.out new file mode 100644 index 00000000..adb5e92a --- /dev/null +++ b/tests/generic/935.out @@ -0,0 +1,2 @@ +QA output created by 935 +Silence is golden. diff --git a/tests/generic/936 b/tests/generic/936 new file mode 100755 index 00000000..eacf9b5e --- /dev/null +++ b/tests/generic/936 @@ -0,0 +1,70 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 936 +# +# Ensure that reflinking into a file well beyond EOF zeroes everything between +# the old EOF and the start of the newly linked chunk. This is an adaptation +# of a reproducer script that Eric Sandeen formulated from a stale data +# exposure bug uncovered by shared/010. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_scratch_reflink + +rm -f $seqres.full + +# Fill disk with a well known pattern so that stale data exposure becomes much +# more obvious. +$XFS_IO_PROG -c "pwrite -S 0x58 -b 1m 0 300m" $SCRATCH_DEV >> $seqres.full +_scratch_mkfs_sized $((300 * 1048576)) >>$seqres.full 2>&1 +_scratch_mount + +DONOR1=$SCRATCH_MNT/a +TARGET=$SCRATCH_MNT/b +blksz=65536 + +$XFS_IO_PROG -f -c "pwrite -S 0x72 0 $blksz" $DONOR1 >> $seqres.full + +$XFS_IO_PROG -f \ + -c "falloc -k $((blksz*2)) $blksz" \ + -c "pwrite -S 0x57 $((blksz*16)) 8192" \ + -c "fdatasync" \ + -c 'stat' \ + -c "reflink $DONOR1 0 $((blksz*17)) $blksz" \ + $TARGET >> $seqres.full + +od -tx1 -Ad -c $TARGET >> $seqres.full +${FILEFRAG_PROG} -v $TARGET >> $seqres.full +md5sum $DONOR1 | _filter_scratch +md5sum $TARGET | _filter_scratch + +_scratch_cycle_mount + +od -tx1 -Ad -c $TARGET >> $seqres.full +${FILEFRAG_PROG} -v $TARGET >> $seqres.full +md5sum $DONOR1 | _filter_scratch +md5sum $TARGET | _filter_scratch + +status=0 +exit diff --git a/tests/generic/936.out b/tests/generic/936.out new file mode 100644 index 00000000..73685490 --- /dev/null +++ b/tests/generic/936.out @@ -0,0 +1,5 @@ +QA output created by 936 +34a4daf52c562253a2f6108c5123605a SCRATCH_MNT/a +4fe4dfe3d2244bd380adcefdc5006e37 SCRATCH_MNT/b +34a4daf52c562253a2f6108c5123605a SCRATCH_MNT/a +4fe4dfe3d2244bd380adcefdc5006e37 SCRATCH_MNT/b diff --git a/tests/generic/937 b/tests/generic/937 new file mode 100755 index 00000000..e3a94dbb --- /dev/null +++ b/tests/generic/937 @@ -0,0 +1,81 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018, Oracle and/or its affiliates. All Rights Reserved. +# +# FS QA Test No. 937 +# +# Ensuring that we cannot dedupe non-matching parts of files: +# - Fail to dedupe non-identical parts of two different files +# - Check that nothing changes in either file +# +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.* $testdir +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink + +# real QA test starts here +_supported_os Linux +_require_test_dedupe + +rm -f $seqres.full + +testdir=$TEST_DIR/test-$seq +rm -rf $testdir +mkdir $testdir + +echo "Create the original files" +blksz=65536 +_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file1 >> $seqres.full +_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file2 >> $seqres.full +_pwrite_byte 0x62 $(((blksz * 6) - 33)) 1 $testdir/file2 >> $seqres.full +_test_cycle_mount + +md5sum $testdir/file1 | _filter_test_dir +md5sum $testdir/file2 | _filter_test_dir + +_compare_range $testdir/file1 0 $testdir/file2 0 "$((blksz * 8))" \ + || echo "Files 1-2 do not match (intentional)" + +echo "(partial) dedupe the middle blocks together" +free_before=$(stat -f -c '%a' $testdir) +_dedupe_range $testdir/file1 $((blksz * 4)) $testdir/file2 \ + $((blksz * 4)) $((blksz * 2)) 2>&1 | _filter_xfs_io_numbers | _filter_dedupe_error +_test_cycle_mount +${FILEFRAG_PROG} -v $testdir/file1 >> $seqres.full +${FILEFRAG_PROG} -v $testdir/file2 >> $seqres.full +free_after=$(stat -f -c '%a' $testdir) +echo "freesp changed by $free_before -> $free_after" >> $seqres.full + +echo "Compare sections" +md5sum $testdir/file1 | _filter_test_dir +md5sum $testdir/file2 | _filter_test_dir + +_compare_range $testdir/file1 0 $testdir/file2 0 $((blksz * 4)) \ + || echo "Start sections do not match (error)" + +_compare_range $testdir/file1 $((blksz * 4)) $testdir/file2 \ + $((blksz * 4)) $((blksz * 2)) \ + || echo "Middle sections do not match (intentional)" + +_compare_range $testdir/file1 $((blksz * 6)) $testdir/file2 \ + $((blksz * 6)) $((blksz * 2)) \ + || echo "End sections do not match (error)" + +# success, all done +status=0 +exit diff --git a/tests/generic/937.out b/tests/generic/937.out new file mode 100644 index 00000000..496975d6 --- /dev/null +++ b/tests/generic/937.out @@ -0,0 +1,12 @@ +QA output created by 937 +Create the original files +35ac8d7917305c385c30f3d82c30a8f6 TEST_DIR/test-937/file1 +39578c21e2cb9f6049b1cf7fc7be12a6 TEST_DIR/test-937/file2 +Files 1-2 do not match (intentional) +(partial) dedupe the middle blocks together +deduped XXXX/XXXX bytes at offset XXXX +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Compare sections +35ac8d7917305c385c30f3d82c30a8f6 TEST_DIR/test-937/file1 +39578c21e2cb9f6049b1cf7fc7be12a6 TEST_DIR/test-937/file2 +Middle sections do not match (intentional) diff --git a/tests/generic/group b/tests/generic/group index 06b062e1..ef08c0de 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -509,3 +509,7 @@ 504 auto quick locks 505 shutdown auto quick metadata 707 auto quick rw collapse zero +934 auto quick clone +935 auto quick clone +936 auto quick clone +937 auto quick dedupe clone