From: "Darrick J. Wong" <djwong@kernel.org>
To: "yangx.jy@fujitsu.com" <yangx.jy@fujitsu.com>
Cc: "zlang@redhat.com" <zlang@redhat.com>,
"fstests@vger.kernel.org" <fstests@vger.kernel.org>,
"bfoster@redhat.com" <bfoster@redhat.com>,
"Yasunori Gotou (Fujitsu)" <y-goto@fujitsu.com>
Subject: Re: [PATCH RESEND 2/2] generic/470: Replace thin volume with blkdiscard -z
Date: Sun, 13 Nov 2022 09:57:54 -0800 [thread overview]
Message-ID: <Y3EwIvDfZdIlzHKg@magnolia> (raw)
In-Reply-To: <20221023064810.847110-2-yangx.jy@fujitsu.com>
On Sun, Oct 23, 2022 at 06:48:13AM +0000, yangx.jy@fujitsu.com wrote:
> generic/470 was original designed to verify mmap(MAP_SYNC) which
> is only vaild to the DAX capable device(e.g. PMEM). Thin volume[1] was
> introduced to fix the inconsistent filesystem issue[2] but it make
> the test become not run because it doesn't support DAX. As Darrick
> mentioned[3], discarding the entire mapped range of scartch device
> can fix the issue as well, so I try to use blkdiscard -z instead.
>
> [1]: https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=fc5870da485aec0f9196a0f2bed32f73f6b2c664
> [2]: https://lore.kernel.org/fstests/20190227061529.GF16436@dastard/
> [3]: https://lore.kernel.org/linux-xfs/Y1NRNtToQTjs0Dbd@magnolia/T/#me0e77cb0ecd80bf4b5109e4433cb4863ae6e6727
>
> Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com>
> ---
> tests/generic/470 | 31 ++++++++++++-------------------
> 1 file changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/tests/generic/470 b/tests/generic/470
> index f3407511..d2846a38 100755
> --- a/tests/generic/470
> +++ b/tests/generic/470
> @@ -15,38 +15,29 @@ _cleanup()
> {
> cd /
> _log_writes_cleanup
> - _dmthin_cleanup
> rm -f $tmp.*
> }
>
> # Import common functions.
> . ./common/filter
> -. ./common/dmthin
> . ./common/dmlogwrites
>
> # real QA test starts here
> _supported_fs generic
> -_require_scratch_nocheck
> +_require_scratch
> _require_no_logdev
> _require_log_writes_dax_mountopt "dax"
> -_require_dm_target thin-pool
> _require_xfs_io_command "mmap" "-S"
> _require_xfs_io_command "log_writes"
> +_require_command "$BLKDISCARD_PROG" blkdiscard
>
> -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size
> -csize=$((1024*64 / 512)) # 64k cluster size
> -lowspace=$((1024*1024 / 512)) # 1m low space threshold
> -
> -# Use a thin device to provide deterministic discard behavior. Discards are used
> -# by the log replay tool for fast zeroing to prevent out-of-order replay issues.
> -_dmthin_init $devsize $devsize $csize $lowspace
> +RANGE=$((512 * 1024 * 1024)) # 512 MiB
> +LEN=$((1024 * 1024)) # 1 MiB
>
> -_log_writes_init $DMTHIN_VOL_DEV
> +_log_writes_init $SCRATCH_DEV $RANGE
> _log_writes_mkfs >> $seqres.full 2>&1
> _log_writes_mount -o dax
>
> -LEN=$((1024 * 1024)) # 1 MiB
> -
> $XFS_IO_PROG -t -c "truncate $LEN" -c "mmap -S 0 $LEN" -c "mwrite 0 $LEN" \
> -c "log_writes -d $LOGWRITES_NAME -m preunmap" \
> -f $SCRATCH_MNT/test
> @@ -54,14 +45,16 @@ $XFS_IO_PROG -t -c "truncate $LEN" -c "mmap -S 0 $LEN" -c "mwrite 0 $LEN" \
> # Unmount the scratch dir and tear down the log writes target
> _log_writes_unmount
> _log_writes_remove
> -_dmthin_check_fs
> +_check_scratch_fs
>
> -# destroy previous filesystem so we can be sure our rebuild works
> -_mkfs_dev $DMTHIN_VOL_DEV >> $seqres.full 2>&1
> +# Discard the mapped range of scratch device and destroy previous filesystem
> +# so we can be sure our rebuild works
> +$BLKDISCARD_PROG -fzl $RANGE $SCRATCH_DEV >> $seqres.full 2>&1
You used -z, which means the comment should say "Forcibly zero the
mapped range of the scratch device..." and note that blkdiscard -z will
fall back to writing buffers of zeroes if the device doesn't support
WRITE SAME with zeroes.
I think the logic in here looks good though.
--D
> +_scratch_mkfs >> $seqres.full 2>&1
>
> # check pre-unmap state
> -_log_writes_replay_log preunmap $DMTHIN_VOL_DEV
> -_dmthin_mount
> +_log_writes_replay_log preunmap $SCRATCH_DEV
> +_scratch_mount
>
> # We should see $SCRATCH_MNT/test as having 1 MiB in block allocations
> du -sh $SCRATCH_MNT/test | _filter_scratch | _filter_spaces
> --
> 2.34.1
next prev parent reply other threads:[~2022-11-13 17:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-23 6:48 [PATCH RESEND 1/2] common/dmlogwrites: Extend _log_writes_init() to accept the specified size yangx.jy
2022-10-23 6:48 ` [PATCH RESEND 2/2] generic/470: Replace thin volume with blkdiscard -z yangx.jy
2022-10-24 4:09 ` Darrick J. Wong
2022-10-24 7:15 ` Yang, Xiao/杨 晓
2022-10-30 7:30 ` yangx.jy
2022-11-01 3:48 ` Darrick J. Wong
2022-11-12 5:48 ` Yang, Xiao/杨 晓
2022-11-13 17:57 ` Darrick J. Wong [this message]
2022-11-14 8:38 ` Yang, Xiao/杨 晓
2022-11-13 17:54 ` [PATCH RESEND 1/2] common/dmlogwrites: Extend _log_writes_init() to accept the specified size Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y3EwIvDfZdIlzHKg@magnolia \
--to=djwong@kernel.org \
--cc=bfoster@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=y-goto@fujitsu.com \
--cc=yangx.jy@fujitsu.com \
--cc=zlang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).