diff mbox

[4/4] generic: test mmap dio through DAX and non-DAX

Message ID 1484708826-23529-5-git-send-email-xzhou@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Murphy Zhou Jan. 18, 2017, 3:07 a.m. UTC 
Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 tests/generic/405     | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/405.out |   2 +
 tests/generic/group   |   1 +
 3 files changed, 103 insertions(+)
 create mode 100755 tests/generic/405
 create mode 100644 tests/generic/405.out

Comments

Eryu Guan Jan. 19, 2017, 5:54 a.m. UTC | #1 
On Wed, Jan 18, 2017 at 11:07:06AM +0800, Xiong Zhou wrote:
> Signed-off-by: Xiong Zhou <xzhou@redhat.com>

Better to have detailed commit log.

> ---
>  tests/generic/405     | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/405.out |   2 +
>  tests/generic/group   |   1 +
>  3 files changed, 103 insertions(+)
>  create mode 100755 tests/generic/405
>  create mode 100644 tests/generic/405.out
> 
> diff --git a/tests/generic/405 b/tests/generic/405
> new file mode 100755
> index 0000000..3717937
> --- /dev/null
> +++ b/tests/generic/405
> @@ -0,0 +1,100 @@
> +#! /bin/bash
> +# FS QA Test 405
> +#
> +# mmap dio between DAX and non-DAX mountpoints.
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2017 Red Hat Inc.  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!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> +	cd /
> +	rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +
> +# remove previous $seqres.full before test
> +rm -f $seqres.full
> +
> +# real QA test starts here
> +
> +# Modify as appropriate.
> +_supported_fs xfs ext4

_supported_fs generic

Other _require rules make sure we have everything we need, so no need to
restrict supported fs to xfs and ext4. (And if we really want to do so,
the test should be a "shared" test, not generic.)

> +_supported_os Linux
> +_require_test
> +_require_scratch_dax
> +_require_test_program "feature"
> +
> +# $1 mmap read/write size
> +_dax_flag_mmap_dio()

Not testing per-file flag now, the name seems a bit misleading.

> +{
> +	# both dax
> +	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/tf_d $1
> +
> +	# from non dax to dax
> +	src/t_mmap_dio $TEST_DIR/tf_s $SCRATCH_MNT/tf_d $1

Assuming TEST_DIR isn't a DAX mount, which seems not always the case.

Perhaps you can check mount options of TEST_DEV using _fs_options() to
see if it's mounted with dax, and _notrun if it is.

Thanks,
Eryu

> +
> +	# from dax to non dax
> +	src/t_mmap_dio $SCRATCH_MNT/tf_s $TEST_DIR/tf_d $1
> +
> +	# both non dax
> +	src/t_mmap_dio $TEST_DIR/tf_s $TEST_DIR/tf_d $1
> +}
> +
> +_do_tests()
> +{
> +	# less than page size
> +	_dax_flag_mmap_dio 1024
> +	# page size
> +	_dax_flag_mmap_dio `src/feature -s`
> +	# bigger sizes, for PMD faults
> +	_dax_flag_mmap_dio 16777216
> +	_dax_flag_mmap_dio 67108864
> +}
> +
> +_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
> +
> +# SCRATCH_DEV mount with dax option
> +_scratch_mount "-o dax" >> $seqres.full 2>&1 || \
> +	_fail "mount -o dax failed"
> +
> +dd if=/dev/zero of=$SCRATCH_MNT/tf_s bs=4k count=256k > /dev/null 2>&1
> +dd if=/dev/zero of=$SCRATCH_MNT/tf_d bs=4k count=256k > /dev/null 2>&1
> +dd if=/dev/zero of=$TEST_DIR/tf_s bs=4k count=256k > /dev/null 2>&1
> +dd if=/dev/zero of=$TEST_DIR/tf_d bs=4k count=256k > /dev/null 2>&1
> +
> +_do_tests
> +_test_unmount
> +_scratch_unmount
> +
> +# success, all done
> +echo "Silence is golden"
> +status=0
> +exit
> diff --git a/tests/generic/405.out b/tests/generic/405.out
> new file mode 100644
> index 0000000..bae761d
> --- /dev/null
> +++ b/tests/generic/405.out
> @@ -0,0 +1,2 @@
> +QA output created by 405
> +Silence is golden
> diff --git a/tests/generic/group b/tests/generic/group
> index 6fc9c3d..a1be466 100644
> --- a/tests/generic/group
> +++ b/tests/generic/group
> @@ -407,3 +407,4 @@
>  402 auto quick rw
>  403 auto quick attr
>  404 auto quick insert
> +405 auto quick
> -- 
> 1.8.3.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Murphy Zhou Jan. 19, 2017, 10:13 a.m. UTC | #2 
v2 :
  Merge helper function changes into the first patch;
  Rewrite _require_dax, check options for sure;
  Print msg in t_mmap_dio.c to show which test going wrong;
  Empty mount options and check after mount to ensure we
wont mount with wrong option;
  Remove unnecessary leading underscore and _fail;
  Use xfs_io instead of dd;
  Other minor fixes.

Test status:
  Both cases not run on normal block device;
  Both cases PASS on ramdisk based pmem devices;
  Both cases FAIL on nvdimm devices with:
    +write(Bad address) len 1024 dax to nondax
    +write(Bad address) len 4096 dax to nondax
    +write(Bad address) len 16777216 dax to nondax
    +write(Bad address) len 67108864 dax to nondax

Xiong Zhou (2):
  xfs: test per-inode DAX flag by IO
  generic: test mmap dio through DAX and non-DAX

 .gitignore            |   1 +
 common/rc             |  14 ++++++
 src/Makefile          |   2 +-
 src/t_mmap_dio.c      |  81 +++++++++++++++++++++++++++++++++++
 tests/generic/405     | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/405.out |   2 +
 tests/generic/group   |   1 +
 tests/xfs/138         | 110 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138.out     |   2 +
 tests/xfs/group       |   1 +
 10 files changed, 329 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c
 create mode 100755 tests/generic/405
 create mode 100644 tests/generic/405.out
 create mode 100755 tests/xfs/138
 create mode 100644 tests/xfs/138.out
diff mbox

Patch

diff --git a/tests/generic/405 b/tests/generic/405
new file mode 100755
index 0000000..3717937
--- /dev/null
+++ b/tests/generic/405
@@ -0,0 +1,100 @@ 
+#! /bin/bash
+# FS QA Test 405
+#
+# mmap dio between DAX and non-DAX mountpoints.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2017 Red Hat Inc.  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!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs xfs ext4
+_supported_os Linux
+_require_test
+_require_scratch_dax
+_require_test_program "feature"
+
+# $1 mmap read/write size
+_dax_flag_mmap_dio()
+{
+	# both dax
+	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/tf_d $1
+
+	# from non dax to dax
+	src/t_mmap_dio $TEST_DIR/tf_s $SCRATCH_MNT/tf_d $1
+
+	# from dax to non dax
+	src/t_mmap_dio $SCRATCH_MNT/tf_s $TEST_DIR/tf_d $1
+
+	# both non dax
+	src/t_mmap_dio $TEST_DIR/tf_s $TEST_DIR/tf_d $1
+}
+
+_do_tests()
+{
+	# less than page size
+	_dax_flag_mmap_dio 1024
+	# page size
+	_dax_flag_mmap_dio `src/feature -s`
+	# bigger sizes, for PMD faults
+	_dax_flag_mmap_dio 16777216
+	_dax_flag_mmap_dio 67108864
+}
+
+_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
+
+# SCRATCH_DEV mount with dax option
+_scratch_mount "-o dax" >> $seqres.full 2>&1 || \
+	_fail "mount -o dax failed"
+
+dd if=/dev/zero of=$SCRATCH_MNT/tf_s bs=4k count=256k > /dev/null 2>&1
+dd if=/dev/zero of=$SCRATCH_MNT/tf_d bs=4k count=256k > /dev/null 2>&1
+dd if=/dev/zero of=$TEST_DIR/tf_s bs=4k count=256k > /dev/null 2>&1
+dd if=/dev/zero of=$TEST_DIR/tf_d bs=4k count=256k > /dev/null 2>&1
+
+_do_tests
+_test_unmount
+_scratch_unmount
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/generic/405.out b/tests/generic/405.out
new file mode 100644
index 0000000..bae761d
--- /dev/null
+++ b/tests/generic/405.out
@@ -0,0 +1,2 @@ 
+QA output created by 405
+Silence is golden
diff --git a/tests/generic/group b/tests/generic/group
index 6fc9c3d..a1be466 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -407,3 +407,4 @@ 
 402 auto quick rw
 403 auto quick attr
 404 auto quick insert
+405 auto quick