From patchwork Mon Apr 8 13:32:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13621180 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E4A17BAEE; Mon, 8 Apr 2024 13:32:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583176; cv=none; b=gQSmIMAVubjBUKT9GqSYF1XwriOA7D+5pXDLc9udny/JR5pOX7GbVU2ymFd30gsxeCwWCkT31ancK/LvlxldTfDYTMyJFlmhfHtsHg0Uxx0YztPc0QOWDzlR1Ja0m7smJ59dJ8eP8ihdiduccVVdQIbVi9ij9Rh8wOOa73fHmvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583176; c=relaxed/simple; bh=t51xpbJsq1rRZ3gASRj5AMyJPYMbKYa7iPpcse60M0M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=b+zI2M472CZ06IJh+F/WOQl/D8EKTz1J3OAJV/BNF1i0nfekueldyzMJwVmGtMXriGmNC4G75LERoVuieqp91q/nKmVi1DnqsSgGoZwy6gWbKh3HyhYmrD/yy6EWCQ0U+39P8XNsEEeSSelxIB/SFJZWKdqMVf+Vn/BR2uZXi70= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=oBjt8pJf; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="oBjt8pJf" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=qwU5aLGzrSuWoiJb7KyORZqjaJKV5qfAaVa2OrhE5GA=; b=oBjt8pJfbgCvyBVgq+bzE/w3UG b3on1dv02qPfJe3Us2HvFEA4sSOBZpriaqS83onoGzMWtKB234ElGUhMhi3va6fnBH3tELrrldULP YTQsZEALzL6YlygOuDLEdzoyetbPsWeBLEKuQy+dCWTHDueELe5pGbbBDoxKZbuT/2PM+93fVNxn9 oIJaA69BhAs+0GPreCsywNRhZDEJWbez2KnWAZ1tnswNVe0xUz6wWJ+Wy1UKDZEJln+ZOTiuVEB+r tbp33wC+N2hRflQD7keGOXwiVPlowCp+ku6D2dVQgaoKxMdvyxeZKsESF25bmxO1yHCtDF5kVH4HL TMiYxTaw==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtp7F-0000000FjRi-0krh; Mon, 08 Apr 2024 13:32:53 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J . Wong " , linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 1/6] xfs: remove support for tools and kernels with v5 support Date: Mon, 8 Apr 2024 15:32:38 +0200 Message-Id: <20240408133243.694134-2-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240408133243.694134-1-hch@lst.de> References: <20240408133243.694134-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html v5 file systems have been the default for more than 10 years. Drop support for non-v5 enabled kernels and xfsprogs. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- common/config | 13 ------------- common/xfs | 26 -------------------------- tests/xfs/002 | 3 --- tests/xfs/005 | 1 - tests/xfs/077 | 1 - tests/xfs/083 | 2 -- tests/xfs/132 | 1 - tests/xfs/148 | 1 - tests/xfs/263 | 5 ----- tests/xfs/299 | 2 -- tests/xfs/304 | 2 -- tests/xfs/305 | 2 -- 12 files changed, 59 deletions(-) diff --git a/common/config b/common/config index 2a1434bb1..6a0496fdd 100644 --- a/common/config +++ b/common/config @@ -329,19 +329,6 @@ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then export SELINUX_MOUNT_OPTIONS fi -# check if mkfs.xfs supports v5 xfs -if [ "$FSTYP" == "xfs" ]; then - XFS_MKFS_HAS_NO_META_SUPPORT="" - touch /tmp/crc_check.img - $MKFS_XFS_PROG -N -d file,name=/tmp/crc_check.img,size=32m -m crc=0 \ - >/dev/null 2>&1; - if [ $? -ne 0 ]; then - XFS_MKFS_HAS_NO_META_SUPPORT=true - fi - rm -f /tmp/crc_check.img - export XFS_MKFS_HAS_NO_META_SUPPORT -fi - _common_mount_opts() { case $FSTYP in diff --git a/common/xfs b/common/xfs index 65b509691..57d21762c 100644 --- a/common/xfs +++ b/common/xfs @@ -59,11 +59,6 @@ _scratch_mkfs_xfs_opts() { mkfs_opts=$* - # remove metadata related mkfs options if mkfs.xfs doesn't them - if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then - mkfs_opts=`echo $mkfs_opts | sed "s/-m\s\+\S\+//g"` - fi - _scratch_options mkfs echo "$MKFS_XFS_PROG $SCRATCH_OPTIONS $mkfs_opts" @@ -439,24 +434,6 @@ _require_projid16bit() || _notrun "16 bit project IDs not supported on $SCRATCH_DEV" } -# this test requires the crc feature to be available in mkfs.xfs -# -_require_xfs_mkfs_crc() -{ - _scratch_mkfs_xfs_supported -m crc=1 >/dev/null 2>&1 \ - || _notrun "mkfs.xfs doesn't have crc feature" -} - -# this test requires the xfs kernel support crc feature -# -_require_xfs_crc() -{ - _scratch_mkfs_xfs -m crc=1 >/dev/null 2>&1 - _try_scratch_mount >/dev/null 2>&1 \ - || _notrun "Kernel doesn't support crc feature" - _scratch_unmount -} - # If the xfs_info output for the given XFS filesystem mount mentions the given # feature. If so, return 0 for success. If not, return 1 for failure. If the # third option is -v, echo 1 for success and 0 for not. @@ -1268,9 +1245,6 @@ _require_scratch_xfs_shrink() # _require_meta_uuid() { - # This will create a crc fs on $SCRATCH_DEV - _require_xfs_crc - _scratch_xfs_db -x -c "uuid restore" 2>&1 \ | grep -q "invalid UUID\|supported on V5 fs" \ && _notrun "Userspace doesn't support meta_uuid feature" diff --git a/tests/xfs/002 b/tests/xfs/002 index 6c0bb4d04..8dfd2693b 100755 --- a/tests/xfs/002 +++ b/tests/xfs/002 @@ -24,9 +24,6 @@ _supported_fs xfs _require_scratch_nocheck _require_no_large_scratch_dev -# So we can explicitly turn it _off_: -_require_xfs_mkfs_crc - _scratch_mkfs_xfs -m crc=0 -d size=128m >> $seqres.full 2>&1 || _fail "mkfs failed" # Scribble past a couple V4 secondary superblocks to populate sb_crc diff --git a/tests/xfs/005 b/tests/xfs/005 index 5f1ab8348..019790295 100755 --- a/tests/xfs/005 +++ b/tests/xfs/005 @@ -20,7 +20,6 @@ _begin_fstest auto quick _supported_fs xfs _require_scratch_nocheck -_require_xfs_mkfs_crc _scratch_mkfs_xfs -m crc=1 >> $seqres.full 2>&1 || _fail "mkfs failed" diff --git a/tests/xfs/077 b/tests/xfs/077 index f24f6f004..37ea931f1 100755 --- a/tests/xfs/077 +++ b/tests/xfs/077 @@ -24,7 +24,6 @@ _supported_fs xfs _require_xfs_copy _require_scratch _require_no_large_scratch_dev -_require_xfs_crc _require_meta_uuid # Takes 2 args, 2nd optional: diff --git a/tests/xfs/083 b/tests/xfs/083 index edab3b7b0..e8ce2221c 100755 --- a/tests/xfs/083 +++ b/tests/xfs/083 @@ -28,8 +28,6 @@ _cleanup() _supported_fs xfs _require_scratch -#_require_xfs_crc # checksum not required, but you probably want it anyway... -#_require_xfs_mkfs_crc _require_attrs _require_populate_commands diff --git a/tests/xfs/132 b/tests/xfs/132 index fa36c09c2..ee1c8c1ec 100755 --- a/tests/xfs/132 +++ b/tests/xfs/132 @@ -24,7 +24,6 @@ _require_scratch_nocheck # due to transaction cancellation. Hence we don't want to check dmesg here. _disable_dmesg_check -_require_xfs_mkfs_crc _scratch_mkfs -m crc=0 > $seqres.full 2>&1 # The files that EIO in the golden output changes if we have quotas enabled diff --git a/tests/xfs/148 b/tests/xfs/148 index 5d0a0bf42..c9f634cfd 100755 --- a/tests/xfs/148 +++ b/tests/xfs/148 @@ -27,7 +27,6 @@ _cleanup() _supported_fs xfs _require_test _require_attrs -_require_xfs_mkfs_crc _disable_dmesg_check imgfile=$TEST_DIR/img-$seq diff --git a/tests/xfs/263 b/tests/xfs/263 index bce4e13f9..bd30dab11 100755 --- a/tests/xfs/263 +++ b/tests/xfs/263 @@ -21,11 +21,6 @@ _supported_fs xfs _require_scratch _require_xfs_quota -# We could test older, non-project capable kernels but keep it simpler; -# Only test crc and beyond (but we will test with and without the feature) -_require_xfs_mkfs_crc -_require_xfs_crc - function option_string() { VAL=$1 diff --git a/tests/xfs/299 b/tests/xfs/299 index 4b9df3c6a..1df1988ac 100755 --- a/tests/xfs/299 +++ b/tests/xfs/299 @@ -31,8 +31,6 @@ chmod a+rwx $seqres.full # arbitrary users will write here _require_scratch _require_xfs_quota -_require_xfs_mkfs_crc -_require_xfs_crc # The actual point at which limit enforcement takes place for the # hard block limit is variable depending on filesystem blocksize, diff --git a/tests/xfs/304 b/tests/xfs/304 index 3c38e6132..0ee6dad63 100755 --- a/tests/xfs/304 +++ b/tests/xfs/304 @@ -19,8 +19,6 @@ _supported_fs xfs _require_scratch _require_xfs_quota -_require_xfs_mkfs_crc -_require_xfs_crc _scratch_mkfs_xfs -m crc=1 >/dev/null 2>&1 diff --git a/tests/xfs/305 b/tests/xfs/305 index d8a6712e5..e76dfdec1 100755 --- a/tests/xfs/305 +++ b/tests/xfs/305 @@ -19,8 +19,6 @@ _supported_fs xfs _require_scratch _require_xfs_quota -_require_xfs_mkfs_crc -_require_xfs_crc _require_command "$KILLALL_PROG" killall _scratch_mkfs_xfs -m crc=1 >/dev/null 2>&1 From patchwork Mon Apr 8 13:32:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13621181 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C73557BB07; Mon, 8 Apr 2024 13:32:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583180; cv=none; b=fjhzJNQ+ditllsTOrtjlbVw2jy35FBfFkEWdmHkpYFHGWni97MyqX/5lHDf3BawFi2Da34hBPXCPxjVif7agcZlVSkg9O9URP774/fSXOif7OgyMuxvKjlbKN8YCKiurxrx1fI1EPdlu/Epeth1sAQAL7o+qAIUQBxkcXs4JnwA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583180; c=relaxed/simple; bh=hGKSUlWC2holbLVM0LsYK6CcQxVa7Za76kksaoUxSxM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jDOQT5C+tMODjLVzJg1nEFHpg5nNxvFrtC0tauUsJVDoSVgUw0k/9c8WdZn0gqUa6mw+z5xFJs0OR8itwUaY+rFDGIJBt8rEWb/jj7GDXmn+bgb96FAA0BCGZPBg6pOhVTvT5sQIShL0djHXMoE61LPcWiTHlO2ah7EOjpSKoOk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=djPu+u57; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="djPu+u57" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=ly6trlBM5f8+ZeaixRMEQOE+juiohDW+AHB/xVUzhaM=; b=djPu+u57D4avM/Kdkg9dNYLWuz HLhRupm0BMMg39qbldWhzONTXFc7UwQb8J8sg1/dubjaoX5kShn4AN8wMfyy+vynf/PiWXhWIp0s4 bwbFsiksZUWAuHboUVSZAMmcYjTYMZi1eyfCmeKrmkG/iSvyGLFQYlyIsD/Pyv+u/VJNgHt5/vfC6 D0xHxVGh7pRVdoQBoPSMPQyDzM7Jd41AsdM24/DlYpCTqYWRLIB+gqxLkhinDs//kuCWGsI6XzF3I t+TveUsq6jsrqN4dX1v1RocRBStWV9xONelEC5QbdjSTn3L3KeEw9vliJweMa9Cg/sP+T6sN1eqrk 0+knzA1w==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtp7I-0000000FjRw-2LfP; Mon, 08 Apr 2024 13:32:58 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J . Wong " , linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 2/6] remove xfs/096 Date: Mon, 8 Apr 2024 15:32:39 +0200 Message-Id: <20240408133243.694134-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240408133243.694134-1-hch@lst.de> References: <20240408133243.694134-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html This test exercises mkfs error handling before strict validation was added and thus is useless for xfsprogs > 4.5. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- .gitignore | 1 - common/xfs | 9 --- tests/xfs/096 | 130 ------------------------------------- tests/xfs/096.out.external | 50 -------------- tests/xfs/096.out.internal | 51 --------------- 5 files changed, 241 deletions(-) delete mode 100755 tests/xfs/096 delete mode 100644 tests/xfs/096.out.external delete mode 100644 tests/xfs/096.out.internal diff --git a/.gitignore b/.gitignore index 3b160209a..51cda513d 100644 --- a/.gitignore +++ b/.gitignore @@ -211,7 +211,6 @@ tags /tests/generic/050.out /tests/xfs/033.out /tests/xfs/071.out -/tests/xfs/096.out /tests/xfs/216.out # cscope files diff --git a/common/xfs b/common/xfs index 57d21762c..49ca5a2d5 100644 --- a/common/xfs +++ b/common/xfs @@ -1211,15 +1211,6 @@ _require_xfs_mkfs_validation() fi } -# The opposite of _require_xfs_mkfs_validation. -_require_xfs_mkfs_without_validation() -{ - _xfs_mkfs_validation_check - if [ "$?" -ne 0 ]; then - _notrun "Requires older mkfs without strict input checks: the last supported version of xfsprogs is 4.5." - fi -} - _require_scratch_xfs_shrink() { _require_scratch diff --git a/tests/xfs/096 b/tests/xfs/096 deleted file mode 100755 index a7a5444f8..000000000 --- a/tests/xfs/096 +++ /dev/null @@ -1,130 +0,0 @@ -#! /bin/bash -# SPDX-License-Identifier: GPL-2.0 -# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. -# -# FS QA Test No. 096 -# -# test out mkfs_xfs output on IRIX/Linux and some of its error handling -# ensure pv#920679 is addressed -# -seqfull=$0 -. ./common/preamble -_begin_fstest mkfs v2log auto quick - -# Import common functions. -. ./common/filter -. ./common/log - -# -# filter out counts which will vary -# - extsz, blocks, agsize, agcount, device name, rtextents -# - log version varies for crc enabled fs -# - lsunit varies for 512/4k sector devices -# filter out differences between linux and irix: -# - sectsz on Linux -# - mmr, mixed-case on IRIX -# - lazy-count on IRIX -# - inode-paths on IRIX -# - trailing spaces on Linux but not on IRIX -# -# Example output: -# meta-data=DEV isize=256 agcount=N, agsize=N blks -# data = bsize=4096 blocks=N, imaxpct=25 -# = sunit=65 swidth=65 blks, unwritten=1 -# naming =version 2 bsize=4096 -# log =internal log bsize=4096 blocks=N, version=1 -# = sunit=0 blks -# realtime =none extsz=65536 blocks=N, rtextents=N -# -mkfs_filter() -{ - tee -a $seqres.full | \ - sed \ - -e 's/extsz=[0-9][0-9]*[ ]*/extsz=N, /' \ - -e 's/blocks=[0-9][0-9]*/blocks=N/' \ - -e 's/imaxpct=[0-9][0-9]*/imaxpct=N/' \ - -e 's/agsize=[0-9][0-9]*/agsize=N/' \ - -e 's/agcount=[0-9][0-9]*/agcount=N/' \ - -e 's/swidth=[0-9][0-9]* blks$/&, unwritten=1/' \ - -e 's/rtextents=[0-9][0-9]*/rtextents=N/' \ - -e 's/meta-data=[^ ]*/meta-data=DEV/' \ - -e 's/ *isize=[0-9]* / isize=N /' \ - -e '/ *= *sectsz=[0-9][0-9]* *attr=[0-9][0-9]*.*$/d' \ - -e '/ *= *mmr=[0-9][0-9]* *$/d' \ - -e 's/ *mixed-case=[YN]//' \ - -e 's/ *ascii-ci=[01]//' \ - -e 's/\(version=\)\([12]\)/\1N/' \ - -e 's/\(sunit=\)\([018] blks\)/\1N blks/' \ - -e 's/sectsz=[0-9][0-9]* *//' \ - -e 's/, lazy-count.*//' \ - -e '/inode-paths/d' \ - -e 's/\(log[ ]*=\).*bsize/\1LOG bsize/' \ - -e 's/\(realtime[ ]*=\).*extsz/\1REALTIME extsz/' \ - -e '/.*crc=/d' \ - -e 's/ *$//' \ - -e 's/ ftype=[01]//' \ - -e '/^log stripe unit.*too large/d' \ - -e '/^log stripe unit adjusted/d' \ - -e '/Discarding/d' \ - | grep -v parent -} - -# real QA test starts here - -# Modify as appropriate. -_supported_fs xfs -_require_scratch -_require_v2log -_require_xfs_mkfs_without_validation - -# choose .out file based on internal/external log -rm -f $seqfull.out -if [ "$USE_EXTERNAL" = yes ]; then - ln -s $seq.out.external $seqfull.out -else - ln -s $seq.out.internal $seqfull.out -fi - -# maximum log record size -max_lr_size=`expr 256 \* 1024` - -big_su=`expr $max_lr_size + 4096` - -# -# Test out various mkfs param combinations -# -cat >$tmp.seq.params <&1 | mkfs_filter - echo "" - echo "" -done - -# success, all done -status=0 -exit diff --git a/tests/xfs/096.out.external b/tests/xfs/096.out.external deleted file mode 100644 index 3122330ac..000000000 --- a/tests/xfs/096.out.external +++ /dev/null @@ -1,50 +0,0 @@ -QA output created by 096 - -# su too big but must be a multiple of fs block size too ---- mkfs=-l version=2,su=262656 --- -log stripe unit (262656) must be a multiple of the block size (4096) - - -# test log stripe greater than LR size ---- mkfs=-l version=2,su=266240 --- -meta-data=DEV isize=N agcount=N, agsize=N blks -data = bsize=4096 blocks=N, imaxpct=N - = sunit=0 swidth=0 blks, unwritten=1 -naming =version 2 bsize=4096 -log =LOG bsize=4096 blocks=N, version=N -realtime =REALTIME extsz=N, blocks=N, rtextents=N - - -# same test but get log stripe from data stripe ---- mkfs=-l version=2 -d su=266240,sw=1 --- -meta-data=DEV isize=N agcount=N, agsize=N blks -data = bsize=4096 blocks=N, imaxpct=N - = sunit=65 swidth=65 blks, unwritten=1 -naming =version 2 bsize=4096 -log =LOG bsize=4096 blocks=N, version=N - = sunit=N blks -realtime =REALTIME extsz=N, blocks=N, rtextents=N - - -# test out data stripe ---- mkfs=-m crc=0 -l version=1 -d su=266240,sw=1 --- -meta-data=DEV isize=N agcount=N, agsize=N blks -data = bsize=4096 blocks=N, imaxpct=N - = sunit=65 swidth=65 blks, unwritten=1 -naming =version 2 bsize=4096 -log =LOG bsize=4096 blocks=N, version=N - = sunit=N blks -realtime =REALTIME extsz=N, blocks=N, rtextents=N - - -# test out data stripe the same but using sunit & swidth ---- mkfs=-m crc=0 -l version=1 -d sunit=520,swidth=520 --- -meta-data=DEV isize=N agcount=N, agsize=N blks -data = bsize=4096 blocks=N, imaxpct=N - = sunit=65 swidth=65 blks, unwritten=1 -naming =version 2 bsize=4096 -log =LOG bsize=4096 blocks=N, version=N - = sunit=N blks -realtime =REALTIME extsz=N, blocks=N, rtextents=N - - diff --git a/tests/xfs/096.out.internal b/tests/xfs/096.out.internal deleted file mode 100644 index 80201d25b..000000000 --- a/tests/xfs/096.out.internal +++ /dev/null @@ -1,51 +0,0 @@ -QA output created by 096 - -# su too big but must be a multiple of fs block size too ---- mkfs=-l version=2,su=262656 --- -log stripe unit (262656) must be a multiple of the block size (4096) - - -# test log stripe greater than LR size ---- mkfs=-l version=2,su=266240 --- -meta-data=DEV isize=N agcount=N, agsize=N blks -data = bsize=4096 blocks=N, imaxpct=N - = sunit=0 swidth=0 blks, unwritten=1 -naming =version 2 bsize=4096 -log =LOG bsize=4096 blocks=N, version=N - = sunit=N blks -realtime =REALTIME extsz=N, blocks=N, rtextents=N - - -# same test but get log stripe from data stripe ---- mkfs=-l version=2 -d su=266240,sw=1 --- -meta-data=DEV isize=N agcount=N, agsize=N blks -data = bsize=4096 blocks=N, imaxpct=N - = sunit=65 swidth=65 blks, unwritten=1 -naming =version 2 bsize=4096 -log =LOG bsize=4096 blocks=N, version=N - = sunit=N blks -realtime =REALTIME extsz=N, blocks=N, rtextents=N - - -# test out data stripe ---- mkfs=-m crc=0 -l version=1 -d su=266240,sw=1 --- -meta-data=DEV isize=N agcount=N, agsize=N blks -data = bsize=4096 blocks=N, imaxpct=N - = sunit=65 swidth=65 blks, unwritten=1 -naming =version 2 bsize=4096 -log =LOG bsize=4096 blocks=N, version=N - = sunit=N blks -realtime =REALTIME extsz=N, blocks=N, rtextents=N - - -# test out data stripe the same but using sunit & swidth ---- mkfs=-m crc=0 -l version=1 -d sunit=520,swidth=520 --- -meta-data=DEV isize=N agcount=N, agsize=N blks -data = bsize=4096 blocks=N, imaxpct=N - = sunit=65 swidth=65 blks, unwritten=1 -naming =version 2 bsize=4096 -log =LOG bsize=4096 blocks=N, version=N - = sunit=N blks -realtime =REALTIME extsz=N, blocks=N, rtextents=N - - From patchwork Mon Apr 8 13:32:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13621182 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2C5F74438; Mon, 8 Apr 2024 13:33:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583184; cv=none; b=ZOct0Nc8/OqMi7EhU7hSzAnbJKXpbv8rDf5CbpC4AZhV9pGdjur8XSNxxqM0Ou5IOrMfg/saXosCA+ONl+Ht6B2075MU6+mI+GHmCPrqGbxUHf+zXBbqNh7IjIVaSI5EOuzNqPonR7/0t6egJMiW8SOiU/SFwz0am2GJBUIW3RU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583184; c=relaxed/simple; bh=hj3soi/5coOdkwW20UsWavzW0qEo31tdFfeqZJfDlrs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UKXqV0p/9gq1vg98akcXnwf94ViKkU/Z+1QmeuqZ27yQU7laKU2lXED2hEfosh6wEK6YX+KPd8pQ6J8EIebSnM7/34a9xayslzUNAkeZ5X9tRbxguF/K8uQMyOQIk8ZWbd6qXjxbkVEgYohwQhv2eAh5yAGrKQMzVF2iRsGPv1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=OcHIm6uN; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="OcHIm6uN" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=g0gaBHJE9MHYo7oSkm6i9GOx5F9FEkqRT039LF9T8NU=; b=OcHIm6uNR+0IA+PVZC4oes+kB3 TluDMT8HqNou8vo8u/quHcAo1z1oBHaBwBO3wyGOYJxv0NeM+4XB4aDN/6/2XpMafSVdiF1Mynwjd lLea/+haPtrrBRdiAdbSkOKodzxYGqcsmmZbN8DLV6jJw+Ic0zEjas+bpKgJspv8Qzls1YnqhE2ce s7P6l7Hop25l7vAGuVwtHc5kXlaFdo13ygoy8sFLepFqbNt867xrV/JYzBdpjlmJXfzKffzdz868i wREa3mLLkcMUC514RF8aCCauWlJT8H9pkv9GxMgtrFSVK/YLqRT2Yse3GyaFYYEWHQUV8odfnQU3r CrDahq3Q==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtp7N-0000000FjSh-0yWz; Mon, 08 Apr 2024 13:33:02 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J . Wong " , linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 3/6] xfs/078: remove the 512 byte block size sub-case Date: Mon, 8 Apr 2024 15:32:40 +0200 Message-Id: <20240408133243.694134-4-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240408133243.694134-1-hch@lst.de> References: <20240408133243.694134-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 512 byte block sizes are only supported for v4 file systems, and xfs/078 crudely forces use of v4 file systems for it. This doesn't work if the kernel is built without v4 support. Given that v4 support is slowly being phased out and 512 byte block sizes have never been common, drop this part of the test. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- tests/xfs/078 | 9 ++------- tests/xfs/078.out | 18 ------------------ 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/tests/xfs/078 b/tests/xfs/078 index 1f475c963..501551e5e 100755 --- a/tests/xfs/078 +++ b/tests/xfs/078 @@ -69,12 +69,8 @@ _grow_loop() echo echo "*** mkfs loop file (size=$original)" - mkfs_crc_opts="" - if [ $bsize -lt 1024 -a -z "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then - mkfs_crc_opts="-m crc=0" - fi - $MKFS_XFS_PROG $mkfs_crc_opts -b size=$bsize $dparam $LOOP_DEV \ - | _filter_mkfs 2>/dev/null + $MKFS_XFS_PROG -b size=$bsize $dparam $LOOP_DEV | \ + _filter_mkfs 2>/dev/null echo "*** extend loop file" _destroy_loop_device $LOOP_DEV @@ -104,7 +100,6 @@ _grow_loop $((168024*4096)) 1376452608 4096 1 # Some other blocksize cases... _grow_loop $((168024*2048)) 1376452608 2048 1 -_grow_loop $((168024*512)) 1376452608 512 1 16m _grow_loop $((168024*1024)) 688230400 1024 1 # Other corner cases suggested by dgc diff --git a/tests/xfs/078.out b/tests/xfs/078.out index cc3c47d13..7bf5ed03e 100644 --- a/tests/xfs/078.out +++ b/tests/xfs/078.out @@ -37,24 +37,6 @@ data blocks changed from 168024 to 672096 *** unmount *** check -=== GROWFS (from 86028288 to 1376452608, 512 blocksize) - -*** mkfs loop file (size=86028288) -meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks -data = bsize=XXX blocks=XXX, imaxpct=PCT - = sunit=XXX swidth=XXX, unwritten=X -naming =VERN bsize=XXX -log =LDEV bsize=XXX blocks=XXX -realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX -*** extend loop file -wrote 512/512 bytes at offset 1376452608 -*** mount loop filesystem -*** grow loop filesystem -xfs_growfs --BlockSize=512 --Blocks=163840 -data blocks changed from 163840 to 2688384 -*** unmount -*** check - === GROWFS (from 172056576 to 688230400, 1024 blocksize) *** mkfs loop file (size=172056576) From patchwork Mon Apr 8 13:32:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13621183 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C877B81219; Mon, 8 Apr 2024 13:33:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583188; cv=none; b=TW49LS7Gl06gXrXn2MYJOwJFyTn+k8l5dfQBHxt/cqPkTSjIYYrYEpCpUzJnfshuikFRoxQPFTz3RvUPlewRKRDtP94b89SWPzo1/qXBM0BljRi2bX/MRr6s4NEyglmHYBnuj8gxYBgHV/GRYYg7/rLHopWxpS0HPCQCfUyWysc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583188; c=relaxed/simple; bh=d/AWhra2gVUPWRTvuUj0g6eXbJw+VHgXMC//1JX2DxU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dCAFys0dOISKzDNH4ed9Pmy8FPQkfdlmQAcNRwjVF+GEEPNOYq5z4UYtoWKdtxY8xn/zn6DK5MIBXGli5O5dm5OCqX2BdTa+1YSC6HnzVDVX/PDrGfFYPrkIheIicbrGVexOsXYeMIZQQysjE7dxuPf9ODOjsFUWEKYZ1/K3uuM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=aVzoBi/8; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="aVzoBi/8" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=E/MZ6N3EAqX5+mntOfEd9+Od3FjPzqMnwMpwHQvkqQ0=; b=aVzoBi/8+adY0psnMLbmoJttzJ NUHT1FDhJDis0e4ENROG7n+REERlLqIxPGgLG5yaI5Zq/LqUA0d04ndm8r+kA9EWkwalyCjjwbx3s CNGq+z9/XZOXqdjWLLZHmNdjjPaeJI0FaM+Tx2W0Ci+9fzFIQ6+qrOAPJkOBaeIh6XwUBRFWTJz4n XnU2fVxrYiTYhOuoqD2N96kj14M3Mqa43WjR06Q+S42tE4izPb5c3u3kdLwpCO1Fet5smkHt5Tzyd 7WMegAsxowydu4uJUBtllGd0N/yfgwJeFChTCiNRQhL6ZeI3XCknjC08lDvKk4Jzh61p0yJ65Hw13 aoVTCMkQ==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtp7R-0000000FjTJ-0wkO; Mon, 08 Apr 2024 13:33:05 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J . Wong " , linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 4/6] xfs/263: remove the nocrc sub-test Date: Mon, 8 Apr 2024 15:32:41 +0200 Message-Id: <20240408133243.694134-5-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240408133243.694134-1-hch@lst.de> References: <20240408133243.694134-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Remove the test on nocrc file systems as v5 has been the default for 10 years and the kernel has made v4 support optional, which would fail this sub-case. Signed-off-by: Christoph Hellwig --- tests/xfs/263 | 5 --- tests/xfs/263.out | 85 ----------------------------------------------- 2 files changed, 90 deletions(-) diff --git a/tests/xfs/263 b/tests/xfs/263 index bd30dab11..54e9355aa 100755 --- a/tests/xfs/263 +++ b/tests/xfs/263 @@ -66,11 +66,6 @@ function test_all_state() done } -echo "==== NO CRC ====" -_scratch_mkfs_xfs "-m crc=0 -n ftype=0" >> $seqres.full -test_all_state - -echo "==== CRC ====" _scratch_mkfs_xfs "-m crc=1" >>$seqres.full test_all_state diff --git a/tests/xfs/263.out b/tests/xfs/263.out index 531d45de5..64c1a5876 100644 --- a/tests/xfs/263.out +++ b/tests/xfs/263.out @@ -1,89 +1,4 @@ QA output created by 263 -==== NO CRC ==== -== Options: rw == -== Options: usrquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: grpquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: usrquota,grpquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: prjquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: usrquota,prjquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: grpquota,prjquota,rw == -== Options: usrquota,grpquota,prjquota,rw == -==== CRC ==== == Options: rw == == Options: usrquota,rw == User quota state on SCRATCH_MNT (SCRATCH_DEV) From patchwork Mon Apr 8 13:32:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13621184 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66AED74BE5; Mon, 8 Apr 2024 13:33:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583194; cv=none; b=m1edTyF1nkaKL+x6oWn+dP3j6JSQG7oF8s78K0gIIFgV+jSpIC87eFG0lCg/hAPeNN6tAXn1EsLvudVZpsz10223Tx8/+Km/OUJz1kXlb8aCUHL3lsGdA1tfh4R+iVWNxJDcTDbhhhU6+KXLTNVw1bTU3TzJQjvO4B/RKMUPdq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583194; c=relaxed/simple; bh=eABoQ/iuPiwkHwtT/kaHegmUsqhj+sdOzEw8ebJW0p4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=txjDzwKreZwkZ0qdLpWBn1skukyrK/DsAkR1JqKe6nrWiuCY8N9n5KGyh+g8dGN2KQwvQmGMVMAUmaPBD69bgCzyf4fbUFZqhtM3FLH3GL4RN0Hu4+t1NHLLn8UKp8kDcymP+N/Ktfrl48hucs31CY2NConIwLbrtmBptSlezAM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=nyQIz9M4; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="nyQIz9M4" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=taRk7UNW+ObDNsLEcsbi21P98HHHmZOnTii7q75osHo=; b=nyQIz9M4HQbe8oC9YNPJYXxci5 f0yI8CWHqdr4oX1ijJdcAEIdnfZ5bqUofWwR1yvBRW8zkq2juAgMS+hJaib4QOEkq7y7dHqkRpXC0 JEqCuDPyZ+WGCugfSnD1YikViBZfU3ngcTHg7qyromchy5E6WMwXRBkJtm7FYQMGG3roUXX8rUkuq 8jSSqTfklWIEcid9wGZbhE09nIcL8s8oyuz3SmwRUNGW7t5ELEpgyN/NBDyoi+580gQVqIYMEdjwh 4vSyH+Nvj6pTqtvWLnbBqktP33IMjtKXH3u3sndHKReaJ+WH8OmywOXqo/V7mBoi3mQMhWIDuvAKm +vPlON9Q==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtp7V-0000000FjTi-1lwI; Mon, 08 Apr 2024 13:33:12 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J . Wong " , linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 5/6] xfs/522: use reflink instead of crc as test feature Date: Mon, 8 Apr 2024 15:32:42 +0200 Message-Id: <20240408133243.694134-6-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240408133243.694134-1-hch@lst.de> References: <20240408133243.694134-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Replace crc as the main test feature with reflink so that this test do not require v4 file system support. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- tests/xfs/522 | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/xfs/522 b/tests/xfs/522 index 2475d5844..05251b0e2 100755 --- a/tests/xfs/522 +++ b/tests/xfs/522 @@ -46,58 +46,58 @@ test_mkfs_config() { echo Simplest config file cat > $def_cfgfile << ENDL [metadata] -crc = 0 +reflink = 0 ENDL test_mkfs_config $def_cfgfile echo Piped-in config file test_mkfs_config << ENDL [metadata] -crc = 0 +reflink = 0 ENDL test_mkfs_config << ENDL [metadata] -crc = 1 +reflink = 1 ENDL echo Full line comment test_mkfs_config << ENDL # This is a full line comment. [metadata] -crc = 0 +reflink = 0 ENDL test_mkfs_config << ENDL # This is a full line comment. [metadata] -crc = 0 +reflink = 0 ENDL test_mkfs_config << ENDL #This is a full line comment. [metadata] -crc = 0 +reflink = 0 ENDL echo End of line comment test_mkfs_config << ENDL [metadata] -crc = 0 ; This is an eol comment. +reflink = 0 ; This is an eol comment. ENDL test_mkfs_config << ENDL [metadata] -crc = 0 ;This is an eol comment. +reflink = 0 ;This is an eol comment. ENDL echo Multiple directives test_mkfs_config << ENDL [metadata] -crc = 0 +reflink = 0 finobt = 0 ENDL echo Multiple sections test_mkfs_config << ENDL [metadata] -crc = 0 +reflink = 0 [inode] sparse = 0 @@ -111,92 +111,92 @@ ENDL echo Space around the section name test_mkfs_config << ENDL [metadata] -crc = 0 +reflink = 0 ENDL test_mkfs_config << ENDL [metadata] -crc = 0 +reflink = 0 ENDL test_mkfs_config << ENDL [metadata] -crc = 0 +reflink = 0 ENDL echo Single space around the key/value directive test_mkfs_config << ENDL [metadata] - crc=0 + reflink=0 ENDL test_mkfs_config << ENDL [metadata] -crc =0 +reflink =0 ENDL test_mkfs_config << ENDL [metadata] -crc= 0 +reflink= 0 ENDL test_mkfs_config << ENDL [metadata] -crc=0 +reflink=0 ENDL echo Two spaces around the key/value directive test_mkfs_config << ENDL [metadata] - crc =0 + reflink =0 ENDL test_mkfs_config << ENDL [metadata] - crc= 0 + reflink= 0 ENDL test_mkfs_config << ENDL [metadata] - crc=0 + reflink=0 ENDL test_mkfs_config << ENDL [metadata] -crc = 0 +reflink = 0 ENDL test_mkfs_config << ENDL [metadata] -crc =0 +reflink =0 ENDL test_mkfs_config << ENDL [metadata] -crc= 0 +reflink= 0 ENDL echo Three spaces around the key/value directive test_mkfs_config << ENDL [metadata] - crc = 0 + reflink = 0 ENDL test_mkfs_config << ENDL [metadata] - crc= 0 + reflink= 0 ENDL test_mkfs_config << ENDL [metadata] -crc = 0 +reflink = 0 ENDL echo Four spaces around the key/value directive test_mkfs_config << ENDL [metadata] - crc = 0 + reflink = 0 ENDL echo Arbitrary spaces and tabs test_mkfs_config << ENDL [metadata] - crc = 0 + reflink = 0 ENDL echo ambiguous comment/section names test_mkfs_config << ENDL [metadata] #[data] -crc = 0 +reflink = 0 ENDL echo ambiguous comment/variable names From patchwork Mon Apr 8 13:32:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13621185 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0AE174BE5; Mon, 8 Apr 2024 13:33:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583198; cv=none; b=os1qc73F9/3JpUzcCVtjbfwdCyrQ4Fhlbl86/XbXXiIQA4KFaLCYcC6lGarbvow3iNFAdyv4Pc4Fd0k4MTET4xfttrBN3efhrgU8VG45BccOY7PV9xP49SYJEuMoh4LpqU4tzbHnPgd+vZAO2MOsjU6KWtZorH4cbH3JaE7h6H4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583198; c=relaxed/simple; bh=0atrBh/X+sVAjmELXLIJFn7ClyhTYL6kv2Zjt55bUds=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZRaFCTvfOPr5uKSt/0lPOsG02BimkZO8ftyaUDmeqqZpfGy114ejGFFpaKFMw3xFjE9shs6X9KWlJlHJFfdDZRhjCvgW31OOHtC2b/+Jn76vYXBVcz0v+QTvQ/mb5zbUgj2M/cHZ9wNHIJx1Qgl8rfRO4pK/am6NXyS5yUsZW7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=x8UPO9CY; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="x8UPO9CY" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=W3fRzgr7JsJHFjx7BvPT8eIm8aOsABy0x8QIT8+oQMY=; b=x8UPO9CYOxeXhGEJGjdp+1sMC+ 2DR4yUdHtUiq6anRc1m+zd0Bwf6R+IAmFTDNmID5hyG+UEdRrxg8OWsDGKjKlcj0Z7Qv5qarrhOlh lSBw0doGBPWjqSmVUMyFGUEGhaojhZtnYHio6JCFoOtNj2yF5iW3yUsB0MroKP8XNQgrQhq9+B6j5 5OsjKz7bp3PDVuBzC686ir5MMPi2GccK1eXou4fg5HT0kpVGz2EzMj9R9X2320sK3migmkdg5Zv1A U8SzRmUUGChqTDPZGOPSwOCJHfCK4XpL8YoLmTFuseZ2hkz6fPDrHsrJFdD3DWYw7E4tFD4NUiMTQ coWERilQ==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtp7b-0000000FjVR-2o3b; Mon, 08 Apr 2024 13:33:16 +0000 From: Christoph Hellwig To: Zorro Lang Cc: "Darrick J . Wong " , linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 6/6] xfs: don't run tests that require v4 file systems when not supported Date: Mon, 8 Apr 2024 15:32:43 +0200 Message-Id: <20240408133243.694134-7-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240408133243.694134-1-hch@lst.de> References: <20240408133243.694134-1-hch@lst.de> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Add a _require_xfs_nocrc helper that checks that we can mkfs and mount a crc=0 file systems before running tests that rely on it to avoid failures on kernels with CONFIG_XFS_SUPPORT_V4 disabled. Signed-off-by: Christoph Hellwig --- common/xfs | 10 ++++++++++ tests/xfs/002 | 1 + tests/xfs/045 | 1 + tests/xfs/095 | 1 + tests/xfs/132 | 1 + tests/xfs/148 | 2 ++ tests/xfs/158 | 1 + tests/xfs/160 | 1 + tests/xfs/194 | 2 ++ tests/xfs/199 | 1 + tests/xfs/300 | 1 + tests/xfs/513 | 1 + tests/xfs/526 | 1 + 13 files changed, 24 insertions(+) diff --git a/common/xfs b/common/xfs index 49ca5a2d5..733c3a5be 100644 --- a/common/xfs +++ b/common/xfs @@ -1852,3 +1852,13 @@ _xfs_discard_max_offset_kb() $XFS_IO_PROG -c 'statfs' "$1" | \ awk '{g[$1] = $3} END {print (g["geom.bsize"] * g["geom.datablocks"] / 1024)}' } + +# check if mkfs and the kernel support nocrc (v4) file systems +_require_xfs_nocrc() +{ + _scratch_mkfs_xfs -m crc=0 > /dev/null 2>&1 || \ + _notrun "v4 file systems not supported" + _try_scratch_mount > /dev/null 2>&1 || \ + _notrun "v4 file systems not supported" + _scratch_unmount +} diff --git a/tests/xfs/002 b/tests/xfs/002 index 8dfd2693b..26d0cd6e4 100755 --- a/tests/xfs/002 +++ b/tests/xfs/002 @@ -23,6 +23,7 @@ _begin_fstest auto quick growfs _supported_fs xfs _require_scratch_nocheck _require_no_large_scratch_dev +_require_xfs_nocrc _scratch_mkfs_xfs -m crc=0 -d size=128m >> $seqres.full 2>&1 || _fail "mkfs failed" diff --git a/tests/xfs/045 b/tests/xfs/045 index d8cc9ac29..69531ba71 100755 --- a/tests/xfs/045 +++ b/tests/xfs/045 @@ -22,6 +22,7 @@ _supported_fs xfs _require_test _require_scratch_nocheck +_require_xfs_nocrc echo "*** get uuid" uuid=`_get_existing_uuid` diff --git a/tests/xfs/095 b/tests/xfs/095 index a3891c85e..e7dc3e9f4 100755 --- a/tests/xfs/095 +++ b/tests/xfs/095 @@ -19,6 +19,7 @@ _begin_fstest log v2log auto _supported_fs xfs _require_scratch _require_v2log +_require_xfs_nocrc if [ "$(blockdev --getss $SCRATCH_DEV)" != "512" ]; then _notrun "need 512b sector size" diff --git a/tests/xfs/132 b/tests/xfs/132 index ee1c8c1ec..b46d3d28c 100755 --- a/tests/xfs/132 +++ b/tests/xfs/132 @@ -19,6 +19,7 @@ _supported_fs xfs # we intentionally corrupt the filesystem, so don't check it after the test _require_scratch_nocheck +_require_xfs_nocrc # on success, we'll get a shutdown filesystem with a really noisy log message # due to transaction cancellation. Hence we don't want to check dmesg here. diff --git a/tests/xfs/148 b/tests/xfs/148 index c9f634cfd..72d05f12f 100755 --- a/tests/xfs/148 +++ b/tests/xfs/148 @@ -27,6 +27,8 @@ _cleanup() _supported_fs xfs _require_test _require_attrs +_require_xfs_nocrc + _disable_dmesg_check imgfile=$TEST_DIR/img-$seq diff --git a/tests/xfs/158 b/tests/xfs/158 index 4440adf6e..0107fa3d6 100755 --- a/tests/xfs/158 +++ b/tests/xfs/158 @@ -18,6 +18,7 @@ _supported_fs xfs _require_scratch_xfs_inobtcount _require_command "$XFS_ADMIN_PROG" "xfs_admin" _require_xfs_repair_upgrade inobtcount +_require_xfs_nocrc # Make sure we can't format a filesystem with inobtcount and not finobt. _scratch_mkfs -m crc=1,inobtcount=1,finobt=0 &> $seqres.full && \ diff --git a/tests/xfs/160 b/tests/xfs/160 index 399fe4bcf..134b38a18 100755 --- a/tests/xfs/160 +++ b/tests/xfs/160 @@ -18,6 +18,7 @@ _supported_fs xfs _require_command "$XFS_ADMIN_PROG" "xfs_admin" _require_scratch_xfs_bigtime _require_xfs_repair_upgrade bigtime +_require_xfs_nocrc date --date='Jan 1 00:00:00 UTC 2040' > /dev/null 2>&1 || \ _notrun "Userspace does not support dates past 2038." diff --git a/tests/xfs/194 b/tests/xfs/194 index 5a1dff5d2..2ef9403bb 100755 --- a/tests/xfs/194 +++ b/tests/xfs/194 @@ -30,6 +30,8 @@ _supported_fs xfs # real QA test starts here _require_scratch +_require_xfs_nocrc + _scratch_mkfs_xfs >/dev/null 2>&1 # For this test we use block size = 1/8 page size diff --git a/tests/xfs/199 b/tests/xfs/199 index 4669f2c3e..f99b04db3 100755 --- a/tests/xfs/199 +++ b/tests/xfs/199 @@ -26,6 +26,7 @@ _cleanup() _supported_fs xfs _require_scratch +_require_xfs_nocrc # clear any mkfs options so that we can directly specify the options we need to # be able to test the features bitmask behaviour correctly. diff --git a/tests/xfs/300 b/tests/xfs/300 index 2ee5eee71..bc1f0efc6 100755 --- a/tests/xfs/300 +++ b/tests/xfs/300 @@ -13,6 +13,7 @@ _begin_fstest auto fsr . ./common/filter _require_scratch +_require_xfs_nocrc # real QA test starts here diff --git a/tests/xfs/513 b/tests/xfs/513 index ce2bb3491..42eceeb90 100755 --- a/tests/xfs/513 +++ b/tests/xfs/513 @@ -37,6 +37,7 @@ _fixed_by_kernel_commit 237d7887ae72 \ _require_test _require_loop _require_xfs_io_command "falloc" +_require_xfs_nocrc LOOP_IMG=$TEST_DIR/$seq.dev LOOP_SPARE_IMG=$TEST_DIR/$seq.logdev diff --git a/tests/xfs/526 b/tests/xfs/526 index 4261e8497..188d0d514 100755 --- a/tests/xfs/526 +++ b/tests/xfs/526 @@ -26,6 +26,7 @@ _supported_fs xfs _require_test _require_scratch_nocheck _require_xfs_mkfs_cfgfile +_require_xfs_nocrc cfgfile=$TEST_DIR/a rm -rf $cfgfile