From patchwork Thu Sep 6 08:40:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandan Rajendra X-Patchwork-Id: 10590021 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 69605180E for ; Thu, 6 Sep 2018 08:38:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B79B2A3EF for ; Thu, 6 Sep 2018 08:38:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FE2D2A431; Thu, 6 Sep 2018 08:38:26 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 E6BE62A3F7 for ; Thu, 6 Sep 2018 08:38:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728216AbeIFNMp (ORCPT ); Thu, 6 Sep 2018 09:12:45 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:48888 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728215AbeIFNMp (ORCPT ); Thu, 6 Sep 2018 09:12:45 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w868XuJC124701 for ; Thu, 6 Sep 2018 04:38:23 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0b-001b2d01.pphosted.com with ESMTP id 2mayddm20e-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 06 Sep 2018 04:38:23 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 6 Sep 2018 02:38:22 -0600 Received: from b03cxnp07028.gho.boulder.ibm.com (9.17.130.15) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 6 Sep 2018 02:38:20 -0600 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w868cJKf57278598 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 6 Sep 2018 01:38:19 -0700 Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C36706E053; Thu, 6 Sep 2018 02:38:19 -0600 (MDT) Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2D6D86E04C; Thu, 6 Sep 2018 02:38:18 -0600 (MDT) Received: from localhost.in.ibm.com (unknown [9.124.35.136]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP; Thu, 6 Sep 2018 02:38:17 -0600 (MDT) From: Chandan Rajendra To: fstests@vger.kernel.org Cc: Chandan Rajendra , eguan@redhat.com, darrick.wong@oracle.com, linux-xfs@vger.kernel.org Subject: [PATCH V2 04/16] Fix xfs/074 to work with 64k block size Date: Thu, 6 Sep 2018 14:10:01 +0530 X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180906084013.2687-1-chandan@linux.vnet.ibm.com> References: <20180906084013.2687-1-chandan@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18090608-0020-0000-0000-00000E5F79D1 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009676; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000266; SDB=6.01084285; UDB=6.00559630; IPR=6.00864284; MB=3.00023141; MTD=3.00000008; XFM=3.00000015; UTC=2018-09-06 08:38:21 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18090608-0021-0000-0000-000062EEAAC4 Message-Id: <20180906084013.2687-5-chandan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-09-06_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1809060091 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 This commit makes file and extent size calculations to be a function of the filesystem's block size. It also adds a brief description of the bug that is being tested. Signed-off-by: Chandan Rajendra --- tests/xfs/074 | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/tests/xfs/074 b/tests/xfs/074 index e5888d5..1e1e16e 100755 --- a/tests/xfs/074 +++ b/tests/xfs/074 @@ -7,6 +7,18 @@ # Check some extent size hint boundary conditions that can result in # MAXEXTLEN overflows. # +# In xfs_bmap_extsize_align(), we had, +# if ((temp = (align_alen % extsz))) { +# align_alen += extsz - temp; +# } +# align_alen had the value of 2097151 (i.e. MAXEXTLEN) blocks. extsz had +# the value of 4096 blocks. +# +# align_alen % extsz will be 4095. so align_alen will end up having +# 2097151 + (4096 - 4095) = 2097152 i.e. (MAXEXTLEN + 1). Thus the length +# of the new extent will be larger than MAXEXTLEN. This will later cause +# the bmbt leaf to have an entry whose length is set to zero block count. +# seq=`basename $0` seqres=$RESULT_DIR/$seq echo "QA output created by $seq" @@ -46,19 +58,22 @@ mkdir -p $LOOP_MNT $XFS_IO_PROG -ft -c "truncate 1t" $LOOP_FILE >> $seqres.full LOOP_DEV=`_create_loop_device $LOOP_FILE` -_mkfs_dev -d size=156452m,agcount=4 -l size=32m $LOOP_DEV +_mkfs_dev -d size=260g,agcount=2 $LOOP_DEV _mount $LOOP_DEV $LOOP_MNT +BLOCK_SIZE=$(_get_block_size $LOOP_MNT) + # Corrupt the BMBT by creating extents larger than MAXEXTLEN +# For 4k blocksize, MAXEXTLEN * 4k = 2097151 * 4k = 8589930496 = ~8GiB $XFS_IO_PROG -ft \ - -c "extsize 16m" \ - -c "falloc 0 30g" \ + -c "extsize $(($BLOCK_SIZE * 4096))" \ + -c "falloc 0 $(($BLOCK_SIZE * 2097152))" \ $LOOP_MNT/foo >> $seqres.full umount $LOOP_MNT _check_xfs_filesystem $LOOP_DEV none none -_mkfs_dev -f -l size=32m $LOOP_DEV +_mkfs_dev -f $LOOP_DEV _mount $LOOP_DEV $LOOP_MNT # check we trim both ends of the extent approproiately; this will fail