* [PATCH v4 0/2] test i_blocks for truncated largefiles
@ 2022-09-21 14:10 Pavel Reichl
2022-09-21 14:10 ` [PATCH v4 1/2] common: new helper to alloacate fixed size files Pavel Reichl
2022-09-21 14:10 ` [PATCH v4 2/2] generic: test i_blocks for truncated large files Pavel Reichl
0 siblings, 2 replies; 5+ messages in thread
From: Pavel Reichl @ 2022-09-21 14:10 UTC (permalink / raw)
To: fstests
Hello,
Zorro, Darick - thank you for your comments. Please see next revision.
V3
* introduced create_sizedfile() helper
* amended g/694 and g/698 to utilize this helper
V4
* copy-pasted the helper as suggested by Zorro (just proposed a different comment)
* updated the tests to use it and check its return value
* added _fixed_by_kernel_commit directive into g/694
Pavel Reichl (2):
common: new helper to alloacate fixed size files
generic: test i_blocks for truncated large files
common/rc | 22 +++++++++++++++++++
tests/generic/694 | 8 ++++++-
tests/generic/698 | 51 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/698.out | 2 ++
4 files changed, 82 insertions(+), 1 deletion(-)
create mode 100755 tests/generic/698
create mode 100644 tests/generic/698.out
--
2.37.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v4 1/2] common: new helper to alloacate fixed size files
2022-09-21 14:10 [PATCH v4 0/2] test i_blocks for truncated largefiles Pavel Reichl
@ 2022-09-21 14:10 ` Pavel Reichl
2022-09-22 0:27 ` Darrick J. Wong
2022-09-21 14:10 ` [PATCH v4 2/2] generic: test i_blocks for truncated large files Pavel Reichl
1 sibling, 1 reply; 5+ messages in thread
From: Pavel Reichl @ 2022-09-21 14:10 UTC (permalink / raw)
To: fstests
Helper that creates files of specified size using falloc if supported,
otherwise pwrite is used.
Signed-off-by: Pavel Reichl <preichl@redhat.com>
---
common/rc | 22 ++++++++++++++++++++++
tests/generic/694 | 8 +++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/common/rc b/common/rc
index a25cbcd0..3d4587b7 100644
--- a/common/rc
+++ b/common/rc
@@ -4925,6 +4925,28 @@ hexdump()
_fail "Use _hexdump(), please!"
}
+# Try to create a file with inode->i_blocks = $length. There may be some small
+# overhead, e.g. ext2 filesystem allocates a substantial number of blocks
+# to store block mappings. Those are accounted to i_blocks.
+_create_file_sized()
+{
+ local length=$1
+ local file=$2
+ local tmp=`mktemp -u`
+ local ret=0
+
+ $XFS_IO_PROG -ft -c "falloc 0 $length" $file >$tmp.out 2>&1
+ ret=$?
+ if (grep -Eq "Operation not supported|command .* not found" $tmp.out);then
+ # fallocate isn't supported, fallback to general buffer write
+ $XFS_IO_PROG -ft -c "pwrite 0 $length" $file >$tmp.out 2>&1
+ ret=$?
+ fi
+ [ $ret -ne 0 ] && cat $tmp.out
+ rm -f $tmp.out
+ return $ret
+}
+
init_rc
################################################################################
diff --git a/tests/generic/694 b/tests/generic/694
index dfd988df..09fb9e71 100755
--- a/tests/generic/694
+++ b/tests/generic/694
@@ -21,6 +21,9 @@ _cleanup()
}
_supported_fs generic
+_fixed_by_kernel_commit 0c336d6e33f4 \
+ "exfat: fix incorrect loading of i_blocks for large file"
+
_require_test
_require_fs_space $TEST_DIR $((4 * 1024 * 1024)) #kB
@@ -30,7 +33,10 @@ junk_dir=$TEST_DIR/$seq
junk_file=$junk_dir/junk
mkdir -p $junk_dir
-$XFS_IO_PROG -f -c "pwrite -W 0 4G" $junk_file > /dev/null
+_create_file_sized 4G $junk_file
+if [ $? -ne 0 ]; then
+ echo "_create_file_sized failed"
+fi
iblocks=`stat -c '%b' $junk_file`
--
2.37.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v4 1/2] common: new helper to alloacate fixed size files
2022-09-21 14:10 ` [PATCH v4 1/2] common: new helper to alloacate fixed size files Pavel Reichl
@ 2022-09-22 0:27 ` Darrick J. Wong
0 siblings, 0 replies; 5+ messages in thread
From: Darrick J. Wong @ 2022-09-22 0:27 UTC (permalink / raw)
To: Pavel Reichl; +Cc: fstests
On Wed, Sep 21, 2022 at 04:10:24PM +0200, Pavel Reichl wrote:
> Helper that creates files of specified size using falloc if supported,
> otherwise pwrite is used.
>
> Signed-off-by: Pavel Reichl <preichl@redhat.com>
> ---
> common/rc | 22 ++++++++++++++++++++++
> tests/generic/694 | 8 +++++++-
> 2 files changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/common/rc b/common/rc
> index a25cbcd0..3d4587b7 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -4925,6 +4925,28 @@ hexdump()
> _fail "Use _hexdump(), please!"
> }
>
> +# Try to create a file with inode->i_blocks = $length. There may be some small
Nit: It's really trying to create a file with i_blocks >= (length/blocksize).
> +# overhead, e.g. ext2 filesystem allocates a substantial number of blocks
> +# to store block mappings. Those are accounted to i_blocks.
> +_create_file_sized()
> +{
> + local length=$1
> + local file=$2
> + local tmp=`mktemp -u`
> + local ret=0
> +
> + $XFS_IO_PROG -ft -c "falloc 0 $length" $file >$tmp.out 2>&1
> + ret=$?
> + if (grep -Eq "Operation not supported|command .* not found" $tmp.out);then
> + # fallocate isn't supported, fallback to general buffer write
> + $XFS_IO_PROG -ft -c "pwrite 0 $length" $file >$tmp.out 2>&1
> + ret=$?
> + fi
> + [ $ret -ne 0 ] && cat $tmp.out
> + rm -f $tmp.out
> + return $ret
> +}
> +
> init_rc
>
> ################################################################################
> diff --git a/tests/generic/694 b/tests/generic/694
> index dfd988df..09fb9e71 100755
> --- a/tests/generic/694
> +++ b/tests/generic/694
> @@ -21,6 +21,9 @@ _cleanup()
> }
>
> _supported_fs generic
> +_fixed_by_kernel_commit 0c336d6e33f4 \
> + "exfat: fix incorrect loading of i_blocks for large file"
> +
> _require_test
> _require_fs_space $TEST_DIR $((4 * 1024 * 1024)) #kB
>
> @@ -30,7 +33,10 @@ junk_dir=$TEST_DIR/$seq
> junk_file=$junk_dir/junk
> mkdir -p $junk_dir
>
> -$XFS_IO_PROG -f -c "pwrite -W 0 4G" $junk_file > /dev/null
> +_create_file_sized 4G $junk_file
> +if [ $? -ne 0 ]; then
> + echo "_create_file_sized failed"
echo "could not create 4G test file" ?
--D
> +fi
>
> iblocks=`stat -c '%b' $junk_file`
>
> --
> 2.37.3
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v4 2/2] generic: test i_blocks for truncated large files
2022-09-21 14:10 [PATCH v4 0/2] test i_blocks for truncated largefiles Pavel Reichl
2022-09-21 14:10 ` [PATCH v4 1/2] common: new helper to alloacate fixed size files Pavel Reichl
@ 2022-09-21 14:10 ` Pavel Reichl
2022-09-22 0:29 ` Darrick J. Wong
1 sibling, 1 reply; 5+ messages in thread
From: Pavel Reichl @ 2022-09-21 14:10 UTC (permalink / raw)
To: fstests
This is a regression test for an incorrect computation of i_blocks for
truncated files larger than 4 GiB. Bug was filed for exFAT.
Test is based on reproducer provied by Christophe Vu-Brugier as part
of kernel patch-fix submission.
Signed-off-by: Pavel Reichl <preichl@redhat.com>
---
tests/generic/698 | 51 +++++++++++++++++++++++++++++++++++++++++++
tests/generic/698.out | 2 ++
2 files changed, 53 insertions(+)
create mode 100755 tests/generic/698
create mode 100644 tests/generic/698.out
diff --git a/tests/generic/698 b/tests/generic/698
new file mode 100755
index 00000000..97ac1474
--- /dev/null
+++ b/tests/generic/698
@@ -0,0 +1,51 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022 Red Hat Inc. All Rights Reserved.
+#
+# FS QA Test 698
+#
+# Verify that i_blocks for truncated files larger than 4 GiB have correct
+# values.
+#
+# This test verifies the problem fixed in kernel with commit
+# 92fba084b79e exfat: fix i_blocks for files truncated over 4 GiB
+#
+. ./common/preamble
+. ./common/filter
+
+_begin_fstest auto
+
+# Override the default cleanup function.
+_cleanup()
+{
+ cd /
+ rm -r -f $tmp.* $junk_dir
+}
+
+_supported_fs generic
+_fixed_by_kernel_commit 92fba084b79e \
+ "exfat: fix i_blocks for files truncated over 4 GiB"
+
+_require_test
+_require_fs_space $TEST_DIR $((5 * 1024 * 1024)) #kB
+
+junk_dir=$TEST_DIR/$seq
+junk_file=$junk_dir/junk
+mkdir -p $junk_dir
+
+_create_file_sized 5G $junk_file
+if [ $? -ne 0 ]; then
+ echo "_create_file_sized failed"
+fi
+
+truncate -s 4G $junk_file
+
+block_size=`stat -c '%B' $junk_file`
+iblocks_after_truncate=`stat -c '%b' $junk_file`
+iblocks_expected=$((4 * 1024 * 1024 * 1024 / $block_size))
+
+_within_tolerance "Number of allocated blocks after truncate" $iblocks_after_truncate $iblocks_expected 1% -v
+
+status=0
+
+exit
diff --git a/tests/generic/698.out b/tests/generic/698.out
new file mode 100644
index 00000000..cbb02d37
--- /dev/null
+++ b/tests/generic/698.out
@@ -0,0 +1,2 @@
+QA output created by 698
+Number of allocated blocks after truncate is in range
--
2.37.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v4 2/2] generic: test i_blocks for truncated large files
2022-09-21 14:10 ` [PATCH v4 2/2] generic: test i_blocks for truncated large files Pavel Reichl
@ 2022-09-22 0:29 ` Darrick J. Wong
0 siblings, 0 replies; 5+ messages in thread
From: Darrick J. Wong @ 2022-09-22 0:29 UTC (permalink / raw)
To: Pavel Reichl; +Cc: fstests
On Wed, Sep 21, 2022 at 04:10:25PM +0200, Pavel Reichl wrote:
> This is a regression test for an incorrect computation of i_blocks for
> truncated files larger than 4 GiB. Bug was filed for exFAT.
>
> Test is based on reproducer provied by Christophe Vu-Brugier as part
> of kernel patch-fix submission.
>
> Signed-off-by: Pavel Reichl <preichl@redhat.com>
> ---
> tests/generic/698 | 51 +++++++++++++++++++++++++++++++++++++++++++
> tests/generic/698.out | 2 ++
> 2 files changed, 53 insertions(+)
> create mode 100755 tests/generic/698
> create mode 100644 tests/generic/698.out
>
> diff --git a/tests/generic/698 b/tests/generic/698
> new file mode 100755
> index 00000000..97ac1474
> --- /dev/null
> +++ b/tests/generic/698
> @@ -0,0 +1,51 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2022 Red Hat Inc. All Rights Reserved.
> +#
> +# FS QA Test 698
> +#
> +# Verify that i_blocks for truncated files larger than 4 GiB have correct
> +# values.
> +#
> +# This test verifies the problem fixed in kernel with commit
> +# 92fba084b79e exfat: fix i_blocks for files truncated over 4 GiB
> +#
> +. ./common/preamble
> +. ./common/filter
> +
> +_begin_fstest auto
> +
> +# Override the default cleanup function.
> +_cleanup()
> +{
> + cd /
> + rm -r -f $tmp.* $junk_dir
> +}
> +
> +_supported_fs generic
> +_fixed_by_kernel_commit 92fba084b79e \
> + "exfat: fix i_blocks for files truncated over 4 GiB"
> +
> +_require_test
> +_require_fs_space $TEST_DIR $((5 * 1024 * 1024)) #kB
> +
> +junk_dir=$TEST_DIR/$seq
> +junk_file=$junk_dir/junk
> +mkdir -p $junk_dir
> +
> +_create_file_sized 5G $junk_file
> +if [ $? -ne 0 ]; then
> + echo "_create_file_sized failed"
Nit: Perhaps "could not create 5G test file" should be the message?
/me shrugs, that's a stylistic nit, so:
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> +fi
> +
> +truncate -s 4G $junk_file
> +
> +block_size=`stat -c '%B' $junk_file`
> +iblocks_after_truncate=`stat -c '%b' $junk_file`
> +iblocks_expected=$((4 * 1024 * 1024 * 1024 / $block_size))
> +
> +_within_tolerance "Number of allocated blocks after truncate" $iblocks_after_truncate $iblocks_expected 1% -v
> +
> +status=0
> +
> +exit
> diff --git a/tests/generic/698.out b/tests/generic/698.out
> new file mode 100644
> index 00000000..cbb02d37
> --- /dev/null
> +++ b/tests/generic/698.out
> @@ -0,0 +1,2 @@
> +QA output created by 698
> +Number of allocated blocks after truncate is in range
> --
> 2.37.3
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-09-22 0:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-21 14:10 [PATCH v4 0/2] test i_blocks for truncated largefiles Pavel Reichl
2022-09-21 14:10 ` [PATCH v4 1/2] common: new helper to alloacate fixed size files Pavel Reichl
2022-09-22 0:27 ` Darrick J. Wong
2022-09-21 14:10 ` [PATCH v4 2/2] generic: test i_blocks for truncated large files Pavel Reichl
2022-09-22 0:29 ` Darrick J. Wong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.