From patchwork Fri Mar 26 11:55:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 12166465 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B6ABC433DB for ; Fri, 26 Mar 2021 12:07:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5709F61A45 for ; Fri, 26 Mar 2021 12:07:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229794AbhCZMHS (ORCPT ); Fri, 26 Mar 2021 08:07:18 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:63717 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229753AbhCZMHC (ORCPT ); Fri, 26 Mar 2021 08:07:02 -0400 IronPort-HdrOrdr: A9a23:pc6zGaHEoNAegkaXpLqECMeALOonbusQ8zAX/mp2TgFYddHdqtC2kJ0gpHvJoRsyeFVlo9CPP6GcXWjRnKQZ3aA9NaqvNTOJhEKGII1u5oPpwXnBNkTFnNJ1+rxnd8FFaeHYKXhfoYLE7BKjE9AmqeP3lZyAoevF1X9iQUVLRshbnmREIz2WGEF3WwVKbKBRfPWhz/BarDmtc2l/VLXYOlA5WYH4x+HjpdbPZB4qI1od4hCSsDXA0tXHOind8hAAcz4n+9sfzVQ= X-IronPort-AV: E=Sophos;i="5.81,280,1610380800"; d="scan'208";a="106216439" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Mar 2021 20:07:00 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 08EAB4CF2653; Fri, 26 Mar 2021 20:07:00 +0800 (CST) Received: from G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.200) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 26 Mar 2021 20:07:00 +0800 Received: from Fedora-30.g08.fujitsu.local (10.167.220.106) by G08CNEXCHPEKD04.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 26 Mar 2021 20:07:00 +0800 From: Xiao Yang To: CC: , , , Xiao Yang , Xiaoli Feng Subject: [PATCH 1/2] generic/608: Remove drop cache and umount & mount cycle Date: Fri, 26 Mar 2021 19:55:58 +0800 Message-ID: <20210326115558.7348-1-yangx.jy@fujitsu.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-yoursite-MailScanner-ID: 08EAB4CF2653.A751B X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@fujitsu.com Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Since commit e7bed0b5bc4b, toggling FS_XFLAG_DAX on an existing file can make S_DAX on the file change immediately when all applications close the file. As a result, we don't need the redundant drop cache and umount & mount cycle. Signed-off-by: Xiaoli Feng Signed-off-by: Xiao Yang --- tests/generic/608 | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/tests/generic/608 b/tests/generic/608 index 861bbff5..d81a2488 100755 --- a/tests/generic/608 +++ b/tests/generic/608 @@ -3,10 +3,10 @@ # Copyright (c) 2020 Fujitsu. All Rights Reserved. # # FS QA Test 608 -# Change FS_XFLAG_DAX on an existing file and check if S_DAX on -# the file can take effect immediately by the following steps: -# 1) Stop all applications which are using the file. -# 2) Do drop_caches or umount & mount cycle. +# Toggling FS_XFLAG_DAX on an existing file can make S_DAX on the +# file change immediately when all applications close the file. +# It's a regression test for: +# 'commit e7bed0b5bc4b ("fs: Kill DCACHE_DONTCACHE dentry even if DCACHE_REFERENCED is set")' seq=`basename $0` seqres=$RESULT_DIR/$seq @@ -36,7 +36,7 @@ _require_dax_iflag _require_xfs_io_command "lsattr" "-v" _require_xfs_io_command "statx" "-r" -test_drop_caches() +test_enable_dax() { local t_file=$SCRATCH_MNT/testfile @@ -49,24 +49,19 @@ test_drop_caches() $XFS_IO_PROG -c 'chattr +x' $t_file _check_xflag $t_file 1 - _check_s_dax $t_file 0 - - # One application is using test file and check if S_DAX on - # the file doesn't take effect immediately by drop_caches - echo 2 > /proc/sys/vm/drop_caches + # One application is using test file and S_DAX + # on the file is not changed immediately _check_s_dax $t_file 0 exec 3<&- - # No application is using test file and check if S_DAX on - # the file takes effect immediately by drop_caches - echo 2 > /proc/sys/vm/drop_caches + # No application is using test file and S_DAX + # on the file is changed immediately _check_s_dax $t_file 1 } -test_cycle_mount() +test_disable_dax() { - local option=$1 local t_dir=$SCRATCH_MNT/testdir local t_file=$t_dir/testfile @@ -81,29 +76,29 @@ test_cycle_mount() $XFS_IO_PROG -c 'chattr -x' $t_file _check_xflag $t_file 0 + # One application is using test file and S_DAX + # on the file is not changed immediately _check_s_dax $t_file 1 exec 3<&- - # No application is using test file and check if S_DAX on - # the file takes effect immediately by umount & mount - _scratch_cycle_mount "$option" + # No application is using test file and S_DAX + # on the file is changed immediately _check_s_dax $t_file 0 } do_tests() { local mount_option=$1 - local cycle_mount_option=$2 _scratch_mount "$mount_option" # Make sure the root dir doesn't have FS_XFLAG_DAX set before we start. $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT &>> $seqres.full - test_drop_caches - - test_cycle_mount "$cycle_mount_option" + # Do test for commit e7bed0b5bc4b + test_enable_dax + test_disable_dax _scratch_unmount } @@ -111,7 +106,7 @@ do_tests() _scratch_mkfs >> $seqres.full 2>&1 # Mount with dax option -do_tests "-o dax=inode" "dax=inode" +do_tests "-o dax=inode" # Mount without dax option export MOUNT_OPTIONS=""