[PATCH 1/2] generic/224: filter out expected XFS warnings for mixed direct/buffer I/O

[PATCH 1/2] generic/224: filter out expected XFS warnings for mixed direct/buffer I/O

[Eryu Guan]

generic/224 is doing concurrent direct and buffered I/O to the same
set of files, and this triggers some expected warnings on XFS. So
filter out these warnings just like what we did in generic/095 and
generic/247.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 tests/generic/224 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/generic/224 b/tests/generic/224
index 2c30a75258f3..29b1c05d06df 100755
--- a/tests/generic/224
+++ b/tests/generic/224
@@ -82,5 +82,14 @@ for i in `seq 0 1 $FILES`; do
 done
 wait
 echo "*** Silence is golden ***"
-status=0
+
+# unmount and check dmesg, filtering out expected XFS warnings about mixed
+# direct and buffered I/O
+_scratch_unmount
+if [ "$FSTYP" == "xfs" ]; then
+	_check_dmesg _filter_xfs_dmesg
+else
+	_check_dmesg
+fi
+status=$?
 exit
-- 
2.13.3

[PATCH 2/2] common/xfs: add iomap_dio_actor() to the dmesg filter

[Eryu Guan]

The warning in fs/iomap.c::iomap_dio_actor() could be triggered when
mixing dio and mmap I/O on the same sparse file. Several tests could
hit this warning now, like generic/095 generic/224 and generic/446.
So add this expected warning to whitelist too.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 common/xfs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/xfs b/common/xfs
index 47b4e1ba4b7f..4995f8ba8dd8 100644
--- a/common/xfs
+++ b/common/xfs
@@ -596,10 +596,12 @@ _filter_xfs_dmesg()
 	local warn4="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_aio_read.*"
 	local warn5="WARNING:.*fs/iomap\.c:.*iomap_dio_rw.*"
 	local warn6="WARNING:.*fs/xfs/xfs_aops\.c:.*__xfs_get_blocks.*"
+	local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*"
 	sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
 	    -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
 	    -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \
 	    -e "s#$warn4#Intentional warnings in xfs_file_aio_read#" \
 	    -e "s#$warn5#Intentional warnings in iomap_dio_rw#" \
-	    -e "s#$warn6#Intentional warnings in __xfs_get_blocks#"
+	    -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \
+	    -e "s#$warn7#Intentional warnings in iomap_dio_actor#"
 }
-- 
2.13.3

Re: [PATCH 1/2] generic/224: filter out expected XFS warnings for mixed direct/buffer I/O

[Brian Foster]

On Mon, Jul 31, 2017 at 12:28:24PM +0800, Eryu Guan wrote:
> generic/224 is doing concurrent direct and buffered I/O to the same
> set of files, and this triggers some expected warnings on XFS. So
> filter out these warnings just like what we did in generic/095 and
> generic/247.
> 
> Signed-off-by: Eryu Guan <eguan@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  tests/generic/224 | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/generic/224 b/tests/generic/224
> index 2c30a75258f3..29b1c05d06df 100755
> --- a/tests/generic/224
> +++ b/tests/generic/224
> @@ -82,5 +82,14 @@ for i in `seq 0 1 $FILES`; do
>  done
>  wait
>  echo "*** Silence is golden ***"
> -status=0
> +
> +# unmount and check dmesg, filtering out expected XFS warnings about mixed
> +# direct and buffered I/O
> +_scratch_unmount
> +if [ "$FSTYP" == "xfs" ]; then
> +	_check_dmesg _filter_xfs_dmesg
> +else
> +	_check_dmesg
> +fi
> +status=$?
>  exit
> -- 
> 2.13.3
> 
> --
> 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

Re: [PATCH 2/2] common/xfs: add iomap_dio_actor() to the dmesg filter

[Brian Foster]

On Mon, Jul 31, 2017 at 12:28:25PM +0800, Eryu Guan wrote:
> The warning in fs/iomap.c::iomap_dio_actor() could be triggered when
> mixing dio and mmap I/O on the same sparse file. Several tests could
> hit this warning now, like generic/095 generic/224 and generic/446.
> So add this expected warning to whitelist too.
> 
> Signed-off-by: Eryu Guan <eguan@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  common/xfs | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/common/xfs b/common/xfs
> index 47b4e1ba4b7f..4995f8ba8dd8 100644
> --- a/common/xfs
> +++ b/common/xfs
> @@ -596,10 +596,12 @@ _filter_xfs_dmesg()
>  	local warn4="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_aio_read.*"
>  	local warn5="WARNING:.*fs/iomap\.c:.*iomap_dio_rw.*"
>  	local warn6="WARNING:.*fs/xfs/xfs_aops\.c:.*__xfs_get_blocks.*"
> +	local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*"
>  	sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
>  	    -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
>  	    -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \
>  	    -e "s#$warn4#Intentional warnings in xfs_file_aio_read#" \
>  	    -e "s#$warn5#Intentional warnings in iomap_dio_rw#" \
> -	    -e "s#$warn6#Intentional warnings in __xfs_get_blocks#"
> +	    -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \
> +	    -e "s#$warn7#Intentional warnings in iomap_dio_actor#"
>  }
> -- 
> 2.13.3
> 
> --
> 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