diff mbox series

[v2,2/5] generic/xxx: Add MMAP CoW test for 'unwritten' case

Message ID 20211105045222.157826-3-ruansy.fnst@fujitsu.com (mailing list archive)
State New, archived
Headers show
Series generic: add a couple of MMAP CoW tests | expand

Commit Message

Shiyang Ruan Nov. 5, 2021, 4:52 a.m. UTC 
Check what happens if we MMAP CoW blocks 2-4 of a page's worth of blocks when
the second block is a unwritten block.  (MMAP version of generic/216,217)

Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
 tests/generic/901     | 76 +++++++++++++++++++++++++++++++++++++++++++
 tests/generic/901.out |  6 ++++
 2 files changed, 82 insertions(+)
 create mode 100755 tests/generic/901
 create mode 100644 tests/generic/901.out

Comments

Darrick J. Wong Nov. 5, 2021, 4:20 p.m. UTC | #1 
On Fri, Nov 05, 2021 at 12:52:19PM +0800, Shiyang Ruan wrote:
> Check what happens if we MMAP CoW blocks 2-4 of a page's worth of blocks when
> the second block is a unwritten block.  (MMAP version of generic/216,217)
> 
> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
> ---
>  tests/generic/901     | 76 +++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/901.out |  6 ++++
>  2 files changed, 82 insertions(+)
>  create mode 100755 tests/generic/901
>  create mode 100644 tests/generic/901.out
> 
> diff --git a/tests/generic/901 b/tests/generic/901
> new file mode 100755
> index 00000000..46459815
> --- /dev/null
> +++ b/tests/generic/901
> @@ -0,0 +1,76 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# FS QA Test No. xxx
> +#
> +# See what happens if we MMAP CoW blocks 2-4 of a page's worth of blocks when
> +# the second block is a unwritten block.  (MMAP version of generic/216,217)
> +#
> +# This test is dependent on the system page size, so we cannot use md5 in
> +# the golden output; we can only compare to a check file.
> +#
> +. ./common/preamble
> +_begin_fstest auto quick clone
> +
> +# Override the default cleanup function.
> +_cleanup()
> +{
> +    cd /
> +    rm -rf $tmp.* $testdir
> +}

Oh, something I didn't notice with the previous patch -- this exact
_cleanup function is now provided by common/preamble as a default.  If
you don't have anything to add to the cleanup process, then you can omit
this definition.

With that fixed,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D


> +
> +# Import common functions.
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_require_scratch_reflink
> +_require_xfs_io_command "falloc"
> +
> +pagesz=$(getconf PAGE_SIZE)
> +blksz=$((pagesz / 4))
> +
> +echo "Format and mount"
> +_scratch_mkfs_blocksized $blksz > $seqres.full 2>&1
> +_scratch_mount >> $seqres.full 2>&1
> +
> +testdir=$SCRATCH_MNT/test-$seq
> +mkdir $testdir
> +
> +real_blksz=$(_get_file_block_size $testdir)
> +test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
> +
> +echo "Create the original files"
> +_pwrite_byte 0x61 0 $pagesz $testdir/file1 >> $seqres.full
> +
> +$XFS_IO_PROG -f -c "truncate $pagesz" $testdir/file2 >> $seqres.full
> +$XFS_IO_PROG -f -c "truncate $pagesz" $testdir/file2.chk >> $seqres.full
> +
> +$XFS_IO_PROG -f -c "falloc -k $blksz $blksz" $testdir/file2 >> $seqres.full
> +_pwrite_byte 0x00 $blksz $blksz $testdir/file2.chk >> $seqres.full
> +
> +$XFS_IO_PROG -f -c "falloc -k $((blksz * 3)) $blksz" $testdir/file2 >> $seqres.full
> +_pwrite_byte 0x00 $((blksz * 3)) $blksz $testdir/file2.chk >> $seqres.full
> +
> +_reflink_range $testdir/file1 $blksz $testdir/file2 $((blksz * 2)) $blksz >> $seqres.full
> +_pwrite_byte 0x61 $((blksz * 2)) $blksz $testdir/file2.chk >> $seqres.full
> +_scratch_cycle_mount
> +
> +echo "Compare files"
> +cmp -s $testdir/file1 $testdir/file2 && echo "file1 and file2 should not match."
> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk don't match."
> +
> +echo "CoW and unmount"
> +$XFS_IO_PROG -f -c "mmap 0 $pagesz" \
> +    -c "mwrite -S 0x63 $((blksz + 17)) $((blksz * 3 - 34))" $testdir/file2 >> $seqres.full
> +$XFS_IO_PROG -f -c "mmap 0 $pagesz" \
> +    -c "mwrite -S 0x63 $((blksz + 17)) $((blksz * 3 - 34))" $testdir/file2.chk >> $seqres.full
> +_scratch_cycle_mount
> +
> +echo "Compare files"
> +cmp -s $testdir/file1 $testdir/file2 && echo "file1 and file2 should not match."
> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk don't match."
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/generic/901.out b/tests/generic/901.out
> new file mode 100644
> index 00000000..07b9b433
> --- /dev/null
> +++ b/tests/generic/901.out
> @@ -0,0 +1,6 @@
> +QA output created by 901
> +Format and mount
> +Create the original files
> +Compare files
> +CoW and unmount
> +Compare files
> -- 
> 2.33.0
> 
> 
>
Shiyang Ruan Nov. 8, 2021, 6:18 a.m. UTC | #2 
在 2021/11/6 0:20, Darrick J. Wong 写道:
> On Fri, Nov 05, 2021 at 12:52:19PM +0800, Shiyang Ruan wrote:
>> Check what happens if we MMAP CoW blocks 2-4 of a page's worth of blocks when
>> the second block is a unwritten block.  (MMAP version of generic/216,217)
>>
>> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
>> ---
>>   tests/generic/901     | 76 +++++++++++++++++++++++++++++++++++++++++++
>>   tests/generic/901.out |  6 ++++
>>   2 files changed, 82 insertions(+)
>>   create mode 100755 tests/generic/901
>>   create mode 100644 tests/generic/901.out
>>
>> diff --git a/tests/generic/901 b/tests/generic/901
>> new file mode 100755
>> index 00000000..46459815
>> --- /dev/null
>> +++ b/tests/generic/901
>> @@ -0,0 +1,76 @@
>> +#! /bin/bash
>> +# SPDX-License-Identifier: GPL-2.0
>> +#
>> +# FS QA Test No. xxx
>> +#
>> +# See what happens if we MMAP CoW blocks 2-4 of a page's worth of blocks when
>> +# the second block is a unwritten block.  (MMAP version of generic/216,217)
>> +#
>> +# This test is dependent on the system page size, so we cannot use md5 in
>> +# the golden output; we can only compare to a check file.
>> +#
>> +. ./common/preamble
>> +_begin_fstest auto quick clone
>> +
>> +# Override the default cleanup function.
>> +_cleanup()
>> +{
>> +    cd /
>> +    rm -rf $tmp.* $testdir
>> +}
> 
> Oh, something I didn't notice with the previous patch -- this exact
> _cleanup function is now provided by common/preamble as a default.  If
> you don't have anything to add to the cleanup process, then you can omit
> this definition.

We created a testdir here but the default _cleanup doesn't remove it, so 
I think this overrided cleanup is needed.

--
Thanks,
Ruan.

> 
> With that fixed,
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> 
> --D
> 
> 
>> +
>> +# Import common functions.
>> +. ./common/filter
>> +. ./common/reflink
>> +
>> +# real QA test starts here
>> +_require_scratch_reflink
>> +_require_xfs_io_command "falloc"
>> +
>> +pagesz=$(getconf PAGE_SIZE)
>> +blksz=$((pagesz / 4))
>> +
>> +echo "Format and mount"
>> +_scratch_mkfs_blocksized $blksz > $seqres.full 2>&1
>> +_scratch_mount >> $seqres.full 2>&1
>> +
>> +testdir=$SCRATCH_MNT/test-$seq
>> +mkdir $testdir
>> +
>> +real_blksz=$(_get_file_block_size $testdir)
>> +test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
>> +
>> +echo "Create the original files"
>> +_pwrite_byte 0x61 0 $pagesz $testdir/file1 >> $seqres.full
>> +
>> +$XFS_IO_PROG -f -c "truncate $pagesz" $testdir/file2 >> $seqres.full
>> +$XFS_IO_PROG -f -c "truncate $pagesz" $testdir/file2.chk >> $seqres.full
>> +
>> +$XFS_IO_PROG -f -c "falloc -k $blksz $blksz" $testdir/file2 >> $seqres.full
>> +_pwrite_byte 0x00 $blksz $blksz $testdir/file2.chk >> $seqres.full
>> +
>> +$XFS_IO_PROG -f -c "falloc -k $((blksz * 3)) $blksz" $testdir/file2 >> $seqres.full
>> +_pwrite_byte 0x00 $((blksz * 3)) $blksz $testdir/file2.chk >> $seqres.full
>> +
>> +_reflink_range $testdir/file1 $blksz $testdir/file2 $((blksz * 2)) $blksz >> $seqres.full
>> +_pwrite_byte 0x61 $((blksz * 2)) $blksz $testdir/file2.chk >> $seqres.full
>> +_scratch_cycle_mount
>> +
>> +echo "Compare files"
>> +cmp -s $testdir/file1 $testdir/file2 && echo "file1 and file2 should not match."
>> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk don't match."
>> +
>> +echo "CoW and unmount"
>> +$XFS_IO_PROG -f -c "mmap 0 $pagesz" \
>> +    -c "mwrite -S 0x63 $((blksz + 17)) $((blksz * 3 - 34))" $testdir/file2 >> $seqres.full
>> +$XFS_IO_PROG -f -c "mmap 0 $pagesz" \
>> +    -c "mwrite -S 0x63 $((blksz + 17)) $((blksz * 3 - 34))" $testdir/file2.chk >> $seqres.full
>> +_scratch_cycle_mount
>> +
>> +echo "Compare files"
>> +cmp -s $testdir/file1 $testdir/file2 && echo "file1 and file2 should not match."
>> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk don't match."
>> +
>> +# success, all done
>> +status=0
>> +exit
>> diff --git a/tests/generic/901.out b/tests/generic/901.out
>> new file mode 100644
>> index 00000000..07b9b433
>> --- /dev/null
>> +++ b/tests/generic/901.out
>> @@ -0,0 +1,6 @@
>> +QA output created by 901
>> +Format and mount
>> +Create the original files
>> +Compare files
>> +CoW and unmount
>> +Compare files
>> -- 
>> 2.33.0
>>
>>
>>
Darrick J. Wong Nov. 8, 2021, 6:08 p.m. UTC | #3 
On Mon, Nov 08, 2021 at 02:18:34PM +0800, Shiyang Ruan wrote:
> 
> 
> 在 2021/11/6 0:20, Darrick J. Wong 写道:
> > On Fri, Nov 05, 2021 at 12:52:19PM +0800, Shiyang Ruan wrote:
> > > Check what happens if we MMAP CoW blocks 2-4 of a page's worth of blocks when
> > > the second block is a unwritten block.  (MMAP version of generic/216,217)
> > > 
> > > Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
> > > ---
> > >   tests/generic/901     | 76 +++++++++++++++++++++++++++++++++++++++++++
> > >   tests/generic/901.out |  6 ++++
> > >   2 files changed, 82 insertions(+)
> > >   create mode 100755 tests/generic/901
> > >   create mode 100644 tests/generic/901.out
> > > 
> > > diff --git a/tests/generic/901 b/tests/generic/901
> > > new file mode 100755
> > > index 00000000..46459815
> > > --- /dev/null
> > > +++ b/tests/generic/901
> > > @@ -0,0 +1,76 @@
> > > +#! /bin/bash
> > > +# SPDX-License-Identifier: GPL-2.0
> > > +#
> > > +# FS QA Test No. xxx
> > > +#
> > > +# See what happens if we MMAP CoW blocks 2-4 of a page's worth of blocks when
> > > +# the second block is a unwritten block.  (MMAP version of generic/216,217)
> > > +#
> > > +# This test is dependent on the system page size, so we cannot use md5 in
> > > +# the golden output; we can only compare to a check file.
> > > +#
> > > +. ./common/preamble
> > > +_begin_fstest auto quick clone
> > > +
> > > +# Override the default cleanup function.
> > > +_cleanup()
> > > +{
> > > +    cd /
> > > +    rm -rf $tmp.* $testdir
> > > +}
> > 
> > Oh, something I didn't notice with the previous patch -- this exact
> > _cleanup function is now provided by common/preamble as a default.  If
> > you don't have anything to add to the cleanup process, then you can omit
> > this definition.
> 
> We created a testdir here but the default _cleanup doesn't remove it, so I
> think this overrided cleanup is needed.

It's never necessary to clean things off the scratch fs because the next
test to use the scratch device will reformat it as desired.

--D

> --
> Thanks,
> Ruan.
> 
> > 
> > With that fixed,
> > Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> > 
> > --D
> > 
> > 
> > > +
> > > +# Import common functions.
> > > +. ./common/filter
> > > +. ./common/reflink
> > > +
> > > +# real QA test starts here
> > > +_require_scratch_reflink
> > > +_require_xfs_io_command "falloc"
> > > +
> > > +pagesz=$(getconf PAGE_SIZE)
> > > +blksz=$((pagesz / 4))
> > > +
> > > +echo "Format and mount"
> > > +_scratch_mkfs_blocksized $blksz > $seqres.full 2>&1
> > > +_scratch_mount >> $seqres.full 2>&1
> > > +
> > > +testdir=$SCRATCH_MNT/test-$seq
> > > +mkdir $testdir
> > > +
> > > +real_blksz=$(_get_file_block_size $testdir)
> > > +test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
> > > +
> > > +echo "Create the original files"
> > > +_pwrite_byte 0x61 0 $pagesz $testdir/file1 >> $seqres.full
> > > +
> > > +$XFS_IO_PROG -f -c "truncate $pagesz" $testdir/file2 >> $seqres.full
> > > +$XFS_IO_PROG -f -c "truncate $pagesz" $testdir/file2.chk >> $seqres.full
> > > +
> > > +$XFS_IO_PROG -f -c "falloc -k $blksz $blksz" $testdir/file2 >> $seqres.full
> > > +_pwrite_byte 0x00 $blksz $blksz $testdir/file2.chk >> $seqres.full
> > > +
> > > +$XFS_IO_PROG -f -c "falloc -k $((blksz * 3)) $blksz" $testdir/file2 >> $seqres.full
> > > +_pwrite_byte 0x00 $((blksz * 3)) $blksz $testdir/file2.chk >> $seqres.full
> > > +
> > > +_reflink_range $testdir/file1 $blksz $testdir/file2 $((blksz * 2)) $blksz >> $seqres.full
> > > +_pwrite_byte 0x61 $((blksz * 2)) $blksz $testdir/file2.chk >> $seqres.full
> > > +_scratch_cycle_mount
> > > +
> > > +echo "Compare files"
> > > +cmp -s $testdir/file1 $testdir/file2 && echo "file1 and file2 should not match."
> > > +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk don't match."
> > > +
> > > +echo "CoW and unmount"
> > > +$XFS_IO_PROG -f -c "mmap 0 $pagesz" \
> > > +    -c "mwrite -S 0x63 $((blksz + 17)) $((blksz * 3 - 34))" $testdir/file2 >> $seqres.full
> > > +$XFS_IO_PROG -f -c "mmap 0 $pagesz" \
> > > +    -c "mwrite -S 0x63 $((blksz + 17)) $((blksz * 3 - 34))" $testdir/file2.chk >> $seqres.full
> > > +_scratch_cycle_mount
> > > +
> > > +echo "Compare files"
> > > +cmp -s $testdir/file1 $testdir/file2 && echo "file1 and file2 should not match."
> > > +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk don't match."
> > > +
> > > +# success, all done
> > > +status=0
> > > +exit
> > > diff --git a/tests/generic/901.out b/tests/generic/901.out
> > > new file mode 100644
> > > index 00000000..07b9b433
> > > --- /dev/null
> > > +++ b/tests/generic/901.out
> > > @@ -0,0 +1,6 @@
> > > +QA output created by 901
> > > +Format and mount
> > > +Create the original files
> > > +Compare files
> > > +CoW and unmount
> > > +Compare files
> > > -- 
> > > 2.33.0
> > > 
> > > 
> > > 
> 
>
diff mbox series

Patch

diff --git a/tests/generic/901 b/tests/generic/901
new file mode 100755
index 00000000..46459815
--- /dev/null
+++ b/tests/generic/901
@@ -0,0 +1,76 @@ 
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# FS QA Test No. xxx
+#
+# See what happens if we MMAP CoW blocks 2-4 of a page's worth of blocks when
+# the second block is a unwritten block.  (MMAP version of generic/216,217)
+#
+# This test is dependent on the system page size, so we cannot use md5 in
+# the golden output; we can only compare to a check file.
+#
+. ./common/preamble
+_begin_fstest auto quick clone
+
+# Override the default cleanup function.
+_cleanup()
+{
+    cd /
+    rm -rf $tmp.* $testdir
+}
+
+# Import common functions.
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_require_scratch_reflink
+_require_xfs_io_command "falloc"
+
+pagesz=$(getconf PAGE_SIZE)
+blksz=$((pagesz / 4))
+
+echo "Format and mount"
+_scratch_mkfs_blocksized $blksz > $seqres.full 2>&1
+_scratch_mount >> $seqres.full 2>&1
+
+testdir=$SCRATCH_MNT/test-$seq
+mkdir $testdir
+
+real_blksz=$(_get_file_block_size $testdir)
+test $real_blksz != $blksz && _notrun "Failed to format with small blocksize."
+
+echo "Create the original files"
+_pwrite_byte 0x61 0 $pagesz $testdir/file1 >> $seqres.full
+
+$XFS_IO_PROG -f -c "truncate $pagesz" $testdir/file2 >> $seqres.full
+$XFS_IO_PROG -f -c "truncate $pagesz" $testdir/file2.chk >> $seqres.full
+
+$XFS_IO_PROG -f -c "falloc -k $blksz $blksz" $testdir/file2 >> $seqres.full
+_pwrite_byte 0x00 $blksz $blksz $testdir/file2.chk >> $seqres.full
+
+$XFS_IO_PROG -f -c "falloc -k $((blksz * 3)) $blksz" $testdir/file2 >> $seqres.full
+_pwrite_byte 0x00 $((blksz * 3)) $blksz $testdir/file2.chk >> $seqres.full
+
+_reflink_range $testdir/file1 $blksz $testdir/file2 $((blksz * 2)) $blksz >> $seqres.full
+_pwrite_byte 0x61 $((blksz * 2)) $blksz $testdir/file2.chk >> $seqres.full
+_scratch_cycle_mount
+
+echo "Compare files"
+cmp -s $testdir/file1 $testdir/file2 && echo "file1 and file2 should not match."
+cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk don't match."
+
+echo "CoW and unmount"
+$XFS_IO_PROG -f -c "mmap 0 $pagesz" \
+    -c "mwrite -S 0x63 $((blksz + 17)) $((blksz * 3 - 34))" $testdir/file2 >> $seqres.full
+$XFS_IO_PROG -f -c "mmap 0 $pagesz" \
+    -c "mwrite -S 0x63 $((blksz + 17)) $((blksz * 3 - 34))" $testdir/file2.chk >> $seqres.full
+_scratch_cycle_mount
+
+echo "Compare files"
+cmp -s $testdir/file1 $testdir/file2 && echo "file1 and file2 should not match."
+cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk don't match."
+
+# success, all done
+status=0
+exit
diff --git a/tests/generic/901.out b/tests/generic/901.out
new file mode 100644
index 00000000..07b9b433
--- /dev/null
+++ b/tests/generic/901.out
@@ -0,0 +1,6 @@ 
+QA output created by 901
+Format and mount
+Create the original files
+Compare files
+CoW and unmount
+Compare files