[PATCH 0/4] mmap dio and DAX

[PATCH 0/4] mmap dio and DAX

[Xiong Zhou]

common/rc         : requires SCRATCH_DEV support DAX
src/t_mmap_dio.c  : intro mmap and O_DIRECT rw through files
tests/generic/405 : IO between DAX/non-DAX mountpoints
tests/xfs/138     : IO between DAX/non-DAX xfs files(per-inode flag)

Xiong Zhou (4):
  common/rc: add _require_scratch_dax
  src/t_mmap_dio: add mmap dio test
  xfs: test per-inode DAX flag by IO
  generic: test mmap dio through DAX and non-DAX

 .gitignore            |   1 +
 common/rc             |  10 +++++
 src/Makefile          |   2 +-
 src/t_mmap_dio.c      |  81 ++++++++++++++++++++++++++++++++++++++
 tests/generic/405     | 100 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/405.out |   2 +
 tests/generic/group   |   1 +
 tests/xfs/138         | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138.out     |   2 +
 tests/xfs/group       |   1 +
 10 files changed, 304 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

-- 
1.8.3.1

[PATCH 1/4] common/rc: add _require_scratch_dax

[Xiong Zhou]

To make sure we can test DAX feature on SCRATCH_DEV.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 common/rc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/rc b/common/rc
index 892c46e..ea7956b 100644
--- a/common/rc
+++ b/common/rc
@@ -2632,6 +2632,16 @@ _require_scratch_shutdown()
 	_scratch_unmount
 }
 
+# Does dax mount option work on this dev/fs?
+_require_scratch_dax()
+{
+	_scratch_unmount
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount -o dax || \
+		_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
+	_scratch_unmount
+}
+
 # Does norecovery support by this fs?
 _require_norecovery()
 {
-- 
1.8.3.1

Re: [PATCH 1/4] common/rc: add _require_scratch_dax

[Eryu Guan]

On Wed, Jan 18, 2017 at 11:07:03AM +0800, Xiong Zhou wrote:
> To make sure we can test DAX feature on SCRATCH_DEV.
> 
> Signed-off-by: Xiong Zhou <xzhou@redhat.com>
> ---
>  common/rc | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/common/rc b/common/rc
> index 892c46e..ea7956b 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2632,6 +2632,16 @@ _require_scratch_shutdown()
>  	_scratch_unmount
>  }
>  
> +# Does dax mount option work on this dev/fs?
> +_require_scratch_dax()
> +{
> +	_scratch_unmount

Use _require_scratch instead of _scratch_unmount here. _require_scratch
ensures we have SCRATCH_DEV defined and unmounts it if it's mounted.

Thanks,
Eryu

> +	_scratch_mkfs > /dev/null 2>&1
> +	_scratch_mount -o dax || \
> +		_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
> +	_scratch_unmount
> +}
> +
>  # Does norecovery support by this fs?
>  _require_norecovery()
>  {
> -- 
> 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

[PATCH 2/4] src/t_mmap_dio: add mmap dio test

[Xiong Zhou]

To test read/write between a mmap area of one file
and another file directly, with different size.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 .gitignore       |  1 +
 src/Makefile     |  2 +-
 src/t_mmap_dio.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c

diff --git a/.gitignore b/.gitignore
index 7dcea14..48a40a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@
 /src/cloner
 /src/renameat2
 /src/t_rename_overwrite
+/src/t_mmap_dio
 
 # dmapi/ binaries
 /dmapi/src/common/cmd/read_invis
diff --git a/src/Makefile b/src/Makefile
index 94d74aa..eb5a56c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
 	godown resvtest writemod makeextents itrash rename \
 	multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \
 	t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
-	holetest t_truncate_self
+	holetest t_truncate_self t_mmap_dio
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
 	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
diff --git a/src/t_mmap_dio.c b/src/t_mmap_dio.c
new file mode 100644
index 0000000..545e900
--- /dev/null
+++ b/src/t_mmap_dio.c
@@ -0,0 +1,81 @@
+/*
+ * This programme was originally written by
+ *     Jeff Moyer <jmoyer@redhat.com>
+ */
+#define _GNU_SOURCE 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <libaio.h>
+#include <errno.h>
+#include <sys/time.h>
+
+void usage(char *prog)
+{
+	fprintf(stderr,
+		"usage: %s <source file> <dest file> <test size>\n",
+		prog);
+	exit(1);
+}
+
+void err_exit(char *op, unsigned long len)
+{
+	fprintf(stderr, "%s(%s) len %lu\n",
+		op, strerror(errno), len);
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	int fd, fd2, ret;
+	char *map;
+	unsigned long len;
+
+	if (argc < 3)
+		usage(basename(argv[0]));
+
+	len = strtoul(argv[3], NULL, 10);
+	if (errno == ERANGE)
+		err_exit("strtoul", 0);
+
+	/* Open source file and mmap*/
+	fd = open(argv[1], O_RDWR, 0644);
+	if (fd < 0)
+		err_exit("open s", len);
+
+	map = (char *)mmap(NULL, len,
+		PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+	if (map == MAP_FAILED)
+		err_exit("mmap", len);
+
+	/* Open dest file with O_DIRECT */
+	fd2 = open(argv[2], O_RDWR|O_DIRECT, 0644);
+	if (fd2 < 0)
+		err_exit("open d", len);
+
+	/* First, test storing to dest file from source mapping */
+	ret = write(fd2, map, len);
+	if (ret != len)
+		err_exit("write", len);
+
+	ret = (int)lseek(fd2, 0, SEEK_SET);
+	if (ret == -1)
+		err_exit("lseek", len);
+
+	/* Next, test reading from dest file into source mapping */
+	ret = read(fd2, map, len);
+	if (ret != len)
+		err_exit("read", len);
+	ret = msync(map, len, MS_SYNC);
+	if (ret < 0)
+		err_exit("msync", len);
+
+	ret = munmap(map, len);
+	if (ret < 0)
+		err_exit("munmap", len);
+
+	exit(0);
+}
-- 
1.8.3.1

[PATCH 3/4] xfs: test per-inode DAX flag by IO

[Xiong Zhou]

We do mmap and O_DIRECT read/write, through files
with and without DAX flag.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 tests/xfs/138     | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138.out |   2 ++
 tests/xfs/group   |   1 +
 3 files changed, 108 insertions(+)
 create mode 100755 tests/xfs/138
 create mode 100644 tests/xfs/138.out

diff --git a/tests/xfs/138 b/tests/xfs/138
new file mode 100755
index 0000000..4b965b3
--- /dev/null
+++ b/tests/xfs/138
@@ -0,0 +1,105 @@
+#! /bin/bash
+# FS QA Test 138
+#
+# Test per-inode DAX flag by mmap direct IO.
+#
+#-----------------------------------------------------------------------
+# 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
+
+_supported_fs xfs
+_supported_os Linux
+_require_scratch_dax
+_require_test_program "feature"
+_require_xfs_io_command "chattr" "+/-x"
+
+# $1 mmap read/write size
+_dax_flag_mmap_dio()
+{
+	# both dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/tf_d $1
+
+	# from non dax to dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/tf_d $1
+
+	# from dax to non dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/tf_d $1
+
+	# both non dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/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"
+
+# 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
+
+_do_tests
+_scratch_unmount >> $seqres.full 2>&1 || _fail "umount failed"
+
+# mount again wo/ dax option
+_scratch_mount >> $seqres.full 2>&1 || _fail "mount failed"
+_do_tests
+_scratch_unmount >> $seqres.full 2>&1
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/xfs/138.out b/tests/xfs/138.out
new file mode 100644
index 0000000..614ba1a
--- /dev/null
+++ b/tests/xfs/138.out
@@ -0,0 +1,2 @@
+QA output created by 138
+Silence is golden
diff --git a/tests/xfs/group b/tests/xfs/group
index 3c5884c..4b406c0 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -135,6 +135,7 @@
 135 auto logprint quick v2log
 136 attr2
 137 auto metadata v2log
+138 auto attr quick
 139 auto quick clone
 140 auto clone
 141 auto log metadata
-- 
1.8.3.1

Re: [PATCH 3/4] xfs: test per-inode DAX flag by IO

[Eryu Guan]

On Wed, Jan 18, 2017 at 11:07:05AM +0800, Xiong Zhou wrote:
> We do mmap and O_DIRECT read/write, through files
> with and without DAX flag.
> 
> Signed-off-by: Xiong Zhou <xzhou@redhat.com>

I think patch 1/4 and 2/4 could be folded into this patch, where the new
helper and test program are used for the first time.

> ---
>  tests/xfs/138     | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/xfs/138.out |   2 ++
>  tests/xfs/group   |   1 +
>  3 files changed, 108 insertions(+)
>  create mode 100755 tests/xfs/138
>  create mode 100644 tests/xfs/138.out
> 
> diff --git a/tests/xfs/138 b/tests/xfs/138
> new file mode 100755
> index 0000000..4b965b3
> --- /dev/null
> +++ b/tests/xfs/138
> @@ -0,0 +1,105 @@
> +#! /bin/bash
> +# FS QA Test 138
> +#
> +# Test per-inode DAX flag by mmap direct IO.
> +#
> +#-----------------------------------------------------------------------
> +# 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
> +
> +_supported_fs xfs
> +_supported_os Linux
> +_require_scratch_dax
> +_require_test_program "feature"

Need _require_test_program "t_mmap_dio"

> +_require_xfs_io_command "chattr" "+/-x"
> +
> +# $1 mmap read/write size
> +_dax_flag_mmap_dio()

Name local functions without leading underscore, it's reserved for
common helpers.

> +{
> +	# both dax
> +	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
> +	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
> +	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/tf_d $1
> +
> +	# from non dax to dax
> +	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
> +	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/tf_d $1
> +
> +	# from dax to non dax
> +	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
> +	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
> +	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/tf_d $1
> +
> +	# both non dax
> +	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
> +	src/t_mmap_dio $SCRATCH_MNT/tf_s $SCRATCH_MNT/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"
> +
> +# mount with dax option
> +_scratch_mount "-o dax" >> $seqres.full 2>&1 || \
> +	_fail "mount -o dax failed"

No need to _fail, test would fail if mkfs & mount 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
> +
> +_do_tests
> +_scratch_unmount >> $seqres.full 2>&1 || _fail "umount failed"
> +
> +# mount again wo/ dax option
> +_scratch_mount >> $seqres.full 2>&1 || _fail "mount failed"
> +_do_tests
> +_scratch_unmount >> $seqres.full 2>&1

No need to unmount, test harness does this for you after test :)

Thanks,
Eryu

> +
> +# success, all done
> +echo "Silence is golden"
> +status=0
> +exit
> diff --git a/tests/xfs/138.out b/tests/xfs/138.out
> new file mode 100644
> index 0000000..614ba1a
> --- /dev/null
> +++ b/tests/xfs/138.out
> @@ -0,0 +1,2 @@
> +QA output created by 138
> +Silence is golden
> diff --git a/tests/xfs/group b/tests/xfs/group
> index 3c5884c..4b406c0 100644
> --- a/tests/xfs/group
> +++ b/tests/xfs/group
> @@ -135,6 +135,7 @@
>  135 auto logprint quick v2log
>  136 attr2
>  137 auto metadata v2log
> +138 auto attr quick
>  139 auto quick clone
>  140 auto clone
>  141 auto log metadata
> -- 
> 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

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

[Xiong Zhou]

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

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
-- 
1.8.3.1

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

[Eryu Guan]

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

[PATCH v2 0/2] mmap dio and DAX

[Xiong Zhou]

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

-- 
1.8.3.1

[PATCH v2 1/2] xfs: test per-inode DAX flag by IO

[Xiong Zhou]

In a DAX mountpoint, do IO betwen files with and
without DAX per-inode flag. We do mmap and O_DIRECT
read/write IO in this case. Then test again in the
same device without dax mountoption.

Add help _require_scratch_dax to make sure we can
test DAX feature on SCRATCH_DEV.

Add mmap dio test programme to test read/write
between a mmap area of one file and another file
directly, with different size.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 .gitignore        |   1 +
 common/rc         |  14 +++++++
 src/Makefile      |   2 +-
 src/t_mmap_dio.c  |  81 ++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138     | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138.out |   2 +
 tests/xfs/group   |   1 +
 7 files changed, 210 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c
 create mode 100755 tests/xfs/138
 create mode 100644 tests/xfs/138.out

diff --git a/.gitignore b/.gitignore
index 7dcea14..48a40a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@
 /src/cloner
 /src/renameat2
 /src/t_rename_overwrite
+/src/t_mmap_dio
 
 # dmapi/ binaries
 /dmapi/src/common/cmd/read_invis
diff --git a/common/rc b/common/rc
index 892c46e..3706620 100644
--- a/common/rc
+++ b/common/rc
@@ -2632,6 +2632,20 @@ _require_scratch_shutdown()
 	_scratch_unmount
 }
 
+# Does dax mount option work on this dev/fs?
+_require_scratch_dax()
+{
+	_require_scratch
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount -o dax
+	# Check options to be sure. XFS ignores dax option
+	# and goes on if dev underneath does not support dax.
+	_fs_options $SCRATCH_DEV | grep -w "dax" > /dev/null 2>&1
+	[ $? -ne 0 ] && \
+		_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
+	_scratch_unmount
+}
+
 # Does norecovery support by this fs?
 _require_norecovery()
 {
diff --git a/src/Makefile b/src/Makefile
index 94d74aa..eb5a56c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
 	godown resvtest writemod makeextents itrash rename \
 	multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \
 	t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
-	holetest t_truncate_self
+	holetest t_truncate_self t_mmap_dio
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
 	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
diff --git a/src/t_mmap_dio.c b/src/t_mmap_dio.c
new file mode 100644
index 0000000..1a26e1b
--- /dev/null
+++ b/src/t_mmap_dio.c
@@ -0,0 +1,81 @@
+/*
+ * This programme was originally written by
+ *     Jeff Moyer <jmoyer@redhat.com>
+ */
+#define _GNU_SOURCE 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <libaio.h>
+#include <errno.h>
+#include <sys/time.h>
+
+void usage(char *prog)
+{
+	fprintf(stderr,
+		"usage: %s <src file> <dest file> <size> <msg>\n",
+		prog);
+	exit(1);
+}
+
+void err_exit(char *op, unsigned long len, char *s)
+{
+	fprintf(stderr, "%s(%s) len %lu %s\n",
+		op, strerror(errno), len, s);
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	int fd, fd2, ret;
+	char *map;
+	unsigned long len;
+
+	if (argc < 3)
+		usage(basename(argv[0]));
+
+	len = strtoul(argv[3], NULL, 10);
+	if (errno == ERANGE)
+		err_exit("strtoul", 0, argv[4]);
+
+	/* Open source file and mmap*/
+	fd = open(argv[1], O_RDWR, 0644);
+	if (fd < 0)
+		err_exit("open s", len, argv[4]);
+
+	map = (char *)mmap(NULL, len,
+		PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+	if (map == MAP_FAILED)
+		err_exit("mmap", len, argv[4]);
+
+	/* Open dest file with O_DIRECT */
+	fd2 = open(argv[2], O_RDWR|O_DIRECT, 0644);
+	if (fd2 < 0)
+		err_exit("open d", len, argv[4]);
+
+	/* First, test storing to dest file from source mapping */
+	ret = write(fd2, map, len);
+	if (ret != len)
+		err_exit("write", len, argv[4]);
+
+	ret = (int)lseek(fd2, 0, SEEK_SET);
+	if (ret == -1)
+		err_exit("lseek", len, argv[4]);
+
+	/* Next, test reading from dest file into source mapping */
+	ret = read(fd2, map, len);
+	if (ret != len)
+		err_exit("read", len, argv[4]);
+	ret = msync(map, len, MS_SYNC);
+	if (ret < 0)
+		err_exit("msync", len, argv[4]);
+
+	ret = munmap(map, len);
+	if (ret < 0)
+		err_exit("munmap", len, argv[4]);
+
+	exit(0);
+}
diff --git a/tests/xfs/138 b/tests/xfs/138
new file mode 100755
index 0000000..9822441
--- /dev/null
+++ b/tests/xfs/138
@@ -0,0 +1,110 @@
+#! /bin/bash
+# FS QA Test 138
+#
+# Test per-inode DAX flag by mmap direct IO.
+#
+#-----------------------------------------------------------------------
+# 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
+
+_supported_fs xfs
+_supported_os Linux
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+_require_xfs_io_command "chattr" "+/-x"
+
+# $1 mmap read/write size
+t_dax_flag_mmap_dio()
+{
+	# both dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "both dax"
+
+	# from non dax to dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "nondax to dax"
+
+	# from dax to non dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dax to nondax"
+
+	# both non dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "both nondax"
+}
+
+do_tests()
+{
+	# less than page size
+	t_dax_flag_mmap_dio 1024
+	# page size
+	t_dax_flag_mmap_dio `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_dax_flag_mmap_dio 16777216
+	t_dax_flag_mmap_dio 67108864
+}
+
+_scratch_mkfs > /dev/null 2>&1
+
+# mount with dax option
+_scratch_mount "-o dax"
+
+psize=`src/feature -s`
+tsize=$((1024 * 1024 * 1024))
+
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_d >> $seqres.full 2>&1
+
+do_tests
+_scratch_unmount
+
+# mount again without dax option
+export MOUNT_OPTIONS=""
+_scratch_mount
+do_tests
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/xfs/138.out b/tests/xfs/138.out
new file mode 100644
index 0000000..614ba1a
--- /dev/null
+++ b/tests/xfs/138.out
@@ -0,0 +1,2 @@
+QA output created by 138
+Silence is golden
diff --git a/tests/xfs/group b/tests/xfs/group
index 3c5884c..4b406c0 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -135,6 +135,7 @@
 135 auto logprint quick v2log
 136 attr2
 137 auto metadata v2log
+138 auto attr quick
 139 auto quick clone
 140 auto clone
 141 auto log metadata
-- 
1.8.3.1

Re: [PATCH v2 1/2] xfs: test per-inode DAX flag by IO

[Ross Zwisler]

On Thu, Jan 19, 2017 at 06:13:57PM +0800, Xiong Zhou wrote:
> In a DAX mountpoint, do IO betwen files with and
> without DAX per-inode flag. We do mmap and O_DIRECT
> read/write IO in this case. Then test again in the
> same device without dax mountoption.
> 
> Add help _require_scratch_dax to make sure we can
> test DAX feature on SCRATCH_DEV.
> 
> Add mmap dio test programme to test read/write
> between a mmap area of one file and another file
> directly, with different size.
> 
> Signed-off-by: Xiong Zhou <xzhou@redhat.com>
> ---
>  .gitignore        |   1 +
>  common/rc         |  14 +++++++
>  src/Makefile      |   2 +-
>  src/t_mmap_dio.c  |  81 ++++++++++++++++++++++++++++++++++++++++
>  tests/xfs/138     | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/xfs/138.out |   2 +
>  tests/xfs/group   |   1 +
>  7 files changed, 210 insertions(+), 1 deletion(-)
>  create mode 100644 src/t_mmap_dio.c
>  create mode 100755 tests/xfs/138
>  create mode 100644 tests/xfs/138.out
> 
> diff --git a/.gitignore b/.gitignore
> index 7dcea14..48a40a0 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -129,6 +129,7 @@
>  /src/cloner
>  /src/renameat2
>  /src/t_rename_overwrite
> +/src/t_mmap_dio
>  
>  # dmapi/ binaries
>  /dmapi/src/common/cmd/read_invis
> diff --git a/common/rc b/common/rc
> index 892c46e..3706620 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2632,6 +2632,20 @@ _require_scratch_shutdown()
>  	_scratch_unmount
>  }
>  
> +# Does dax mount option work on this dev/fs?
> +_require_scratch_dax()
> +{
> +	_require_scratch
> +	_scratch_mkfs > /dev/null 2>&1
> +	_scratch_mount -o dax
> +	# Check options to be sure. XFS ignores dax option
> +	# and goes on if dev underneath does not support dax.
> +	_fs_options $SCRATCH_DEV | grep -w "dax" > /dev/null 2>&1
> +	[ $? -ne 0 ] && \
> +		_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
> +	_scratch_unmount
> +}
> +
>  # Does norecovery support by this fs?
>  _require_norecovery()
>  {
> diff --git a/src/Makefile b/src/Makefile
> index 94d74aa..eb5a56c 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> @@ -12,7 +12,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
>  	godown resvtest writemod makeextents itrash rename \
>  	multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \
>  	t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
> -	holetest t_truncate_self
> +	holetest t_truncate_self t_mmap_dio
>  
>  LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
>  	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
> diff --git a/src/t_mmap_dio.c b/src/t_mmap_dio.c
> new file mode 100644
> index 0000000..1a26e1b
> --- /dev/null
> +++ b/src/t_mmap_dio.c
> @@ -0,0 +1,81 @@
> +/*
> + * This programme was originally written by
> + *     Jeff Moyer <jmoyer@redhat.com>
> + */
> +#define _GNU_SOURCE 1
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <unistd.h>
> +#include <fcntl.h>
> +#include <sys/mman.h>
> +#include <libaio.h>
> +#include <errno.h>
> +#include <sys/time.h>
> +
> +void usage(char *prog)
> +{
> +	fprintf(stderr,
> +		"usage: %s <src file> <dest file> <size> <msg>\n",
> +		prog);
> +	exit(1);
> +}
> +
> +void err_exit(char *op, unsigned long len, char *s)
> +{
> +	fprintf(stderr, "%s(%s) len %lu %s\n",
> +		op, strerror(errno), len, s);
> +	exit(1);
> +}
> +
> +int main(int argc, char **argv)
> +{
> +	int fd, fd2, ret;
> +	char *map;
> +	unsigned long len;
> +
> +	if (argc < 3)
> +		usage(basename(argv[0]));
> +
> +	len = strtoul(argv[3], NULL, 10);
> +	if (errno == ERANGE)
> +		err_exit("strtoul", 0, argv[4]);
> +
> +	/* Open source file and mmap*/
> +	fd = open(argv[1], O_RDWR, 0644);
> +	if (fd < 0)
> +		err_exit("open s", len, argv[4]);
> +
> +	map = (char *)mmap(NULL, len,
> +		PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
> +	if (map == MAP_FAILED)
> +		err_exit("mmap", len, argv[4]);
> +
> +	/* Open dest file with O_DIRECT */
> +	fd2 = open(argv[2], O_RDWR|O_DIRECT, 0644);
> +	if (fd2 < 0)
> +		err_exit("open d", len, argv[4]);
> +
> +	/* First, test storing to dest file from source mapping */
> +	ret = write(fd2, map, len);
> +	if (ret != len)
> +		err_exit("write", len, argv[4]);
> +
> +	ret = (int)lseek(fd2, 0, SEEK_SET);
> +	if (ret == -1)
> +		err_exit("lseek", len, argv[4]);
> +
> +	/* Next, test reading from dest file into source mapping */
> +	ret = read(fd2, map, len);
> +	if (ret != len)
> +		err_exit("read", len, argv[4]);
> +	ret = msync(map, len, MS_SYNC);
> +	if (ret < 0)
> +		err_exit("msync", len, argv[4]);
> +
> +	ret = munmap(map, len);
> +	if (ret < 0)
> +		err_exit("munmap", len, argv[4]);

Small nit: you munmap() to clean up the mmap(), but you don't close fd or fd2.

Re: [PATCH v2 1/2] xfs: test per-inode DAX flag by IO

[Xiong Zhou]

On Thu, Jan 19, 2017 at 01:49:25PM -0700, Ross Zwisler wrote:
> On Thu, Jan 19, 2017 at 06:13:57PM +0800, Xiong Zhou wrote:
...snip..
> > +	ret = munmap(map, len);
> > +	if (ret < 0)
> > +		err_exit("munmap", len, argv[4]);
> 
> Small nit: you munmap() to clean up the mmap(), but you don't close fd or fd2.

Thanks Ross and Eryu reviewing!

I'll send v3 of this patch shortly.

--
Xiong

[PATCH v3] xfs: test per-inode DAX flag by IO

[Xiong Zhou]

In a DAX mountpoint, do IO betwen files with and
without DAX per-inode flag. We do mmap and O_DIRECT
read/write IO in this case. Then test again in the
same device without dax mountoption.

Add help _require_scratch_dax to make sure we can
test DAX feature on SCRATCH_DEV.

Add mmap dio test programme to test read/write
between a mmap area of one file and another file
directly, with different size.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
v3:
 close fds in C test programme for clean up.

 .gitignore        |   1 +
 common/rc         |  14 +++++++
 src/Makefile      |   2 +-
 src/t_mmap_dio.c  |  89 +++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138     | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138.out |   2 +
 tests/xfs/group   |   1 +
 7 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c
 create mode 100755 tests/xfs/138
 create mode 100644 tests/xfs/138.out

diff --git a/.gitignore b/.gitignore
index 7dcea14..48a40a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@
 /src/cloner
 /src/renameat2
 /src/t_rename_overwrite
+/src/t_mmap_dio
 
 # dmapi/ binaries
 /dmapi/src/common/cmd/read_invis
diff --git a/common/rc b/common/rc
index 892c46e..3706620 100644
--- a/common/rc
+++ b/common/rc
@@ -2632,6 +2632,20 @@ _require_scratch_shutdown()
 	_scratch_unmount
 }
 
+# Does dax mount option work on this dev/fs?
+_require_scratch_dax()
+{
+	_require_scratch
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount -o dax
+	# Check options to be sure. XFS ignores dax option
+	# and goes on if dev underneath does not support dax.
+	_fs_options $SCRATCH_DEV | grep -w "dax" > /dev/null 2>&1
+	[ $? -ne 0 ] && \
+		_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
+	_scratch_unmount
+}
+
 # Does norecovery support by this fs?
 _require_norecovery()
 {
diff --git a/src/Makefile b/src/Makefile
index 94d74aa..eb5a56c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
 	godown resvtest writemod makeextents itrash rename \
 	multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \
 	t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
-	holetest t_truncate_self
+	holetest t_truncate_self t_mmap_dio
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
 	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
diff --git a/src/t_mmap_dio.c b/src/t_mmap_dio.c
new file mode 100644
index 0000000..abec442
--- /dev/null
+++ b/src/t_mmap_dio.c
@@ -0,0 +1,89 @@
+/*
+ * This programme was originally written by
+ *     Jeff Moyer <jmoyer@redhat.com>
+ */
+#define _GNU_SOURCE 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <libaio.h>
+#include <errno.h>
+#include <sys/time.h>
+
+void usage(char *prog)
+{
+	fprintf(stderr,
+		"usage: %s <src file> <dest file> <size> <msg>\n",
+		prog);
+	exit(1);
+}
+
+void err_exit(char *op, unsigned long len, char *s)
+{
+	fprintf(stderr, "%s(%s) len %lu %s\n",
+		op, strerror(errno), len, s);
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	int fd, fd2, ret;
+	char *map;
+	unsigned long len;
+
+	if (argc < 3)
+		usage(basename(argv[0]));
+
+	len = strtoul(argv[3], NULL, 10);
+	if (errno == ERANGE)
+		err_exit("strtoul", 0, argv[4]);
+
+	/* Open source file and mmap*/
+	fd = open(argv[1], O_RDWR, 0644);
+	if (fd < 0)
+		err_exit("open s", len, argv[4]);
+
+	map = (char *)mmap(NULL, len,
+		PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+	if (map == MAP_FAILED)
+		err_exit("mmap", len, argv[4]);
+
+	/* Open dest file with O_DIRECT */
+	fd2 = open(argv[2], O_RDWR|O_DIRECT, 0644);
+	if (fd2 < 0)
+		err_exit("open d", len, argv[4]);
+
+	/* First, test storing to dest file from source mapping */
+	ret = write(fd2, map, len);
+	if (ret != len)
+		err_exit("write", len, argv[4]);
+
+	ret = (int)lseek(fd2, 0, SEEK_SET);
+	if (ret == -1)
+		err_exit("lseek", len, argv[4]);
+
+	/* Next, test reading from dest file into source mapping */
+	ret = read(fd2, map, len);
+	if (ret != len)
+		err_exit("read", len, argv[4]);
+	ret = msync(map, len, MS_SYNC);
+	if (ret < 0)
+		err_exit("msync", len, argv[4]);
+
+	ret = munmap(map, len);
+	if (ret < 0)
+		err_exit("munmap", len, argv[4]);
+
+	ret = close(fd);
+	if (ret < 0)
+		err_exit("clsoe fd", len, argv[4]);
+
+	ret = close(fd2);
+	if (ret < 0)
+		err_exit("close fd2", len, argv[4]);
+
+	exit(0);
+}
diff --git a/tests/xfs/138 b/tests/xfs/138
new file mode 100755
index 0000000..9822441
--- /dev/null
+++ b/tests/xfs/138
@@ -0,0 +1,110 @@
+#! /bin/bash
+# FS QA Test 138
+#
+# Test per-inode DAX flag by mmap direct IO.
+#
+#-----------------------------------------------------------------------
+# 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
+
+_supported_fs xfs
+_supported_os Linux
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+_require_xfs_io_command "chattr" "+/-x"
+
+# $1 mmap read/write size
+t_dax_flag_mmap_dio()
+{
+	# both dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "both dax"
+
+	# from non dax to dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "nondax to dax"
+
+	# from dax to non dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dax to nondax"
+
+	# both non dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "both nondax"
+}
+
+do_tests()
+{
+	# less than page size
+	t_dax_flag_mmap_dio 1024
+	# page size
+	t_dax_flag_mmap_dio `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_dax_flag_mmap_dio 16777216
+	t_dax_flag_mmap_dio 67108864
+}
+
+_scratch_mkfs > /dev/null 2>&1
+
+# mount with dax option
+_scratch_mount "-o dax"
+
+psize=`src/feature -s`
+tsize=$((1024 * 1024 * 1024))
+
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_d >> $seqres.full 2>&1
+
+do_tests
+_scratch_unmount
+
+# mount again without dax option
+export MOUNT_OPTIONS=""
+_scratch_mount
+do_tests
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/xfs/138.out b/tests/xfs/138.out
new file mode 100644
index 0000000..614ba1a
--- /dev/null
+++ b/tests/xfs/138.out
@@ -0,0 +1,2 @@
+QA output created by 138
+Silence is golden
diff --git a/tests/xfs/group b/tests/xfs/group
index 3c5884c..4b406c0 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -135,6 +135,7 @@
 135 auto logprint quick v2log
 136 attr2
 137 auto metadata v2log
+138 auto attr quick
 139 auto quick clone
 140 auto clone
 141 auto log metadata
-- 
1.8.3.1

[PATCH v4 0/2] mmap dio and DAX

[Xiong Zhou]

common/rc         : requires SCRATCH_DEV support DAX
src/t_mmap_dio.c  : intro mmap and O_DIRECT rw through files
tests/generic/405 : IO between DAX/non-DAX mountpoints
tests/xfs/138     : IO between DAX/non-DAX xfs files(per-inode flag)

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.

v3:
 close fds in C test programme for clean up.

v4:
 Test both buffered and O_DIRECT IO;
 Fix arg numbers in C test programme;
 Fix fs options check after mount.
 Cc Jeff Moyer since this test is based on his code.
 (Sorry for the late cc!)

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

  I've reported this to nvdimm list.
  https://lists.01.org/pipermail/linux-nvdimm/2017-January/008600.html

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

 .gitignore            |   1 +
 common/rc             |  13 ++++++
 src/Makefile          |   2 +-
 src/t_mmap_dio.c      | 105 ++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/405     | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/405.out |   2 +
 tests/generic/group   |   1 +
 tests/xfs/138         | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138.out     |   2 +
 tests/xfs/group       |   1 +
 10 files changed, 361 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

-- 
1.8.3.1

[PATCH v4 1/2] xfs: test per-inode DAX flag by IO

[Xiong Zhou]

In a DAX mountpoint, do IO betwen files with and
without DAX per-inode flag. We do mmap, both
O_DIRECT and buffered read/write IO in this case.
Then test again in the same device without dax
mountoption.

Add help _require_scratch_dax to make sure we can
test DAX feature on SCRATCH_DEV.

Add mmap dio test programme to test read/write
between a mmap area of one file and another file
directly or buffered, with different size.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 .gitignore        |   1 +
 common/rc         |  13 ++++++
 src/Makefile      |   2 +-
 src/t_mmap_dio.c  | 105 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138     | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/138.out |   2 +
 tests/xfs/group   |   1 +
 7 files changed, 239 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c
 create mode 100755 tests/xfs/138
 create mode 100644 tests/xfs/138.out

diff --git a/.gitignore b/.gitignore
index 7dcea14..48a40a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@
 /src/cloner
 /src/renameat2
 /src/t_rename_overwrite
+/src/t_mmap_dio
 
 # dmapi/ binaries
 /dmapi/src/common/cmd/read_invis
diff --git a/common/rc b/common/rc
index 892c46e..9551e09 100644
--- a/common/rc
+++ b/common/rc
@@ -2632,6 +2632,19 @@ _require_scratch_shutdown()
 	_scratch_unmount
 }
 
+# Does dax mount option work on this dev/fs?
+_require_scratch_dax()
+{
+	_require_scratch
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount -o dax
+	# Check options to be sure. XFS ignores dax option
+	# and goes on if dev underneath does not support dax.
+	_fs_options $SCRATCH_DEV | grep -qw "dax" || \
+		_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
+	_scratch_unmount
+}
+
 # Does norecovery support by this fs?
 _require_norecovery()
 {
diff --git a/src/Makefile b/src/Makefile
index 94d74aa..eb5a56c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
 	godown resvtest writemod makeextents itrash rename \
 	multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \
 	t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
-	holetest t_truncate_self
+	holetest t_truncate_self t_mmap_dio
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
 	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
diff --git a/src/t_mmap_dio.c b/src/t_mmap_dio.c
new file mode 100644
index 0000000..3ac1790
--- /dev/null
+++ b/src/t_mmap_dio.c
@@ -0,0 +1,105 @@
+/*
+ * This programme was originally written by
+ *     Jeff Moyer <jmoyer@redhat.com>
+ */
+#define _GNU_SOURCE 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <libaio.h>
+#include <errno.h>
+#include <sys/time.h>
+
+void usage(char *prog)
+{
+	fprintf(stderr,
+		"usage: %s <src file> <dest file> <size> <msg>\n",
+		prog);
+	exit(1);
+}
+
+void err_exit(char *op, unsigned long len, char *s)
+{
+	fprintf(stderr, "%s(%s) len %lu %s\n",
+		op, strerror(errno), len, s);
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	int fd, fd2, ret, dio = 1;
+	char *map;
+	char *msg;
+	char *sfile;
+	char *dfile;
+	unsigned long len, opt;
+
+	if (argc < 4)
+		usage(basename(argv[0]));
+
+	while ((opt = getopt(argc, argv, "b")) != -1)
+		dio = 0;
+
+	sfile = argv[optind];
+	dfile = argv[optind + 1];
+	msg = argv[optind + 3];
+	len = strtoul(argv[optind + 2], NULL, 10);
+	if (errno == ERANGE)
+		err_exit("strtoul", 0, msg);
+
+	/* Open source file and mmap*/
+	fd = open(sfile, O_RDWR, 0644);
+	if (fd < 0)
+		err_exit("open src", len, msg);
+
+	map = (char *)mmap(NULL, len,
+		PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+	if (map == MAP_FAILED)
+		err_exit("mmap", len, msg);
+
+	if (dio == 1) {
+		/* Open dest file with O_DIRECT */
+		fd2 = open(dfile, O_RDWR|O_DIRECT, 0644);
+		if (fd2 < 0)
+			err_exit("open dest", len, msg);
+	} else {
+		/* Open dest file without O_DIRECT */
+		fd2 = open(dfile, O_RDWR, 0644);
+		if (fd2 < 0)
+			err_exit("open dest", len, msg);
+	}
+
+	/* First, test storing to dest file from source mapping */
+	ret = write(fd2, map, len);
+	if (ret != len)
+		err_exit("write", len, msg);
+
+	ret = (int)lseek(fd2, 0, SEEK_SET);
+	if (ret == -1)
+		err_exit("lseek", len, msg);
+
+	/* Next, test reading from dest file into source mapping */
+	ret = read(fd2, map, len);
+	if (ret != len)
+		err_exit("read", len, msg);
+	ret = msync(map, len, MS_SYNC);
+	if (ret < 0)
+		err_exit("msync", len, msg);
+
+	ret = munmap(map, len);
+	if (ret < 0)
+		err_exit("munmap", len, msg);
+
+	ret = close(fd);
+	if (ret < 0)
+		err_exit("clsoe fd", len, msg);
+
+	ret = close(fd2);
+	if (ret < 0)
+		err_exit("close fd2", len, msg);
+
+	exit(0);
+}
diff --git a/tests/xfs/138 b/tests/xfs/138
new file mode 100755
index 0000000..e959a53
--- /dev/null
+++ b/tests/xfs/138
@@ -0,0 +1,116 @@
+#! /bin/bash
+# FS QA Test 138
+#
+# Test per-inode DAX flag by mmap direct/buffered IO.
+#
+#-----------------------------------------------------------------------
+# 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
+
+_supported_fs xfs
+_supported_os Linux
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+_require_xfs_io_command "chattr" "+/-x"
+
+# $1 mmap read/write size
+t_dax_flag_mmap_dio()
+{
+	# both dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
+	# with O_DIRECT first
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both dax"
+	# again with buffered IO
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} $1 "buffered both dax"
+
+	# from non dax to dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio nondax to dax"
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} $1 "buffered nondax to dax"
+
+	# from dax to non dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio dax to nondax"
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} $1 "buffered dax to nondax"
+
+	# both non dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both nondax"
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} $1 "buffered both nondax"
+}
+
+do_tests()
+{
+	# less than page size
+	t_dax_flag_mmap_dio 1024
+	# page size
+	t_dax_flag_mmap_dio `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_dax_flag_mmap_dio 16777216
+	t_dax_flag_mmap_dio 67108864
+}
+
+_scratch_mkfs > /dev/null 2>&1
+
+# mount with dax option
+_scratch_mount "-o dax"
+
+psize=`src/feature -s`
+tsize=$((1024 * 1024 * 1024))
+
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_d >> $seqres.full 2>&1
+
+do_tests
+_scratch_unmount
+
+# mount again without dax option
+export MOUNT_OPTIONS=""
+_scratch_mount
+do_tests
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/xfs/138.out b/tests/xfs/138.out
new file mode 100644
index 0000000..614ba1a
--- /dev/null
+++ b/tests/xfs/138.out
@@ -0,0 +1,2 @@
+QA output created by 138
+Silence is golden
diff --git a/tests/xfs/group b/tests/xfs/group
index 3c5884c..4b406c0 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -135,6 +135,7 @@
 135 auto logprint quick v2log
 136 attr2
 137 auto metadata v2log
+138 auto attr quick
 139 auto quick clone
 140 auto clone
 141 auto log metadata
-- 
1.8.3.1

[PATCH] fixup! xfs: test per-inode DAX flag by IO

[Ross Zwisler]

This makes a few changes to allow xfs/138 to use PMD faults, and has a few
other changes which I think are improvements.

For PMD faults:
- We need to use MKFS_OPTIONS="-d su=2m,sw=1" to ensure that the block
  allocations we get from XFS are 2MiB sized and aligned.  Without this we
  will fall back to 4k DAX pages for all the tests.

- We need to preallocate the file size with fallocate, rather than using
  "xfs_io -c pwrite".  This lets XFS increase the size of the test files
  before the test starts, giving us 2MiB sized and aligned blocks.  This
  also has the added bonus that we don't start out the mmap portion of the
  test with all the areas of the files written to and allocated.  This
  means that on the first read pass through a portion of a file we exercise
  the zero page DAX path for holes, then on subsequent passes we'll fill
  the holes and exercise the normal DAX path, giving us better overall
  coverage of the DAX code.  It also makes the test run slightly faster.

- For some reason I was having trouble getting XFS to give me 2MiB aligned
  and sized block allocations with file size 1GiB?  The test only needs
  file sizes of 64 MiB, and dropping the files used to that size ensured
  that I always got 2MiB allocations, but truthfully I don't understand
  this behavior from XFS.

And one cleanup thing:

- Changed the sizes above 4k to use bash math instead of having hard coded
  values.  I personally don't have 67108864 memorized to be 64 MiB (maybe
  everyone else does), but the meaning of $((64 * 1024 * 1024)) is more
  obvious to the reader.

I'm working on similar changes for your generic/405, but am still having
trouble getting PMD faults from ext4, even with the mkfs options I had
previously been using for other testing.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
---
 tests/xfs/138 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/xfs/138 b/tests/xfs/138
index 9822441..4762534 100755
--- a/tests/xfs/138
+++ b/tests/xfs/138
@@ -79,22 +79,21 @@ do_tests()
 	# page size
 	t_dax_flag_mmap_dio `src/feature -s`
 	# bigger sizes, for PMD faults
-	t_dax_flag_mmap_dio 16777216
-	t_dax_flag_mmap_dio 67108864
+	t_dax_flag_mmap_dio $((16 * 1024 * 1024))
+	t_dax_flag_mmap_dio $((64 * 1024 * 1024))
 }
 
+export MKFS_OPTIONS="-d su=2m,sw=1"
 _scratch_mkfs > /dev/null 2>&1
 
 # mount with dax option
 _scratch_mount "-o dax"
 
 psize=`src/feature -s`
-tsize=$((1024 * 1024 * 1024))
+tsize=$((64 * 1024 * 1024))
 
-$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
-	$SCRATCH_MNT/tf_s >> $seqres.full 2>&1
-$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
-	$SCRATCH_MNT/tf_d >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "falloc 0 $tsize" $SCRATCH_MNT/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "falloc 0 $tsize" $SCRATCH_MNT/tf_d >> $seqres.full 2>&1
 
 do_tests
 _scratch_unmount
-- 
2.7.4

[PATCH v5 0/2] mmap dio and DAX

[Xiong Zhou]

Hi Ross,

Thanks for the fixup!
Here are v5 for testing and reviewing. And I need your
permission to add you in the signed-off list :)

---
common/rc         : requires SCRATCH_DEV support DAX
src/t_mmap_dio.c  : intro mmap and O_DIRECT rw through files
tests/generic/405 : IO between DAX/non-DAX mountpoints
tests/xfs/138     : IO between DAX/non-DAX xfs files(per-inode flag)

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.

v3:
 close fds in C test programme for clean up.

v4:
 Test both buffered and O_DIRECT IO;
 Fix arg numbers in C test programme;
 Fix fs options check after mount.
 Cc Jeff Moyer since this test is based on his code.
 (Sorry for the late cc!)

v5:
 Mainly from Ross Zwisler <ross.zwisler@linux.intel.com>
 Add mkfs options to make fs 2M aligned, to hit PMD faults;
 Use falloc instead of pwrite to init test file aviding 4k
alignment;
 64M test file instead of 1G;
 Bumping test seq numners;
 Other minor fixes.

Test status:
  Both cases not run on normal block device;
  Both cases PASS on ramdisk based pmem devices;
  Both cases PASS on nvdimm(memory namespace) devices;
  DIO in both cases FAIL on brd based ramdisk with:
  DIO in both cases FAIL on nvdimm(raw namespace) devices with:
    +write(Bad address) len 1024 dio dax to nondax
    +write(Bad address) len 4096 dio dax to nondax
    +write(Bad address) len 16777216 dio dax to nondax
    +write(Bad address) len 67108864 dio dax to nondax
  (expected behavior)
  https://lists.01.org/pipermail/linux-nvdimm/2017-January/008600.html

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

 .gitignore            |   1 +
 common/rc             |  13 ++++++
 src/Makefile          |   2 +-
 src/t_mmap_dio.c      | 107 ++++++++++++++++++++++++++++++++++++++++++
 tests/generic/407     | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/407.out |   2 +
 tests/generic/group   |   1 +
 tests/xfs/196         | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/196.out     |   2 +
 tests/xfs/group       |   1 +
 10 files changed, 377 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c
 create mode 100755 tests/generic/407
 create mode 100644 tests/generic/407.out
 create mode 100755 tests/xfs/196
 create mode 100644 tests/xfs/196.out

-- 
1.8.3.1

[PATCH v5 1/2] xfs: test per-inode DAX flag by IO

[Xiong Zhou]

In a DAX mountpoint, do IO betwen files with and
without DAX per-inode flag. We do mmap, both
O_DIRECT and buffered read/write IO in this case.
Then test again in the same device without dax
mountoption.

Add help _require_scratch_dax to make sure we can
test DAX feature on SCRATCH_DEV.

Add mmap dio test programme to test read/write
between a mmap area of one file and another file
directly or buffered, with different size.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 .gitignore        |   1 +
 common/rc         |  13 ++++++
 src/Makefile      |   2 +-
 src/t_mmap_dio.c  | 107 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/196     | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/196.out |   2 +
 tests/xfs/group   |   1 +
 7 files changed, 249 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c
 create mode 100755 tests/xfs/196
 create mode 100644 tests/xfs/196.out

diff --git a/.gitignore b/.gitignore
index 7dcea14..48a40a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@
 /src/cloner
 /src/renameat2
 /src/t_rename_overwrite
+/src/t_mmap_dio
 
 # dmapi/ binaries
 /dmapi/src/common/cmd/read_invis
diff --git a/common/rc b/common/rc
index 7e2eaee..b99c4e2 100644
--- a/common/rc
+++ b/common/rc
@@ -2633,6 +2633,19 @@ _require_scratch_shutdown()
 	_scratch_unmount
 }
 
+# Does dax mount option work on this dev/fs?
+_require_scratch_dax()
+{
+	_require_scratch
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount -o dax
+	# Check options to be sure. XFS ignores dax option
+	# and goes on if dev underneath does not support dax.
+	_fs_options $SCRATCH_DEV | grep -qw "dax" || \
+		_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
+	_scratch_unmount
+}
+
 # Does norecovery support by this fs?
 _require_norecovery()
 {
diff --git a/src/Makefile b/src/Makefile
index 94d74aa..eb5a56c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
 	godown resvtest writemod makeextents itrash rename \
 	multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \
 	t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
-	holetest t_truncate_self
+	holetest t_truncate_self t_mmap_dio
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
 	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
diff --git a/src/t_mmap_dio.c b/src/t_mmap_dio.c
new file mode 100644
index 0000000..b47a51e
--- /dev/null
+++ b/src/t_mmap_dio.c
@@ -0,0 +1,107 @@
+/*
+ * This programme was originally written by
+ *     Jeff Moyer <jmoyer@redhat.com>
+ *
+ * Copyright (C) 2016, Red Hat, Inc.
+ */
+#define _GNU_SOURCE 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <libaio.h>
+#include <errno.h>
+#include <sys/time.h>
+
+void usage(char *prog)
+{
+	fprintf(stderr,
+		"usage: %s <src file> <dest file> <size> <msg>\n",
+		prog);
+	exit(1);
+}
+
+void err_exit(char *op, unsigned long len, char *s)
+{
+	fprintf(stderr, "%s(%s) len %lu %s\n",
+		op, strerror(errno), len, s);
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	int fd, fd2, ret, dio = 1;
+	char *map;
+	char *msg;
+	char *sfile;
+	char *dfile;
+	unsigned long len, opt;
+
+	if (argc < 4)
+		usage(basename(argv[0]));
+
+	while ((opt = getopt(argc, argv, "b")) != -1)
+		dio = 0;
+
+	sfile = argv[optind];
+	dfile = argv[optind + 1];
+	msg = argv[optind + 3];
+	len = strtoul(argv[optind + 2], NULL, 10);
+	if (errno == ERANGE)
+		err_exit("strtoul", 0, msg);
+
+	/* Open source file and mmap*/
+	fd = open(sfile, O_RDWR, 0644);
+	if (fd < 0)
+		err_exit("open src", len, msg);
+
+	map = (char *)mmap(NULL, len,
+		PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+	if (map == MAP_FAILED)
+		err_exit("mmap", len, msg);
+
+	if (dio == 1) {
+		/* Open dest file with O_DIRECT */
+		fd2 = open(dfile, O_RDWR|O_DIRECT, 0644);
+		if (fd2 < 0)
+			err_exit("open dest", len, msg);
+	} else {
+		/* Open dest file without O_DIRECT */
+		fd2 = open(dfile, O_RDWR, 0644);
+		if (fd2 < 0)
+			err_exit("open dest", len, msg);
+	}
+
+	/* First, test storing to dest file from source mapping */
+	ret = write(fd2, map, len);
+	if (ret != len)
+		err_exit("write", len, msg);
+
+	ret = (int)lseek(fd2, 0, SEEK_SET);
+	if (ret == -1)
+		err_exit("lseek", len, msg);
+
+	/* Next, test reading from dest file into source mapping */
+	ret = read(fd2, map, len);
+	if (ret != len)
+		err_exit("read", len, msg);
+	ret = msync(map, len, MS_SYNC);
+	if (ret < 0)
+		err_exit("msync", len, msg);
+
+	ret = munmap(map, len);
+	if (ret < 0)
+		err_exit("munmap", len, msg);
+
+	ret = close(fd);
+	if (ret < 0)
+		err_exit("clsoe fd", len, msg);
+
+	ret = close(fd2);
+	if (ret < 0)
+		err_exit("close fd2", len, msg);
+
+	exit(0);
+}
diff --git a/tests/xfs/196 b/tests/xfs/196
new file mode 100755
index 0000000..55adc9c
--- /dev/null
+++ b/tests/xfs/196
@@ -0,0 +1,124 @@
+#! /bin/bash
+# FS QA Test 196
+#
+# Test per-inode DAX flag by mmap direct/buffered IO.
+#
+#-----------------------------------------------------------------------
+# 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
+
+_supported_fs xfs
+_supported_os Linux
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+_require_xfs_io_command "chattr" "+/-x"
+_require_xfs_io_command "falloc"
+
+# $1 mmap read/write size
+t_dax_flag_mmap_dio()
+{
+	# both dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
+	# with O_DIRECT first
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both dax"
+	# again with buffered IO
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered both dax"
+
+	# from non dax to dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+		$1 "dio nondax to dax"
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered nondax to dax"
+
+	# from dax to non dax
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+		$1 "dio dax to nondax"
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered dax to nondax"
+
+	# both non dax
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+		$1 "dio both nondax"
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered both nondax"
+}
+
+do_tests()
+{
+	# less than page size
+	t_dax_flag_mmap_dio 1024
+	# page size
+	t_dax_flag_mmap_dio `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_dax_flag_mmap_dio $((16 * 1024 * 1024))
+	t_dax_flag_mmap_dio $((64 * 1024 * 1024))
+}
+
+# make xfs 2Mb aligned for PMD fault testing
+_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
+
+# mount with dax option
+_scratch_mount "-o dax"
+
+tsize=$((64 * 1024 * 1024))
+
+$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+	$SCRATCH_MNT/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+	$SCRATCH_MNT/tf_d >> $seqres.full 2>&1
+
+do_tests
+_scratch_unmount
+
+# mount again without dax option
+export MOUNT_OPTIONS=""
+_scratch_mount
+do_tests
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/xfs/196.out b/tests/xfs/196.out
new file mode 100644
index 0000000..477dcf0
--- /dev/null
+++ b/tests/xfs/196.out
@@ -0,0 +1,2 @@
+QA output created by 196
+Silence is golden
diff --git a/tests/xfs/group b/tests/xfs/group
index 9757ec8..41d053f 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -193,6 +193,7 @@
 193 auto quick clone
 194 rw auto
 195 ioctl dump auto quick
+196 auto attr quick
 197 dir auto quick
 198 auto quick clone
 199 mount auto quick
-- 
1.8.3.1

Re: [PATCH v5 1/2] xfs: test per-inode DAX flag by IO

[Ross Zwisler]

On Sun, Feb 05, 2017 at 02:21:43PM +0800, Xiong Zhou wrote:
> In a DAX mountpoint, do IO betwen files with and
> without DAX per-inode flag. We do mmap, both
> O_DIRECT and buffered read/write IO in this case.
> Then test again in the same device without dax
> mountoption.
> 
> Add help _require_scratch_dax to make sure we can
> test DAX feature on SCRATCH_DEV.
> 
> Add mmap dio test programme to test read/write
> between a mmap area of one file and another file
> directly or buffered, with different size.
> 
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>

Yep, this fine. :)

> Signed-off-by: Xiong Zhou <xzhou@redhat.com>

These changes all look good.

Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>

[PATCH v5 2/2] generic: test mmap io through DAX and non-DAX

[Xiong Zhou]

Mount TEST_DEV as non-DAX, SCRATCH_DEV as DAX, then
do some IO between them. In this case we use mmap
and dio/buffered IO read/write test programme.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 tests/generic/407     | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/407.out |   2 +
 tests/generic/group   |   1 +
 3 files changed, 128 insertions(+)
 create mode 100755 tests/generic/407
 create mode 100644 tests/generic/407.out

diff --git a/tests/generic/407 b/tests/generic/407
new file mode 100755
index 0000000..6a457e4
--- /dev/null
+++ b/tests/generic/407
@@ -0,0 +1,125 @@
+#! /bin/bash
+# FS QA Test 407
+#
+# mmap direct/buffered io 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
+
+_supported_fs generic
+_supported_os Linux
+_require_test
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+_require_xfs_io_command "falloc"
+
+# $1 mmap read/write size
+t_mmap_dio_dax()
+{
+	# both dax
+	# with O_DIRECT first
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both dax"
+	# again with buffered IO
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered both dax"
+
+	# from non dax to dax
+	src/t_mmap_dio $TEST_DIR/tf_s \
+		$SCRATCH_MNT/tf_d $1 "dio nondax to dax"
+	src/t_mmap_dio -b $TEST_DIR/tf_s \
+		$SCRATCH_MNT/tf_d $1 "buffered nondax to dax"
+
+	# from dax to non dax
+	src/t_mmap_dio $SCRATCH_MNT/tf_s \
+		$TEST_DIR/tf_d $1 "dio dax to nondax"
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_s \
+		$TEST_DIR/tf_d $1 "buffered dax to nondax"
+
+	# both non dax
+	src/t_mmap_dio $TEST_DIR/tf_{s,d} $1 "dio both nondax"
+	src/t_mmap_dio -b $TEST_DIR/tf_{s,d} \
+		$1 "buffered both nondax"
+}
+
+do_tests()
+{
+	# less than page size
+	t_mmap_dio_dax 1024
+	# page size
+	t_mmap_dio_dax `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_mmap_dio_dax $((16 * 1024 * 1024))
+	t_mmap_dio_dax $((64 * 1024 * 1024))
+}
+
+# make fs 2Mb aligned for PMD fault testing
+if [[ $FSTYP =~ ext ]] ; then
+	_scratch_mkfs "-E stride=512,stripe_width=1" \
+		> /dev/null 2>&1
+elif [[ $FSTYP =~ xfs ]] ; then
+	_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
+fi
+
+# mount SCRATCH_DEV with dax option, TEST_DEV not
+export MOUNT_OPTIONS=""
+export TEST_FS_MOUNT_OPTS=""
+_test_cycle_mount
+_fs_options $TEST_DEV | grep -qw "dax" && \
+	_notrun "we need $TEST_DEV mount without dax"
+_scratch_mount "-o dax"
+
+tsize=$((64 * 1024 * 1024))
+
+$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+	$SCRATCH_MNT/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+	$SCRATCH_MNT/tf_d >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+	$TEST_DIR/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+	$TEST_DIR/tf_d >> $seqres.full 2>&1
+
+do_tests
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/generic/407.out b/tests/generic/407.out
new file mode 100644
index 0000000..d05a416
--- /dev/null
+++ b/tests/generic/407.out
@@ -0,0 +1,2 @@
+QA output created by 407
+Silence is golden
diff --git a/tests/generic/group b/tests/generic/group
index 159d691..027a238 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -409,3 +409,4 @@
 404 auto quick insert
 405 auto mkfs
 406 auto quick dangerous
+407 auto quick
-- 
1.8.3.1

Re: [PATCH v5 2/2] generic: test mmap io through DAX and non-DAX

[Ross Zwisler]

On Sun, Feb 05, 2017 at 02:21:44PM +0800, Xiong Zhou wrote:
> Mount TEST_DEV as non-DAX, SCRATCH_DEV as DAX, then
> do some IO between them. In this case we use mmap
> and dio/buffered IO read/write test programme.
> 
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>

Yep, this is fine.

> Signed-off-by: Xiong Zhou <xzhou@redhat.com>
<>
> diff --git a/tests/generic/407 b/tests/generic/407
<>
> +do_tests()
> +{
> +	# less than page size
> +	t_mmap_dio_dax 1024
> +	# page size
> +	t_mmap_dio_dax `src/feature -s`
> +	# bigger sizes, for PMD faults
> +	t_mmap_dio_dax $((16 * 1024 * 1024))
> +	t_mmap_dio_dax $((64 * 1024 * 1024))
> +}
> +
> +# make fs 2Mb aligned for PMD fault testing
> +if [[ $FSTYP =~ ext ]] ; then
> +	_scratch_mkfs "-E stride=512,stripe_width=1" \
> +		> /dev/null 2>&1
> +elif [[ $FSTYP =~ xfs ]] ; then
> +	_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
> +fi
> +
> +# mount SCRATCH_DEV with dax option, TEST_DEV not
> +export MOUNT_OPTIONS=""
> +export TEST_FS_MOUNT_OPTS=""
> +_test_cycle_mount
> +_fs_options $TEST_DEV | grep -qw "dax" && \
> +	_notrun "we need $TEST_DEV mount without dax"
> +_scratch_mount "-o dax"
> +
> +tsize=$((64 * 1024 * 1024))

Ugh - for some reason 64 MiB files for me don't get PMDs on ext4 because the
ext4 block allocator gives us misaligned blocks.  I'll follow up with them in
a new thread on the ext4 list and I'll cc you, Xiong.

If we up this to 128 MiB, so

tsize=$((128 * 1024 * 1024))

I get PMDs for both ext4 and XFS.  Can we make this one change before
applying?

The rest looks good to me.  Thanks for the tests!

Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>

[PATCH v6 0/2] mmap dio and DAX

[Xiong Zhou]

Hi Ross and all,

After adding some initialization of test files, I've
got different test results that the write call succeeds
while the following read call fails.

Please help test and review, Thanks!

-----
common/rc         : requires SCRATCH_DEV support DAX
src/t_mmap_dio.c  : intro mmap and O_DIRECT rw through files
tests/generic/405 : IO between DAX/non-DAX mountpoints
tests/xfs/138     : IO between DAX/non-DAX xfs files(per-inode flag)

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.

v3:
 close fds in C test programme for clean up.

v4:
 Test both buffered and O_DIRECT IO;
 Fix arg numbers in C test programme;
 Fix fs options check after mount.
 Cc Jeff Moyer since this test is based on his code.
 (Sorry for the late cc!)

v5:
 Mainly from Ross Zwisler <ross.zwisler@linux.intel.com>
 Add mkfs options to make fs 2M aligned, to hit PMD faults;
 Use falloc instead of pwrite to init test file aviding 4k
alignment;
 64M test file instead of 1G;
 Bumping test seq numners;
 Other minor fixes.

v6:
 Test file size increase to 128M;
 Add fsync after write in t_mmap_dio.c;
 Split sub tests in both cases, re-initialize test files
before every sub test. This change reveals the new read
failure issue.

Test status:
  Both cases not run on normal block device;
  Both cases not run on ext2/3 fs(no falloc);
  Both cases PASS on memory-mode nvdimm devices;
  DIO in both cases FAIL on brd based ramdisk with:
  DIO in both cases FAIL on raw-mode nvdimm devices with:
    +read(Bad address) len 1024 dio dax to nondax
    +read(Bad address) len 4096 dio dax to nondax
    +read(Bad address) len 16777216 dio dax to nondax
    +read(Bad address) len 67108864 dio dax to nondax
  I've reported this as an issue:
  https://lists.01.org/pipermail/linux-nvdimm/2017-February/008781.html


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

 .gitignore            |   1 +
 common/rc             |  13 +++++
 src/Makefile          |   2 +-
 src/t_mmap_dio.c      | 111 +++++++++++++++++++++++++++++++++++
 tests/generic/407     | 152 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/407.out |   2 +
 tests/generic/group   |   1 +
 tests/xfs/196         | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/196.out     |   2 +
 tests/xfs/group       |   1 +
 10 files changed, 442 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c
 create mode 100755 tests/generic/407
 create mode 100644 tests/generic/407.out
 create mode 100755 tests/xfs/196
 create mode 100644 tests/xfs/196.out

-- 
1.8.3.1

[PATCH v6 1/2] xfs: test per-inode DAX flag by IO

[Xiong Zhou]

In a DAX mountpoint, do IO betwen files with and
without DAX per-inode flag. We do mmap, both
O_DIRECT and buffered read/write IO in this case.
Then test again in the same device without dax
mountoption.

Add help _require_scratch_dax to make sure we can
test DAX feature on SCRATCH_DEV.

Add mmap dio test programme to test read/write
between a mmap area of one file and another file
directly or buffered, with different size.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 .gitignore        |   1 +
 common/rc         |  13 +++++
 src/Makefile      |   2 +-
 src/t_mmap_dio.c  | 111 ++++++++++++++++++++++++++++++++++++++
 tests/xfs/196     | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/196.out |   2 +
 tests/xfs/group   |   1 +
 7 files changed, 287 insertions(+), 1 deletion(-)
 create mode 100644 src/t_mmap_dio.c
 create mode 100755 tests/xfs/196
 create mode 100644 tests/xfs/196.out

diff --git a/.gitignore b/.gitignore
index 7dcea14..48a40a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@
 /src/cloner
 /src/renameat2
 /src/t_rename_overwrite
+/src/t_mmap_dio
 
 # dmapi/ binaries
 /dmapi/src/common/cmd/read_invis
diff --git a/common/rc b/common/rc
index 7e2eaee..b99c4e2 100644
--- a/common/rc
+++ b/common/rc
@@ -2633,6 +2633,19 @@ _require_scratch_shutdown()
 	_scratch_unmount
 }
 
+# Does dax mount option work on this dev/fs?
+_require_scratch_dax()
+{
+	_require_scratch
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount -o dax
+	# Check options to be sure. XFS ignores dax option
+	# and goes on if dev underneath does not support dax.
+	_fs_options $SCRATCH_DEV | grep -qw "dax" || \
+		_notrun "$SCRATCH_DEV $FSTYP does not support -o dax"
+	_scratch_unmount
+}
+
 # Does norecovery support by this fs?
 _require_norecovery()
 {
diff --git a/src/Makefile b/src/Makefile
index 94d74aa..eb5a56c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
 	godown resvtest writemod makeextents itrash rename \
 	multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \
 	t_mmap_writev t_truncate_cmtime dirhash_collide t_rename_overwrite \
-	holetest t_truncate_self
+	holetest t_truncate_self t_mmap_dio
 
 LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
 	preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \
diff --git a/src/t_mmap_dio.c b/src/t_mmap_dio.c
new file mode 100644
index 0000000..69b9ca8
--- /dev/null
+++ b/src/t_mmap_dio.c
@@ -0,0 +1,111 @@
+/*
+ * This programme was originally written by
+ *     Jeff Moyer <jmoyer@redhat.com>
+ *
+ * Copyright (C) 2016, Red Hat, Inc.
+ */
+#define _GNU_SOURCE 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <libaio.h>
+#include <errno.h>
+#include <sys/time.h>
+
+void usage(char *prog)
+{
+	fprintf(stderr,
+		"usage: %s <src file> <dest file> <size> <msg>\n",
+		prog);
+	exit(1);
+}
+
+void err_exit(char *op, unsigned long len, char *s)
+{
+	fprintf(stderr, "%s(%s) len %lu %s\n",
+		op, strerror(errno), len, s);
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	int fd, fd2, ret, dio = 1;
+	char *map;
+	char *msg;
+	char *sfile;
+	char *dfile;
+	unsigned long len, opt;
+
+	if (argc < 4)
+		usage(basename(argv[0]));
+
+	while ((opt = getopt(argc, argv, "b")) != -1)
+		dio = 0;
+
+	sfile = argv[optind];
+	dfile = argv[optind + 1];
+	msg = argv[optind + 3];
+	len = strtoul(argv[optind + 2], NULL, 10);
+	if (errno == ERANGE)
+		err_exit("strtoul", 0, msg);
+
+	/* Open source file and mmap*/
+	fd = open(sfile, O_RDWR, 0644);
+	if (fd < 0)
+		err_exit("open src", len, msg);
+
+	map = (char *)mmap(NULL, len,
+		PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+	if (map == MAP_FAILED)
+		err_exit("mmap", len, msg);
+
+	if (dio == 1) {
+		/* Open dest file with O_DIRECT */
+		fd2 = open(dfile, O_RDWR|O_DIRECT, 0644);
+		if (fd2 < 0)
+			err_exit("open dest", len, msg);
+	} else {
+		/* Open dest file without O_DIRECT */
+		fd2 = open(dfile, O_RDWR, 0644);
+		if (fd2 < 0)
+			err_exit("open dest", len, msg);
+	}
+
+	/* First, test storing to dest file from source mapping */
+	ret = write(fd2, map, len);
+	if (ret != len)
+		err_exit("write", len, msg);
+
+	ret = fsync(fd2);
+	if (ret != 0)
+		err_exit("fsync", len, msg);
+
+	ret = (int)lseek(fd2, 0, SEEK_SET);
+	if (ret == -1)
+		err_exit("lseek", len, msg);
+
+	/* Next, test reading from dest file into source mapping */
+	ret = read(fd2, map, len);
+	if (ret != len)
+		err_exit("read", len, msg);
+	ret = msync(map, len, MS_SYNC);
+	if (ret < 0)
+		err_exit("msync", len, msg);
+
+	ret = munmap(map, len);
+	if (ret < 0)
+		err_exit("munmap", len, msg);
+
+	ret = close(fd);
+	if (ret < 0)
+		err_exit("clsoe fd", len, msg);
+
+	ret = close(fd2);
+	if (ret < 0)
+		err_exit("close fd2", len, msg);
+
+	exit(0);
+}
diff --git a/tests/xfs/196 b/tests/xfs/196
new file mode 100755
index 0000000..8b1099c
--- /dev/null
+++ b/tests/xfs/196
@@ -0,0 +1,158 @@
+#! /bin/bash
+# FS QA Test 196
+#
+# Test per-inode DAX flag by mmap direct/buffered IO.
+#
+#-----------------------------------------------------------------------
+# 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
+
+_supported_fs xfs
+_supported_os Linux
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+_require_xfs_io_command "chattr" "+/-x"
+_require_xfs_io_command "falloc"
+
+prep_files()
+{
+	rm -f $SCRATCH_MNT/tf_{s,d}
+
+	$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+		$SCRATCH_MNT/tf_{s,d} >> $seqres.full 2>&1
+}
+
+t_both_dax()
+{
+	prep_files
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_{s,d}
+	# with O_DIRECT first
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both dax"
+
+	prep_files
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_{s,d}
+	# again with buffered IO
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered both dax"
+}
+
+t_nondax_to_dax()
+{
+	prep_files
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+		$1 "dio nondax to dax"
+
+	prep_files
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered nondax to dax"
+}
+
+t_dax_to_nondax()
+{
+	prep_files
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+		$1 "dio dax to nondax"
+
+	prep_files
+	$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered dax to nondax"
+}
+
+t_both_nondax()
+{
+	prep_files
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_{s,d}
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+		$1 "dio both nondax"
+
+	prep_files
+	$XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_{s,d}
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered both nondax"
+}
+
+# $1 mmap read/write size
+t_dax_flag_mmap_dio()
+{
+	t_both_dax $1
+	t_dax_to_nondax $1
+	t_nondax_to_dax $1
+	t_both_nondax $1
+}
+
+do_tests()
+{
+	# less than page size
+	t_dax_flag_mmap_dio 1024
+	# page size
+	t_dax_flag_mmap_dio `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_dax_flag_mmap_dio $((16 * 1024 * 1024))
+	t_dax_flag_mmap_dio $((64 * 1024 * 1024))
+}
+
+# make xfs 2Mb aligned for PMD fault testing
+_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
+
+# mount with dax option
+_scratch_mount "-o dax"
+
+tsize=$((128 * 1024 * 1024))
+
+do_tests
+_scratch_unmount
+
+# mount again without dax option
+export MOUNT_OPTIONS=""
+_scratch_mount
+do_tests
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/xfs/196.out b/tests/xfs/196.out
new file mode 100644
index 0000000..477dcf0
--- /dev/null
+++ b/tests/xfs/196.out
@@ -0,0 +1,2 @@
+QA output created by 196
+Silence is golden
diff --git a/tests/xfs/group b/tests/xfs/group
index 9757ec8..41d053f 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -193,6 +193,7 @@
 193 auto quick clone
 194 rw auto
 195 ioctl dump auto quick
+196 auto attr quick
 197 dir auto quick
 198 auto quick clone
 199 mount auto quick
-- 
1.8.3.1

[PATCH v6 2/2] generic: test mmap io through DAX and non-DAX

[Xiong Zhou]

Mount TEST_DEV as non-DAX, SCRATCH_DEV as DAX, then
do some IO between them. In this case we use mmap
and dio/buffered IO read/write test programme.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 tests/generic/407     | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/407.out |   2 +
 tests/generic/group   |   1 +
 3 files changed, 155 insertions(+)
 create mode 100755 tests/generic/407
 create mode 100644 tests/generic/407.out

diff --git a/tests/generic/407 b/tests/generic/407
new file mode 100755
index 0000000..b5b2ce4
--- /dev/null
+++ b/tests/generic/407
@@ -0,0 +1,152 @@
+#! /bin/bash
+# FS QA Test 407
+#
+# mmap direct/buffered io 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
+
+_supported_fs generic
+_supported_os Linux
+_require_test
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+_require_xfs_io_command "falloc"
+
+prep_files()
+{
+	rm -f $SCRATCH_MNT/tf_{s,d}
+	rm -f $TEST_DIR/tf_{s,d}
+
+	$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+		$SCRATCH_MNT/tf_{s,d} >> $seqres.full 2>&1
+	$XFS_IO_PROG -f -c "falloc 0 $tsize" \
+		$TEST_DIR/tf_{s,d} >> $seqres.full 2>&1
+}
+
+t_both_dax()
+{
+	prep_files
+	# with O_DIRECT first
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both dax"
+
+	prep_files
+	# again with buffered IO
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered both dax"
+}
+
+t_nondax_to_dax()
+{
+	prep_files
+	src/t_mmap_dio $TEST_DIR/tf_s \
+		$SCRATCH_MNT/tf_d $1 "dio nondax to dax"
+
+	prep_files
+	src/t_mmap_dio -b $TEST_DIR/tf_s \
+		$SCRATCH_MNT/tf_d $1 "buffered nondax to dax"
+}
+
+t_dax_to_nondax()
+{
+	prep_files
+	src/t_mmap_dio $SCRATCH_MNT/tf_s \
+		$TEST_DIR/tf_d $1 "dio dax to nondax"
+
+	prep_files
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_s \
+		$TEST_DIR/tf_d $1 "buffered dax to nondax"
+}
+
+t_both_nondax()
+{
+	prep_files
+	src/t_mmap_dio $TEST_DIR/tf_{s,d} $1 "dio both nondax"
+
+	prep_files
+	src/t_mmap_dio -b $TEST_DIR/tf_{s,d} \
+		$1 "buffered both nondax"
+}
+
+# $1 mmap read/write size
+t_mmap_dio_dax()
+{
+	t_both_dax $1
+	t_dax_to_nondax $1
+	t_nondax_to_dax $1
+	t_both_nondax $1
+}
+
+do_tests()
+{
+	# less than page size
+	t_mmap_dio_dax 1024
+	# page size
+	t_mmap_dio_dax `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_mmap_dio_dax $((16 * 1024 * 1024))
+	t_mmap_dio_dax $((64 * 1024 * 1024))
+}
+
+# make fs 2Mb aligned for PMD fault testing
+if [[ $FSTYP =~ ext ]] ; then
+	_scratch_mkfs "-E stride=512,stripe_width=1" \
+		> /dev/null 2>&1
+elif [[ $FSTYP =~ xfs ]] ; then
+	_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
+fi
+
+# mount SCRATCH_DEV with dax option, TEST_DEV not
+export MOUNT_OPTIONS=""
+export TEST_FS_MOUNT_OPTS=""
+_test_cycle_mount
+_fs_options $TEST_DEV | grep -qw "dax" && \
+	_notrun "we need $TEST_DEV mount without dax"
+_scratch_mount "-o dax"
+
+tsize=$((128 * 1024 * 1024))
+
+do_tests
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/generic/407.out b/tests/generic/407.out
new file mode 100644
index 0000000..d05a416
--- /dev/null
+++ b/tests/generic/407.out
@@ -0,0 +1,2 @@
+QA output created by 407
+Silence is golden
diff --git a/tests/generic/group b/tests/generic/group
index 159d691..027a238 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -409,3 +409,4 @@
 404 auto quick insert
 405 auto mkfs
 406 auto quick dangerous
+407 auto quick
-- 
1.8.3.1

Re: [PATCH v6 2/2] generic: test mmap io through DAX and non-DAX

[Eryu Guan]

On Wed, Feb 08, 2017 at 12:11:18PM +0800, Xiong Zhou wrote:
> Mount TEST_DEV as non-DAX, SCRATCH_DEV as DAX, then
> do some IO between them. In this case we use mmap
> and dio/buffered IO read/write test programme.
> 
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> Signed-off-by: Xiong Zhou <xzhou@redhat.com>
> ---
>  tests/generic/407     | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/407.out |   2 +
>  tests/generic/group   |   1 +
>  3 files changed, 155 insertions(+)
>  create mode 100755 tests/generic/407
>  create mode 100644 tests/generic/407.out
> 
> diff --git a/tests/generic/407 b/tests/generic/407
> new file mode 100755
> index 0000000..b5b2ce4
> --- /dev/null
> +++ b/tests/generic/407
> @@ -0,0 +1,152 @@
> +#! /bin/bash
> +# FS QA Test 407
> +#
> +# mmap direct/buffered io between DAX and non-DAX mountpoints.
[snip]
> +
> +# make fs 2Mb aligned for PMD fault testing
> +if [[ $FSTYP =~ ext ]] ; then
> +	_scratch_mkfs "-E stride=512,stripe_width=1" \
> +		> /dev/null 2>&1
> +elif [[ $FSTYP =~ xfs ]] ; then
> +	_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
> +fi

If FSTYP isn't extN nor xfs, then scratch device is not mkfs'ed, I think
you're missing a default "else" here, which calls _scratch_mkfs without
any options.

If you're OK with this update, I can fix it at commit time.

Thanks,
Eryu

Re: [PATCH v6 2/2] generic: test mmap io through DAX and non-DAX

[Xiong Zhou]

On Fri, Feb 17, 2017 at 02:46:24PM +0800, Eryu Guan wrote:
> On Wed, Feb 08, 2017 at 12:11:18PM +0800, Xiong Zhou wrote:
> > Mount TEST_DEV as non-DAX, SCRATCH_DEV as DAX, then
> > do some IO between them. In this case we use mmap
> > and dio/buffered IO read/write test programme.
> > 
> > Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> > Signed-off-by: Xiong Zhou <xzhou@redhat.com>
> > ---
> >  tests/generic/407     | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
> >  tests/generic/407.out |   2 +
> >  tests/generic/group   |   1 +
> >  3 files changed, 155 insertions(+)
> >  create mode 100755 tests/generic/407
> >  create mode 100644 tests/generic/407.out
> > 
> > diff --git a/tests/generic/407 b/tests/generic/407
> > new file mode 100755
> > index 0000000..b5b2ce4
> > --- /dev/null
> > +++ b/tests/generic/407
> > @@ -0,0 +1,152 @@
> > +#! /bin/bash
> > +# FS QA Test 407
> > +#
> > +# mmap direct/buffered io between DAX and non-DAX mountpoints.
> [snip]
> > +
> > +# make fs 2Mb aligned for PMD fault testing
> > +if [[ $FSTYP =~ ext ]] ; then
> > +	_scratch_mkfs "-E stride=512,stripe_width=1" \
> > +		> /dev/null 2>&1
> > +elif [[ $FSTYP =~ xfs ]] ; then
> > +	_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
> > +fi
> 
> If FSTYP isn't extN nor xfs, then scratch device is not mkfs'ed, I think
> you're missing a default "else" here, which calls _scratch_mkfs without
> any options.
> 
> If you're OK with this update, I can fix it at commit time.

Okay, Thank you!

> 
> Thanks,
> Eryu

[PATCH v4 2/2] generic: test mmap io through DAX and non-DAX

[Xiong Zhou]

Mount TEST_DEV as non-DAX, SCRATCH_DEV as DAX, then
do some IO between them. In this case we use mmap
and dio/buffered IO read/write test programme.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 tests/generic/405     | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/405.out |   2 +
 tests/generic/group   |   1 +
 3 files changed, 122 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..31d8df5
--- /dev/null
+++ b/tests/generic/405
@@ -0,0 +1,119 @@
+#! /bin/bash
+# FS QA Test 405
+#
+# mmap direct/buffered io 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
+
+_supported_fs generic
+_supported_os Linux
+_require_test
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+
+# $1 mmap read/write size
+t_mmap_dio_dax()
+{
+	# both dax
+	# with O_DIRECT first
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both dax"
+	# again with buffered IO
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+		$1 "buffered both dax"
+
+	# from non dax to dax
+	src/t_mmap_dio $TEST_DIR/tf_s \
+		$SCRATCH_MNT/tf_d $1 "dio nondax to dax"
+	src/t_mmap_dio -b $TEST_DIR/tf_s \
+		$SCRATCH_MNT/tf_d $1 "buffered nondax to dax"
+
+	# from dax to non dax
+	src/t_mmap_dio $SCRATCH_MNT/tf_s \
+		$TEST_DIR/tf_d $1 "dio dax to nondax"
+	src/t_mmap_dio -b $SCRATCH_MNT/tf_s \
+		$TEST_DIR/tf_d $1 "buffered dax to nondax"
+
+	# both non dax
+	src/t_mmap_dio $TEST_DIR/tf_{s,d} $1 "dio both nondax"
+	src/t_mmap_dio -b $TEST_DIR/tf_{s,d} \
+		$1 "buffered both nondax"
+}
+
+do_tests()
+{
+	# less than page size
+	t_mmap_dio_dax 1024
+	# page size
+	t_mmap_dio_dax `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_mmap_dio_dax 16777216
+	t_mmap_dio_dax 67108864
+}
+
+_scratch_mkfs > /dev/null 2>&1
+
+# mount SCRATCH_DEV with dax option, TEST_DEV not
+export MOUNT_OPTIONS=""
+export TEST_FS_MOUNT_OPTS=""
+_test_cycle_mount
+_fs_options $TEST_DEV | grep -qw "dax" && \
+	_notrun "we need $TEST_DEV mount without dax"
+_scratch_mount "-o dax"
+
+psize=`src/feature -s`
+tsize=$((1024 * 1024 * 1024))
+
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_d >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$TEST_DIR/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$TEST_DIR/tf_d >> $seqres.full 2>&1
+
+do_tests
+
+# 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

Re: [PATCH v4 0/2] mmap dio and DAX

[Ross Zwisler]

On Fri, Jan 20, 2017 at 02:15:48PM +0800, Xiong Zhou wrote:
> common/rc         : requires SCRATCH_DEV support DAX
> src/t_mmap_dio.c  : intro mmap and O_DIRECT rw through files
> tests/generic/405 : IO between DAX/non-DAX mountpoints
> tests/xfs/138     : IO between DAX/non-DAX xfs files(per-inode flag)
> 
> 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.
> 
> v3:
>  close fds in C test programme for clean up.
> 
> v4:
>  Test both buffered and O_DIRECT IO;
>  Fix arg numbers in C test programme;
>  Fix fs options check after mount.
>  Cc Jeff Moyer since this test is based on his code.
>  (Sorry for the late cc!)
> 
> Test status:
>   Both cases not run on normal block device;
>   Both cases PASS on ramdisk based pmem devices;
>   DIO in both cases FAIL on brd based ramdisk with:
>   DIO in both cases FAIL on nvdimm devices with:
>     +write(Bad address) len 1024 dio dax to nondax
>     +write(Bad address) len 4096 dio dax to nondax
>     +write(Bad address) len 16777216 dio dax to nondax
>     +write(Bad address) len 67108864 dio dax to nondax
> 
>   I've reported this to nvdimm list.
>   https://lists.01.org/pipermail/linux-nvdimm/2017-January/008600.html
> 
> Xiong Zhou (2):
>   xfs: test per-inode DAX flag by IO
>   generic: test mmap io through DAX and non-DAX
> 
>  .gitignore            |   1 +
>  common/rc             |  13 ++++++
>  src/Makefile          |   2 +-
>  src/t_mmap_dio.c      | 105 ++++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/405     | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/405.out |   2 +
>  tests/generic/group   |   1 +
>  tests/xfs/138         | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/xfs/138.out     |   2 +
>  tests/xfs/group       |   1 +
>  10 files changed, 361 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
> 
> -- 
> 1.8.3.1

I just wanted to let you know that I'm testing with these new xfstests right
now, and so far I've been unable to successfully get any PMD faults.  I'm
looking into why that is right now, and should hopefully have some changes so
we can do both PTE and PMD testing with this set.

Also, it looks like the test number "generic/405" was already used in
xfstests/master by this commit:

66768bc generic/405: test mkfs against thin provision device

So this may need to be generic/406. :)

Re: [PATCH v4 0/2] mmap dio and DAX

[Xiong Zhou]

On Tue, Jan 24, 2017 at 03:28:55PM -0700, Ross Zwisler wrote:
> On Fri, Jan 20, 2017 at 02:15:48PM +0800, Xiong Zhou wrote:
> > common/rc         : requires SCRATCH_DEV support DAX
> > src/t_mmap_dio.c  : intro mmap and O_DIRECT rw through files
> > tests/generic/405 : IO between DAX/non-DAX mountpoints
> > tests/xfs/138     : IO between DAX/non-DAX xfs files(per-inode flag)
> > 
> > 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.
> > 
> > v3:
> >  close fds in C test programme for clean up.
> > 
> > v4:
> >  Test both buffered and O_DIRECT IO;
> >  Fix arg numbers in C test programme;
> >  Fix fs options check after mount.
> >  Cc Jeff Moyer since this test is based on his code.
> >  (Sorry for the late cc!)
> > 
> > Test status:
> >   Both cases not run on normal block device;
> >   Both cases PASS on ramdisk based pmem devices;
> >   DIO in both cases FAIL on brd based ramdisk with:
> >   DIO in both cases FAIL on nvdimm devices with:
> >     +write(Bad address) len 1024 dio dax to nondax
> >     +write(Bad address) len 4096 dio dax to nondax
> >     +write(Bad address) len 16777216 dio dax to nondax
> >     +write(Bad address) len 67108864 dio dax to nondax
> > 
> >   I've reported this to nvdimm list.
> >   https://lists.01.org/pipermail/linux-nvdimm/2017-January/008600.html
> > 
> > Xiong Zhou (2):
> >   xfs: test per-inode DAX flag by IO
> >   generic: test mmap io through DAX and non-DAX
> > 
> >  .gitignore            |   1 +
> >  common/rc             |  13 ++++++
> >  src/Makefile          |   2 +-
> >  src/t_mmap_dio.c      | 105 ++++++++++++++++++++++++++++++++++++++++++++
> >  tests/generic/405     | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++
> >  tests/generic/405.out |   2 +
> >  tests/generic/group   |   1 +
> >  tests/xfs/138         | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
> >  tests/xfs/138.out     |   2 +
> >  tests/xfs/group       |   1 +
> >  10 files changed, 361 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
> > 
> > -- 
> > 1.8.3.1
> 
> I just wanted to let you know that I'm testing with these new xfstests right
> now, and so far I've been unable to successfully get any PMD faults.  I'm
> looking into why that is right now, and should hopefully have some changes so
> we can do both PTE and PMD testing with this set.

Thank you very much for looking into this!

Adding a printk msg in dax_iomap_pmd_fault in fs/dax.c shows that
these 2 cases called this function, so do __radix_tree_insert
in lib/radix-tree.c with order > 0.  I must have missed something..

> 
> Also, it looks like the test number "generic/405" was already used in
> xfstests/master by this commit:
> 
> 66768bc generic/405: test mkfs against thin provision device
> 
> So this may need to be generic/406. :)

Ya, i can update this or Eryu can handle it while applying.

Thanks,
Xiong

Re: [PATCH v4 0/2] mmap dio and DAX

[Eryu Guan]

On Fri, Feb 03, 2017 at 01:57:17PM +0800, Xiong Zhou wrote:

> > I just wanted to let you know that I'm testing with these new xfstests right
> > now, and so far I've been unable to successfully get any PMD faults.  I'm
> > looking into why that is right now, and should hopefully have some changes so
> > we can do both PTE and PMD testing with this set.
> 
> Thank you very much for looking into this!
> 
> Adding a printk msg in dax_iomap_pmd_fault in fs/dax.c shows that
> these 2 cases called this function, so do __radix_tree_insert
> in lib/radix-tree.c with order > 0.  I must have missed something..
> 
> > 
> > Also, it looks like the test number "generic/405" was already used in
> > xfstests/master by this commit:
> > 
> > 66768bc generic/405: test mkfs against thin provision device
> > 
> > So this may need to be generic/406. :)
> 
> Ya, i can update this or Eryu can handle it while applying.

I'll do renumber after patch being reviewed, no need to update patch
only to change the seq number. (Better to use latest tree when writing
new case though.)

Thanks,
Eryu

Re: [PATCH v4 0/2] mmap dio and DAX

[Ross Zwisler]

On Fri, Feb 03, 2017 at 01:57:17PM +0800, Xiong Zhou wrote:
> On Tue, Jan 24, 2017 at 03:28:55PM -0700, Ross Zwisler wrote:
> > On Fri, Jan 20, 2017 at 02:15:48PM +0800, Xiong Zhou wrote:
> > > common/rc         : requires SCRATCH_DEV support DAX
> > > src/t_mmap_dio.c  : intro mmap and O_DIRECT rw through files
> > > tests/generic/405 : IO between DAX/non-DAX mountpoints
> > > tests/xfs/138     : IO between DAX/non-DAX xfs files(per-inode flag)
> > > 
> > > 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.
> > > 
> > > v3:
> > >  close fds in C test programme for clean up.
> > > 
> > > v4:
> > >  Test both buffered and O_DIRECT IO;
> > >  Fix arg numbers in C test programme;
> > >  Fix fs options check after mount.
> > >  Cc Jeff Moyer since this test is based on his code.
> > >  (Sorry for the late cc!)
> > > 
> > > Test status:
> > >   Both cases not run on normal block device;
> > >   Both cases PASS on ramdisk based pmem devices;
> > >   DIO in both cases FAIL on brd based ramdisk with:
> > >   DIO in both cases FAIL on nvdimm devices with:
> > >     +write(Bad address) len 1024 dio dax to nondax
> > >     +write(Bad address) len 4096 dio dax to nondax
> > >     +write(Bad address) len 16777216 dio dax to nondax
> > >     +write(Bad address) len 67108864 dio dax to nondax
> > > 
> > >   I've reported this to nvdimm list.
> > >   https://lists.01.org/pipermail/linux-nvdimm/2017-January/008600.html
> > > 
> > > Xiong Zhou (2):
> > >   xfs: test per-inode DAX flag by IO
> > >   generic: test mmap io through DAX and non-DAX
> > > 
> > >  .gitignore            |   1 +
> > >  common/rc             |  13 ++++++
> > >  src/Makefile          |   2 +-
> > >  src/t_mmap_dio.c      | 105 ++++++++++++++++++++++++++++++++++++++++++++
> > >  tests/generic/405     | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++
> > >  tests/generic/405.out |   2 +
> > >  tests/generic/group   |   1 +
> > >  tests/xfs/138         | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
> > >  tests/xfs/138.out     |   2 +
> > >  tests/xfs/group       |   1 +
> > >  10 files changed, 361 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
> > > 
> > > -- 
> > > 1.8.3.1
> > 
> > I just wanted to let you know that I'm testing with these new xfstests right
> > now, and so far I've been unable to successfully get any PMD faults.  I'm
> > looking into why that is right now, and should hopefully have some changes so
> > we can do both PTE and PMD testing with this set.
> 
> Thank you very much for looking into this!
> 
> Adding a printk msg in dax_iomap_pmd_fault in fs/dax.c shows that
> these 2 cases called this function, so do __radix_tree_insert
> in lib/radix-tree.c with order > 0.  I must have missed something..

Ah, yea, the flow is a little confusing.  When we first try to do a PMD fault
we insert a 2MiB "empty" entry into the radix tree that basically just allows
us to lock an entire 2MiB range.  This happens in dax_iomap_pmd_fault() via 
grab_mapping_entry().  This is most likely what you're seeing with your debug.

Then, with that empty 2MiB entry in place we try and actually service the
fault and insert a real mapping to a 2MiB huge page.  There are still cases
when this can fall back to 4k pages, and one of them is if the block
allocation we are given by the filesystem isn't 2MiB aligned.  That is the
alignment check against PG_PMD_COLOUR in dax_pmd_insert_mapping(), and that's
what we were hitting.  The way to get around this is to tell XFS that we would
like 2MiB aligned and sized block allocations via the following mkfs options:

export MKFS_OPTIONS="-d su=2m,sw=1"

We also need to fallocate our storage space so that we get 2 MiB allocations
instead of 4k allocations.

I've been working on patches that do all of this - I'll try and send them out
today.

This has taken a little longer than I would have liked because when debugging
this issue I found an issue with DAX + DIO in the kernel.  So, your test has
already found an important bug in the kernel before it was even committed to
xfstests!  :)

BTW, if we fallocate our files, is there additional value in writing data into
the files before we start testing as you do via these lines?

$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
        $SCRATCH_MNT/tf_s >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
        $SCRATCH_MNT/tf_d >> $seqres.full 2>&1

This puts a known pattern into the files and means that reads are handled from
media instead of from hole pages, but we never verify the data pattern and it
slows down the test quite a bit.  What do you think?

Re: [PATCH v4 0/2] mmap dio and DAX

[Xiong Zhou]

On Fri, Feb 03, 2017 at 09:57:10AM -0700, Ross Zwisler wrote:
> On Fri, Feb 03, 2017 at 01:57:17PM +0800, Xiong Zhou wrote:
> > On Tue, Jan 24, 2017 at 03:28:55PM -0700, Ross Zwisler wrote:
> > > On Fri, Jan 20, 2017 at 02:15:48PM +0800, Xiong Zhou wrote:
> > > > common/rc         : requires SCRATCH_DEV support DAX
> > > > src/t_mmap_dio.c  : intro mmap and O_DIRECT rw through files
> > > > tests/generic/405 : IO between DAX/non-DAX mountpoints
> > > > tests/xfs/138     : IO between DAX/non-DAX xfs files(per-inode flag)
> > > > 
> > > > 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.
> > > > 
> > > > v3:
> > > >  close fds in C test programme for clean up.
> > > > 
> > > > v4:
> > > >  Test both buffered and O_DIRECT IO;
> > > >  Fix arg numbers in C test programme;
> > > >  Fix fs options check after mount.
> > > >  Cc Jeff Moyer since this test is based on his code.
> > > >  (Sorry for the late cc!)
> > > > 
> > > > Test status:
> > > >   Both cases not run on normal block device;
> > > >   Both cases PASS on ramdisk based pmem devices;
> > > >   DIO in both cases FAIL on brd based ramdisk with:
> > > >   DIO in both cases FAIL on nvdimm devices with:
> > > >     +write(Bad address) len 1024 dio dax to nondax
> > > >     +write(Bad address) len 4096 dio dax to nondax
> > > >     +write(Bad address) len 16777216 dio dax to nondax
> > > >     +write(Bad address) len 67108864 dio dax to nondax
> > > > 
> > > >   I've reported this to nvdimm list.
> > > >   https://lists.01.org/pipermail/linux-nvdimm/2017-January/008600.html
> > > > 
> > > > Xiong Zhou (2):
> > > >   xfs: test per-inode DAX flag by IO
> > > >   generic: test mmap io through DAX and non-DAX
> > > > 
> > > >  .gitignore            |   1 +
> > > >  common/rc             |  13 ++++++
> > > >  src/Makefile          |   2 +-
> > > >  src/t_mmap_dio.c      | 105 ++++++++++++++++++++++++++++++++++++++++++++
> > > >  tests/generic/405     | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++
> > > >  tests/generic/405.out |   2 +
> > > >  tests/generic/group   |   1 +
> > > >  tests/xfs/138         | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
> > > >  tests/xfs/138.out     |   2 +
> > > >  tests/xfs/group       |   1 +
> > > >  10 files changed, 361 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
> > > > 
> > > > -- 
> > > > 1.8.3.1
> > > 
> > > I just wanted to let you know that I'm testing with these new xfstests right
> > > now, and so far I've been unable to successfully get any PMD faults.  I'm
> > > looking into why that is right now, and should hopefully have some changes so
> > > we can do both PTE and PMD testing with this set.
> > 
> > Thank you very much for looking into this!
> > 
> > Adding a printk msg in dax_iomap_pmd_fault in fs/dax.c shows that
> > these 2 cases called this function, so do __radix_tree_insert
> > in lib/radix-tree.c with order > 0.  I must have missed something..
> 
> Ah, yea, the flow is a little confusing.  When we first try to do a PMD fault
> we insert a 2MiB "empty" entry into the radix tree that basically just allows
> us to lock an entire 2MiB range.  This happens in dax_iomap_pmd_fault() via 
> grab_mapping_entry().  This is most likely what you're seeing with your debug.
> 
> Then, with that empty 2MiB entry in place we try and actually service the
> fault and insert a real mapping to a 2MiB huge page.  There are still cases
> when this can fall back to 4k pages, and one of them is if the block
> allocation we are given by the filesystem isn't 2MiB aligned.  That is the
> alignment check against PG_PMD_COLOUR in dax_pmd_insert_mapping(), and that's
> what we were hitting.  The way to get around this is to tell XFS that we would
> like 2MiB aligned and sized block allocations via the following mkfs options:
> 
> export MKFS_OPTIONS="-d su=2m,sw=1"
> 
> We also need to fallocate our storage space so that we get 2 MiB allocations
> instead of 4k allocations.

Aha, I forgot to checking return status of fault handler. Thanks very much
for the detailed explanation and instructions. :)

> 
> I've been working on patches that do all of this - I'll try and send them out
> today.
> 
> This has taken a little longer than I would have liked because when debugging
> this issue I found an issue with DAX + DIO in the kernel.  So, your test has
> already found an important bug in the kernel before it was even committed to
> xfstests!  :)

Good to know. :)

> 
> BTW, if we fallocate our files, is there additional value in writing data into
> the files before we start testing as you do via these lines?
> 
> $XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
>         $SCRATCH_MNT/tf_s >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
>         $SCRATCH_MNT/tf_d >> $seqres.full 2>&1
> 
> This puts a known pattern into the files and means that reads are handled from
> media instead of from hole pages, but we never verify the data pattern and it
> slows down the test quite a bit.  What do you think?

falloc is better for this job. I'll send next version after more tests.

Thanks for reviewing!

--
Xiong

[PATCH v2 2/2] generic: test mmap dio through DAX and non-DAX

[Xiong Zhou]

Mount TEST_DEV as non-DAX, SCRATCH_DEV as DAX, then
do some IO between them. In this case we use mmap
and dio read/write test programme.

Signed-off-by: Xiong Zhou <xzhou@redhat.com>
---
 tests/generic/405     | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/405.out |   2 +
 tests/generic/group   |   1 +
 3 files changed, 119 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..05bf2b5
--- /dev/null
+++ b/tests/generic/405
@@ -0,0 +1,116 @@
+#! /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
+
+_supported_fs generic
+_supported_os Linux
+_require_test
+_require_scratch_dax
+_require_test_program "feature"
+_require_test_program "t_mmap_dio"
+
+# $1 mmap read/write size
+t_mmap_dio_dax()
+{
+	# both dax
+	src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "both dax"
+
+	# from non dax to dax
+	src/t_mmap_dio $TEST_DIR/tf_s \
+		$SCRATCH_MNT/tf_d $1 "nondax to dax"
+
+	# from dax to non dax
+	src/t_mmap_dio $SCRATCH_MNT/tf_s \
+		$TEST_DIR/tf_d $1 "dax to nondax"
+
+	# both non dax
+	src/t_mmap_dio $TEST_DIR/tf_{s,d} $1 "both nondax"
+}
+
+do_tests()
+{
+	# less than page size
+	t_mmap_dio_dax 1024
+	# page size
+	t_mmap_dio_dax `src/feature -s`
+	# bigger sizes, for PMD faults
+	t_mmap_dio_dax 16777216
+	t_mmap_dio_dax 67108864
+}
+
+_scratch_mkfs > /dev/null 2>&1
+
+# mount SCRATCH_DEV with dax option, TEST_DEV not
+export MOUNT_OPTIONS=""
+export TEST_FS_MOUNT_OPTS=""
+_test_unmount
+_test_mount
+_fs_options $TEST_DEV | grep -w "dax" > /dev/null 2>&1
+if [ $? -eq 0 ] ; then
+	_notrun "we need $TEST_DEV mount without dax"
+fi
+_scratch_mount "-o dax"
+_fs_options $SCRATCH_DEV | grep -w "dax" > /dev/null 2>&1
+if [ $? -ne 0 ] ; then
+	_notrun "we need $SCRATCH_DEV mount with dax"
+fi
+
+psize=`src/feature -s`
+tsize=$((1024 * 1024 * 1024))
+
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$SCRATCH_MNT/tf_d >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$TEST_DIR/tf_s >> $seqres.full 2>&1
+$XFS_IO_PROG -f -c "pwrite -W -b $psize 0 $tsize" \
+	$TEST_DIR/tf_d >> $seqres.full 2>&1
+
+do_tests
+
+# 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