From patchwork Tue Oct 10 14:54:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 9996357 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 94028601AE for ; Tue, 10 Oct 2017 14:55:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 860B32862C for ; Tue, 10 Oct 2017 14:55:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AC8D28634; Tue, 10 Oct 2017 14:55:30 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 11E5F2862C for ; Tue, 10 Oct 2017 14:55:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932095AbdJJOz3 (ORCPT ); Tue, 10 Oct 2017 10:55:29 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:54686 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751385AbdJJOz3 (ORCPT ); Tue, 10 Oct 2017 10:55:29 -0400 Received: by mail-wm0-f67.google.com with SMTP id i124so6141607wmf.3 for ; Tue, 10 Oct 2017 07:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LUS9AGz5rTIRG/GVU9ktvgiv1wtOpgJXGJM5FVFeyn0=; b=QnzaBkcEUafT5r3QPSLQjqSa7doaEYoqo9TRInaKg43mckIuuhpm51zKa0kje/crF5 M4buF+9gNCzvt6nUorHbZLmLwlVpc0EbSnrzZfx7mTgwuWz1A9wvev4/ENgQmjmYK6iy resupedK+tV5oN+K5m/BEatNUt35/5KJdB/nNxn7mhW34O/OqbGoVgPi1opj5Wn5c57Y +JXaAirldiTZ8j04rT0wns4GFQMQlvesJDiyZgb+j+Xo6WkY6IaAznPoI9n+mCGO/wbY RTG5wgM7sps/ufDsidqWfhFPEVvrCK68opyzCHwXUFu02vOpWbunRi+xww7WLOat/WZw Mczg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LUS9AGz5rTIRG/GVU9ktvgiv1wtOpgJXGJM5FVFeyn0=; b=SU6/OYZzxK8VBJUZp29WeZz3MK5B7aL5e24NK8Q6D7/zMLaDzY7sF5ERezVBPilPoy KUBm+blVAkDXf5iJ0bYe0hy6cdLzpRPqeyOoTPR3WUEuvATtloR1AYpcjt4dSItvdVcx atWLG8qHHqGS/0qIoTFldRn63ZuHb7XyFG5t02v4fKpyQfpqxFSbSLoxcAP3ixlzzJMY 91oh9H4xO3lVcUZJnxMdnUqJHhoia0huDF8hxQSKOmfZLGomI7m1/dLmJrm6lFdRTO7+ 9qt+EDdRklPMiQ1zwTpbNxsF+ZQLagRq0pX6vWOlkV++VoBAkfOCwVC0GVYX9rHrHGZ9 vTuw== X-Gm-Message-State: AMCzsaWRsMHZTSLBmSNtFohw/dzaCBtWvz/EjIyAgZFKsc4qIFghHeFQ UvUlf+iAomrqv7dJzdommgi0UR/4 X-Google-Smtp-Source: AOwi7QC0/5Xf5qu3OjuGtU41SRgv2zHrGuBnDgFdw3APl68ewb/Is5Qrxwh0aSv7iuemx1D8MhOhTg== X-Received: by 10.28.126.208 with SMTP id z199mr10572050wmc.91.1507647327575; Tue, 10 Oct 2017 07:55:27 -0700 (PDT) Received: from orange.brq.redhat.com. (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id y129sm8368891wmg.42.2017.10.10.07.55.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Oct 2017 07:55:26 -0700 (PDT) From: Ilya Dryomov To: fstests@vger.kernel.org Cc: Lukas Czerner Subject: [PATCH 2/3] common/rc: turn _filter_xfs_dmesg() into _filter_aiodio_dmesg() Date: Tue, 10 Oct 2017 16:54:57 +0200 Message-Id: <1507647298-9971-3-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1507647298-9971-1-git-send-email-idryomov@gmail.com> References: <1507647298-9971-1-git-send-email-idryomov@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With upstream commit 332391a9935d ("fs: Fix page cache inconsistency when mixing buffered and AIO DIO"), ext4 (and probably other non-iomap based filesystems) need a _check_dmesg() whitelist entry for a new WARN in dio_complete() -- generic/095 and 247 trigger a dio_complete() splat pretty reliably for me. Add dio_complete() entry to _filter_xfs_dmesg(), rename it and use it unconditionally in generic/095, 224, 247 and 446. Signed-off-by: Ilya Dryomov --- common/rc | 8 +++++--- tests/generic/095 | 7 ++----- tests/generic/224 | 9 +++------ tests/generic/247 | 9 +++------ tests/generic/446 | 9 +++------ 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/common/rc b/common/rc index e15c8fc27405..03d2a9cd2484 100644 --- a/common/rc +++ b/common/rc @@ -2027,10 +2027,10 @@ _run_aiodio() return $status } -# xfs generates WARNINGs on purpose when applications mix buffered/mmap IO with +# We generate WARNINGs on purpose when applications mix buffered/mmap IO with # direct IO on the same file. This is a helper for _check_dmesg() to filter out # such warnings. -_filter_xfs_dmesg() +_filter_aiodio_dmesg() { local warn1="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_write.*" local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_read.*" @@ -2040,6 +2040,7 @@ _filter_xfs_dmesg() 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 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#" \ -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \ @@ -2047,7 +2048,8 @@ _filter_xfs_dmesg() -e "s#$warn5#Intentional warnings in iomap_dio_rw#" \ -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#$warn8#Intentional warnings in iomap_dio_complete#" \ + -e "s#$warn9#Intentional warnings in dio_complete#" } # this test requires y2038 sysfs switch and filesystem diff --git a/tests/generic/095 b/tests/generic/095 index 050215d41700..fd4f13fd0a1b 100755 --- a/tests/generic/095 +++ b/tests/generic/095 @@ -126,10 +126,7 @@ $FIO_PROG $fio_config >>$seqres.full 2>&1 # 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 +_check_dmesg _filter_aiodio_dmesg + status=$? exit diff --git a/tests/generic/224 b/tests/generic/224 index 29b1c05d06df..6b3a81536aa8 100755 --- a/tests/generic/224 +++ b/tests/generic/224 @@ -83,13 +83,10 @@ done wait echo "*** Silence is golden ***" -# unmount and check dmesg, filtering out expected XFS warnings about mixed +# unmount and check dmesg, filtering out expected warnings about mixed # direct and buffered I/O _scratch_unmount -if [ "$FSTYP" == "xfs" ]; then - _check_dmesg _filter_xfs_dmesg -else - _check_dmesg -fi +_check_dmesg _filter_aiodio_dmesg + status=$? exit diff --git a/tests/generic/247 b/tests/generic/247 index aac7078045ee..0614100cd7a8 100755 --- a/tests/generic/247 +++ b/tests/generic/247 @@ -80,13 +80,10 @@ wait echo "Silence is golden." -# unmount and check dmesg, filtering out expected XFS warnings about mixed +# unmount and check dmesg, filtering out expected warnings about mixed # mmap/dio _test_unmount -if [ "$FSTYP" == "xfs" ]; then - _check_dmesg _filter_xfs_dmesg -else - _check_dmesg -fi +_check_dmesg _filter_aiodio_dmesg + status=$? exit diff --git a/tests/generic/446 b/tests/generic/446 index 6a1b69aa2edc..01228322911e 100755 --- a/tests/generic/446 +++ b/tests/generic/446 @@ -79,13 +79,10 @@ wait $dread_pid > /dev/null 2>&1 echo "Silence is golden" -# check dmesg, filtering out expected XFS warnings about mixed mmap/dio +# check dmesg, filtering out expected warnings about mixed mmap/dio # and umount first in case umount triggers warnings _scratch_unmount -if [ "$FSTYP" == "xfs" ]; then - _check_dmesg _filter_xfs_dmesg -else - _check_dmesg -fi +_check_dmesg _filter_aiodio_dmesg + status=$? exit