* [PATCH 1/3] fstests: move _check_dmesg to common/rc
@ 2015-06-19 9:33 Eryu Guan
2015-06-19 9:33 ` [PATCH 2/3] fstests: add _check_dmesg the ability to filter out intentional dmesg log Eryu Guan
2015-06-19 9:33 ` [PATCH v4 3/3] generic: concurrent IO test with mixed IO types Eryu Guan
0 siblings, 2 replies; 3+ messages in thread
From: Eryu Guan @ 2015-06-19 9:33 UTC (permalink / raw
To: fstests; +Cc: Eryu Guan
Move _check_dmesg to common/rc so that tests could call it directly.
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
check | 32 +++-----------------------------
common/rc | 27 +++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/check b/check
index a300130..866b706 100755
--- a/check
+++ b/check
@@ -396,32 +396,6 @@ _check_filesystems()
fi
}
-_check_dmesg()
-{
- if [ ! -f ${RESULT_DIR}/check_dmesg ]; then
- return
- fi
- rm -f ${RESULT_DIR}/check_dmesg
-
- # search the dmesg log of last run of $seqnum for possible failures
- # use sed \cregexpc address type, since $seqnum contains "/"
- dmesg | tac | sed -ne "0,\#run fstests $seqnum at $date_time#p" | \
- tac >$seqres.dmesg
- grep -q -e "kernel BUG at" \
- -e "WARNING:" \
- -e "BUG:" \
- -e "Oops:" \
- -e "possible recursive locking detected" \
- $seqres.dmesg
- if [ $? -eq 0 ]; then
- echo "_check_dmesg: something found in dmesg (see $seqres.dmesg)"
- err=true
- else
- rm -f $seqres.dmesg
- fi
-}
-
-
_prepare_test_list
if $OPTIONS_HAVE_SECTIONS; then
@@ -542,7 +516,7 @@ for section in $HOST_OPTIONS_SECTIONS; do
# the filename for the test and the name output are different.
# we don't include the tests/ directory in the name output.
- seqnum=`echo $seq | sed -e "s;$SRC_DIR/;;"`
+ export seqnum=`echo $seq | sed -e "s;$SRC_DIR/;;"`
# Similarly, the result directory needs to replace the tests/
# part of the test location.
@@ -593,7 +567,7 @@ for section in $HOST_OPTIONS_SECTIONS; do
[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
$LOGGER_PROG "run xfstest $seqnum"
if [ -w /dev/kmsg ]; then
- date_time=`date +"%F %T"`
+ export date_time=`date +"%F %T"`
echo "run fstests $seqnum at $date_time" > /dev/kmsg
# _check_dmesg depends on this log in dmesg
touch ${RESULT_DIR}/check_dmesg
@@ -663,7 +637,7 @@ for section in $HOST_OPTIONS_SECTIONS; do
try="$try $seqnum"
n_try=`expr $n_try + 1`
_check_filesystems
- _check_dmesg
+ _check_dmesg || err=true
fi
fi
diff --git a/common/rc b/common/rc
index 610045e..141ab5c 100644
--- a/common/rc
+++ b/common/rc
@@ -2936,6 +2936,33 @@ _get_device_size()
grep `_short_dev $1` /proc/partitions | awk '{print $3}'
}
+# check dmesg log for WARNING/Oops/etc.
+_check_dmesg()
+{
+ if [ ! -f ${RESULT_DIR}/check_dmesg ]; then
+ return 0
+ fi
+ rm -f ${RESULT_DIR}/check_dmesg
+
+ # search the dmesg log of last run of $seqnum for possible failures
+ # use sed \cregexpc address type, since $seqnum contains "/"
+ dmesg | tac | sed -ne "0,\#run fstests $seqnum at $date_time#p" | \
+ tac >$seqres.dmesg
+ grep -q -e "kernel BUG at" \
+ -e "WARNING:" \
+ -e "BUG:" \
+ -e "Oops:" \
+ -e "possible recursive locking detected" \
+ $seqres.dmesg
+ if [ $? -eq 0 ]; then
+ echo "_check_dmesg: something found in dmesg (see $seqres.dmesg)"
+ return 1
+ else
+ rm -f $seqres.dmesg
+ return 0
+ fi
+}
+
# don't check dmesg log after test
_disable_dmesg_check()
{
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] fstests: add _check_dmesg the ability to filter out intentional dmesg log
2015-06-19 9:33 [PATCH 1/3] fstests: move _check_dmesg to common/rc Eryu Guan
@ 2015-06-19 9:33 ` Eryu Guan
2015-06-19 9:33 ` [PATCH v4 3/3] generic: concurrent IO test with mixed IO types Eryu Guan
1 sibling, 0 replies; 3+ messages in thread
From: Eryu Guan @ 2015-06-19 9:33 UTC (permalink / raw
To: fstests; +Cc: Eryu Guan
Introduce a parameter to _check_dmesg which allows callers to provide a
customized filter function to filter out intentional dmesg logs. The
default filter is a simple 'cat' command.
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
common/rc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/common/rc b/common/rc
index 141ab5c..15e7795 100644
--- a/common/rc
+++ b/common/rc
@@ -2944,10 +2944,15 @@ _check_dmesg()
fi
rm -f ${RESULT_DIR}/check_dmesg
+ # default filter is a simple cat command, caller could provide a
+ # customized filter and pass the name through the first argument, to
+ # filter out intentional WARNINGs or Oopses
+ filter=${1:-cat}
+
# search the dmesg log of last run of $seqnum for possible failures
# use sed \cregexpc address type, since $seqnum contains "/"
dmesg | tac | sed -ne "0,\#run fstests $seqnum at $date_time#p" | \
- tac >$seqres.dmesg
+ tac | $filter >$seqres.dmesg
grep -q -e "kernel BUG at" \
-e "WARNING:" \
-e "BUG:" \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v4 3/3] generic: concurrent IO test with mixed IO types
2015-06-19 9:33 [PATCH 1/3] fstests: move _check_dmesg to common/rc Eryu Guan
2015-06-19 9:33 ` [PATCH 2/3] fstests: add _check_dmesg the ability to filter out intentional dmesg log Eryu Guan
@ 2015-06-19 9:33 ` Eryu Guan
1 sibling, 0 replies; 3+ messages in thread
From: Eryu Guan @ 2015-06-19 9:33 UTC (permalink / raw
To: fstests; +Cc: Eryu Guan
Test concurrent buffered I/O, DIO, AIO, mmap I/O and splice I/O on the
same files.
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
This fio job file has been proven to be potent, it triggers WARNINGs on ext4
and xfs with 4.1-rc6 kernel.
ext4: WARNING: at fs/ext4/inode.c:1328
xfs: WARNING: CPU: 7 PID: 3090 at fs/xfs/xfs_file.c:726 xfs_file_dio_aio_write+0x176/0x2a8 [xfs]()
The ext4 issue should be fixed by Lukas's patch
ext4: fix reservation release on invalidatepage for delalloc fs
The xfs warning is on purpose, so it's filtered out and test still passes on
xfs. Note that I filter another similar warning
WARNING: CPU: 0 PID: 14519 at fs/xfs/xfs_file.c:341 xfs_file_read_iter+0x230/0x2b0 [xfs]()
It's not triggerd everytime but not hard to see. I'm not so sure if it should
be filtered out too, please review.
Also, the fio job ever paniced kernel in mm code and hung xfs. The hang in xfs
was in splice code but it's gone on current 4.1-rcX kernel.
I reduced the numjobs and iodepth to reduce the test time(~25s on my test host)
and scale them by $LOAD_FACTOR. And it still could trigger the warning on
ext4(with certain fio version, e.g. fio-2.1) with reduced workload.
v2:
- use mktemp to create tmp fio job file
v3:
- initialize scratch dev and mount it correctly before test
- roll back to use /tmp/$$ as tmp
v4:
- filter out xfs intentional WARNINGs when checking dmesg, to make the test pass on xfs
tests/generic/090 | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++
tests/generic/090.out | 2 +
tests/generic/group | 1 +
3 files changed, 144 insertions(+)
create mode 100755 tests/generic/090
create mode 100644 tests/generic/090.out
diff --git a/tests/generic/090 b/tests/generic/090
new file mode 100755
index 0000000..69bc988
--- /dev/null
+++ b/tests/generic/090
@@ -0,0 +1,141 @@
+#! /bin/bash
+# FS QA Test generic/090
+#
+# Concurrent mixed I/O (buffer I/O, aiodio, mmap, splice) on the same files
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2015 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
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch
+
+iodepth=$((16 * LOAD_FACTOR))
+iodepth_batch=$((8 * LOAD_FACTOR))
+numjobs=$((5 * LOAD_FACTOR))
+fio_config=$tmp.fio
+cat >$fio_config <<EOF
+[global]
+bs=8k
+iodepth=$iodepth
+iodepth_batch=$iodepth_batch
+randrepeat=1
+size=1m
+directory=$SCRATCH_MNT
+numjobs=$numjobs
+[job1]
+ioengine=sync
+bs=1k
+direct=1
+rw=randread
+filename=file1:file2
+[job2]
+ioengine=libaio
+rw=randwrite
+direct=1
+filename=file1:file2
+[job3]
+bs=1k
+ioengine=posixaio
+rw=randwrite
+direct=1
+filename=file1:file2
+[job4]
+ioengine=splice
+direct=1
+rw=randwrite
+filename=file1:file2
+[job5]
+bs=1k
+ioengine=sync
+rw=randread
+filename=file1:file2
+[job6]
+ioengine=posixaio
+rw=randwrite
+filename=file1:file2
+[job7]
+ioengine=splice
+rw=randwrite
+filename=file1:file2
+[job8]
+ioengine=mmap
+rw=randwrite
+bs=1k
+filename=file1:file2
+[job9]
+ioengine=mmap
+rw=randwrite
+direct=1
+filename=file1:file2
+EOF
+# with ioengine=mmap and direct=1, fio requires bs to be at least pagesize,
+# which is a fio built-in var.
+echo 'bs=$pagesize' >> $fio_config
+
+rm -f $seqres.full
+_require_fio $fio_config
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+echo "Silence is golden"
+$FIO_PROG $fio_config >>$seqres.full 2>&1
+
+# xfs generates WARNINGs on purpose when applications mix buffered/mmap IO with
+# direct IO on the same file. On the other hand, this fio job has been proven
+# to be potent, we don't want to simply _disable_dmesg_check which could miss
+# other potential bugs. So filter out the intentional WARNINGs, make sure test
+# doesn't fail because of this warning and fails on other WARNINGs.
+filter_xfs_dmesg()
+{
+ local warn1="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_write.*"
+ local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*"
+ sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
+ -e "s#$warn2#Intentional warnings in xfs_file_read_iter#"
+}
+
+# umount before checking dmesg in case umount triggers any WARNING or Oops
+_scratch_unmount
+
+if [ "$FSTYP" == "xfs" ]; then
+ _check_dmesg filter_xfs_dmesg
+else
+ _check_dmesg
+fi
+status=$?
+exit
diff --git a/tests/generic/090.out b/tests/generic/090.out
new file mode 100644
index 0000000..2b5100d
--- /dev/null
+++ b/tests/generic/090.out
@@ -0,0 +1,2 @@
+QA output created by 090
+Silence is golden
diff --git a/tests/generic/group b/tests/generic/group
index 0c8964c..2e534a5 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -92,6 +92,7 @@
087 perms auto quick
088 perms auto quick
089 metadata auto
+090 auto rw stress
091 rw auto quick
092 auto quick prealloc
093 attr cap udf auto
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-19 9:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-19 9:33 [PATCH 1/3] fstests: move _check_dmesg to common/rc Eryu Guan
2015-06-19 9:33 ` [PATCH 2/3] fstests: add _check_dmesg the ability to filter out intentional dmesg log Eryu Guan
2015-06-19 9:33 ` [PATCH v4 3/3] generic: concurrent IO test with mixed IO types Eryu Guan
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.