From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f193.google.com ([209.85.215.193]:38865 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726001AbfG1Lam (ORCPT ); Sun, 28 Jul 2019 07:30:42 -0400 Date: Sun, 28 Jul 2019 19:30:36 +0800 From: Eryu Guan Subject: Re: [PATCH v2 1/3] common: filter aiodio dmesg after fs/iomap.c to fs/iomap/ move Message-ID: <20190728113036.GO7943@desktop> References: <156394156831.1850719.2997473679130010771.stgit@magnolia> <156394157450.1850719.464315342783936237.stgit@magnolia> <20190725180330.GH1561054@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190725180330.GH1561054@magnolia> Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org On Thu, Jul 25, 2019 at 11:03:30AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong > > Since the iomap code are moving to fs/iomap/ we have to add new entries > to the aiodio dmesg filter to reflect this. > > Signed-off-by: Darrick J. Wong > --- > v2: fix all the iomap regexes > --- > common/filter | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/common/filter b/common/filter > index ed082d24..2e32ab10 100644 > --- a/common/filter > +++ b/common/filter > @@ -550,10 +550,10 @@ _filter_aiodio_dmesg() > local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_read.*" > local warn3="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*" > local warn4="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_aio_read.*" > - local warn5="WARNING:.*fs/iomap\.c:.*iomap_dio_rw.*" > + local warn5="WARNING:.*fs/iomap.*:.*iomap_dio_rw.*" > local warn6="WARNING:.*fs/xfs/xfs_aops\.c:.*__xfs_get_blocks.*" > - local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*" > - local warn8="WARNING:.*fs/iomap\.c:.*iomap_dio_complete.*" > + local warn7="WARNING:.*fs/iomap.*:.*iomap_dio_actor.*" > + local warn8="WARNING:.*fs/iomap.*:.*iomap_dio_complete.*" I don't think we need new filters anymore, as commit 5a9d929d6e13 ("iomap: report collisions between directio and buffered writes to userspace") replaced the WARN_ON with a pr_crit(). These filters are there only for old kernels. Thanks, Eryu > local warn9="WARNING:.*fs/direct-io\.c:.*dio_complete.*" > sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \ > -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \ > @@ -563,7 +563,8 @@ _filter_aiodio_dmesg() > -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \ > -e "s#$warn7#Intentional warnings in iomap_dio_actor#" \ > -e "s#$warn8#Intentional warnings in iomap_dio_complete#" \ > - -e "s#$warn9#Intentional warnings in dio_complete#" > + -e "s#$warn9#Intentional warnings in dio_complete#" \ > + -e "s#$warn10#Intentional warnings in iomap_dio_actor#" > } > > # We generate assert related WARNINGs on purpose and make sure test doesn't fail