Re: [PATCH 1/3] common/rc: Make swapon check in _require_scratch_swapfile() specific to btrfs

Brian Foster
2020-10-30T13:18:39Z

On Fri, Oct 30, 2020 at 01:22:51AM +0530, Ritesh Harjani wrote:
> swapon/off check in _require_scratch_swapfile() was specifically added
> for btrfs[1]/[2] since in previous kernels, swapfile was not supported on btrfs.
> This rather masks the issue sometimes with swapon system call in
> case if it fails.
> for e.g. in latest ext4 upstream tree when "-g quick" (which ran swap tests too)
> was tested, all swap tests resulted into "_notrun" since swapon failed
> inside _require_scratch_swapfile() itself.
> Whereas this failure on ext4 was actually due to a regression with latest
> fast-commit patch, which went un-noticed.
> Hence make this swapon/off check only specific to btrfs.
> Tested default config of xfs/btrfs/ext4/f2fs with this patch.
>
> With this change on buggy kernel, we could clearly catch the swap failures.
> e.g.
> generic/472 17s ...
> <...>
> @@ -1,4 +1,7 @@
> QA output created by 472
> regular swap
> +swapon: Invalid argument
> too long swap
> +swapon: Invalid argument
> tiny swap
> +swapon: Invalid argument
> ...
> (Run 'diff -u /home/qemu/src/tools-work/xfstests-dev/tests/generic/472.out \
> /home/qemu/src/tools-work/xfstests-dev/results//ext4/generic/472.out.bad' \
> to see the entire diff)
>
> [1]: 8c96cfbfe530 ("generic/35[67]: disable swapfile tests on Btrfs")
> [2]: bd6d67ee598e ("generic: enable swapfile tests on Btrfs")
>
> Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
> ---
> common/rc | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index b0c353c4c107..4c59968a6bd3 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2358,18 +2358,20 @@ _require_scratch_swapfile()
> [ -n "$SELINUX_MOUNT_OPTIONS" ] && export \
> SELINUX_MOUNT_OPTIONS="-o context=system_u:object_r:swapfile_t:s0"
>
> - _scratch_mount
> + if [ "$FSTYP" = "btrfs" ]; then
> + _scratch_mount
> +
> + # Minimum size for mkswap is 10 pages
> + _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10))
>
> - # Minimum size for mkswap is 10 pages
> - _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10))
> + if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then
> + _scratch_unmount
> + _notrun "swapfiles are not supported"
> + fi
>
> - if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then
> + swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1
> _scratch_unmount
> - _notrun "swapfiles are not supported"
> fi
> -
> - swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1
> - _scratch_unmount
> }

This factors out the majority of this function for !btrfs cases to the
point where it doesn't do anything swap related. Perhaps it would be
more clear to do something like '[ $FSTYP = "btrfs" ] &&
_require_scratch_swapfile()' in the actual tests that require filtering
out on btrfs..?

Brian

>
> # Check that a fs has enough free space (in 1024b blocks)
> --
> 2.26.2
>