Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp264539ybk; Tue, 12 May 2020 22:45:15 -0700 (PDT) X-Google-Smtp-Source: APiQypLB2gBFBfi198MWtt3dDgjW2JDMgGReVRyFnfg0VV2GY3naD3p9xWdjomB72O3ArkQ1t2eY X-Received: by 2002:a17:906:7282:: with SMTP id b2mr21439703ejl.161.1589348714972; Tue, 12 May 2020 22:45:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589348714; cv=none; d=google.com; s=arc-20160816; b=MnaIne0YnmR1PeVVEUy9x1S5/Qms4FfxG1xJAuhvt5sZtEynHUr/urY4s7YUT/2wSm OH3BxnTgkrho1SAAHV7ImM06s3lfJCLXSUZPdejK5oFBhl95giKqG9GHkM/uhHsAqFLS 9iJs+iVAXaUMaBfaWMY63Cj1QUZ7UguLeSPymHlS+pVt3ZZfLDOnK37ITQkXmhdrPyoi OTtckOUqLw0a4op+C2HPeJz+HONQ0jYoe9HcY/2i4IcMg6opir6aXip0FeLkCCnHFhAc 9l2HMXy2i/N4MSkwZr9Kxw2DN6g5V6mV+xFwGv6P+x3T39tIEKKE7arv0AsPxo98i5Nl w9UA== 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=iIwHBDGvC0dIGWjH3zTCGwf1IU61nUVVvv2lnD95fI4=; b=awLJ8CfRcO8nnrG2i9XryVjvZuBRXUC/nhPX4giZs8CSmw+Q7rOvagZ4JLjl1uh5jk lQpTx18bMokopHcnTkrbwJ3vGpxbPLW4SaB4yulX44lsobctvcWTmDKXzUPAYR4SCJuy xkupJtVjDasZJObtUGdvpxojSWkQYfytmj3+G0yiL47Jxmseov0h5ei1RTXeedffEDSO hAeDLD+z5HVzwYUkSDR5XaD7HpmITIcUydVEhdOMnFGUxtp91VtDHc+fbKq8gRHJk5mD P++GtqDq/Pg4/VFjyccPe8yv5dfIQaDG/psXv1hexzI/UO3tWKk5eEK4DRfP3HagS1TO PZQA== 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 v4si6193303ejq.17.2020.05.12.22.44.51; Tue, 12 May 2020 22:45:14 -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 S1728927AbgEMFn5 (ORCPT + 99 others); Wed, 13 May 2020 01:43:57 -0400 Received: from mga17.intel.com ([192.55.52.151]:48159 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729115AbgEMFnd (ORCPT ); Wed, 13 May 2020 01:43:33 -0400 IronPort-SDR: 4fJKdtudFdRHRzoUoC3J8GtK+Eh5ZX9D25+CHVWRnQWrsb0HhVyicfUKh1mhAKGz8HWr/PhT6b OoIREZth7ROA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2020 22:43:32 -0700 IronPort-SDR: KksgJznGzkDMibT49Fr8VyWlCesurpYtjJ7qodFoyLF1chbYieS7C2VZMIfoz4drdPbZq+8c80 lbmFIPEBcsSg== X-IronPort-AV: E=Sophos;i="5.73,386,1583222400"; d="scan'208";a="251670140" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2020 22:43:32 -0700 From: ira.weiny@intel.com To: linux-ext4@vger.kernel.org, Andreas Dilger , "Theodore Y. Ts'o" , Jan Kara 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 6/9] fs/ext4: Only change S_DAX on inode load Date: Tue, 12 May 2020 22:43:21 -0700 Message-Id: <20200513054324.2138483-7-ira.weiny@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200513054324.2138483-1-ira.weiny@intel.com> References: <20200513054324.2138483-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 To prevent complications with in memory inodes we only set S_DAX on inode load. FS_XFLAG_DAX can be changed at any time and S_DAX will change after inode eviction and reload. Add init bool to ext4_set_inode_flags() to indicate if the inode is being newly initialized. Assert that S_DAX is not set on an inode which is just being loaded. Signed-off-by: Ira Weiny --- Changes from RFC: Change J_ASSERT() to WARN_ON_ONCE() Fix bug which would clear S_DAX incorrectly --- fs/ext4/ext4.h | 2 +- fs/ext4/ialloc.c | 2 +- fs/ext4/inode.c | 13 ++++++++++--- fs/ext4/ioctl.c | 3 ++- fs/ext4/super.c | 4 ++-- fs/ext4/verity.c | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 1a3daf2d18ef..86a0994332ce 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2692,7 +2692,7 @@ extern int ext4_can_truncate(struct inode *inode); extern int ext4_truncate(struct inode *); extern int ext4_break_layouts(struct inode *); extern int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length); -extern void ext4_set_inode_flags(struct inode *); +extern void ext4_set_inode_flags(struct inode *, bool init); extern int ext4_alloc_da_blocks(struct inode *inode); extern void ext4_set_aops(struct inode *inode); extern int ext4_writepage_trans_blocks(struct inode *); diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 4b8c9a9bdf0c..7941c140723f 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -1116,7 +1116,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir, ei->i_block_group = group; ei->i_last_alloc_group = ~0; - ext4_set_inode_flags(inode); + ext4_set_inode_flags(inode, true); if (IS_DIRSYNC(inode)) ext4_handle_sync(handle); if (insert_inode_locked(inode) < 0) { diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d3a4c2ed7a1c..23e42a223235 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4419,11 +4419,13 @@ static bool ext4_should_enable_dax(struct inode *inode) return false; } -void ext4_set_inode_flags(struct inode *inode) +void ext4_set_inode_flags(struct inode *inode, bool init) { unsigned int flags = EXT4_I(inode)->i_flags; unsigned int new_fl = 0; + WARN_ON_ONCE(IS_DAX(inode) && init); + if (flags & EXT4_SYNC_FL) new_fl |= S_SYNC; if (flags & EXT4_APPEND_FL) @@ -4434,8 +4436,13 @@ void ext4_set_inode_flags(struct inode *inode) new_fl |= S_NOATIME; if (flags & EXT4_DIRSYNC_FL) new_fl |= S_DIRSYNC; - if (ext4_should_enable_dax(inode)) + + /* Because of the way inode_set_flags() works we must preserve S_DAX + * here if already set. */ + new_fl |= (inode->i_flags & S_DAX); + if (init && ext4_should_enable_dax(inode)) new_fl |= S_DAX; + if (flags & EXT4_ENCRYPT_FL) new_fl |= S_ENCRYPTED; if (flags & EXT4_CASEFOLD_FL) @@ -4649,7 +4656,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, * not initialized on a new filesystem. */ } ei->i_flags = le32_to_cpu(raw_inode->i_flags); - ext4_set_inode_flags(inode); + ext4_set_inode_flags(inode, true); inode->i_blocks = ext4_inode_blocks(raw_inode, ei); ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo); if (ext4_has_feature_64bit(sb)) diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 5813e5e73eab..145083e8cd1e 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -381,7 +381,8 @@ static int ext4_ioctl_setflags(struct inode *inode, ext4_clear_inode_flag(inode, i); } - ext4_set_inode_flags(inode); + ext4_set_inode_flags(inode, false); + inode->i_ctime = current_time(inode); err = ext4_mark_iloc_dirty(handle, inode, &iloc); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index d0434b513919..5ec900fdf73c 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1344,7 +1344,7 @@ static int ext4_set_context(struct inode *inode, const void *ctx, size_t len, ext4_set_inode_flag(inode, EXT4_INODE_ENCRYPT); ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); - ext4_set_inode_flags(inode); + ext4_set_inode_flags(inode, false); } return res; } @@ -1367,7 +1367,7 @@ static int ext4_set_context(struct inode *inode, const void *ctx, size_t len, ctx, len, 0); if (!res) { ext4_set_inode_flag(inode, EXT4_INODE_ENCRYPT); - ext4_set_inode_flags(inode); + ext4_set_inode_flags(inode, false); res = ext4_mark_inode_dirty(handle, inode); if (res) EXT4_ERROR_INODE(inode, "Failed to mark inode dirty"); diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c index f05a09fb2ae4..89a155ece323 100644 --- a/fs/ext4/verity.c +++ b/fs/ext4/verity.c @@ -244,7 +244,7 @@ static int ext4_end_enable_verity(struct file *filp, const void *desc, if (err) goto out_stop; ext4_set_inode_flag(inode, EXT4_INODE_VERITY); - ext4_set_inode_flags(inode); + ext4_set_inode_flags(inode, false); err = ext4_mark_iloc_dirty(handle, inode, &iloc); } out_stop: -- 2.25.1