From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 956AEC43603 for ; Wed, 11 Dec 2019 06:34:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C5E920836 for ; Wed, 11 Dec 2019 06:34:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BIP4Z/AY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726151AbfLKGeN (ORCPT ); Wed, 11 Dec 2019 01:34:13 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:55605 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726208AbfLKGeN (ORCPT ); Wed, 11 Dec 2019 01:34:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576046050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8hC+lyVgBAgdiR8u700LnYAPf7oRSuJv3NC/hcWMAT0=; b=BIP4Z/AYfk28KrOWSuy6cbWBGIMrvpJj221vPo/W5B5Z8banOeJd1YfqUGSvXw32d2QY2a uMxbio8zn1SGxcPQ6/mmgX/FrGX8RnpVFWXR+xEGUxyzKJUvP5sfLZ0i+5CmbmirtaEYUp nkBHgAvtlSW64ukasay7lhtbuyZYZYc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-284-isZuIVk6OjuYN_QRN2YnjA-1; Wed, 11 Dec 2019 01:34:07 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 67C7E1800D45; Wed, 11 Dec 2019 06:34:06 +0000 (UTC) Received: from localhost (dhcp-12-102.nay.redhat.com [10.66.12.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93BB919C69; Wed, 11 Dec 2019 06:34:05 +0000 (UTC) Date: Wed, 11 Dec 2019 14:42:16 +0800 From: Zorro Lang To: "Darrick J. Wong" Cc: fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: Re: [PATCH v2] xfstests: xfs mount option sanity test Message-ID: <20191211064216.GA14328@dhcp-12-102.nay.redhat.com> Mail-Followup-To: "Darrick J. Wong" , fstests@vger.kernel.org, linux-xfs@vger.kernel.org References: <20191030103410.2239-1-zlang@redhat.com> <20191030163922.GB15224@magnolia> <20191030232453.GD3802@dhcp-12-102.nay.redhat.com> MIME-Version: 1.0 In-Reply-To: <20191030232453.GD3802@dhcp-12-102.nay.redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: isZuIVk6OjuYN_QRN2YnjA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Thu, Oct 31, 2019 at 07:24:53AM +0800, Zorro Lang wrote: > On Wed, Oct 30, 2019 at 09:39:22AM -0700, Darrick J. Wong wrote: > > On Wed, Oct 30, 2019 at 06:34:10PM +0800, Zorro Lang wrote: > > > XFS is changing to suit the new mount API, so add this case to make > > > sure the changing won't bring in regression issue on xfs mount option > > > parse phase, and won't change some default behaviors either. > > >=20 > > > Signed-off-by: Zorro Lang > > > --- > > >=20 > > > Hi, > > >=20 > > > V2 did below changes: > > > 1) Fix wrong output messages in _do_test function > >=20 > > Hmm, I still see this on 5.4-rc4: > >=20 > > +[FAILED]: mount /dev/loop0 /mnt/148.mnt -o logbsize=3D16384 > > +ERROR: expect there's logbsize=3D16k in , but found > ^^^ > not >=20 > > +[FAILED]: mount /dev/loop0 /mnt/148.mnt -o logbsize=3D16k > > +ERROR: expect there's logbsize=3D16k in , but found > ^^^ > not >=20 > Sorry for this typo, I'll fix it. >=20 > >=20 > > Oh, right, you're stripping out MKFS_OPTIONS and formatting a loop > > device, which on my system means you get rmapbt=3D1 by default and > > whatnot. >=20 > Hmm... why rmapbt=3D1 cause logbsize=3D16k can't be displayed in /proc/m= ounts? >=20 > Actually set MKFS_OPTIONS=3D"" is not helpful for this case, due to I run > "$MKFS_XFS_PROG -f $* $LOOP_DEV" directly. I strip out MKFS_OPTIONS, > because I use SCRACH_DEV at first :) >=20 > >=20 > > I think the larger problem here might be that now we have to figure out > > the special-casing of some of these options. >=20 > Maybe we should avoid the testing about those behaviors can't be sure, if= we > can't make it have a fixed output. It's been long time passed. I still don't have a proper way to reproduce an= d avoid this failure you hit. Does anyone has a better idea for this case? Thanks, Zorro >=20 > Thanks, > Zorro >=20 > >=20 > > --D > >=20 > > > 2) Remove logbufs=3DN and logbsize=3DN default display test. Lastest = upstream > > > kernel displays these options in /proc/mounts by default, but old = kernel > > > doesn't show them except user indicate these options when mount xf= s. > > > Refer to https://marc.info/?l=3Dfstests&m=3D157199699615477&w=3D2 > > >=20 > > > Thanks, > > > Zorro > > >=20 > > > tests/xfs/148 | 320 ++++++++++++++++++++++++++++++++++++++++++++= ++ > > > tests/xfs/148.out | 6 + > > > tests/xfs/group | 1 + > > > 3 files changed, 327 insertions(+) > > > create mode 100755 tests/xfs/148 > > > create mode 100644 tests/xfs/148.out > > >=20 > > > diff --git a/tests/xfs/148 b/tests/xfs/148 > > > new file mode 100755 > > > index 00000000..a662f6f7 > > > --- /dev/null > > > +++ b/tests/xfs/148 > > > @@ -0,0 +1,320 @@ > > > +#! /bin/bash > > > +# SPDX-License-Identifier: GPL-2.0 > > > +# Copyright (c) 2019 Red Hat, Inc. All Rights Reserved. > > > +# > > > +# FS QA Test 148 > > > +# > > > +# XFS mount options sanity check, refer to 'man 5 xfs'. > > > +# > > > +seq=3D`basename $0` > > > +seqres=3D$RESULT_DIR/$seq > > > +echo "QA output created by $seq" > > > + > > > +here=3D`pwd` > > > +tmp=3D/tmp/$$ > > > +status=3D1=09# failure is the default! > > > +trap "_cleanup; exit \$status" 0 1 2 3 15 > > > + > > > +_cleanup() > > > +{ > > > +=09cd / > > > +=09rm -f $tmp.* > > > +=09$UMOUNT_PROG $LOOP_MNT 2>/dev/null > > > +=09if [ -n "$LOOP_DEV" ];then > > > +=09=09_destroy_loop_device $LOOP_DEV 2>/dev/null > > > +=09fi > > > +=09if [ -n "$LOOP_SPARE_DEV" ];then > > > +=09=09_destroy_loop_device $LOOP_SPARE_DEV 2>/dev/null > > > +=09fi > > > +=09rm -f $LOOP_IMG > > > +=09rm -f $LOOP_SPARE_IMG > > > +=09rmdir $LOOP_MNT > > > +} > > > + > > > +# 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 > > > +_supported_fs xfs > > > +_supported_os Linux > > > +_require_test > > > +_require_loop > > > +_require_xfs_io_command "falloc" > > > + > > > +LOOP_IMG=3D$TEST_DIR/$seq.dev > > > +LOOP_SPARE_IMG=3D$TEST_DIR/$seq.logdev > > > +LOOP_MNT=3D$TEST_DIR/$seq.mnt > > > + > > > +echo "** create loop device" > > > +$XFS_IO_PROG -f -c "falloc 0 1g" $LOOP_IMG > > > +LOOP_DEV=3D`_create_loop_device $LOOP_IMG` > > > + > > > +echo "** create loop log device" > > > +$XFS_IO_PROG -f -c "falloc 0 512m" $LOOP_SPARE_IMG > > > +LOOP_SPARE_DEV=3D`_create_loop_device $LOOP_SPARE_IMG` > > > + > > > +echo "** create loop mount point" > > > +rmdir $LOOP_MNT 2>/dev/null > > > +mkdir -p $LOOP_MNT || _fail "cannot create loopback mount point" > > > + > > > +# avoid the effection from MKFS_OPTIONS > > > +MKFS_OPTIONS=3D"" > > > +do_mkfs() > > > +{ > > > +=09$MKFS_XFS_PROG -f $* $LOOP_DEV | _filter_mkfs >$seqres.full 2>$tm= p.mkfs > > > +=09if [ "${PIPESTATUS[0]}" -ne 0 ]; then > > > +=09=09_fail "Fails on _mkfs_dev $* $LOOP_DEV" > > > +=09fi > > > +=09. $tmp.mkfs > > > +} > > > + > > > +is_dev_mounted() > > > +{ > > > +=09findmnt --source $LOOP_DEV >/dev/null > > > +=09return $? > > > +} > > > + > > > +get_mount_info() > > > +{ > > > +=09findmnt --source $LOOP_DEV -o OPTIONS -n > > > +} > > > + > > > +force_unmount() > > > +{ > > > +=09$UMOUNT_PROG $LOOP_MNT >/dev/null 2>&1 > > > +} > > > + > > > +# _do_test [ ] > > > +_do_test() > > > +{ > > > +=09local opts=3D"$1" > > > +=09local mounted=3D"$2"=09# pass or fail > > > +=09local key=3D"$3" > > > +=09local found=3D"$4"=09# true or false > > > +=09local rc > > > +=09local info > > > + > > > +=09# mount test > > > +=09_mount $LOOP_DEV $LOOP_MNT $opts 2>/dev/null > > > +=09rc=3D$? > > > +=09if [ $rc -eq 0 ];then > > > +=09=09if [ "${mounted}" =3D "fail" ];then > > > +=09=09=09echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts" > > > +=09=09=09echo "ERROR: expect ${mounted}, but pass" > > > +=09=09=09return 1 > > > +=09=09fi > > > +=09=09is_dev_mounted > > > +=09=09if [ $? -ne 0 ];then > > > +=09=09=09echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts" > > > +=09=09=09echo "ERROR: fs not mounted even mount return 0" > > > +=09=09=09return 1 > > > +=09=09fi > > > +=09else > > > +=09=09if [ "${mount_ret}" =3D "pass" ];then > > > +=09=09=09echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts" > > > +=09=09=09echo "ERROR: expect ${mounted}, but fail" > > > +=09=09=09return 1 > > > +=09=09fi > > > +=09=09is_dev_mounted > > > +=09=09if [ $? -eq 0 ];then > > > +=09=09=09echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts" > > > +=09=09=09echo "ERROR: fs is mounted even mount return non-zero" > > > +=09=09=09return 1 > > > +=09=09fi > > > +=09fi > > > + > > > +=09# Skip below checking if "$key" argument isn't specified > > > +=09if [ -z "$key" ];then > > > +=09=09return 0 > > > +=09fi > > > +=09# Check the mount options after fs mounted. > > > +=09info=3D`get_mount_info` > > > +=09echo $info | grep -q "${key}" > > > +=09rc=3D$? > > > +=09if [ $rc -eq 0 ];then > > > +=09=09if [ "$found" !=3D "true" ];then > > > +=09=09=09echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts" > > > +=09=09=09echo "ERROR: expect there's not $key in $info, but not foun= d" > > > +=09=09=09return 1 > > > +=09=09fi > > > +=09else > > > +=09=09if [ "$found" !=3D "false" ];then > > > +=09=09=09echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts" > > > +=09=09=09echo "ERROR: expect there's $key in $info, but found" > > > +=09=09=09return 1 > > > +=09=09fi > > > +=09fi > > > + > > > +=09return 0 > > > +} > > > + > > > +do_test() > > > +{ > > > +=09# force unmount before testing > > > +=09force_unmount > > > +=09_do_test "$@" > > > +=09# force unmount after testing > > > +=09force_unmount > > > +} > > > + > > > +echo "** start xfs mount testing ..." > > > +# Test allocsize=3Dsize > > > +# Valid values for this option are page size (typically 4KiB) throug= h to 1GiB > > > +do_mkfs > > > +if [ $dbsize -ge 1024 ];then > > > +=09blsize=3D"$((dbsize / 1024))k" > > > +fi > > > +do_test "" pass "allocsize" "false" > > > +do_test "-o allocsize=3D$blsize" pass "allocsize=3D$blsize" "true" > > > +do_test "-o allocsize=3D1048576k" pass "allocsize=3D1048576k" "true" > > > +do_test "-o allocsize=3D$((dbsize / 2))" fail > > > +do_test "-o allocsize=3D2g" fail > > > + > > > +# Test attr2 > > > +do_mkfs -m crc=3D1 > > > +do_test "" pass "attr2" "true" > > > +do_test "-o attr2" pass "attr2" "true" > > > +do_test "-o noattr2" fail > > > +do_mkfs -m crc=3D0 > > > +do_test "" pass "attr2" "true" > > > +do_test "-o attr2" pass "attr2" "true" > > > +do_test "-o noattr2" pass "attr2" "false" > > > + > > > +# Test discard > > > +do_mkfs > > > +do_test "" pass "discard" "false" > > > +do_test "-o discard" pass "discard" "true" > > > +do_test "-o nodiscard" pass "discard" "false" > > > + > > > +# Test grpid|bsdgroups|nogrpid|sysvgroups > > > +do_test "" pass "grpid" "false" > > > +do_test "-o grpid" pass "grpid" "true" > > > +do_test "-o bsdgroups" pass "grpid" "true" > > > +do_test "-o nogrpid" pass "grpid" "false" > > > +do_test "-o sysvgroups" pass "grpid" "false" > > > + > > > +# Test filestreams > > > +do_test "" pass "filestreams" "false" > > > +do_test "-o filestreams" pass "filestreams" "true" > > > + > > > +# Test ikeep > > > +do_test "" pass "ikeep" "false" > > > +do_test "-o ikeep" pass "ikeep" "true" > > > +do_test "-o noikeep" pass "ikeep" "false" > > > + > > > +# Test inode32|inode64 > > > +do_test "" pass "inode64" "true" > > > +do_test "-o inode32" pass "inode32" "true" > > > +do_test "-o inode64" pass "inode64" "true" > > > + > > > +# Test largeio > > > +do_test "" pass "largeio" "false" > > > +do_test "-o largeio" pass "largeio" "true" > > > +do_test "-o nolargeio" pass "largeio" "false" > > > + > > > +# Test logbufs=3Dvalue. Valid numbers range from 2=E2=80=938 inclusi= ve. > > > +# New kernel (refer to 4f62282a3696 xfs: cleanup xlog_get_iclog_buff= er_size) > > > +# prints "logbufs=3DN" in /proc/mounts, but old kernel not. So the d= efault > > > +# 'display' about logbufs can't be expected, disable this test. > > > +#do_test "" pass "logbufs" "false" > > > +do_test "-o logbufs=3D8" pass "logbufs=3D8" "true" > > > +do_test "-o logbufs=3D2" pass "logbufs=3D2" "true" > > > +do_test "-o logbufs=3D1" fail > > > +do_test "-o logbufs=3D9" fail > > > +do_test "-o logbufs=3D99999999999999" fail > > > + > > > +# Test logbsize=3Dvalue. > > > +do_mkfs -m crc=3D1 -l version=3D2 > > > +# New kernel (refer to 4f62282a3696 xfs: cleanup xlog_get_iclog_buff= er_size) > > > +# prints "logbsize=3DN" in /proc/mounts, but old kernel not. So the = default > > > +# 'display' about logbsize can't be expected, disable this test. > > > +#do_test "" pass "logbsize" "false" > > > +do_test "-o logbsize=3D16384" pass "logbsize=3D16k" "true" > > > +do_test "-o logbsize=3D16k" pass "logbsize=3D16k" "true" > > > +do_test "-o logbsize=3D32k" pass "logbsize=3D32k" "true" > > > +do_test "-o logbsize=3D64k" pass "logbsize=3D64k" "true" > > > +do_test "-o logbsize=3D128k" pass "logbsize=3D128k" "true" > > > +do_test "-o logbsize=3D256k" pass "logbsize=3D256k" "true" > > > +do_test "-o logbsize=3D8k" fail > > > +do_test "-o logbsize=3D512k" fail > > > +do_mkfs -m crc=3D0 -l version=3D1 > > > +# New kernel (refer to 4f62282a3696 xfs: cleanup xlog_get_iclog_buff= er_size) > > > +# prints "logbsize=3DN" in /proc/mounts, but old kernel not. So the = default > > > +# 'display' about logbsize can't be expected, disable this test. > > > +#do_test "" pass "logbsize" "false" > > > +do_test "-o logbsize=3D16384" pass "logbsize=3D16k" "true" > > > +do_test "-o logbsize=3D16k" pass "logbsize=3D16k" "true" > > > +do_test "-o logbsize=3D32k" pass "logbsize=3D32k" "true" > > > +do_test "-o logbsize=3D64k" fail > > > + > > > +# Test logdev > > > +do_mkfs > > > +do_test "" pass "logdev" "false" > > > +do_test "-o logdev=3D$LOOP_SPARE_DEV" fail > > > +do_mkfs -l logdev=3D$LOOP_SPARE_DEV > > > +do_test "-o logdev=3D$LOOP_SPARE_DEV" pass "logdev=3D$LOOP_SPARE_DEV= " "true" > > > +do_test "" fail > > > + > > > +# Test noalign > > > +do_mkfs > > > +do_test "" pass "noalign" "false" > > > +do_test "-o noalign" pass "noalign" "true" > > > + > > > +# Test norecovery > > > +do_test "" pass "norecovery" "false" > > > +do_test "-o norecovery,ro" pass "norecovery" "true" > > > +do_test "-o norecovery" fail > > > + > > > +# Test nouuid > > > +do_test "" pass "nouuid" "false" > > > +do_test "-o nouuid" pass "nouuid" "true" > > > + > > > +# Test noquota > > > +do_test "" pass "noquota" "true" > > > +do_test "-o noquota" pass "noquota" "true" > > > + > > > +# Test uquota/usrquota/quota/uqnoenforce/qnoenforce > > > +do_test "" pass "usrquota" "false" > > > +do_test "-o uquota" pass "usrquota" "true" > > > +do_test "-o usrquota" pass "usrquota" "true" > > > +do_test "-o quota" pass "usrquota" "true" > > > +do_test "-o uqnoenforce" pass "usrquota" "true" > > > +do_test "-o qnoenforce" pass "usrquota" "true" > > > + > > > +# Test gquota/grpquota/gqnoenforce > > > +do_test "" pass "grpquota" "false" > > > +do_test "-o gquota" pass "grpquota" "true" > > > +do_test "-o grpquota" pass "grpquota" "true" > > > +do_test "-o gqnoenforce" pass "gqnoenforce" "true" > > > + > > > +# Test pquota/prjquota/pqnoenforce > > > +do_test "" pass "prjquota" "false" > > > +do_test "-o pquota" pass "prjquota" "true" > > > +do_test "-o prjquota" pass "prjquota" "true" > > > +do_test "-o pqnoenforce" pass "pqnoenforce" "true" > > > + > > > +# Test sunit=3Dvalue and swidth=3Dvalue > > > +do_mkfs -d sunit=3D128,swidth=3D128 > > > +do_test "-o sunit=3D8,swidth=3D8" pass "sunit=3D8,swidth=3D8" "true" > > > +do_test "-o sunit=3D8,swidth=3D64" pass "sunit=3D8,swidth=3D64" "tru= e" > > > +do_test "-o sunit=3D128,swidth=3D128" pass "sunit=3D128,swidth=3D128= " "true" > > > +do_test "-o sunit=3D256,swidth=3D256" pass "sunit=3D256,swidth=3D256= " "true" > > > +do_test "-o sunit=3D2,swidth=3D2" fail > > > + > > > +# Test swalloc > > > +do_mkfs > > > +do_test "" pass "swalloc" "false" > > > +do_test "-o swalloc" pass "swalloc" "true" > > > + > > > +# Test wsync > > > +do_test "" pass "wsync" "false" > > > +do_test "-o wsync" pass "wsync" "true" > > > + > > > +echo "** end of testing" > > > +# success, all done > > > +status=3D0 > > > +exit > > > diff --git a/tests/xfs/148.out b/tests/xfs/148.out > > > new file mode 100644 > > > index 00000000..a71d9231 > > > --- /dev/null > > > +++ b/tests/xfs/148.out > > > @@ -0,0 +1,6 @@ > > > +QA output created by 148 > > > +** create loop device > > > +** create loop log device > > > +** create loop mount point > > > +** start xfs mount testing ... > > > +** end of testing > > > diff --git a/tests/xfs/group b/tests/xfs/group > > > index f4ebcd8c..019aebad 100644 > > > --- a/tests/xfs/group > > > +++ b/tests/xfs/group > > > @@ -145,6 +145,7 @@ > > > 145 dmapi > > > 146 dmapi > > > 147 dmapi > > > +148 auto quick mount > > > 150 dmapi > > > 151 dmapi > > > 152 dmapi > > > --=20 > > > 2.20.1 > > >=20 >=20