| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1386511249-3421-1-git-send-email-linkinjeon@gmail.com>
Date: Sun, 8 Dec 2013 23:00:49 +0900
From: Namjae Jeon <linkinjeon@...il.com>
To: viro@...iv.linux.org.uk, dchinner@...morbit.com, bpm@....com,
tytso@....edu, adilger.kernel@...ger.ca, jack@...e.cz
Cc: linux-fsdevel@...r.kernel.org, xfs@....sgi.com,
linux-ext4@...r.kernel.org, linux-kernel@...r.kernel.org,
Namjae Jeon <linkinjeon@...il.com>,
Namjae Jeon <namjae.jeon@...sung.com>,
Ashish Sangwan <a.sangwan@...sung.com>
Subject: [PATCH v4 5/10] xfstest: shared/001: Standard collapse range tests
From: Namjae Jeon <namjae.jeon@...sung.com>
This testcase(001) tries to test various corner cases
for fcollapse range functionality over different type of extents.
Signed-off-by: Namjae Jeon <namjae.jeon@...sung.com>
Signed-off-by: Ashish Sangwan <a.sangwan@...sung.com>
---
common/punch | 133 ++++++++++++++++++++++++++++----------------------
common/rc | 14 ++++++
tests/shared/001 | 65 ++++++++++++++++++++++++
tests/shared/001.out | 53 ++++++++++++++++++++
tests/shared/group | 1 +
5 files changed, 209 insertions(+), 57 deletions(-)
create mode 100644 tests/shared/001
create mode 100644 tests/shared/001.out
diff --git a/common/punch b/common/punch
index a49638c..f401455 100644
--- a/common/punch
+++ b/common/punch
@@ -317,13 +317,23 @@ _test_generic_punch()
map_cmd=$4
filter_cmd=$5
testfile=$6
+ multiple=1
+
+ #
+ # If we are testing collapse range, we increare all the offsets of this
+ # test by a factor of 4. We do this because unlike punch, collapse
+ # range also decreases the size of file hence require bigger offsets.
+ #
+ if [ "$zero_cmd" == "fcollapse" ]; then
+ multiple=4
+ fi
echo " 1. into a hole"
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -332,9 +342,9 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 0 20k" $sync_cmd \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite 0 $(($multiple * 20))k" $sync_cmd \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -344,9 +354,9 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "$alloc_cmd 0 20k" \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "$alloc_cmd 0 $(($multiple * 20))k" \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -356,9 +366,9 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 8k 8k" $sync_cmd \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite $(($multiple * 8))k $(($multiple * 8))k" $sync_cmd \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -368,9 +378,9 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "$alloc_cmd 8k 8k" \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "$alloc_cmd $(($multiple * 8))k $(($multiple * 8))k" \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -380,9 +390,9 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 0 8k" $sync_cmd \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite 0 $(($multiple * 8))k" $sync_cmd \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -392,10 +402,10 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 0 8k" $sync_cmd \
- -c "$alloc_cmd 8k 8k" \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite 0 $(($multiple * 8))k" $sync_cmd \
+ -c "$alloc_cmd $(($multiple * 8))k $(($multiple * 8))k" \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -404,9 +414,9 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "$alloc_cmd 0 8k" \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "$alloc_cmd 0 $(($multiple * 8))k" \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -415,10 +425,10 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "$alloc_cmd 0 8k" \
- -c "pwrite 8k 8k" $sync_cmd \
- -c "$zero_cmd 4k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "$alloc_cmd 0 $(($multiple * 8))k" \
+ -c "pwrite $(($multiple * 8))k $(($multiple * 8))k" $sync_cmd \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -428,9 +438,9 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 8k 4k" $sync_cmd \
- -c "$zero_cmd 4k 12k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite $(($multiple * 8))k $(($multiple * 4))k" $sync_cmd \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 12))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -439,12 +449,12 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "$alloc_cmd 0 20k" \
- -c "pwrite 0 8k" \
- -c "pwrite 12k 8k" $sync_cmd \
- -c "$punch_cmd 8k 4k" \
- -c "$zero_cmd 4k 12k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "$alloc_cmd 0 $(($multiple * 20))k" \
+ -c "pwrite 0 $(($multiple * 8))k" \
+ -c "pwrite $(($multiple * 12))k $(($multiple * 8))k" $sync_cmd \
+ -c "$punch_cmd $(($multiple * 8))k $(($multiple * 4))k" \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 12))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -454,10 +464,10 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "$alloc_cmd 0 20k" \
- -c "pwrite 8k 4k" $sync_cmd \
- -c "$zero_cmd 4k 12k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "$alloc_cmd 0 $(($multiple * 20))k" \
+ -c "pwrite $(($multiple * 8))k $(($multiple * 4))k" $sync_cmd \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 12))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -466,11 +476,11 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "$alloc_cmd 0 20k" \
- -c "pwrite 0k 8k" $sync_cmd \
- -c "pwrite 12k 8k" -c "fsync" \
- -c "$zero_cmd 4k 12k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "$alloc_cmd 0 $(($multiple * 20))k" \
+ -c "pwrite 0k $(($multiple * 4))k" $sync_cmd \
+ -c "pwrite $(($multiple * 12))k $(($multiple * 8))k" -c "fsync" \
+ -c "$zero_cmd $(($multiple * 4))k $(($multiple * 12))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -478,9 +488,9 @@ _test_generic_punch()
echo " 14. data -> hole @ EOF"
rm -f $testfile
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 0 20k" $sync_cmd \
- -c "$zero_cmd 12k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite 0 $(($multiple * 20))k" $sync_cmd \
+ -c "$zero_cmd $(($multiple * 12))k $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
@@ -489,13 +499,22 @@ _test_generic_punch()
if [ "$remove_testfile" ]; then
rm -f $testfile
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 0 20k" $sync_cmd \
- -c "$zero_cmd 0k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite 0 $(($multiple * 20))k" $sync_cmd \
+ -c "$zero_cmd 0 $(($multiple * 8))k" \
-c "$map_cmd -v" $testfile | $filter_cmd
[ $? -ne 0 ] && die_now
_md5_checksum $testfile
+ # If zero_cmd is fcollpase, don't check unaligned offsets
+ if [ "$zero_cmd" == "fcollapse" ]; then
+ if [ "$remove_testfile" ]; then
+ rm -f $testfile
+ rm -f $testfile.2
+ fi
+ return
+ fi
+
echo " 16. data -> cache cold ->hole"
if [ "$remove_testfile" ]; then
rm -f $testfile
@@ -503,12 +522,12 @@ _test_generic_punch()
else
cp $testfile $testfile.2
fi
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 8k 12k" -c "fsync" $testfile.2 \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite $(($multiple * 8))k $(($multiple * 12))k" -c "fsync" $testfile.2 \
> /dev/null
- $XFS_IO_PROG -f -c "truncate 20k" \
- -c "pwrite 0 20k" $sync_cmd \
- -c "$zero_cmd 0k 8k" \
+ $XFS_IO_PROG -f -c "truncate $(($multiple * 20))k" \
+ -c "pwrite 0 $(($multiple * 20))k" $sync_cmd \
+ -c "$zero_cmd 0k $(($multiple * 8))k" \
-c "fadvise -d" \
-c "$map_cmd -v" $testfile | $filter_cmd
diff $testfile $testfile.2
diff --git a/common/rc b/common/rc
index 5f61d57..3be4721 100644
--- a/common/rc
+++ b/common/rc
@@ -1259,6 +1259,20 @@ _require_xfs_io_falloc_punch()
_notrun "xfs_io fallocate punch command failed (no fs support?)"
}
+# check that xfs_io, kernel and filesystem all support fallocate with collapse
+# range
+_require_xfs_io_falloc_collapse()
+{
+ testfile=$TEST_DIR/$$.falloc
+ testio=`$XFS_IO_PROG -f -c "pwrite 0 20k" -c "fsync" \
+ -c "fcollapse 4k 8k" $testfile 2>&1`
+ rm -f $testfile 2>&1 > /dev/null
+ echo $testio | grep -q "not found" && \
+ _notrun "xfs_io fallocate collapse range support is missing"
+ echo $testio | grep -q "Operation not supported" && \
+ _notrun "xfs_io fallocate collapse range failed (no fs support?)"
+}
+
# check that xfs_io, kernel and filesystem support fiemap
_require_xfs_io_fiemap()
{
diff --git a/tests/shared/001 b/tests/shared/001
new file mode 100644
index 0000000..b3ebbba
--- /dev/null
+++ b/tests/shared/001
@@ -0,0 +1,65 @@
+#! /bin/bash
+# FS QA Test No. 1
+#
+# Standard collapse range tests
+# This testcase is one of the 4 testcases (shared 001 - 004) which tries to
+# test various corner cases for fcollapse range functionality over different
+# type of extents. These tests are based on generic/255 test case.
+# For the type of tests, check the description of _test_generic_punch
+# in common/rc.
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Samsung Electronics. All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+
+_cleanup()
+{
+ rm -f $tmp.*
+}
+
+trap "_cleanup ; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+# we need to include common/punch to get defination fo filter functions
+. ./common/rc
+. ./common/filter
+. ./common/punch
+
+# real QA test starts here
+_supported_fs xfs ext4
+_supported_os Linux
+
+_require_xfs_io_falloc_punch
+_require_xfs_io_falloc
+_require_xfs_io_fiemap
+_require_xfs_io_falloc_collapse
+
+testfile=$TEST_DIR/$seq.$$
+
+_test_generic_punch falloc fpunch fcollapse fiemap _filter_hole_fiemap $testfile
+_check_test_fs
+
+status=0
+exit
diff --git a/tests/shared/001.out b/tests/shared/001.out
new file mode 100644
index 0000000..bff2bab
--- /dev/null
+++ b/tests/shared/001.out
@@ -0,0 +1,53 @@
+QA output created by 001
+ 1. into a hole
+f4f35d60b3cc18aaa6d8d92f0cd3708a
+ 2. into allocated space
+0: [0..95]: extent
+f1894a71ac539f6f90426d98a4990a47
+ 3. into unwritten space
+0: [0..95]: extent
+f4f35d60b3cc18aaa6d8d92f0cd3708a
+ 4. hole -> data
+0: [0..31]: hole
+1: [32..63]: extent
+2: [64..95]: hole
+d8f51c20223dbce5c7c90db87bc221b0
+ 5. hole -> unwritten
+0: [0..31]: hole
+1: [32..63]: extent
+2: [64..95]: hole
+f4f35d60b3cc18aaa6d8d92f0cd3708a
+ 6. data -> hole
+0: [0..31]: extent
+1: [32..95]: hole
+f07217d5ac7ffa15dd8910c4aa912674
+ 7. data -> unwritten
+0: [0..63]: extent
+1: [64..95]: hole
+f07217d5ac7ffa15dd8910c4aa912674
+ 8. unwritten -> hole
+0: [0..31]: extent
+1: [32..95]: hole
+f4f35d60b3cc18aaa6d8d92f0cd3708a
+ 9. unwritten -> data
+0: [0..63]: extent
+1: [64..95]: hole
+d8f51c20223dbce5c7c90db87bc221b0
+ 10. hole -> data -> hole
+bb7df04e1b0a2570657527a7e108ae23
+ 11. data -> hole -> data
+0: [0..63]: extent
+0f0151cbed83e4bf6e5bde26e82ab115
+ 12. unwritten -> data -> unwritten
+0: [0..63]: extent
+bb7df04e1b0a2570657527a7e108ae23
+ 13. data -> unwritten -> data
+0: [0..63]: extent
+0f0151cbed83e4bf6e5bde26e82ab115
+ 14. data -> hole @ EOF
+fallocate: Invalid argument
+0: [0..159]: extent
+7670f4830c6724a25e7c22d9eb9a6f4f
+ 15. data -> hole @ 0
+0: [0..95]: extent
+f1894a71ac539f6f90426d98a4990a47
diff --git a/tests/shared/group b/tests/shared/group
index 0ad640b..5562f92 100644
--- a/tests/shared/group
+++ b/tests/shared/group
@@ -3,6 +3,7 @@
# - do not start group names with a digit
# - comment line before each group is "new" description
#
+001 auto prealloc
032 mkfs auto quick
051 acl udf auto quick
218 auto fsr quick
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists