From patchwork Mon Mar 4 21:19:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10838633 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 239A4188D for ; Mon, 4 Mar 2019 21:19:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 135492B2D8 for ; Mon, 4 Mar 2019 21:19:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 07DC92B3B5; Mon, 4 Mar 2019 21:19: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 B74572B2F3 for ; Mon, 4 Mar 2019 21:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726054AbfCDVTq (ORCPT ); Mon, 4 Mar 2019 16:19:46 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:37998 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726038AbfCDVTq (ORCPT ); Mon, 4 Mar 2019 16:19:46 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x24LJDIr015418; Mon, 4 Mar 2019 21:19: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=Ui6xlkZYL/Z57dTP0lyOKzzP0jm0VVf33eC7Hxee/SI=; b=u5aGj/mFAjMFdx5XCuJWan6H87UGCipfmcRNlkJvxRmPoXHkQvB+H0rb+Urp8xN67C78 lOYmPUL7NVmtrDQewgMTDy9vUKgw4JB7RVFPpENvjLafPzObTKYWk8XinepG0FIICFSv YmgVK/80nQgVRYqJfEy9elsYhsZ1XOfG5j3mmbRSSY9IwHukG4Jj0jkfM/+CMXYfQSH7 39mQz5RBgkADO1FX6q1hHkke5LT8irxltcJYeozO20/7jSAdG9mHP9mMRZX1rtx5YgWA YcNooDpXEiQpDnxqCYhm+zUKjd5uhBg1krTIK1cZR8Vr0Y0HEzFquXS4ey9gCimm2xoc xg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2qyh8u1c04-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 04 Mar 2019 21:19:44 +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 x24LJhph003571 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Mar 2019 21:19:43 GMT Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x24LJhSf030822; Mon, 4 Mar 2019 21:19:43 GMT Received: from localhost (/10.159.248.244) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 04 Mar 2019 13:19:42 -0800 Subject: [PATCH 5/5] populate: force large finobt creation on xfs From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Mon, 04 Mar 2019 13:19:41 -0800 Message-ID: <155173438168.767.3984211596797515595.stgit@magnolia> In-Reply-To: <155173434205.767.15128498725168844621.stgit@magnolia> References: <155173434205.767.15128498725168844621.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9185 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 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-1810050000 definitions=main-1903040150 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 Teach the populate routines to create enough inodes that we end up with multi-level inode btrees. Signed-off-by: Darrick J. Wong --- common/populate | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/common/populate b/common/populate index d49fbc29..95953476 100644 --- a/common/populate +++ b/common/populate @@ -260,6 +260,21 @@ _scratch_xfs_populate() { $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/BNOBT" ./src/punch-alternating "${SCRATCH_MNT}/BNOBT" + # Inode btree + echo "+ inobt btree" + local ino_per_rec=64 + local rec_per_btblock=16 + local nr="$(( 2 * (blksz / rec_per_btblock) * ino_per_rec ))" + local dir="${SCRATCH_MNT}/INOBT" + mkdir -p "${dir}" + seq 0 "${nr}" | while read f; do + touch "${dir}/${f}" + done + + seq 0 "$((ino_per_rec + 1))" "${nr}" | while read f; do + rm -f "${dir}/${f}" + done + # Reverse-mapping btree is_rmapbt="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep -c 'rmapbt=1')" if [ $is_rmapbt -gt 0 ]; then @@ -562,6 +577,8 @@ _scratch_xfs_populate_check() { __populate_check_xfs_aformat "${btree_attr}" "btree" __populate_check_xfs_agbtree_height "bno" __populate_check_xfs_agbtree_height "cnt" + __populate_check_xfs_agbtree_height "ino" + test $is_finobt -ne 0 && __populate_check_xfs_agbtree_height "fino" test $is_rmapbt -ne 0 && __populate_check_xfs_agbtree_height "rmap" test $is_reflink -ne 0 && __populate_check_xfs_agbtree_height "refcnt" }