From: Ross Zwisler <ross.zwisler@linux.intel.com> To: fstests@vger.kernel.org, Eryu Guan <eguan@redhat.com> Cc: Jan Kara <jack@suse.cz>, linux-nvdimm@lists.01.org, "Darrick J. Wong" <darrick.wong@oracle.com>, Dave Chinner <david@fromorbit.com>, linux-xfs@vger.kernel.org, Christoph Hellwig <hch@lst.de> Subject: [fstests PATCH v2] xfs: add regression test for DAX mount option usage Date: Mon, 11 Sep 2017 14:01:03 -0600 [thread overview] Message-ID: <20170911200103.28226-1-ross.zwisler@linux.intel.com> (raw) In-Reply-To: <CAPcyv4gGpAW7kUCgqSoNCPkFZVYzTVQi3C4x6AFm2KHvFrZSfw@mail.gmail.com> This adds a regression test for the following kernel patch: xfs: always use DAX if mount option is used This test will also pass with kernel v4.14-rc1 and beyond because the XFS DAX I/O mount option has been disabled (but not removed), so the "chattr -x" to turn off DAX doesn't actually do anything. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Suggested-by: Christoph Hellwig <hch@infradead.org> --- Changes since v1: - Use perf instead of tracepoints to detect whether DAX is used. (Dan) --- tests/xfs/431 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/431.out | 2 ++ tests/xfs/group | 1 + 3 files changed, 80 insertions(+) create mode 100755 tests/xfs/431 create mode 100644 tests/xfs/431.out diff --git a/tests/xfs/431 b/tests/xfs/431 new file mode 100755 index 0000000..2865a6d --- /dev/null +++ b/tests/xfs/431 @@ -0,0 +1,77 @@ +#! /bin/bash +# FS QA Test xfs/431 +# +# This is a regression test for kernel patch: +# xfs: always use DAX if mount option is used +# created by Ross Zwisler <ross.zwisler@linux.intel.com> +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Intel Corporation. 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 + +# remove previous $seqres.full before test +rm -f $seqres.full + +# Modify as appropriate. +_supported_os Linux +_supported_fs xfs +_require_scratch_dax + +# real QA test starts here +export PERF_PROG="`set_prog_path perf`" +[ "$PERF_PROG" = "" ] && _notrun "perf not found" + +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount "-o dax" >> $seqres.full 2>&1 + +pgsize=`$here/src/feature -s` + +PERF_OUTPUT=$tmp.perf + +$PERF_PROG record -o $PERF_OUTPUT -e 'fs_dax:dax_load_hole' \ + $XFS_IO_PROG -t -c "truncate $pgsize" \ + -c "chattr -x" \ + -c "mmap -r 0 $pgsize" -c "mread 0 $pgsize" -c "munmap" \ + -f $SCRATCH_MNT/testfile > /dev/null 2>&1 + +$PERF_PROG script -i $PERF_OUTPUT | grep -q 'fs_dax:dax_load_hole' +if [[ $? == 0 ]]; then + echo "DAX was used" +else + echo "DAX was NOT used" +fi + +# success, all done +status=0 +exit diff --git a/tests/xfs/431.out b/tests/xfs/431.out new file mode 100644 index 0000000..194ae1e --- /dev/null +++ b/tests/xfs/431.out @@ -0,0 +1,2 @@ +QA output created by 431 +DAX was used diff --git a/tests/xfs/group b/tests/xfs/group index 0a449b9..4e7019c 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -427,3 +427,4 @@ 428 dangerous_fuzzers dangerous_scrub dangerous_online_repair 429 dangerous_fuzzers dangerous_scrub dangerous_repair 430 dangerous_fuzzers dangerous_scrub dangerous_online_repair +431 auto quick -- 2.9.5 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Ross Zwisler <ross.zwisler@linux.intel.com> To: fstests@vger.kernel.org, Eryu Guan <eguan@redhat.com> Cc: Ross Zwisler <ross.zwisler@linux.intel.com>, Jan Kara <jack@suse.cz>, "Darrick J. Wong" <darrick.wong@oracle.com>, linux-nvdimm@lists.01.org, Dave Chinner <david@fromorbit.com>, Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org, Dan Williams <dan.j.williams@intel.com> Subject: [fstests PATCH v2] xfs: add regression test for DAX mount option usage Date: Mon, 11 Sep 2017 14:01:03 -0600 [thread overview] Message-ID: <20170911200103.28226-1-ross.zwisler@linux.intel.com> (raw) In-Reply-To: <CAPcyv4gGpAW7kUCgqSoNCPkFZVYzTVQi3C4x6AFm2KHvFrZSfw@mail.gmail.com> This adds a regression test for the following kernel patch: xfs: always use DAX if mount option is used This test will also pass with kernel v4.14-rc1 and beyond because the XFS DAX I/O mount option has been disabled (but not removed), so the "chattr -x" to turn off DAX doesn't actually do anything. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Suggested-by: Christoph Hellwig <hch@infradead.org> --- Changes since v1: - Use perf instead of tracepoints to detect whether DAX is used. (Dan) --- tests/xfs/431 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/431.out | 2 ++ tests/xfs/group | 1 + 3 files changed, 80 insertions(+) create mode 100755 tests/xfs/431 create mode 100644 tests/xfs/431.out diff --git a/tests/xfs/431 b/tests/xfs/431 new file mode 100755 index 0000000..2865a6d --- /dev/null +++ b/tests/xfs/431 @@ -0,0 +1,77 @@ +#! /bin/bash +# FS QA Test xfs/431 +# +# This is a regression test for kernel patch: +# xfs: always use DAX if mount option is used +# created by Ross Zwisler <ross.zwisler@linux.intel.com> +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Intel Corporation. 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 + +# remove previous $seqres.full before test +rm -f $seqres.full + +# Modify as appropriate. +_supported_os Linux +_supported_fs xfs +_require_scratch_dax + +# real QA test starts here +export PERF_PROG="`set_prog_path perf`" +[ "$PERF_PROG" = "" ] && _notrun "perf not found" + +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount "-o dax" >> $seqres.full 2>&1 + +pgsize=`$here/src/feature -s` + +PERF_OUTPUT=$tmp.perf + +$PERF_PROG record -o $PERF_OUTPUT -e 'fs_dax:dax_load_hole' \ + $XFS_IO_PROG -t -c "truncate $pgsize" \ + -c "chattr -x" \ + -c "mmap -r 0 $pgsize" -c "mread 0 $pgsize" -c "munmap" \ + -f $SCRATCH_MNT/testfile > /dev/null 2>&1 + +$PERF_PROG script -i $PERF_OUTPUT | grep -q 'fs_dax:dax_load_hole' +if [[ $? == 0 ]]; then + echo "DAX was used" +else + echo "DAX was NOT used" +fi + +# success, all done +status=0 +exit diff --git a/tests/xfs/431.out b/tests/xfs/431.out new file mode 100644 index 0000000..194ae1e --- /dev/null +++ b/tests/xfs/431.out @@ -0,0 +1,2 @@ +QA output created by 431 +DAX was used diff --git a/tests/xfs/group b/tests/xfs/group index 0a449b9..4e7019c 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -427,3 +427,4 @@ 428 dangerous_fuzzers dangerous_scrub dangerous_online_repair 429 dangerous_fuzzers dangerous_scrub dangerous_repair 430 dangerous_fuzzers dangerous_scrub dangerous_online_repair +431 auto quick -- 2.9.5
next prev parent reply other threads:[~2017-09-11 19:58 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-07 21:08 [PATCH 0/2] xfs: some DAX fixes Ross Zwisler 2017-09-07 21:08 ` Ross Zwisler 2017-09-07 21:08 ` [PATCH 1/2] xfs: always use DAX if mount option is used Ross Zwisler 2017-09-07 21:08 ` Ross Zwisler 2017-09-08 7:20 ` Christoph Hellwig 2017-09-08 7:20 ` Christoph Hellwig 2017-09-08 15:28 ` Ross Zwisler 2017-09-08 15:28 ` Ross Zwisler 2017-09-08 21:21 ` [PATCH] xfs: add regression test for DAX mount option usage Ross Zwisler 2017-09-08 21:21 ` Ross Zwisler 2017-09-11 15:16 ` Ross Zwisler 2017-09-11 15:16 ` Ross Zwisler 2017-09-11 15:37 ` Dan Williams 2017-09-11 15:37 ` Dan Williams 2017-09-11 20:01 ` Ross Zwisler [this message] 2017-09-11 20:01 ` [fstests PATCH v2] " Ross Zwisler 2017-09-14 6:57 ` Eryu Guan 2017-09-14 6:57 ` Eryu Guan 2017-09-15 22:42 ` Ross Zwisler 2017-09-15 22:42 ` Ross Zwisler 2017-09-16 22:26 ` Dave Chinner 2017-09-16 22:26 ` Dave Chinner 2017-09-12 6:44 ` [PATCH] " Dave Chinner 2017-09-12 6:44 ` Dave Chinner 2017-09-12 15:38 ` Ross Zwisler 2017-09-12 15:38 ` Ross Zwisler 2017-09-12 23:47 ` Dave Chinner 2017-09-12 23:47 ` Dave Chinner 2017-09-13 14:42 ` Ross Zwisler 2017-09-13 14:42 ` Ross Zwisler 2017-09-13 22:01 ` Dave Chinner 2017-09-13 22:01 ` Dave Chinner 2017-09-13 22:23 ` Dan Williams 2017-09-13 22:23 ` Dan Williams 2017-09-13 23:34 ` Dave Chinner 2017-09-13 23:34 ` Dave Chinner 2017-09-14 0:28 ` Dan Williams 2017-09-14 0:28 ` Dan Williams 2017-09-14 0:40 ` Dave Chinner 2017-09-14 0:40 ` Dave Chinner 2017-09-14 1:24 ` Dan Williams 2017-09-14 1:24 ` Dan Williams 2017-09-14 12:19 ` Jeff Moyer 2017-09-14 12:19 ` Jeff Moyer 2017-09-14 13:16 ` Johannes Thumshirn 2017-09-14 13:16 ` Johannes Thumshirn 2017-09-14 14:10 ` Dan Williams 2017-09-14 14:10 ` Dan Williams 2017-09-15 9:18 ` Johannes Thumshirn 2017-09-15 9:18 ` Johannes Thumshirn 2017-09-15 17:39 ` Dan Williams 2017-09-15 17:39 ` Dan Williams 2017-09-18 7:47 ` Johannes Thumshirn 2017-09-18 7:47 ` Johannes Thumshirn 2017-09-07 21:08 ` [PATCH 2/2] xfs: validate bdev support for DAX inode flag Ross Zwisler 2017-09-07 21:08 ` Ross Zwisler 2017-09-08 7:21 ` Christoph Hellwig 2017-09-08 7:21 ` Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170911200103.28226-1-ross.zwisler@linux.intel.com \ --to=ross.zwisler@linux.intel.com \ --cc=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=eguan@redhat.com \ --cc=fstests@vger.kernel.org \ --cc=hch@lst.de \ --cc=jack@suse.cz \ --cc=linux-nvdimm@lists.01.org \ --cc=linux-xfs@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.