From patchwork Mon Apr 24 15:11:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13222304 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91F57C7EE22 for ; Mon, 24 Apr 2023 15:11:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54C556B007E; Mon, 24 Apr 2023 11:11:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4FAA56B0080; Mon, 24 Apr 2023 11:11:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34EDE6B0081; Mon, 24 Apr 2023 11:11:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2114C6B007E for ; Mon, 24 Apr 2023 11:11:15 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D612B140255 for ; Mon, 24 Apr 2023 15:11:14 +0000 (UTC) X-FDA: 80716622868.24.F5A67E3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 0C0B314000B for ; Mon, 24 Apr 2023 15:11:12 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=RCcnsNKq; spf=pass (imf09.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682349073; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Kbo9ZNiAf7/tMT1LpoE5F98CTclJG4BltSH6n6+BASw=; b=svrKsQgAiKmqF3KjaxB+RWQtU4ZFRpFvTKauuHKtmfAtF8XuSvZEzKSnV+ulcPqaLvV18x w7+uYqnyhb+1P3tjMYjlsjhwF3FMvmppD7TzPJa/hElU/ulzeZ8fLx+qaKV6wu9Hh5qew8 dO+eEytOeaEA1cOSLbf77V7X7a9l3+s= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=RCcnsNKq; spf=pass (imf09.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682349073; a=rsa-sha256; cv=none; b=Nlh3kHn/98khHUOCtPGB5mCyEdRVQLLRMbc09ONFW6yUzfCt4QvRuAZhAvR6nAi648EZsp IKCXfeFaCaymVGY8F18OgN821wTY/B1OnlbniNM3SISypwK9UUimyVRNsqctImpeYraWSh jETfu3Z+x84o3DShvtVJazNbTWo5SSY= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 17ADB60F04; Mon, 24 Apr 2023 15:11:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39C69C4339C; Mon, 24 Apr 2023 15:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682349071; bh=LE5Eh9ovFKUm6KJZ5P5kcewXFLQQROg06eiUbScjjvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RCcnsNKq9Vn2vd/wl6VSl9MN7DxhyK8G1mY+jWZnjnryRrlkS0rhMKHuTSC3ri9t9 GQxDuTIz2MuB+V5MI3ipC9bH4+AGx2c73mWtBY3yRK/GVGUEa2PmUYLaTTj2lMw8SG j0jPJBWLWSDPqmUE3BOP/x7uSu+VcN1L+3xK3hRWQFrWYmXXhh3+oKPNOZKZLVgTIo xK2gVP60nWvtSHf9lcm4va0zxcLYoEm5MFZwe4cIDhVmMyyB85kQTwC+G9afH/AbHc PgGqDaBcW/XRkDUMVrLtsb2JXP2GhN+Gy7p1oLA2GH4Po1aVbgKCOcPtBY1C2nQ/nO C5bqLSvFz9HtQ== From: Jeff Layton To: Alexander Viro , Christian Brauner , "Darrick J. Wong" , Hugh Dickins , Andrew Morton , Dave Chinner , Chuck Lever Cc: Jan Kara , Amir Goldstein , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org Subject: [PATCH v2 2/3] shmem: mark for high-res timestamps on next update after getattr Date: Mon, 24 Apr 2023 11:11:03 -0400 Message-Id: <20230424151104.175456-3-jlayton@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230424151104.175456-1-jlayton@kernel.org> References: <20230424151104.175456-1-jlayton@kernel.org> MIME-Version: 1.0 X-Stat-Signature: 9c6p6o7sh76ouskn7mk9wuh7hqmrbxw3 X-Rspam-User: X-Rspamd-Queue-Id: 0C0B314000B X-Rspamd-Server: rspam06 X-HE-Tag: 1682349072-421697 X-HE-Meta: U2FsdGVkX1/5u3xWgqzZwhslZE0lHzVKg0/s5exxEOaMZNo/2aJqjC+qfsxy1mhl+bg57kNRNIg7Sx4pq6z/+TgAtdcl2+a6t5lgMnZ09bqp23/X7ZrtNmgKlXdy/URINOAG8No0k8531gVhCfO8GndjvrtfXdXYZwL0Iqily2XPr6TOIsL0DxNmg3iGAvWPgfqRseS1yJFVs2YUmaCVzKW53WR5RW55DnoWgdbmgZepcwDRE76c85DenFYO60JOqjFV8jP/8GNbUeFGC1nypqLBn3CfWWaPQUAspFp2mXCqhhcgJCRyN1xavowe0ZwfIBXmRZGdZGg4zqsNXvPL3FFY27Q4ZEW+ifmO2wTZHdzx2c4b1v0SOrV3OW8HqxqZvor50sIzkNAux+JiYynISzBCJ/rfUDS+8SIPDLPdSe0cg3Kli23OOyagGHDCOvdu8vw3MKNBa52R2oTVHeshtthc/dX53qJjUgr3d/G58BBUrUOEksyJRdoJjgXfl7YLF2t+dj85TFghIJzpCRPTTivRiUhvc34os0N99dj1t3skRbK1iSLsOgKUa+JOoUpofpA0h/P0fYcj+JnUQUrjx9jAzHjdKj8ekxXycIov8fOKwC6rXg/sf7kk+j6grdgw39S0/xHiKVzy1lQ49O6qJK7x/188zLFAX3ehNzstLawe+k3yvekFr211RrTOIx0od43O8aqJzKDzFzuhDtuhdJUfvIp/ySxIg4cjjGBujYE0Yn7UE+tSst96I8LgK5you0UYT7P4qESp+yQu3cNrfEuG/Sdb4SptyJnE0cy0rp7Hu/lVskdyQz1JO67Fpvvkn4bXsiRPH1DxvkPpK5RIzX1R7b5j5b3RyJJg3a0BY4kd0fQ8kM5205Dtw50a55b009zrXb+ezPsKUTq+70KpAP6VkyzUrHOMEcs+roZyiluJ88CrC0EvWB0pYPJfJO5MYsb/rUuJIlhiE3LFNst LRn2xDqu VTtO2sSMyoNwRWVHb9K7a0I8CdOisSP4iygKMkGMYpkQN/CwGA9fKxT19rwrtWojlMYLCojciJt4vFcXEPIzUS4WADrXte3vc7cCPnsvKDRre1M1OLpwP+wVUPfmCk4X4IpQeQjL/EQJvVpwxKyeh4EXMpbjVw1gn2yZ/m0MKxwPuOVZOhUoaBTFCQcvG7uW7jgpHGl3c3vqD3Wofkx9FKwgbxq5sT7G/huS/HYvH8wlIGWtzR9CMLrByXYk+CtN/s7A9Y64W3EyAHYQQbuTisPUofsAlmxwAF3yqchmrwwWVLx8bDmRGP1/dSSUt7ELJaGBXHXRA1ETHCZcPMnTVBl+AoQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Change the s_time_gran for tmpfs to 2, to make it eligible to use the low order bit as a flag. Switch to the current_ctime helper instead of current_time. Signed-off-by: Jeff Layton --- mm/shmem.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 448f393d8ab2..497ffa29d172 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1039,7 +1039,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend) { shmem_undo_range(inode, lstart, lend, false); - inode->i_ctime = inode->i_mtime = current_time(inode); + inode->i_ctime = inode->i_mtime = current_ctime(inode); inode_inc_iversion(inode); } EXPORT_SYMBOL_GPL(shmem_truncate_range); @@ -1070,6 +1070,11 @@ static int shmem_getattr(struct mnt_idmap *idmap, if (shmem_is_huge(inode, 0, false, NULL, 0)) stat->blksize = HPAGE_PMD_SIZE; + if (request_mask & (STATX_CTIME|STATX_MTIME)) + generic_fill_multigrain_cmtime(inode, stat); + else + stat->result_mask &= ~(STATX_CTIME|STATX_MTIME); + if (request_mask & STATX_BTIME) { stat->result_mask |= STATX_BTIME; stat->btime.tv_sec = info->i_crtime.tv_sec; @@ -1136,7 +1141,7 @@ static int shmem_setattr(struct mnt_idmap *idmap, if (attr->ia_valid & ATTR_MODE) error = posix_acl_chmod(idmap, dentry, inode->i_mode); if (!error && update_ctime) { - inode->i_ctime = current_time(inode); + inode->i_ctime = current_ctime(inode); if (update_mtime) inode->i_mtime = inode->i_ctime; inode_inc_iversion(inode); @@ -2361,7 +2366,7 @@ static struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block inode->i_ino = ino; inode_init_owner(idmap, inode, dir, mode); inode->i_blocks = 0; - inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_atime = inode->i_mtime = inode->i_ctime = current_ctime(inode); inode->i_generation = get_random_u32(); info = SHMEM_I(inode); memset(info, 0, (char *)inode - (char *)info); @@ -2940,7 +2945,7 @@ shmem_mknod(struct mnt_idmap *idmap, struct inode *dir, error = 0; dir->i_size += BOGO_DIRENT_SIZE; - dir->i_ctime = dir->i_mtime = current_time(dir); + dir->i_ctime = dir->i_mtime = current_ctime(dir); inode_inc_iversion(dir); d_instantiate(dentry, inode); dget(dentry); /* Extra count - pin the dentry in core */ @@ -3016,7 +3021,7 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr } dir->i_size += BOGO_DIRENT_SIZE; - inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode); + inode->i_ctime = dir->i_ctime = dir->i_mtime = current_ctime(inode); inode_inc_iversion(dir); inc_nlink(inode); ihold(inode); /* New dentry reference */ @@ -3034,7 +3039,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry) shmem_free_inode(inode->i_sb); dir->i_size -= BOGO_DIRENT_SIZE; - inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode); + inode->i_ctime = dir->i_ctime = dir->i_mtime = current_ctime(inode); inode_inc_iversion(dir); drop_nlink(inode); dput(dentry); /* Undo the count from "create" - this does all the work */ @@ -3124,7 +3129,7 @@ static int shmem_rename2(struct mnt_idmap *idmap, new_dir->i_size += BOGO_DIRENT_SIZE; old_dir->i_ctime = old_dir->i_mtime = new_dir->i_ctime = new_dir->i_mtime = - inode->i_ctime = current_time(old_dir); + inode->i_ctime = current_ctime(old_dir); inode_inc_iversion(old_dir); inode_inc_iversion(new_dir); return 0; @@ -3178,7 +3183,7 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir, folio_put(folio); } dir->i_size += BOGO_DIRENT_SIZE; - dir->i_ctime = dir->i_mtime = current_time(dir); + dir->i_ctime = dir->i_mtime = current_ctime(dir); inode_inc_iversion(dir); d_instantiate(dentry, inode); dget(dentry); @@ -3250,7 +3255,7 @@ static int shmem_fileattr_set(struct mnt_idmap *idmap, (fa->flags & SHMEM_FL_USER_MODIFIABLE); shmem_set_inode_flags(inode, info->fsflags); - inode->i_ctime = current_time(inode); + inode->i_ctime = current_ctime(inode); inode_inc_iversion(inode); return 0; } @@ -3320,7 +3325,7 @@ static int shmem_xattr_handler_set(const struct xattr_handler *handler, name = xattr_full_name(handler, name); err = simple_xattr_set(&info->xattrs, name, value, size, flags, NULL); if (!err) { - inode->i_ctime = current_time(inode); + inode->i_ctime = current_ctime(inode); inode_inc_iversion(inode); } return err; @@ -3786,7 +3791,7 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_flags |= SB_NOUSER; } sb->s_export_op = &shmem_export_ops; - sb->s_flags |= SB_NOSEC | SB_I_VERSION; + sb->s_flags |= SB_NOSEC | SB_I_VERSION | SB_MULTIGRAIN_TS; #else sb->s_flags |= SB_NOUSER; #endif @@ -3816,7 +3821,7 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_blocksize_bits = PAGE_SHIFT; sb->s_magic = TMPFS_MAGIC; sb->s_op = &shmem_ops; - sb->s_time_gran = 1; + sb->s_time_gran = 2; #ifdef CONFIG_TMPFS_XATTR sb->s_xattr = shmem_xattr_handlers; #endif