From patchwork Mon Jul 3 07:35:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 9822089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 68AA860353 for ; Mon, 3 Jul 2017 07:36:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DEE126E51 for ; Mon, 3 Jul 2017 07:36:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 527FA28372; Mon, 3 Jul 2017 07:36:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 024A527FBA for ; Mon, 3 Jul 2017 07:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752334AbdGCHgR (ORCPT ); Mon, 3 Jul 2017 03:36:17 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:32664 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752186AbdGCHgQ (ORCPT ); Mon, 3 Jul 2017 03:36:16 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="20774015" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 03 Jul 2017 15:36:14 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id C7A3F46B53E2; Mon, 3 Jul 2017 15:36:09 +0800 (CST) Received: from localhost.localdomain (10.167.220.81) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 3 Jul 2017 15:36:13 +0800 From: Xiao Yang To: CC: , , , Xiao Yang Subject: [PATCH] generic/446: add __xfs_get_blocks() into _filter_xfs_dmesg Date: Mon, 3 Jul 2017 15:35:59 +0800 Message-ID: <1499067359-23500-1-git-send-email-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.167.220.81] X-yoursite-MailScanner-ID: C7A3F46B53E2.AC6AE X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On xfs filesystem, the following patch fixed system crash caused by this race, but it introduced the __xfs_get_blocks() warning when the race occurred: 04197b3 ("xfs: don't BUG() on mixed direct and mapped I/O") On upstream kernel, the fix patch was cleared by: acdda3a ("xfs: use iomap_dio_rw") When the fix patch was applied and not cleared(e.g, on RHEL7.4), this case triggered the __xfs_get_blocks() warning as expected. Moreover, generic/095 may reproduce the same warning occasionally. So we could add __xfs_get_blocks() into _filter_xfs_dmesg. Signed-off-by: Xiao Yang --- common/xfs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/xfs b/common/xfs index 77100f7..a1ee384 100644 --- a/common/xfs +++ b/common/xfs @@ -595,9 +595,11 @@ _filter_xfs_dmesg() 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 warn6="WARNING:.*fs/xfs/xfs_aops\.c:.*__xfs_get_blocks.*" 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#$warn5#Intentional warnings in iomap_dio_rw#" \ + -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" }