From patchwork Tue Jun 18 21:07:15 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: 11002831 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 18543924 for ; Tue, 18 Jun 2019 21:07:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09FF4212E8 for ; Tue, 18 Jun 2019 21:07:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7AEA27F4B; Tue, 18 Jun 2019 21:07:48 +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 7FF9B22F3E for ; Tue, 18 Jun 2019 21:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730869AbfFRVHX (ORCPT ); Tue, 18 Jun 2019 17:07:23 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:54868 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731068AbfFRVHX (ORCPT ); Tue, 18 Jun 2019 17:07:23 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5IL43oL143790; Tue, 18 Jun 2019 21:07:18 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=ZaTpbmM0TGO+VrZ+A34FSGarLjneylHsUL3BmqFp2e0=; b=zTmacvvLnAMps8aiQ2UWfVZ0X2/utvXVBxnHsYUoyJHNgJcB61cj2+aU+KRX3qzWUu5h 4t6xBsMEK+r/B6S97CcNfRlUPkn9QB3QCxUpO5vyJnjsNmHwN0DygEubZHF/xg+o4HBv IuA/0ij4sCEmag06zJrRmci4KAKxyW+6FmujUo/5HWVKa8ePq4Rl4UrTCrP1jiKrFT+O XgVyFnJl39vQCWmpM/WD8ysRVtq2Zt7zvelj34XxwuixiQoedpKKVPT7g6OlsbqidlCv KD+9ePvzBxQ3MT+c+EgsAgYwIbL1GW4lQ7ZVuMHeyfg8sVh76tdRqcnERPWJb+qyu27S tg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 2t4rmp6t0n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jun 2019 21:07:18 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5IL78jM128828; Tue, 18 Jun 2019 21:07:17 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2t5h5tyqn4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jun 2019 21:07:17 +0000 Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x5IL7G4t023052; Tue, 18 Jun 2019 21:07:16 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 18 Jun 2019 14:07:16 -0700 Subject: [PATCH 2/4] xfs: rework min log size helper From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 18 Jun 2019 14:07:15 -0700 Message-ID: <156089203509.345809.3448903728041546348.stgit@magnolia> In-Reply-To: <156089201978.345809.17444450351199726553.stgit@magnolia> References: <156089201978.345809.17444450351199726553.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9292 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 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-1810050000 definitions=main-1906180167 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9292 signatures=668687 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-1906180167 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong The recent _scratch_find_xfs_min_logblocks helper has a major thinko in it -- it relies on feeding a too-small size to _scratch_do_mkfs so that mkfs will tell us the minimum log size. Unfortunately, _scratch_do_mkfs will see that first failure and retry the mkfs without MKFS_OPTIONS, which means that we return the minimum log size for the default mkfs settings without MKFS_OPTIONS. This is a problem if someone's running fstests with a set of MKFS_OPTIONS that affects the minimum log size. To fix this, open-code the _scratch_do_mkfs retry behavior so that we only do the "retry without MKFS_OPTIONS" behavior if the mkfs failed for a reason other than the minimum log size check. Signed-off-by: Darrick J. Wong --- common/rc | 13 ++++++++++--- common/xfs | 23 +++++++++++++++++++++-- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/common/rc b/common/rc index 25203bb4..a38b7f02 100644 --- a/common/rc +++ b/common/rc @@ -438,6 +438,14 @@ _scratch_mkfs_options() echo $SCRATCH_OPTIONS $MKFS_OPTIONS $* $SCRATCH_DEV } +# Format the scratch device directly. First argument is the mkfs command. +# Second argument are all the parameters. stdout goes to $tmp.mkfsstd and +# stderr goes to $tmp.mkfserr. +__scratch_do_mkfs() +{ + eval "$1 $2 $SCRATCH_DEV" 2>$tmp.mkfserr 1>$tmp.mkfsstd +} + # Do the actual mkfs work on SCRATCH_DEV. Firstly mkfs with both MKFS_OPTIONS # and user specified mkfs options, if that fails (due to conflicts between mkfs # options), do a second mkfs with only user provided mkfs options. @@ -456,8 +464,7 @@ _scratch_do_mkfs() # save mkfs output in case conflict means we need to run again. # only the output for the mkfs that applies should be shown - eval "$mkfs_cmd $MKFS_OPTIONS $extra_mkfs_options $SCRATCH_DEV" \ - 2>$tmp.mkfserr 1>$tmp.mkfsstd + __scratch_do_mkfs "$mkfs_cmd" "$MKFS_OPTIONS $extra_mkfs_options" mkfs_status=$? # a mkfs failure may be caused by conflicts between $MKFS_OPTIONS and @@ -471,7 +478,7 @@ _scratch_do_mkfs() ) >> $seqres.full # running mkfs again. overwrite previous mkfs output files - eval "$mkfs_cmd $extra_mkfs_options $SCRATCH_DEV" \ + __scratch_do_mkfs "$mkfs_cmd" "$extra_mkfs_options" \ 2>$tmp.mkfserr 1>$tmp.mkfsstd mkfs_status=$? fi diff --git a/common/xfs b/common/xfs index f8dafc6c..8733e2ae 100644 --- a/common/xfs +++ b/common/xfs @@ -87,16 +87,33 @@ _scratch_find_xfs_min_logblocks() # minimum log size. local XFS_MIN_LOG_BYTES=2097152 - _scratch_do_mkfs "$mkfs_cmd" "cat" $* -N -l size=$XFS_MIN_LOG_BYTES \ - 2>$tmp.mkfserr 1>$tmp.mkfsstd + # Try formatting the filesystem with all the options given and the + # minimum log size. We hope either that this succeeds or that mkfs + # tells us the required minimum log size for the feature set. + # + # We cannot use _scratch_do_mkfs because it will retry /any/ failed + # mkfs with MKFS_OPTIONS removed even if the only "failure" was that + # the log was too small. + local extra_mkfs_options="$* -N -l size=$XFS_MIN_LOG_BYTES" + __scratch_do_mkfs "$mkfs_cmd" "$MKFS_OPTIONS $extra_mkfs_options" local mkfs_status=$? + # If the format fails for a reason other than the log being too small, + # try again without MKFS_OPTIONS because that's what _scratch_do_mkfs + # will do if we pass in the log size option. + if [ $mkfs_status -ne 0 ] && + ! grep -q 'log size.*too small, minimum' $tmp.mkfserr; then + __scratch_do_mkfs "$mkfs_cmd" "$extra_mkfs_options" + local mkfs_status=$? + fi + # mkfs suceeded, so we must pick out the log block size to do the # unit conversion if [ $mkfs_status -eq 0 ]; then local blksz="$(grep '^log.*bsize' $tmp.mkfsstd | \ sed -e 's/log.*bsize=\([0-9]*\).*$/\1/g')" echo $((XFS_MIN_LOG_BYTES / blksz)) + rm -f $tmp.mkfsstd $tmp.mkfserr return fi @@ -104,6 +121,7 @@ _scratch_find_xfs_min_logblocks() if grep -q 'minimum size is' $tmp.mkfserr; then grep 'minimum size is' $tmp.mkfserr | \ sed -e 's/^.*minimum size is \([0-9]*\) blocks/\1/g' + rm -f $tmp.mkfsstd $tmp.mkfserr return fi @@ -111,6 +129,7 @@ _scratch_find_xfs_min_logblocks() echo "Cannot determine minimum log size" >&2 cat $tmp.mkfsstd >> $seqres.full cat $tmp.mkfserr >> $seqres.full + rm -f $tmp.mkfsstd $tmp.mkfserr } _scratch_mkfs_xfs()