* [PATCH v3 1/6] common: refactor sysfs_attr functions
2023-09-27 23:14 [PATCH v3 0/6] btrfs: simple quotas fstests Boris Burkov
@ 2023-09-27 23:14 ` Boris Burkov
2023-09-27 23:14 ` [PATCH v3 2/6] btrfs: quota mode helpers Boris Burkov
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Boris Burkov @ 2023-09-27 23:14 UTC (permalink / raw)
To: linux-btrfs, kernel-team, fstests
Expand the has/get/require functions to allow passing a dev by
parameter, and implement the test_dev specific one in terms of the new
generic one.
Signed-off-by: Boris Burkov <boris@bur.io>
---
common/rc | 127 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 82 insertions(+), 45 deletions(-)
diff --git a/common/rc b/common/rc
index 1618ded54..c3cd53546 100644
--- a/common/rc
+++ b/common/rc
@@ -4689,47 +4689,33 @@ run_fsx()
rm -f $tmp.fsx
}
-# Test for the existence of a sysfs entry at /sys/fs/$FSTYP/DEV/$ATTR
+_require_statx()
+{
+ $here/src/stat_test --check-statx ||
+ _notrun "This test requires the statx system call"
+}
+
+# Get the path to the sysfs directory for the fs on a device
#
# Only one argument is needed:
-# - attr: path name under /sys/fs/$FSTYP/DEV
+# - dev: mounted block device for the fs
#
# Usage example:
-# _require_fs_sysfs error/fail_at_unmount
-_has_fs_sysfs()
+# _fs_sysfs_dname /dev/mapper/scratch-dev
+_fs_sysfs_dname()
{
- local attr=$1
- local dname
+ local dev=$1
+
+ if [ ! -b "$dev" ]; then
+ _fail "Usage: _fs_sysfs_dname <mounted_device>"
+ fi
case "$FSTYP" in
btrfs)
- dname=$(findmnt -n -o UUID $TEST_DEV) ;;
+ findmnt -n -o UUID ${dev} ;;
*)
- dname=$(_short_dev $TEST_DEV) ;;
+ _short_dev $dev ;;
esac
-
- if [ -z "$attr" -o -z "$dname" ];then
- _fail "Usage: _require_fs_sysfs <sysfs_attr_path>"
- fi
-
- test -e /sys/fs/${FSTYP}/${dname}/${attr}
-}
-
-# Require the existence of a sysfs entry at /sys/fs/$FSTYP/DEV/$ATTR
-_require_fs_sysfs()
-{
- _has_fs_sysfs "$@" && return
-
- local attr=$1
- local dname=$(_short_dev $TEST_DEV)
-
- _notrun "This test requires /sys/fs/${FSTYP}/${dname}/${attr}"
-}
-
-_require_statx()
-{
- $here/src/stat_test --check-statx ||
- _notrun "This test requires the statx system call"
}
# Write "content" into /sys/fs/$FSTYP/$DEV/$ATTR
@@ -4753,13 +4739,7 @@ _set_fs_sysfs_attr()
_fail "Usage: _set_fs_sysfs_attr <mounted_device> <attr> <content>"
fi
- local dname
- case "$FSTYP" in
- btrfs)
- dname=$(findmnt -n -o UUID ${dev}) ;;
- *)
- dname=$(_short_dev $dev) ;;
- esac
+ local dname=$(_fs_sysfs_dname $dev)
echo "$content" > /sys/fs/${FSTYP}/${dname}/${attr}
}
@@ -4781,17 +4761,74 @@ _get_fs_sysfs_attr()
_fail "Usage: _get_fs_sysfs_attr <mounted_device> <attr>"
fi
- local dname
- case "$FSTYP" in
- btrfs)
- dname=$(findmnt -n -o UUID ${dev}) ;;
- *)
- dname=$(_short_dev $dev) ;;
- esac
+ local dname=$(_fs_sysfs_dname $dev)
cat /sys/fs/${FSTYP}/${dname}/${attr}
}
+# Test for the existence of a sysfs entry at /sys/fs/$FSTYP/$DEV/$ATTR
+#
+# All arguments are necessary, and in this order:
+# - dev: device name, e.g. $SCRATCH_DEV
+# - attr: path name under /sys/fs/$FSTYP/$dev
+#
+# Usage example:
+# _has_fs_sysfs_attr /dev/mapper/scratch-dev error/fail_at_unmount
+_has_fs_sysfs_attr()
+{
+ local dev=$1
+ local attr=$2
+
+ if [ ! -b "$dev" -o -z "$attr" ];then
+ _fail "Usage: _get_fs_sysfs_attr <mounted_device> <attr>"
+ fi
+
+ local dname=$(_fs_sysfs_dname $dev)
+
+ test -e /sys/fs/${FSTYP}/${dname}/${attr}
+}
+
+# Require the existence of a sysfs entry at /sys/fs/$FSTYP/$DEV/$ATTR
+# All arguments are necessary, and in this order:
+# - dev: device name, e.g. $SCRATCH_DEV
+# - attr: path name under /sys/fs/$FSTYP/$dev
+#
+# Usage example:
+# _require_fs_sysfs_attr /dev/mapper/scratch-dev error/fail_at_unmount
+_require_fs_sysfs_attr()
+{
+ _has_fs_sysfs_attr "$@" && return
+
+ local dev=$1
+ local attr=$2
+ local dname=$(_fs_sysfs_dname $dev)
+
+ _notrun "This test requires /sys/fs/${FSTYP}/${dname}/${attr}"
+}
+
+# Test for the existence of a sysfs entry at /sys/fs/$FSTYP/DEV/$ATTR
+#
+# Only one argument is needed:
+# - attr: path name under /sys/fs/$FSTYP/DEV
+#
+# Usage example:
+# _has_fs_sysfs error/fail_at_unmount
+_has_fs_sysfs()
+{
+ _has_fs_sysfs_attr $TEST_DEV "$@"
+}
+
+# Require the existence of a sysfs entry at /sys/fs/$FSTYP/DEV/$ATTR
+_require_fs_sysfs()
+{
+ _has_fs_sysfs "$@" && return
+
+ local attr=$1
+ local dname=$(_short_dev $TEST_DEV)
+
+ _notrun "This test requires /sys/fs/${FSTYP}/${dname}/${attr}"
+}
+
# Generic test for specific filesystem feature.
# Currently only implemented to test overlayfs features.
_require_scratch_feature()
--
2.42.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 2/6] btrfs: quota mode helpers
2023-09-27 23:14 [PATCH v3 0/6] btrfs: simple quotas fstests Boris Burkov
2023-09-27 23:14 ` [PATCH v3 1/6] common: refactor sysfs_attr functions Boris Burkov
@ 2023-09-27 23:14 ` Boris Burkov
2023-09-28 13:07 ` Anand Jain
2023-09-27 23:14 ` [PATCH v3 3/6] btrfs/301: new test for simple quotas Boris Burkov
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Boris Burkov @ 2023-09-27 23:14 UTC (permalink / raw)
To: linux-btrfs, kernel-team, fstests
To facilitate skipping tests depending on the qgroup mode after mkfs,
add support for figuring out the mode. This cannot just rely on the new
sysfs file, since it might not be present on older kernels.
Signed-off-by: Boris Burkov <boris@bur.io>
---
common/btrfs | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/common/btrfs b/common/btrfs
index c9903a413..37796cc6e 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -689,3 +689,41 @@ _require_btrfs_scratch_logical_resolve_v2()
fi
_scratch_unmount
}
+
+_qgroup_mode()
+{
+ local dev=$1
+
+ if [ ! -b "$dev" ]; then
+ _fail "Usage: _qgroup_mode <mounted_device>"
+ fi
+
+ if _has_fs_sysfs_attr $dev /qgroups/mode; then
+ _get_fs_sysfs_attr $dev qgroups/mode
+ else
+ echo "disabled"
+ fi
+}
+
+_check_regular_qgroup()
+{
+ _qgroup_mode "$@" | grep -q 'qgroup'
+}
+
+_require_scratch_qgroup()
+{
+ _scratch_mkfs >>$seqres.full 2>&1
+ _scratch_mount
+ _run_btrfs_util_prog quota enable $SCRATCH_MNT
+ _check_regular_qgroup $SCRATCH_DEV || _notrun "not running normal qgroups"
+ _scratch_unmount
+}
+
+_require_scratch_enable_simple_quota()
+{
+ _scratch_mkfs >>$seqres.full 2>&1
+ _scratch_mount
+ _qgroup_mode $SCRATCH_DEV | grep 'squota' && _notrun "cannot enable simple quota; on by default"
+ $BTRFS_UTIL_PROG quota enable --simple $SCRATCH_MNT || _notrun "simple quotas not available"
+ _scratch_unmount
+}
--
2.42.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v3 2/6] btrfs: quota mode helpers
2023-09-27 23:14 ` [PATCH v3 2/6] btrfs: quota mode helpers Boris Burkov
@ 2023-09-28 13:07 ` Anand Jain
0 siblings, 0 replies; 10+ messages in thread
From: Anand Jain @ 2023-09-28 13:07 UTC (permalink / raw)
To: Boris Burkov, linux-btrfs, kernel-team, fstests
On 28/09/2023 07:14, Boris Burkov wrote:
> To facilitate skipping tests depending on the qgroup mode after mkfs,
> add support for figuring out the mode. This cannot just rely on the new
> sysfs file, since it might not be present on older kernels.
>
> Signed-off-by: Boris Burkov <boris@bur.io>
> ---
> common/btrfs | 38 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
>
> diff --git a/common/btrfs b/common/btrfs
> index c9903a413..37796cc6e 100644
> --- a/common/btrfs
> +++ b/common/btrfs
> @@ -689,3 +689,41 @@ _require_btrfs_scratch_logical_resolve_v2()
> fi
> _scratch_unmount
> }
> +
> +_qgroup_mode()
> +{
> + local dev=$1
> +
> + if [ ! -b "$dev" ]; then
> + _fail "Usage: _qgroup_mode <mounted_device>"
> + fi
> +
> + if _has_fs_sysfs_attr $dev /qgroups/mode; then
> + _get_fs_sysfs_attr $dev qgroups/mode
> + else
> + echo "disabled"
> + fi
> +}
> +
> +_check_regular_qgroup()
> +{
> + _qgroup_mode "$@" | grep -q 'qgroup'
> +}
> +
> +_require_scratch_qgroup()
> +{
> + _scratch_mkfs >>$seqres.full 2>&1
> + _scratch_mount
> + _run_btrfs_util_prog quota enable $SCRATCH_MNT
> + _check_regular_qgroup $SCRATCH_DEV || _notrun "not running normal qgroups"
> + _scratch_unmount
> +}
> +
> +_require_scratch_enable_simple_quota()
> +{
> + _scratch_mkfs >>$seqres.full 2>&1
> + _scratch_mount
> + _qgroup_mode $SCRATCH_DEV | grep 'squota' && _notrun "cannot enable simple quota; on by default"
> + $BTRFS_UTIL_PROG quota enable --simple $SCRATCH_MNT || _notrun "simple quotas not available"
> + _scratch_unmount
> +}
The rest of the patches look good so far. However, the indentation is
mixed above; lines have a combination of spaces and tabs. Please help
fix it if you are resending the whole series, or else I will fix it
while merging.
Thanks, Anand
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 3/6] btrfs/301: new test for simple quotas
2023-09-27 23:14 [PATCH v3 0/6] btrfs: simple quotas fstests Boris Burkov
2023-09-27 23:14 ` [PATCH v3 1/6] common: refactor sysfs_attr functions Boris Burkov
2023-09-27 23:14 ` [PATCH v3 2/6] btrfs: quota mode helpers Boris Burkov
@ 2023-09-27 23:14 ` Boris Burkov
2023-09-28 15:39 ` Filipe Manana
2023-09-27 23:14 ` [PATCH v3 4/6] btrfs: quota rescan helpers Boris Burkov
` (2 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Boris Burkov @ 2023-09-27 23:14 UTC (permalink / raw)
To: linux-btrfs, kernel-team, fstests
Test some interesting basic and edge cases of simple quotas.
To some extent, this is redundant with the alternate testing strategy of
using MKFS_OPTIONS to enable simple quotas, running the full suite and
relying on kernel warnings and fsck to surface issues.
Signed-off-by: Boris Burkov <boris@bur.io>
---
tests/btrfs/301 | 418 ++++++++++++++++++++++++++++++++++++++++++++
tests/btrfs/301.out | 2 +
2 files changed, 420 insertions(+)
create mode 100755 tests/btrfs/301
create mode 100644 tests/btrfs/301.out
diff --git a/tests/btrfs/301 b/tests/btrfs/301
new file mode 100755
index 000000000..527c25230
--- /dev/null
+++ b/tests/btrfs/301
@@ -0,0 +1,418 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2023 Meta Platforms, Inc. All Rights Reserved.
+#
+# FS QA Test 301
+#
+# Test common btrfs simple quotas scenarios involving sharing extents and
+# removing them in various orders.
+#
+. ./common/preamble
+_begin_fstest auto quick qgroup copy_range snapshot
+
+# Import common functions.
+# . ./common/filter
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs btrfs
+_require_scratch
+_require_scratch_enable_simple_quota
+
+subv=$SCRATCH_MNT/subv
+nested=$SCRATCH_MNT/subv/nested
+snap=$SCRATCH_MNT/snap
+k=1024
+m=$(($k * $k))
+nr_fill=1024
+fill_sz=$((8 * $k))
+total_fill=$(($nr_fill * $fill_sz))
+eb_sz=$((16 * $k))
+ext_sz=$((128 * m))
+limit_nr=8
+limit=$(($ext_sz * $limit_nr))
+
+get_qgroup_usage()
+{
+ local qgroupid=$1
+
+ $BTRFS_UTIL_PROG qgroup show --sync --raw $SCRATCH_MNT | grep "$qgroupid" | $AWK_PROG '{print $3}'
+}
+
+get_subvol_usage()
+{
+ local subvolid=$1
+ get_qgroup_usage "0/$subvolid"
+}
+
+count_subvol_owned_metadata()
+{
+ local subvolid=$1
+ # find nodes and leaves owned by the subvol, then get unique offsets
+ # to account for snapshots sharing metadata.
+ count=$($BTRFS_UTIL_PROG inspect-internal dump-tree $SCRATCH_DEV | \
+ grep "owner $subvolid" | awk '{print $2}' | sort | uniq | wc -l)
+ # output bytes rather than number of metadata blocks
+ echo $(($count * $eb_sz))
+}
+
+check_qgroup_usage()
+{
+ local qgroupid=$1
+ local expected=$2
+ local actual=$(get_qgroup_usage $qgroupid)
+
+ [ $expected -eq $actual ] || _fail "qgroup $qgroupid mismatched usage $actual vs $expected"
+}
+
+check_subvol_usage()
+{
+ local subvolid=$1
+ local expected_data=$2
+ # need to sync to see updated usage numbers.
+ # could probably improve by placing syncs only where they are strictly
+ # needed after actual operations, but it is more error prone.
+ sync
+
+ local expected_meta=$(count_subvol_owned_metadata $subvolid)
+ local actual=$(get_subvol_usage $subvolid)
+ local expected=$(($expected_data + $expected_meta))
+
+ [ $expected -eq $actual ] || _fail "subvol $subvolid mismatched usage $actual vs $expected (expected data $expected_data expected meta $expected_meta diff $(($actual - $expected)))"
+ echo "OK $subvolid $expected_data $expected_meta $actual" >> $seqres.full
+}
+
+set_subvol_limit()
+{
+ local subvolid=$1
+ local limit=$2
+
+ $BTRFS_UTIL_PROG qgroup limit $2 0/$1 $SCRATCH_MNT
+}
+
+sync_check_subvol_usage()
+{
+ sync
+ check_subvol_usage $@
+}
+
+trigger_cleaner()
+{
+ $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
+ sleep 1
+ $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
+}
+
+cycle_mount_check_subvol_usage()
+{
+ _scratch_cycle_mount
+ check_subvol_usage $@
+}
+
+
+do_write()
+{
+ local file=$1
+ local sz=$2
+
+ $XFS_IO_PROG -fc "pwrite -q 0 $sz" $file
+ local ret=$?
+ return $ret
+}
+
+do_enospc_write()
+{
+ local file=$1
+ local sz=$2
+
+ do_write $file $sz 2>/dev/null && _fail "write expected enospc"
+}
+
+do_falloc()
+{
+ local file=$1
+ local sz=$2
+
+ $XFS_IO_PROG -fc "falloc 0 $sz" $file
+}
+
+do_enospc_falloc()
+{
+ local file=$1
+ local sz=$2
+
+ do_falloc $file $sz 2>/dev/null && _fail "falloc expected enospc"
+}
+
+enable_quota()
+{
+ local mode=$1
+
+ [ $mode == "n" ] && return
+ arg=$([ $mode == "s" ] && echo "--simple")
+
+ $BTRFS_UTIL_PROG quota enable $arg $SCRATCH_MNT
+}
+
+prepare()
+{
+ _scratch_mkfs >> $seqres.full
+ _scratch_mount
+ enable_quota "s"
+ $BTRFS_UTIL_PROG subvolume create $subv >> $seqres.full
+ set_subvol_limit 256 $limit
+ check_subvol_usage 256 0
+
+ # Create a bunch of little filler files to generate several levels in
+ # the btree, to make snapshotting sharing scenarios complex enough.
+ $FIO_PROG --name=filler --directory=$subv --rw=randwrite --nrfiles=$nr_fill --filesize=$fill_sz >/dev/null 2>&1
+ check_subvol_usage 256 $total_fill
+
+ # Create a single file whose extents we will explicitly share/unshare.
+ do_write $subv/f $ext_sz
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+}
+
+prepare_snapshotted()
+{
+ prepare
+ $BTRFS_UTIL_PROG subvolume snapshot $subv $snap >> $seqres.full
+ echo "snapshot" >> $seqres.full
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ check_subvol_usage 257 0
+}
+
+prepare_nested()
+{
+ prepare
+ $BTRFS_UTIL_PROG qgroup create 1/100 $SCRATCH_MNT
+ $BTRFS_UTIL_PROG qgroup assign 0/256 1/100 $SCRATCH_MNT >> $seqres.full
+ $BTRFS_UTIL_PROG subvolume create $nested >> $seqres.full
+ do_write $nested/f $ext_sz
+ check_subvol_usage 257 $ext_sz
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ local subv_usage=$(get_subvol_usage 256)
+ local nested_usage=$(get_subvol_usage 257)
+ check_qgroup_usage 1/100 $(($subv_usage + $nested_usage))
+}
+
+basic_accounting()
+{
+ prepare
+ echo "basic" >> $seqres.full
+ echo "delete file" >> $seqres.full
+ rm $subv/f
+ check_subvol_usage 256 $total_fill
+ cycle_mount_check_subvol_usage 256 $total_fill
+ do_write $subv/tmp 512M
+ rm $subv/tmp
+ do_write $subv/tmp 512M
+ rm $subv/tmp
+ do_enospc_falloc $subv/large_falloc 2G
+ do_enospc_write $subv/large 2G
+ _scratch_unmount
+}
+
+reservation_accounting()
+{
+ prepare
+ for i in $(seq 10); do
+ do_write $subv/tmp 512M
+ rm $subv/tmp
+ done
+ do_enospc_write $subv/large 2G
+ _scratch_unmount
+}
+
+snapshot_accounting()
+{
+ prepare_snapshotted
+ echo "unshare snapshot metadata" >> $seqres.full
+ touch $snap/f
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ check_subvol_usage 257 0
+ echo "unshare snapshot data" >> $seqres.full
+ do_write $snap/f $ext_sz
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ check_subvol_usage 257 $ext_sz
+ echo "delete snapshot file" >> $seqres.full
+ rm $snap/f
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ check_subvol_usage 257 0
+ echo "delete original file" >> $seqres.full
+ rm $subv/f
+ check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 0
+ cycle_mount_check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 0
+ _scratch_unmount
+}
+
+delete_subvol_file()
+{
+ prepare_snapshotted
+ echo "delete subvol file first" >> $seqres.full
+ rm $subv/f
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ check_subvol_usage 257 0
+ rm $snap/f
+ trigger_cleaner
+ check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 0
+ cycle_mount_check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 0
+ _scratch_unmount
+}
+
+delete_snapshot_file()
+{
+ prepare_snapshotted
+ echo "delete snapshot file first" >> $seqres.full
+ rm $snap/f
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ check_subvol_usage 257 0
+ rm $subv/f
+ check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 0
+ cycle_mount_check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 0
+ _scratch_unmount
+}
+
+delete_subvol()
+{
+ echo "del sv" > /dev/ksmg
+ prepare_snapshotted
+ echo "delete subvol first" >> $seqres.full
+ $BTRFS_UTIL_PROG subvolume delete $subv >> $seqres.full
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ check_subvol_usage 257 0
+ rm $snap/f
+ trigger_cleaner
+ check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 0
+ $BTRFS_UTIL_PROG subvolume delete $snap >> $seqres.full
+ trigger_cleaner
+ check_subvol_usage 256 0
+ check_subvol_usage 257 0
+ cycle_mount_check_subvol_usage 256 0
+ check_subvol_usage 257 0
+ _scratch_unmount
+}
+
+delete_snapshot()
+{
+ echo "del snap" > /dev/ksmg
+ prepare_snapshotted
+ echo "delete snapshot first" >> $seqres.full
+ $BTRFS_UTIL_PROG subvolume delete $snap >> $seqres.full
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ check_subvol_usage 257 0
+ $BTRFS_UTIL_PROG subvolume delete $subv >> $seqres.full
+ trigger_cleaner
+ check_subvol_usage 256 0
+ check_subvol_usage 257 0
+ _scratch_unmount
+}
+
+nested_accounting()
+{
+ echo "nested" > /dev/ksmg
+ prepare_nested
+ echo "nested" >> $seqres.full
+ echo "delete file" >> $seqres.full
+ rm $subv/f
+ check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 $ext_sz
+ local subv_usage=$(get_subvol_usage 256)
+ local nested_usage=$(get_subvol_usage 257)
+ check_qgroup_usage 1/100 $(($subv_usage + $nested_usage))
+ rm $nested/f
+ check_subvol_usage 256 $total_fill
+ check_subvol_usage 257 0
+ subv_usage=$(get_subvol_usage 256)
+ nested_usage=$(get_subvol_usage 257)
+ check_qgroup_usage 1/100 $(($subv_usage + $nested_usage))
+ _scratch_unmount
+}
+
+enable_mature()
+{
+ echo "mature" > /dev/ksmg
+ _scratch_mkfs >> $seqres.full
+ _scratch_mount
+ $BTRFS_UTIL_PROG subvolume create $subv >> $seqres.full
+ do_write $subv/f $ext_sz
+ sync
+ enable_quota "s"
+ set_subvol_limit 256 $limit
+ _scratch_cycle_mount
+ usage=$(get_subvol_usage 256)
+ [ $usage -lt $ext_sz ] || _fail "captured usage from before enable $usage"
+ do_write $subv/g $ext_sz
+ usage=$(get_subvol_usage 256)
+ [ $usage -lt $ext_sz ] && "failed to capture usage after enable $usage"
+ check_subvol_usage 256 $ext_sz
+ rm $subv/f
+ check_subvol_usage 256 $ext_sz
+ _scratch_cycle_mount
+ rm $subv/g
+ check_subvol_usage 256 0
+ _scratch_unmount
+}
+
+reflink_accounting()
+{
+ prepare
+ # do more reflinks than would fit
+ for i in $(seq $(($limit_nr * 2))); do
+ cp --reflink=always $subv/f $subv/f.i
+ done
+ # no additional data usage from reflinks
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ _scratch_unmount
+}
+
+delete_link()
+{
+ prepare
+ cp --reflink=always $subv/f $subv/f.link
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ rm $subv/f.link
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ rm $subv/f
+ check_subvol_usage 256 $(($total_fill))
+ _scratch_unmount
+}
+
+delete_linked()
+{
+ prepare
+ cp --reflink=always $subv/f $subv/f.link
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ rm $subv/f
+ check_subvol_usage 256 $(($total_fill + $ext_sz))
+ rm $subv/f.link
+ check_subvol_usage 256 $(($total_fill))
+ _scratch_unmount
+}
+
+basic_accounting
+reservation_accounting
+snapshot_accounting
+delete_subvol_file
+delete_snapshot_file
+delete_subvol
+delete_snapshot
+nested_accounting
+enable_mature
+reflink_accounting
+delete_link
+delete_linked
+
+echo "Silence is golden"
+
+# success, all done
+status=0
+exit
diff --git a/tests/btrfs/301.out b/tests/btrfs/301.out
new file mode 100644
index 000000000..4025504e4
--- /dev/null
+++ b/tests/btrfs/301.out
@@ -0,0 +1,2 @@
+QA output created by 301
+Silence is golden
--
2.42.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v3 3/6] btrfs/301: new test for simple quotas
2023-09-27 23:14 ` [PATCH v3 3/6] btrfs/301: new test for simple quotas Boris Burkov
@ 2023-09-28 15:39 ` Filipe Manana
0 siblings, 0 replies; 10+ messages in thread
From: Filipe Manana @ 2023-09-28 15:39 UTC (permalink / raw)
To: Boris Burkov; +Cc: linux-btrfs, kernel-team, fstests
On Thu, Sep 28, 2023 at 2:41 AM Boris Burkov <boris@bur.io> wrote:
>
> Test some interesting basic and edge cases of simple quotas.
>
> To some extent, this is redundant with the alternate testing strategy of
> using MKFS_OPTIONS to enable simple quotas, running the full suite and
> relying on kernel warnings and fsck to surface issues.
>
> Signed-off-by: Boris Burkov <boris@bur.io>
> ---
> tests/btrfs/301 | 418 ++++++++++++++++++++++++++++++++++++++++++++
> tests/btrfs/301.out | 2 +
> 2 files changed, 420 insertions(+)
> create mode 100755 tests/btrfs/301
> create mode 100644 tests/btrfs/301.out
>
> diff --git a/tests/btrfs/301 b/tests/btrfs/301
> new file mode 100755
> index 000000000..527c25230
> --- /dev/null
> +++ b/tests/btrfs/301
> @@ -0,0 +1,418 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2023 Meta Platforms, Inc. All Rights Reserved.
> +#
> +# FS QA Test 301
> +#
> +# Test common btrfs simple quotas scenarios involving sharing extents and
> +# removing them in various orders.
> +#
> +. ./common/preamble
> +_begin_fstest auto quick qgroup copy_range snapshot
Why the copy_range group? The test doesn't exercise copy_range.
It does exercise reflinking, so it should be in the "clone" group.
Also the following groups are missing: subvol prealloc
> +
> +# Import common functions.
> +# . ./common/filter
Here a:
. ./common/reflink
> +
> +# real QA test starts here
> +
> +# Modify as appropriate.
> +_supported_fs btrfs
> +_require_scratch
Should be: _require_scratch_reflink
> +_require_scratch_enable_simple_quota
Here missing:
_require_cp_reflink
_require_btrfs_command inspect-internal dump-tree
_require_xfs_io_command "falloc"
> +
> +subv=$SCRATCH_MNT/subv
> +nested=$SCRATCH_MNT/subv/nested
> +snap=$SCRATCH_MNT/snap
> +k=1024
> +m=$(($k * $k))
Do we really need to define variables with the size of a KiB and a MiB?
Are there any programmers who don't know what those are? :)
> +nr_fill=1024
> +fill_sz=$((8 * $k))
Just doing ...=$((8 * 1024 ))
Everyone would be aware it's 8 KiB...
> +total_fill=$(($nr_fill * $fill_sz))
> +eb_sz=$((16 * $k))
Same here.
> +ext_sz=$((128 * m))
And here 128 * 1024 * 1024
> +limit_nr=8
> +limit=$(($ext_sz * $limit_nr))
> +
> +get_qgroup_usage()
> +{
> + local qgroupid=$1
> +
> + $BTRFS_UTIL_PROG qgroup show --sync --raw $SCRATCH_MNT | grep "$qgroupid" | $AWK_PROG '{print $3}'
> +}
> +
> +get_subvol_usage()
> +{
> + local subvolid=$1
> + get_qgroup_usage "0/$subvolid"
> +}
> +
> +count_subvol_owned_metadata()
> +{
> + local subvolid=$1
> + # find nodes and leaves owned by the subvol, then get unique offsets
> + # to account for snapshots sharing metadata.
> + count=$($BTRFS_UTIL_PROG inspect-internal dump-tree $SCRATCH_DEV | \
> + grep "owner $subvolid" | awk '{print $2}' | sort | uniq | wc -l)
awk -> $AWK_PROG
> + # output bytes rather than number of metadata blocks
> + echo $(($count * $eb_sz))
So $eb_sz is the extent buffer, leaf/node, size. This is expecting the
default of 16K on x86 (4K pages systems).
Will the test fail if one runs with MKFS_OPTIONS="--nodesize 4K" for
example, or some other different node size?
What about on a 64K pages system, where by default the node size is
64K? Will the test fail?
I would rather make the test flexible to run with any node size, or if
not doable or impractical,
make it require a 4K page size and explicitly pass --nodesize 16K to
mkfs. We have tests where we do this.
> +}
> +
> +check_qgroup_usage()
> +{
> + local qgroupid=$1
> + local expected=$2
> + local actual=$(get_qgroup_usage $qgroupid)
> +
> + [ $expected -eq $actual ] || _fail "qgroup $qgroupid mismatched usage $actual vs $expected"
> +}
> +
> +check_subvol_usage()
> +{
> + local subvolid=$1
> + local expected_data=$2
> + # need to sync to see updated usage numbers.
> + # could probably improve by placing syncs only where they are strictly
> + # needed after actual operations, but it is more error prone.
Can we get proper sentences?
Some are ending with punctuation, others are not. First word should
also be capitalized.
Same applies to everywhere else in the test.
> + sync
I would rather move the sync to the helpers called below, and comment
that it's because they use
the btrfs inspect-internal command, which reads from disk and
therefore everything needs to be
flushed.
> +
> + local expected_meta=$(count_subvol_owned_metadata $subvolid)
> + local actual=$(get_subvol_usage $subvolid)
> + local expected=$(($expected_data + $expected_meta))
> +
> + [ $expected -eq $actual ] || _fail "subvol $subvolid mismatched usage $actual vs $expected (expected data $expected_data expected meta $expected_meta diff $(($actual - $expected)))"
> + echo "OK $subvolid $expected_data $expected_meta $actual" >> $seqres.full
> +}
> +
> +set_subvol_limit()
> +{
> + local subvolid=$1
> + local limit=$2
> +
> + $BTRFS_UTIL_PROG qgroup limit $2 0/$1 $SCRATCH_MNT
> +}
> +
> +sync_check_subvol_usage()
> +{
> + sync
> + check_subvol_usage $@
> +}
Does this helper make any sense? Because check_subvol_usage() is doing
a sync call already.
And it's not called anywhere... so it can be deleted.
> +
> +trigger_cleaner()
> +{
> + $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
> + sleep 1
> + $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
This may be too timing sensitive.
We have other tests that do something like this:
_scratch_remount commit=1
sleep 1.5
At the very least add comments explaining why that guarantees the
cleaner is triggered and
it completes before the function returns, just like we have in
btrfs/276 for example.
> +}
> +
> +cycle_mount_check_subvol_usage()
> +{
> + _scratch_cycle_mount
> + check_subvol_usage $@
> +}
> +
> +
> +do_write()
> +{
> + local file=$1
> + local sz=$2
> +
> + $XFS_IO_PROG -fc "pwrite -q 0 $sz" $file
> + local ret=$?
> + return $ret
Do we need this? Can't the function end just with the $XFS_IO_PROG call?
Wouldn't that be the same?
> +}
> +
> +do_enospc_write()
> +{
> + local file=$1
> + local sz=$2
> +
> + do_write $file $sz 2>/dev/null && _fail "write expected enospc"
So this pattern of calling _fail everywhere, is a bit against what is
generally done in fstests.
Just don't redirect stderr - make it part of the golden output - this
is even better because we can confirm the write failed with -ENOSPC
and not some other error.
> +}
> +
> +do_falloc()
> +{
> + local file=$1
> + local sz=$2
> +
> + $XFS_IO_PROG -fc "falloc 0 $sz" $file
> +}
> +
> +do_enospc_falloc()
> +{
> + local file=$1
> + local sz=$2
> +
> + do_falloc $file $sz 2>/dev/null && _fail "falloc expected enospc"
Same here as before.
> +}
> +
> +enable_quota()
> +{
> + local mode=$1
> +
> + [ $mode == "n" ] && return
> + arg=$([ $mode == "s" ] && echo "--simple")
> +
> + $BTRFS_UTIL_PROG quota enable $arg $SCRATCH_MNT
> +}
> +
> +prepare()
> +{
> + _scratch_mkfs >> $seqres.full
> + _scratch_mount
> + enable_quota "s"
> + $BTRFS_UTIL_PROG subvolume create $subv >> $seqres.full
> + set_subvol_limit 256 $limit
> + check_subvol_usage 256 0
> +
> + # Create a bunch of little filler files to generate several levels in
> + # the btree, to make snapshotting sharing scenarios complex enough.
> + $FIO_PROG --name=filler --directory=$subv --rw=randwrite --nrfiles=$nr_fill --filesize=$fill_sz >/dev/null 2>&1
Using fio, we need a _require_fio somewhere. See other tests like
generic/299 for example.
> + check_subvol_usage 256 $total_fill
> +
> + # Create a single file whose extents we will explicitly share/unshare.
> + do_write $subv/f $ext_sz
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> +}
> +
> +prepare_snapshotted()
> +{
> + prepare
> + $BTRFS_UTIL_PROG subvolume snapshot $subv $snap >> $seqres.full
> + echo "snapshot" >> $seqres.full
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + check_subvol_usage 257 0
> +}
> +
> +prepare_nested()
> +{
> + prepare
> + $BTRFS_UTIL_PROG qgroup create 1/100 $SCRATCH_MNT
> + $BTRFS_UTIL_PROG qgroup assign 0/256 1/100 $SCRATCH_MNT >> $seqres.full
> + $BTRFS_UTIL_PROG subvolume create $nested >> $seqres.full
> + do_write $nested/f $ext_sz
> + check_subvol_usage 257 $ext_sz
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + local subv_usage=$(get_subvol_usage 256)
> + local nested_usage=$(get_subvol_usage 257)
> + check_qgroup_usage 1/100 $(($subv_usage + $nested_usage))
> +}
> +
> +basic_accounting()
> +{
> + prepare
> + echo "basic" >> $seqres.full
> + echo "delete file" >> $seqres.full
> + rm $subv/f
> + check_subvol_usage 256 $total_fill
> + cycle_mount_check_subvol_usage 256 $total_fill
> + do_write $subv/tmp 512M
> + rm $subv/tmp
> + do_write $subv/tmp 512M
> + rm $subv/tmp
> + do_enospc_falloc $subv/large_falloc 2G
> + do_enospc_write $subv/large 2G
> + _scratch_unmount
> +}
> +
> +reservation_accounting()
> +{
> + prepare
> + for i in $(seq 10); do
> + do_write $subv/tmp 512M
> + rm $subv/tmp
> + done
> + do_enospc_write $subv/large 2G
> + _scratch_unmount
> +}
> +
> +snapshot_accounting()
> +{
> + prepare_snapshotted
> + echo "unshare snapshot metadata" >> $seqres.full
> + touch $snap/f
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + check_subvol_usage 257 0
> + echo "unshare snapshot data" >> $seqres.full
> + do_write $snap/f $ext_sz
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + check_subvol_usage 257 $ext_sz
> + echo "delete snapshot file" >> $seqres.full
> + rm $snap/f
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + check_subvol_usage 257 0
> + echo "delete original file" >> $seqres.full
> + rm $subv/f
> + check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 0
> + cycle_mount_check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 0
> + _scratch_unmount
> +}
> +
> +delete_subvol_file()
> +{
> + prepare_snapshotted
> + echo "delete subvol file first" >> $seqres.full
> + rm $subv/f
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + check_subvol_usage 257 0
> + rm $snap/f
> + trigger_cleaner
> + check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 0
> + cycle_mount_check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 0
> + _scratch_unmount
> +}
> +
> +delete_snapshot_file()
> +{
> + prepare_snapshotted
> + echo "delete snapshot file first" >> $seqres.full
> + rm $snap/f
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + check_subvol_usage 257 0
> + rm $subv/f
> + check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 0
> + cycle_mount_check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 0
> + _scratch_unmount
> +}
> +
> +delete_subvol()
> +{
> + echo "del sv" > /dev/ksmg
Missing a >> $seqres.full here instead of > /dev/ksmg - which is also
misspelled, should be kmsg.
> + prepare_snapshotted
> + echo "delete subvol first" >> $seqres.full
> + $BTRFS_UTIL_PROG subvolume delete $subv >> $seqres.full
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + check_subvol_usage 257 0
> + rm $snap/f
> + trigger_cleaner
> + check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 0
> + $BTRFS_UTIL_PROG subvolume delete $snap >> $seqres.full
> + trigger_cleaner
> + check_subvol_usage 256 0
> + check_subvol_usage 257 0
> + cycle_mount_check_subvol_usage 256 0
> + check_subvol_usage 257 0
> + _scratch_unmount
> +}
> +
> +delete_snapshot()
> +{
> + echo "del snap" > /dev/ksmg
> + prepare_snapshotted
> + echo "delete snapshot first" >> $seqres.full
> + $BTRFS_UTIL_PROG subvolume delete $snap >> $seqres.full
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + check_subvol_usage 257 0
> + $BTRFS_UTIL_PROG subvolume delete $subv >> $seqres.full
> + trigger_cleaner
> + check_subvol_usage 256 0
> + check_subvol_usage 257 0
> + _scratch_unmount
> +}
> +
> +nested_accounting()
> +{
> + echo "nested" > /dev/ksmg
Same here.
> + prepare_nested
> + echo "nested" >> $seqres.full
> + echo "delete file" >> $seqres.full
> + rm $subv/f
> + check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 $ext_sz
> + local subv_usage=$(get_subvol_usage 256)
> + local nested_usage=$(get_subvol_usage 257)
> + check_qgroup_usage 1/100 $(($subv_usage + $nested_usage))
> + rm $nested/f
> + check_subvol_usage 256 $total_fill
> + check_subvol_usage 257 0
> + subv_usage=$(get_subvol_usage 256)
> + nested_usage=$(get_subvol_usage 257)
> + check_qgroup_usage 1/100 $(($subv_usage + $nested_usage))
> + _scratch_unmount
> +}
> +
> +enable_mature()
> +{
> + echo "mature" > /dev/ksmg
Same here.
> + _scratch_mkfs >> $seqres.full
> + _scratch_mount
> + $BTRFS_UTIL_PROG subvolume create $subv >> $seqres.full
> + do_write $subv/f $ext_sz
> + sync
Why is the sync needed? At least add a comment.
> + enable_quota "s"
If enabling quotas requires flushing all delalloc, the kernel should
do it, no need for user space to call sync or anything equivalent.
Would be odd to get incorrect quotas when enabling because there's
pending delalloc.
> + set_subvol_limit 256 $limit
> + _scratch_cycle_mount
> + usage=$(get_subvol_usage 256)
> + [ $usage -lt $ext_sz ] || _fail "captured usage from before enable $usage"
> + do_write $subv/g $ext_sz
> + usage=$(get_subvol_usage 256)
> + [ $usage -lt $ext_sz ] && "failed to capture usage after enable $usage"
> + check_subvol_usage 256 $ext_sz
> + rm $subv/f
> + check_subvol_usage 256 $ext_sz
> + _scratch_cycle_mount
> + rm $subv/g
> + check_subvol_usage 256 0
> + _scratch_unmount
> +}
> +
> +reflink_accounting()
> +{
> + prepare
> + # do more reflinks than would fit
> + for i in $(seq $(($limit_nr * 2))); do
> + cp --reflink=always $subv/f $subv/f.i
Use the helper _cp_reflink instead.
> + done
> + # no additional data usage from reflinks
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + _scratch_unmount
> +}
> +
> +delete_link()
> +{
> + prepare
> + cp --reflink=always $subv/f $subv/f.link
Same here.
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + rm $subv/f.link
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + rm $subv/f
> + check_subvol_usage 256 $(($total_fill))
> + _scratch_unmount
> +}
> +
> +delete_linked()
> +{
> + prepare
> + cp --reflink=always $subv/f $subv/f.link
Same here.
Thanks.
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + rm $subv/f
> + check_subvol_usage 256 $(($total_fill + $ext_sz))
> + rm $subv/f.link
> + check_subvol_usage 256 $(($total_fill))
> + _scratch_unmount
> +}
> +
> +basic_accounting
> +reservation_accounting
> +snapshot_accounting
> +delete_subvol_file
> +delete_snapshot_file
> +delete_subvol
> +delete_snapshot
> +nested_accounting
> +enable_mature
> +reflink_accounting
> +delete_link
> +delete_linked
> +
> +echo "Silence is golden"
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/btrfs/301.out b/tests/btrfs/301.out
> new file mode 100644
> index 000000000..4025504e4
> --- /dev/null
> +++ b/tests/btrfs/301.out
> @@ -0,0 +1,2 @@
> +QA output created by 301
> +Silence is golden
> --
> 2.42.0
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 4/6] btrfs: quota rescan helpers
2023-09-27 23:14 [PATCH v3 0/6] btrfs: simple quotas fstests Boris Burkov
` (2 preceding siblings ...)
2023-09-27 23:14 ` [PATCH v3 3/6] btrfs/301: new test for simple quotas Boris Burkov
@ 2023-09-27 23:14 ` Boris Burkov
2023-09-28 12:58 ` Anand Jain
2023-09-27 23:14 ` [PATCH v3 5/6] btrfs: use new rescan wrapper Boris Burkov
2023-09-27 23:14 ` [PATCH v3 6/6] btrfs: skip squota incompatible tests Boris Burkov
5 siblings, 1 reply; 10+ messages in thread
From: Boris Burkov @ 2023-09-27 23:14 UTC (permalink / raw)
To: linux-btrfs, kernel-team, fstests
Many btrfs tests explicitly trigger quota rescan. This is not a
meaningful operation for simple quotas, so we wrap it in a helper that
doesn't blow up quite so badly and lets us run those tests where the
rescan is a qgroup detail.
Signed-off-by: Boris Burkov <boris@bur.io>
---
common/btrfs | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/common/btrfs b/common/btrfs
index 37796cc6e..0053fec48 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -710,6 +710,24 @@ _check_regular_qgroup()
_qgroup_mode "$@" | grep -q 'qgroup'
}
+_qgroup_rescan()
+{
+ local mnt=$1
+
+ _check_regular_qgroup $dev || return 1
+ _run_btrfs_util_prog quota rescan -w $mnt
+}
+
+_require_qgroup_rescan()
+{
+ _scratch_mkfs >>$seqres.full 2>&1
+ _scratch_mount
+ _run_btrfs_util_prog quota enable $SCRATCH_MNT
+ $BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT || \
+ _notrun "not able to run quota rescan"
+ _scratch_unmount
+}
+
_require_scratch_qgroup()
{
_scratch_mkfs >>$seqres.full 2>&1
--
2.42.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v3 4/6] btrfs: quota rescan helpers
2023-09-27 23:14 ` [PATCH v3 4/6] btrfs: quota rescan helpers Boris Burkov
@ 2023-09-28 12:58 ` Anand Jain
0 siblings, 0 replies; 10+ messages in thread
From: Anand Jain @ 2023-09-28 12:58 UTC (permalink / raw)
To: Boris Burkov, linux-btrfs, kernel-team, fstests
On 28/09/2023 07:14, Boris Burkov wrote:
> Many btrfs tests explicitly trigger quota rescan. This is not a
> meaningful operation for simple quotas, so we wrap it in a helper that
> doesn't blow up quite so badly and lets us run those tests where the
> rescan is a qgroup detail.
>
> Signed-off-by: Boris Burkov <boris@bur.io>
> ---
> common/btrfs | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/common/btrfs b/common/btrfs
> index 37796cc6e..0053fec48 100644
> --- a/common/btrfs
> +++ b/common/btrfs
> @@ -710,6 +710,24 @@ _check_regular_qgroup()
> _qgroup_mode "$@" | grep -q 'qgroup'
> }
>
> +_qgroup_rescan()
> +{
> + local mnt=$1
> +
> + _check_regular_qgroup $dev || return 1
$dev is not initialized.
Test case such as btrfs/028 fails with MKFS_OPTIONS="-O squota" config
option.
btrfs/028 30s ... [failed, exit status 1]- output mismatch (see
/xfstests-dev/results//btrfs/028.out.bad)
--- tests/btrfs/028.out 2023-02-20 12:32:31.399005973 +0800
+++ /xfstests-dev/results//btrfs/028.out.bad 2023-09-28
20:54:52.744848575 +0800
@@ -1,2 +1,3 @@
QA output created by 028
-Silence is golden
+failed: '/usr/local/bin/btrfs quota rescan -w /mnt/scratch'
+(see /xfstests-dev/results//btrfs/028.full for details)
...
(Run 'diff -u /xfstests-dev/tests/btrfs/028.out
/xfstests-dev/results//btrfs/028.out.bad' to see the entire diff)
Thanks, Anand
> + _run_btrfs_util_prog quota rescan -w $mnt
> +}
> +
> +_require_qgroup_rescan()
> +{
> + _scratch_mkfs >>$seqres.full 2>&1
> + _scratch_mount
> + _run_btrfs_util_prog quota enable $SCRATCH_MNT
> + $BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT || \
> + _notrun "not able to run quota rescan"
> + _scratch_unmount
> +}
> +
> _require_scratch_qgroup()
> {
> _scratch_mkfs >>$seqres.full 2>&1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 5/6] btrfs: use new rescan wrapper
2023-09-27 23:14 [PATCH v3 0/6] btrfs: simple quotas fstests Boris Burkov
` (3 preceding siblings ...)
2023-09-27 23:14 ` [PATCH v3 4/6] btrfs: quota rescan helpers Boris Burkov
@ 2023-09-27 23:14 ` Boris Burkov
2023-09-27 23:14 ` [PATCH v3 6/6] btrfs: skip squota incompatible tests Boris Burkov
5 siblings, 0 replies; 10+ messages in thread
From: Boris Burkov @ 2023-09-27 23:14 UTC (permalink / raw)
To: linux-btrfs, kernel-team, fstests
These tests can pass in simple quota mode if we skip the rescans via the
wrapper.
Signed-off-by: Boris Burkov <boris@bur.io>
---
tests/btrfs/022 | 1 +
tests/btrfs/028 | 2 +-
tests/btrfs/104 | 2 +-
tests/btrfs/123 | 2 +-
tests/btrfs/126 | 2 +-
tests/btrfs/139 | 2 +-
tests/btrfs/153 | 2 +-
tests/btrfs/171 | 6 +++---
tests/btrfs/179 | 2 +-
tests/btrfs/180 | 2 +-
tests/btrfs/190 | 2 +-
tests/btrfs/193 | 2 +-
tests/btrfs/210 | 2 +-
tests/btrfs/224 | 6 +++---
tests/btrfs/230 | 2 +-
tests/btrfs/232 | 2 +-
16 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/tests/btrfs/022 b/tests/btrfs/022
index e2d37b094..b1ef2fdf7 100755
--- a/tests/btrfs/022
+++ b/tests/btrfs/022
@@ -14,6 +14,7 @@ _begin_fstest auto qgroup limit
_supported_fs btrfs
_require_scratch
+_require_qgroup_rescan
_require_btrfs_qgroup_report
# Test to make sure we can actually turn it on and it makes sense
diff --git a/tests/btrfs/028 b/tests/btrfs/028
index fe0678f86..c4080c950 100755
--- a/tests/btrfs/028
+++ b/tests/btrfs/028
@@ -25,7 +25,7 @@ _scratch_mkfs >/dev/null
_scratch_mount
_run_btrfs_util_prog quota enable $SCRATCH_MNT
-_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+_qgroup_rescan $SCRATCH_MNT
# Increase the probability of generating de-refer extent, and decrease
# other.
diff --git a/tests/btrfs/104 b/tests/btrfs/104
index 499de6bfb..c9528eb13 100755
--- a/tests/btrfs/104
+++ b/tests/btrfs/104
@@ -94,7 +94,7 @@ _explode_fs_tree 1 $SCRATCH_MNT/snap2/files-snap2
# Enable qgroups now that we have our filesystem prepared. This
# will kick off a scan which we will have to wait for.
_run_btrfs_util_prog quota enable $SCRATCH_MNT
-_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+_qgroup_rescan $SCRATCH_MNT
# Remount to clear cache, force everything to disk
_scratch_cycle_mount
diff --git a/tests/btrfs/123 b/tests/btrfs/123
index c179eeec9..4c5b7e116 100755
--- a/tests/btrfs/123
+++ b/tests/btrfs/123
@@ -39,7 +39,7 @@ sync
# enable quota and rescan to get correct number
_run_btrfs_util_prog quota enable $SCRATCH_MNT
-_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+_qgroup_rescan $SCRATCH_MNT
# now balance data block groups to corrupt qgroup
_run_btrfs_balance_start -d $SCRATCH_MNT >> $seqres.full
diff --git a/tests/btrfs/126 b/tests/btrfs/126
index 2b0edb65b..1bb24e00f 100755
--- a/tests/btrfs/126
+++ b/tests/btrfs/126
@@ -28,7 +28,7 @@ _scratch_mkfs >/dev/null
_scratch_mount "-o enospc_debug"
_run_btrfs_util_prog quota enable $SCRATCH_MNT
-_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+_qgroup_rescan $SCRATCH_MNT
_run_btrfs_util_prog qgroup limit 512K 0/5 $SCRATCH_MNT
# The amount of written data may change due to different nodesize at mkfs time,
diff --git a/tests/btrfs/139 b/tests/btrfs/139
index c4b09f9fc..f3d92ba46 100755
--- a/tests/btrfs/139
+++ b/tests/btrfs/139
@@ -30,7 +30,7 @@ SUBVOL=$SCRATCH_MNT/subvol
_run_btrfs_util_prog subvolume create $SUBVOL
_run_btrfs_util_prog quota enable $SCRATCH_MNT
-_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+_qgroup_rescan $SCRATCH_MNT
_run_btrfs_util_prog qgroup limit -e 1G $SUBVOL
# Write and delete files within 1G limits, multiple times
diff --git a/tests/btrfs/153 b/tests/btrfs/153
index 99fab1018..4a5fe2b8c 100755
--- a/tests/btrfs/153
+++ b/tests/btrfs/153
@@ -24,7 +24,7 @@ _scratch_mkfs >/dev/null
_scratch_mount
_run_btrfs_util_prog quota enable $SCRATCH_MNT
-_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+_qgroup_rescan $SCRATCH_MNT
_run_btrfs_util_prog qgroup limit 100M 0/5 $SCRATCH_MNT
testfile1=$SCRATCH_MNT/testfile1
diff --git a/tests/btrfs/171 b/tests/btrfs/171
index 461cdd0fa..6a1ed1c1a 100755
--- a/tests/btrfs/171
+++ b/tests/btrfs/171
@@ -35,7 +35,7 @@ $BTRFS_UTIL_PROG subvolume snapshot "$SCRATCH_MNT/subvol" \
"$SCRATCH_MNT/snapshot" > /dev/null
$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > /dev/null
-$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null
+_qgroup_rescan $SCRATCH_MNT > /dev/null
# Create high level qgroup
$BTRFS_UTIL_PROG qgroup create 1/0 "$SCRATCH_MNT"
@@ -45,7 +45,7 @@ $BTRFS_UTIL_PROG qgroup assign "$SCRATCH_MNT/snapshot" 1/0 "$SCRATCH_MNT" \
# Above assignment will mark qgroup inconsistent due to the shared extents
# between subvol/snapshot/high level qgroup, do rescan here.
-$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null
+_qgroup_rescan $SCRATCH_MNT > /dev/null
# Now remove the qgroup relationship and make 1/0 childless
# Due to the shared extent outside of 1/0, we will mark qgroup inconsistent
@@ -54,7 +54,7 @@ $BTRFS_UTIL_PROG qgroup remove "$SCRATCH_MNT/snapshot" 1/0 "$SCRATCH_MNT" \
2>&1 | _filter_btrfs_qgroup_assign_warnings
# Above removal also marks qgroup inconsistent, rescan again
-$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null
+_qgroup_rescan $SCRATCH_MNT > /dev/null
# After the test, btrfs check will verify qgroup numbers to catch any
# corruption.
diff --git a/tests/btrfs/179 b/tests/btrfs/179
index 479667f05..00013af0a 100755
--- a/tests/btrfs/179
+++ b/tests/btrfs/179
@@ -33,7 +33,7 @@ _scratch_mount
mkdir -p "$SCRATCH_MNT/snapshots"
$BTRFS_UTIL_PROG subvolume create "$SCRATCH_MNT/src" > /dev/null
$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > /dev/null
-$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null
+_qgroup_rescan "$SCRATCH_MNT" > /dev/null
fill_workload()
{
diff --git a/tests/btrfs/180 b/tests/btrfs/180
index b7c8dac96..aa195f7b4 100755
--- a/tests/btrfs/180
+++ b/tests/btrfs/180
@@ -27,7 +27,7 @@ _scratch_mkfs > /dev/null
_scratch_mount
$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > /dev/null
-$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null
+_qgroup_rescan "$SCRATCH_MNT" > /dev/null
$BTRFS_UTIL_PROG qgroup limit -e 1G "$SCRATCH_MNT"
$XFS_IO_PROG -f -c "falloc 0 900M" "$SCRATCH_MNT/padding"
diff --git a/tests/btrfs/190 b/tests/btrfs/190
index 974438c15..f78c14fe4 100755
--- a/tests/btrfs/190
+++ b/tests/btrfs/190
@@ -30,7 +30,7 @@ _log_writes_mkfs >> $seqres.full 2>&1
_log_writes_mount
$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT >> $seqres.full
-$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+_qgroup_rescan $SCRATCH_MNT >> $seqres.full
# Create enough metadata for later balance
for ((i = 0; i < $nr_files; i++)); do
diff --git a/tests/btrfs/193 b/tests/btrfs/193
index b4632ab0a..67220c7a5 100755
--- a/tests/btrfs/193
+++ b/tests/btrfs/193
@@ -26,7 +26,7 @@ _scratch_mkfs > /dev/null
_scratch_mount
$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > /dev/null
-$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null
+_qgroup_rescan "$SCRATCH_MNT" > /dev/null
$BTRFS_UTIL_PROG qgroup limit -e 256M "$SCRATCH_MNT"
# Create a file with the following layout:
diff --git a/tests/btrfs/210 b/tests/btrfs/210
index 383a307ff..f3d769fa0 100755
--- a/tests/btrfs/210
+++ b/tests/btrfs/210
@@ -29,7 +29,7 @@ _pwrite_byte 0xcd 0 16M "$SCRATCH_MNT/src/file" > /dev/null
# by qgroup
sync
$BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT"
-$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null
+_qgroup_rescan "$SCRATCH_MNT" > /dev/null
$BTRFS_UTIL_PROG qgroup create 1/0 "$SCRATCH_MNT"
# Create a snapshot with qgroup inherit
diff --git a/tests/btrfs/224 b/tests/btrfs/224
index d7ec57360..de10942fe 100755
--- a/tests/btrfs/224
+++ b/tests/btrfs/224
@@ -30,7 +30,7 @@ assign_shared_test()
echo "=== qgroup assign shared test ===" >> $seqres.full
$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
- $BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+ _qgroup_rescan $SCRATCH_MNT >> $seqres.full
$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/b >> $seqres.full
@@ -54,7 +54,7 @@ assign_no_shared_test()
echo "=== qgroup assign no shared test ===" >> $seqres.full
$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
- $BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+ _qgroup_rescan $SCRATCH_MNT >> $seqres.full
$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/b >> $seqres.full
@@ -75,7 +75,7 @@ snapshot_test()
echo "=== qgroup snapshot test ===" >> $seqres.full
$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
- $BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+ _qgroup_rescan $SCRATCH_MNT >> $seqres.full
$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
_ddt of="$SCRATCH_MNT"/a/file1 bs=1M count=1 >> $seqres.full 2>&1
diff --git a/tests/btrfs/230 b/tests/btrfs/230
index 46b0c6369..7a4cd18e9 100755
--- a/tests/btrfs/230
+++ b/tests/btrfs/230
@@ -31,7 +31,7 @@ _pwrite_byte 0xcd 0 1G $SCRATCH_MNT/file >> $seqres.full
sync
$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
-$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+_qgroup_rescan $SCRATCH_MNT >> $seqres.full
# Set the limit to just 512MiB, which is way below the existing usage
$BTRFS_UTIL_PROG qgroup limit 512M 0/5 $SCRATCH_MNT
diff --git a/tests/btrfs/232 b/tests/btrfs/232
index 02c7e49de..debe070bb 100755
--- a/tests/btrfs/232
+++ b/tests/btrfs/232
@@ -46,7 +46,7 @@ _pwrite_byte 0xcd 0 900m $SCRATCH_MNT/file >> $seqres.full
sync
$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
-$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+_qgroup_rescan $SCRATCH_MNT >> $seqres.full
# set the limit to 1 g, leaving us just 100mb of slack space
$BTRFS_UTIL_PROG qgroup limit 1G 0/5 $SCRATCH_MNT
--
2.42.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 6/6] btrfs: skip squota incompatible tests
2023-09-27 23:14 [PATCH v3 0/6] btrfs: simple quotas fstests Boris Burkov
` (4 preceding siblings ...)
2023-09-27 23:14 ` [PATCH v3 5/6] btrfs: use new rescan wrapper Boris Burkov
@ 2023-09-27 23:14 ` Boris Burkov
5 siblings, 0 replies; 10+ messages in thread
From: Boris Burkov @ 2023-09-27 23:14 UTC (permalink / raw)
To: linux-btrfs, kernel-team, fstests
These tests cannot succeed if mkfs enable squotas, as they either test
the specifics of qgroups behavior or they test *enabling* squotas. Skip
these in squota mode.
Signed-off-by: Boris Burkov <boris@bur.io>
---
tests/btrfs/017 | 1 +
tests/btrfs/057 | 1 +
tests/btrfs/091 | 3 ++-
tests/btrfs/301 | 5 +++++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/tests/btrfs/017 b/tests/btrfs/017
index 622071018..496cc7df1 100755
--- a/tests/btrfs/017
+++ b/tests/btrfs/017
@@ -22,6 +22,7 @@ _begin_fstest auto quick qgroup
_supported_fs btrfs
_require_scratch
+_require_scratch_qgroup
_require_cloner
# Currently in btrfs the node/leaf size can not be smaller than the page
diff --git a/tests/btrfs/057 b/tests/btrfs/057
index 782d854a0..e932a6572 100755
--- a/tests/btrfs/057
+++ b/tests/btrfs/057
@@ -15,6 +15,7 @@ _begin_fstest auto quick
# real QA test starts here
_supported_fs btrfs
_require_scratch
+_require_qgroup_rescan
_scratch_mkfs_sized $((1024 * 1024 * 1024)) >> $seqres.full 2>&1
diff --git a/tests/btrfs/091 b/tests/btrfs/091
index f2cd00b2e..a71e03406 100755
--- a/tests/btrfs/091
+++ b/tests/btrfs/091
@@ -19,6 +19,7 @@ _begin_fstest auto quick qgroup
_supported_fs btrfs
_require_scratch
_require_cp_reflink
+_require_scratch_qgroup
# use largest node/leaf size (64K) to allow the test to be run on arch with
# page size > 4k.
@@ -35,7 +36,7 @@ _run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv2
_run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv3
_run_btrfs_util_prog quota enable $SCRATCH_MNT
-_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+_qgroup_rescan $SCRATCH_MNT
$XFS_IO_PROG -f -c "pwrite 0 256K" $SCRATCH_MNT/subv1/file1 | _filter_xfs_io
cp --reflink $SCRATCH_MNT/subv1/file1 $SCRATCH_MNT/subv2/file1
diff --git a/tests/btrfs/301 b/tests/btrfs/301
index 527c25230..f6b55c83f 100755
--- a/tests/btrfs/301
+++ b/tests/btrfs/301
@@ -33,6 +33,11 @@ ext_sz=$((128 * m))
limit_nr=8
limit=$(($ext_sz * $limit_nr))
+_scratch_mkfs >> $seqres.full
+_scratch_mount
+_qgroup_mode $SCRATCH_MNT | grep 'squota' && _notrun "test relies on starting without simple quotas enabled"
+_scratch_unmount
+
get_qgroup_usage()
{
local qgroupid=$1
--
2.42.0
^ permalink raw reply related [flat|nested] 10+ messages in thread