Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp1667312ybk; Thu, 21 May 2020 12:15:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpLzZQogjneMCap1PGCf+OThGnwKPTONFp5j55QF2imJihah5K1xZ5+zeuQJdp1HdfcbUY X-Received: by 2002:a17:906:86d6:: with SMTP id j22mr4914721ejy.1.1590088517773; Thu, 21 May 2020 12:15:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590088517; cv=none; d=google.com; s=arc-20160816; b=MJXRaaRALITAsM7BuwvGqQuRJdhvLj1W9nTd0hrwDfoAN91ESXwFIQnwf4t8cnp6r2 /vBBVQvDtjEDuw5mhY1/I9Cc9fgmgj7rqRlz2TfTYq8gpf6v64bsvbxdaOy+JRZN0HQj yR0e+ifJOLHCcJufHDj+zPAdQjQ3qdPODvSq3BOIpuMjFKZAQ9/nONm/ru/nZ8IG+YIr sU9CMLy/H0yz3YTne/exv4sCSgnAoaMnBlbRRVTN9EBeabpfOzUhX4EKH4SArBFjsxko rs4q7fgfyPppmJt40I2K70PgxOT7KA0bppMCuhPAX75Zg1V4zWcam//ZNclAPed5zRzy 9QBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=F2IpvZNP87kXJnNO7b92uPcNOQ6zlTqwFqE1Uu87HzA=; b=MeggmwijWUit4eudWf7xDRp30VmVlnlcEgoBI7aNKz9jSazhmoZAw148jiSHmwr2Xo Spb2RQWvIyc3PdOu/WcoYAhUsaKKIsEU0QqWzud2USVGw0G9Afd6F1TXOPWSW0gNvysI 2ex8X8VHV5vaALhyYFGO42kJ0Waum5Aoqy41jMb0fcrGfomEpjo0gV4azG6AKR+WWrbk 6vN7F3xgYtQlmOi++MWfUMzsuh/kALO9bOgnZce2gBhwNzN+nam0f7CG2X/tU/5ZbCC4 Q8E5PKhnzB6W42/niy3FWSWwZvahKwBJGmgQGveeyfUv9QuaYrYg8U3y2ocf5mGqVinQ uSVw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n20si3562783edb.207.2020.05.21.12.14.39; Thu, 21 May 2020 12:15:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730557AbgEUTNq (ORCPT + 99 others); Thu, 21 May 2020 15:13:46 -0400 Received: from mga18.intel.com ([134.134.136.126]:30193 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730389AbgEUTNT (ORCPT ); Thu, 21 May 2020 15:13:19 -0400 IronPort-SDR: iaFqbH4NlNsES6Uq6WDUEnlBCFnjWabF8wwTlALNeYjlCOS77+/zyILociA9N2qcDh75T+DqYh cSpqFDz9DFdA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2020 12:13:19 -0700 IronPort-SDR: xRfq7Wr1KXx2ehet3ZPfxBq6X8c4OpEHxxEqw82qnbrJQtUvSW7PbUKF9XUHiPula8QaMyL107 +mA26JbmBQIA== X-IronPort-AV: E=Sophos;i="5.73,418,1583222400"; d="scan'208";a="265158904" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2020 12:13:18 -0700 From: ira.weiny@intel.com To: linux-ext4@vger.kernel.org, Andreas Dilger , "Theodore Y. Ts'o" , Jan Kara , Eric Biggers Cc: Ira Weiny , Al Viro , Dan Williams , Dave Chinner , Christoph Hellwig , Jeff Moyer , "Darrick J. Wong" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 4/8] fs/ext4: Update ext4_should_use_dax() Date: Thu, 21 May 2020 12:13:09 -0700 Message-Id: <20200521191313.261929-5-ira.weiny@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200521191313.261929-1-ira.weiny@intel.com> References: <20200521191313.261929-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Ira Weiny S_DAX should only be enabled when the underlying block device supports dax. Cache the underlying support for DAX in the super block and modify ext4_should_use_dax() to check for device support prior to the over riding mount option. While we are at it change the function to ext4_should_enable_dax() as this better reflects the ask as well as matches xfs. Signed-off-by: Ira Weiny --- Changes from V3: Add a sb DAX supported flag for performance Changes from RFC Change function name to 'should enable' Clean up bool conversion Reorder this for better bisect-ability --- fs/ext4/ext4.h | 1 + fs/ext4/inode.c | 15 ++++++++++----- fs/ext4/super.c | 5 ++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 1a3daf2d18ef..0b4db9ce7756 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1979,6 +1979,7 @@ static inline bool ext4_has_incompat_features(struct super_block *sb) */ #define EXT4_FLAGS_RESIZING 0 #define EXT4_FLAGS_SHUTDOWN 1 +#define EXT4_FLAGS_BDEV_IS_DAX 2 static inline int ext4_forced_shutdown(struct ext4_sb_info *sbi) { diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index a10ff12194db..6532870f6a0b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4398,10 +4398,10 @@ int ext4_get_inode_loc(struct inode *inode, struct ext4_iloc *iloc) !ext4_test_inode_state(inode, EXT4_STATE_XATTR)); } -static bool ext4_should_use_dax(struct inode *inode) +static bool ext4_should_enable_dax(struct inode *inode) { - if (!test_opt(inode->i_sb, DAX_ALWAYS)) - return false; + struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); + if (!S_ISREG(inode->i_mode)) return false; if (ext4_should_journal_data(inode)) @@ -4412,7 +4412,12 @@ static bool ext4_should_use_dax(struct inode *inode) return false; if (ext4_test_inode_flag(inode, EXT4_INODE_VERITY)) return false; - return true; + if (!test_bit(EXT4_FLAGS_BDEV_IS_DAX, &sbi->s_ext4_flags)) + return false; + if (test_opt(inode->i_sb, DAX_ALWAYS)) + return true; + + return false; } void ext4_set_inode_flags(struct inode *inode) @@ -4430,7 +4435,7 @@ void ext4_set_inode_flags(struct inode *inode) new_fl |= S_NOATIME; if (flags & EXT4_DIRSYNC_FL) new_fl |= S_DIRSYNC; - if (ext4_should_use_dax(inode)) + if (ext4_should_enable_dax(inode)) new_fl |= S_DAX; if (flags & EXT4_ENCRYPT_FL) new_fl |= S_ENCRYPTED; diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 7b99c44d0a91..f7d76dcaedfe 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4092,13 +4092,16 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto failed_mount; } + if (bdev_dax_supported(sb->s_bdev, blocksize)) + set_bit(EXT4_FLAGS_BDEV_IS_DAX, &sbi->s_ext4_flags); + if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) { if (ext4_has_feature_inline_data(sb)) { ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem" " that may contain inline data"); goto failed_mount; } - if (!bdev_dax_supported(sb->s_bdev, blocksize)) { + if (!test_bit(EXT4_FLAGS_BDEV_IS_DAX, &sbi->s_ext4_flags)) { ext4_msg(sb, KERN_ERR, "DAX unsupported by block device."); goto failed_mount; -- 2.25.1