From patchwork Thu Oct 8 15:05:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11823155 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 197A01752 for ; Thu, 8 Oct 2020 15:05:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E672121789 for ; Thu, 8 Oct 2020 15:05:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="BuKBjP+G" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730819AbgJHPF5 (ORCPT ); Thu, 8 Oct 2020 11:05:57 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:47374 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729833AbgJHPF5 (ORCPT ); Thu, 8 Oct 2020 11:05:57 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 098F0FDd158194; Thu, 8 Oct 2020 15:05:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=xw7i5l+Ibg11/qQXDO8qXOvi0UlQywT6rtY/GcQXrJY=; b=BuKBjP+GlIuyYSgEcjFQe98WbV9HE0VjMuPf8+/GFMIZnMmySrHSOzZVGuYT+ptQzSLH FXL4TRJoHHYPh8NufajmkvTX3UYCPnsFmQGNMjdAr8vbQnhP4J+EeXcdfJ2pQzpsR8kd tpG4fuN5U2anDmU3n9M1WKJ9GRygH3bvWWtiFkQgQkLwvEn7od9zXQ+aCn47fBkxhxV7 jqy0RdqMA92rf2o8RGmIV1GJZNbhOOKGTYF5NRKMtudTkCNbIc4M8an15K/ZBfyG3c+m sTZEqlDvF0OLGMBvODqErfJBIED7ZyvbDRcKEUyELWQNfDKqnsRMK40Z6Lw60Mi3j7EU 8g== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2130.oracle.com with ESMTP id 33xetb8d5g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 08 Oct 2020 15:05:53 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 098F0wjL054125; Thu, 8 Oct 2020 15:05:53 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3020.oracle.com with ESMTP id 3410k1973k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 08 Oct 2020 15:05:53 +0000 Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 098F5qDT005308; Thu, 8 Oct 2020 15:05:52 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Oct 2020 08:05:52 -0700 Date: Thu, 8 Oct 2020 08:05:51 -0700 From: "Darrick J. Wong" To: Eryu Guan Cc: Chandan Babu R , linux-xfs@vger.kernel.org, sandeen@redhat.com, fstests Subject: [PATCH 4/3] xfstest: test running growfs on the realtime volume Message-ID: <20201008150551.GM6540@magnolia> References: <160216932411.313389.9231180037053830573.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <160216932411.313389.9231180037053830573.stgit@magnolia> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9767 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 spamscore=0 adultscore=0 bulkscore=0 malwarescore=0 suspectscore=1 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2010080115 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9767 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxscore=0 clxscore=1015 priorityscore=1501 adultscore=0 mlxlogscore=999 phishscore=0 impostorscore=0 malwarescore=0 suspectscore=1 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2010080115 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong Make sure that we can run growfs to expand the realtime volume without it blowing up. This is a regression test for the following patches: xfs: Set xfs_buf type flag when growing summary/bitmap files xfs: Set xfs_buf's b_ops member when zeroing bitmap/summary files xfs: fix realtime bitmap/summary file truncation when growing rt volume xfs: make xfs_growfs_rt update secondary superblocks xfs: annotate grabbing the realtime bitmap/summary locks in growfs Because the xfs maintainer realized that no, we have no tests for this particular piece of functionality. Signed-off-by: Darrick J. Wong Reviewed-by: Chandan Babu R --- tests/xfs/916 | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/916.out | 10 ++++++ tests/xfs/group | 1 + 3 files changed, 93 insertions(+) create mode 100755 tests/xfs/916 create mode 100644 tests/xfs/916.out diff --git a/tests/xfs/916 b/tests/xfs/916 new file mode 100755 index 00000000..cde00314 --- /dev/null +++ b/tests/xfs/916 @@ -0,0 +1,82 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2020, Oracle and/or its affiliates. All Rights Reserved. +# +# FS QA Test No. 916 +# +# Tests xfs_growfs on the realtime volume to make sure none of it blows up. +# This is a regression test for the following patches: +# +# xfs: Set xfs_buf type flag when growing summary/bitmap files +# xfs: Set xfs_buf's b_ops member when zeroing bitmap/summary files +# xfs: fix realtime bitmap/summary file truncation when growing rt volume +# xfs: make xfs_growfs_rt update secondary superblocks +# xfs: annotate grabbing the realtime bitmap/summary locks in growfs +# +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 / + _scratch_unmount >> $seqres.full 2>&1 + test -e "$rtdev" && losetup -d $rtdev >> $seqres.full 2>&1 + rm -f $tmp.* $TEST_DIR/$seq.rtvol +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs xfs +# Note that we don't _require_realtime because we synthesize a rt volume +# below. +_require_scratch_nocheck +_require_no_large_scratch_dev + +echo "Create fake rt volume" +truncate -s 400m $TEST_DIR/$seq.rtvol +rtdev=$(_create_loop_device $TEST_DIR/$seq.rtvol) + +echo "Format and mount 100m rt volume" +export USE_EXTERNAL=yes +export SCRATCH_RTDEV=$rtdev +_scratch_mkfs -r size=100m > $seqres.full +_scratch_mount || _notrun "Could not mount scratch with synthetic rt volume" + +testdir=$SCRATCH_MNT/test-$seq +mkdir $testdir + +echo "Check rt volume stats" +$XFS_IO_PROG -c 'chattr +t' $testdir +$XFS_INFO_PROG $SCRATCH_MNT >> $seqres.full +before=$(stat -f -c '%b' $testdir) + +echo "Create some files" +_pwrite_byte 0x61 0 1m $testdir/original >> $seqres.full + +echo "Grow fs" +$XFS_GROWFS_PROG $SCRATCH_MNT 2>&1 | _filter_growfs >> $seqres.full +_scratch_cycle_mount + +echo "Recheck 400m rt volume stats" +$XFS_INFO_PROG $SCRATCH_MNT >> $seqres.full +after=$(stat -f -c '%b' $testdir) +_within_tolerance "rt volume size" $after $((before * 4)) 5% -v + +echo "Create more copies to make sure the bitmap really works" +cp -p $testdir/original $testdir/copy3 + +echo "Check filesystem" +_check_xfs_filesystem $SCRATCH_DEV none $rtdev + +# success, all done +status=0 +exit diff --git a/tests/xfs/916.out b/tests/xfs/916.out new file mode 100644 index 00000000..55f2356a --- /dev/null +++ b/tests/xfs/916.out @@ -0,0 +1,10 @@ +QA output created by 916 +Create fake rt volume +Format and mount 100m rt volume +Check rt volume stats +Create some files +Grow fs +Recheck 400m rt volume stats +rt volume size is in range +Create more copies to make sure the bitmap really works +Check filesystem diff --git a/tests/xfs/group b/tests/xfs/group index ef375397..4e58b5cc 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -549,6 +549,7 @@ 910 auto quick inobtcount 911 auto quick bigtime 915 auto quick quota +916 auto quick realtime growfs 1202 auto quick swapext 1208 auto quick swapext 1500 dangerous_fuzzers dangerous_bothrepair