From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 539A8C433E0 for ; Fri, 19 Feb 2021 16:46:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2277C64E24 for ; Fri, 19 Feb 2021 16:46:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbhBSQqO (ORCPT ); Fri, 19 Feb 2021 11:46:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59979 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229889AbhBSQqN (ORCPT ); Fri, 19 Feb 2021 11:46:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613753086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=mFjpcsaLB3LlYq1+pdOCXCECMBuYJbs+N5Lg9VTGj28=; b=B3XdOjrhuqni75LJrRSOBGgYnDHGl3eYsuEFVeZvEX+hGCIAGBr6BJqEIApfW3qYtkzsCH haikGln6plLmGjw0bV8QgckZ3ugqOlPoSzYRuRHNNiVcMqH6cAm7qciv8tiKQoy2d7q8KT zxByWlv1foUxLyc/MOc2ruEI3gl0IhA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-337-LJuXHajsMIKrMVGfkwIU2Q-1; Fri, 19 Feb 2021 11:44:44 -0500 X-MC-Unique: LJuXHajsMIKrMVGfkwIU2Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32B6F8799EB; Fri, 19 Feb 2021 16:44:43 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.66.60.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id D13E160CEC; Fri, 19 Feb 2021 16:44:41 +0000 (UTC) From: XiaoLi Feng To: fstests@vger.kernel.org Cc: yangx.jy@cn.fujitsu.com, Xiaoli Feng Subject: [PATCH v3] generic/608: verify S_DAX is active immediately for DONTCACHE Date: Sat, 20 Feb 2021 00:44:38 +0800 Message-Id: <20210219164438.26747-1-xifeng@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Xiaoli Feng After upstream linux patches(77573fa310d, 88149082bb8), if FS_XFLAG_DAX is set, DONTCACHE is also set. So S_DAX on the file should be active immediately once FS_XFLAG_DAX is set. --- tests/generic/608 | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/tests/generic/608 b/tests/generic/608 index dd89d91c..b207602e 100755 --- a/tests/generic/608 +++ b/tests/generic/608 @@ -6,7 +6,10 @@ # 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. +# 2) Enable the dax flag on the file that no applications are using. +# The upstream commit 88149082bb8 make the S_DAX take effect +# immediately because the inode is no longer cached and will re-read +# from disk. seq=`basename $0` seqres=$RESULT_DIR/$seq @@ -36,7 +39,7 @@ _require_dax_iflag _require_xfs_io_command "lsattr" "-v" _require_xfs_io_command "statx" "-r" -test_drop_caches() +test_caches() { local t_file=$SCRATCH_MNT/testfile @@ -49,24 +52,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 + # the file doesn't take effect 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 + # the file takes effect immediately _check_s_dax $t_file 1 } -test_cycle_mount() +test_nocache() { - local option=$1 local t_dir=$SCRATCH_MNT/testdir local t_file=$t_dir/testfile @@ -77,30 +75,30 @@ test_cycle_mount() _check_xflag $t_file 1 _check_s_dax $t_file 1 - exec 3< $t_file - - $XFS_IO_PROG -c 'chattr -x' $t_file + $XFS_IO_PROG -c 'chattr -x -R' $t_dir _check_xflag $t_file 0 - _check_s_dax $t_file 1 + _check_s_dax $t_file 0 - exec 3<&- + $XFS_IO_PROG -c 'chattr +x' $t_file + # Here S_DAX on the file will take effect immediately + # because of inode DONTCACHE. + _check_xflag $t_file 1 + _check_s_dax $t_file 1 - # No application is using test file and check if S_DAX on - # the file takes effect immediately by umount & mount - _scratch_cycle_mount "$option" + $XFS_IO_PROG -c 'chattr -x' $t_file + _check_xflag $t_file 0 _check_s_dax $t_file 0 } do_tests() { local mount_option=$1 - local cycle_mount_option=$2 _scratch_mount "$mount_option" - test_drop_caches + test_caches - test_cycle_mount "$cycle_mount_option" + test_nocache _scratch_unmount } @@ -108,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="" -- 2.18.1