From patchwork Tue Apr 11 14:37:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13207695 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 E027FC76196 for ; Tue, 11 Apr 2023 14:37:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB31C280001; Tue, 11 Apr 2023 10:37:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D627E28000C; Tue, 11 Apr 2023 10:37:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C039D280001; Tue, 11 Apr 2023 10:37:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A82B928000C for ; Tue, 11 Apr 2023 10:37:11 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 77DAF80DE7 for ; Tue, 11 Apr 2023 14:37:11 +0000 (UTC) X-FDA: 80669362662.06.72BB967 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf29.hostedemail.com (Postfix) with ESMTP id 2DA5212001E for ; Tue, 11 Apr 2023 14:37:08 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fzPI7v3S; spf=pass (imf29.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=1681223828; 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=YHYJ58zGg50V/rRl2bjqWR/GYgPheUUBpiJEBWpxlTQ=; b=RoZzBIYuJ42zn5bqX36rrwGXmML7WievpU35Z+9SCxMuIi+6SvawJiPaXoP0paBzICWIbY DGOMPZNP+SUSTD/rWGt/DINJwXFh/qHmKGlep2zQ46vloOlNv74qcg6Q5/iSoS3CEs1aIe tsnaKkosNMuRcWDdx2dqkpa6yMfsivU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fzPI7v3S; spf=pass (imf29.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=1681223828; a=rsa-sha256; cv=none; b=ByASHlFC3GZt3MUqEvj6UCX8lTt1tIQJjMy9VVvNvmb7PSeg2NIlKOMpWlmb/haA8tbMDo pEMxP+g2E3Tv8DPnPDAjPkl9b97hLBHjEDDMgyhGUD90aJBioOOrC2wWicNwLgJsrar5v0 AKBq0QyLishvkfmUBkY6ine7BCBkZYQ= 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 60B3F627AF; Tue, 11 Apr 2023 14:37:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7C8FC433EF; Tue, 11 Apr 2023 14:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681223826; bh=Awb6q4i/Q5m9mXXhrXc+BP9AQEQgndLooZSbj9YNpPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fzPI7v3S7qN/G08Aq6LYTNv0NKM9fu4g0hJuZR6XFHbF7ihRuAeDxXOaXuJOkOTVp Vk1rmLqrdQE0rlLC/CqOsDXA3rEJ9n0UM7RjrHyyKk3FVCDD25Qocp/JA7evtaJrhV fse4d3jnaSqKPSTcjkn8BOl1WiY49jRMMJhM7BkLjuN7pwpyoeLx2J1lcU37Hfc8DK mqhThaLYJP7Y8795gicp9jSzG+8qpuHu1agOLxRQt7yjqMcbNzujso+isKjTK0A89U SpipD7P5bfXbxPE0ogu3SQv3WdMP94X/44cbGZwZLuRJbwRL3WiXIL9dI8iJf00K76 cY2LycIOshb4A== From: Jeff Layton To: Alexander Viro , Christian Brauner , "Darrick J. Wong" , Hugh Dickins , Andrew Morton , Dave Chinner , Chuck Lever Cc: 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: [RFC PATCH 1/3][RESEND] fs: add infrastructure for opportunistic high-res ctime/mtime updates Date: Tue, 11 Apr 2023 10:37:00 -0400 Message-Id: <20230411143702.64495-2-jlayton@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411143702.64495-1-jlayton@kernel.org> References: <20230411143702.64495-1-jlayton@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2DA5212001E X-Stat-Signature: bfnk7brqtn8d753idjuqyy19ap3u5173 X-Rspam-User: X-HE-Tag: 1681223828-423608 X-HE-Meta: U2FsdGVkX180rbEyyA02ICyfh3eNwWxzgZd4ZcIow6g2JHQzSyPQb5fHK7E9qHEN3kKOap0BxuLbhyVGB2/1NGlNkfH83K/OwF8ZyUS30Edi5QQsYUbzmmciaMCCVJFUszN9/jfjXu5PR4auYjp/AHCcsI1p/cZ18IOzu4Sb5wijp1cLzLAlZOyPzyQGWxkzwunqjzzHqtA6/83LeYhDqiADGrwYlqs4lsZ3UYKwvPbm1AxTAAwocPcCEqwKMT3E0+Vy2/eTYpBp0e+2LXom+Bn+i38J+6astaF13QYvgOk78c5RFGNP9Gk2fB5LMbN8LKPcXqoqmeNg4FCeX5TazazkvKZeP7uo5up0iq7nK9HPGI6PahGr4zB0YIqQ5R5MbZLyajeVZA9IyEQ+z+s+G+JulfU2GYi+qS2iZ1ZR1Hhx46TAisw8Tvd/w03illfuDnbwoCpqcpNn5ZdR92ZVjr+bL3vfnK6KjUWbYFaj8It6G8drcOveXaKTGAxjkYNXsBKv1gOITWrbnjULDEq214KnsEG2rNjlKDDlRPqjK6vQRnLqJu2EnmlvqQABD6mqW9E2wNpRUaxzTOOoZj0R5qVsWRb3Oj6cQyu/hMWrhaJGcvqqbkLHlLD+BztuewsaT5rxYslKRBlH0nVxuy4V5C4sbUlg711ayNA3kHJpR8zg4dpTRYZyFQ7Ht6wj0tFeDypvgY5TrEauAuq2P5OwYr999GnDnjWqGbJYkjo2ffZSFzWPthOVG3PoQ7L5+iPsYnxgde2K8ammueQlTfYzL7RjU4jhPBVQ3tZovK9Y+3/NIiv8TbIO2kYa+NgqNhOhog1KeqJi+B6kwCMT5OfiFbIKP2BCxt2piy3b1KyO5hap4SVPMyzz59U8KqSvtHYA4SRIDUduUiN3xUrXWQk2x58RSO0qbFJk08cYnIdR2UE//wdNxbYS5VNociPqKBrJa2mtEPuqkDCWcMMFbeI BU4/6TFj saEid5YqUKET4irVNZySV2SlrElsH1l75+R1HVFNSodgCj4lwjJYix/Jy3Wq7+0r4KnI88vKVY7ChqBpYXTCUrRE6mg+K/yb0oc9HQ2z+gtu/Wr6j9b4U/ngd8IG6CxjhxC6ejEdKPpeSBNf3pBidrzqu1v+mX0M+CT+DWtC2CTox4IabC9SEuJHyJNhDScUmuJo5TYcJ245Lypxb6hdBJ/NKIDTv+UIYewSV9nS0zdQvmDfe2fXlVaj6WTFAJL5wck+jphbsFl+qWwpZM6Ue4IM10qYmoLUaN+KpbO4eVwPe1dGEPVXCw+Xwn+7sqpk7EQ6BrZ6yVNUBH9zWeBsunA6SL7LxKsZAQCcT0irkfs9UaMtdc15wu9/reApJWrj2KHH1duWOujEs3wecEPaSHNniXWgnX3ktMw8Q 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: The VFS always uses coarse-grained timestamp updates for filling out the ctime and mtime after a change. This has the benefit of allowing filesystems to optimize away metadata updates. Unfortunately, this has always been an issue when we're exporting via NFSv3, which relies on timestamps to validate caches. Even with NFSv4, a lot of exported filesystems don't properly support a change attribute and are subject to the same problem of timestamp granularity. Other applications have similar issues (e.g backup applications). Switching to always using high resolution timestamps would improve the situation for NFS, but that becomes rather expensive, as we'd have to log a lot more metadata updates. This patch grabs a new i_state bit to use as a flag that filesystems can set in their getattr routine to indicate that the mtime or ctime was queried since it was last updated. It then adds a new current_cmtime function that acts like the current_time helper, but will conditionally grab high-res timestamps when the i_state flag is set in the inode. This allows NFS and other applications to reap the benefits of high-res ctime and mtime timestamps, but at a substantially lower cost than fetching them every time. Cc: Dave Chinner Signed-off-by: Jeff Layton --- fs/inode.c | 40 ++++++++++++++++++++++++++++++++++++++-- fs/stat.c | 10 ++++++++++ include/linux/fs.h | 5 ++++- 3 files changed, 52 insertions(+), 3 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 4558dc2f1355..3630f67fd042 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2062,6 +2062,42 @@ static int __file_update_time(struct file *file, struct timespec64 *now, return ret; } +/** + * current_cmtime - Return FS time (possibly high-res) + * @inode: inode. + * + * Return the current time truncated to the time granularity supported by + * the fs, as suitable for a ctime or mtime change. If something recently + * fetched the ctime or mtime out of the inode via getattr, then get a + * high-resolution timestamp. + * + * Note that inode and inode->sb cannot be NULL. + * Otherwise, the function warns and returns coarse time without truncation. + */ +struct timespec64 current_cmtime(struct inode *inode) +{ + struct timespec64 now; + + if (unlikely(!inode->i_sb)) { + WARN(1, "%s() called with uninitialized super_block in the inode", __func__); + ktime_get_coarse_real_ts64(&now); + return now; + } + + /* Do a lockless check for the flag before taking the spinlock */ + if (READ_ONCE(inode->i_state) & I_CMTIME_QUERIED) { + ktime_get_real_ts64(&now); + spin_lock(&inode->i_lock); + inode->i_state &= ~I_CMTIME_QUERIED; + spin_unlock(&inode->i_lock); + } else { + ktime_get_coarse_real_ts64(&now); + } + + return timestamp_truncate(now, inode); +} +EXPORT_SYMBOL(current_cmtime); + /** * file_update_time - update mtime and ctime time * @file: file accessed @@ -2080,7 +2116,7 @@ int file_update_time(struct file *file) { int ret; struct inode *inode = file_inode(file); - struct timespec64 now = current_time(inode); + struct timespec64 now = current_cmtime(inode); ret = inode_needs_update_time(inode, &now); if (ret <= 0) @@ -2109,7 +2145,7 @@ static int file_modified_flags(struct file *file, int flags) { int ret; struct inode *inode = file_inode(file); - struct timespec64 now = current_time(inode); + struct timespec64 now = current_cmtime(inode); /* * Clear the security bits if the process is not being run by root. diff --git a/fs/stat.c b/fs/stat.c index 7c238da22ef0..d8b80a2e36b7 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -64,6 +64,16 @@ void generic_fillattr(struct mnt_idmap *idmap, struct inode *inode, } EXPORT_SYMBOL(generic_fillattr); +void fill_cmtime_and_mark(struct inode *inode, struct kstat *stat) +{ + spin_lock(&inode->i_lock); + inode->i_state |= I_CMTIME_QUERIED; + stat->ctime = inode->i_ctime; + stat->mtime = inode->i_mtime; + spin_unlock(&inode->i_lock); +} +EXPORT_SYMBOL(fill_cmtime_and_mark); + /** * generic_fill_statx_attr - Fill in the statx attributes from the inode flags * @inode: Inode to use as the source diff --git a/include/linux/fs.h b/include/linux/fs.h index c85916e9f7db..7dece4390979 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1457,7 +1457,8 @@ static inline bool fsuidgid_has_mapping(struct super_block *sb, kgid_has_mapping(fs_userns, kgid); } -extern struct timespec64 current_time(struct inode *inode); +struct timespec64 current_time(struct inode *inode); +struct timespec64 current_cmtime(struct inode *inode); /* * Snapshotting support. @@ -2116,6 +2117,7 @@ static inline void kiocb_clone(struct kiocb *kiocb, struct kiocb *kiocb_src, #define I_DONTCACHE (1 << 16) #define I_SYNC_QUEUED (1 << 17) #define I_PINNING_FSCACHE_WB (1 << 18) +#define I_CMTIME_QUERIED (1 << 19) #define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC) #define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES) @@ -2839,6 +2841,7 @@ extern int page_symlink(struct inode *inode, const char *symname, int len); extern const struct inode_operations page_symlink_inode_operations; extern void kfree_link(void *); void generic_fillattr(struct mnt_idmap *, struct inode *, struct kstat *); +void fill_cmtime_and_mark(struct inode *inode, struct kstat *stat); void generic_fill_statx_attr(struct inode *inode, struct kstat *stat); extern int vfs_getattr_nosec(const struct path *, struct kstat *, u32, unsigned int); extern int vfs_getattr(const struct path *, struct kstat *, u32, unsigned int); From patchwork Tue Apr 11 14:37:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13207694 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 EFB94C77B70 for ; Tue, 11 Apr 2023 14:37:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D06628000A; Tue, 11 Apr 2023 10:37:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 88041280001; Tue, 11 Apr 2023 10:37:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 748BC28000A; Tue, 11 Apr 2023 10:37:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 65B0F280001 for ; Tue, 11 Apr 2023 10:37:11 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 412E8160DE0 for ; Tue, 11 Apr 2023 14:37:11 +0000 (UTC) X-FDA: 80669362662.05.991FA1E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id 86336140019 for ; Tue, 11 Apr 2023 14:37:09 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lntjKiiq; spf=pass (imf26.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=1681223829; 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=cmsV/BNDrmF6zQdi+rsdgHY9rce/ydYxUGcPmL06UuA=; b=k4/qpr+3m58vfdGguNY8f4uuO0Rv47dpjuOmfnVXzXQOLP4YmmXq3YkOh+co3+xqFivqaO VPPOlVAF38h1I5lqVRLN0a90d8fY73wMbac33Ru1qlPBUi9+Weg11cjHk6gKLhLxc79K2+ PwIV5i9vmVI5rTepF1ZAa1+nXn8a7UE= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lntjKiiq; spf=pass (imf26.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=1681223829; a=rsa-sha256; cv=none; b=m/AYnJ+CfQ41sxLUI2ROQ72gnqQpnl7IpnYaRA/4eCfh621ONyKYJEZ74xO10OYpDVHYpS YnfYOfmZHptc3bidw9qE4/D5wp7GNhmMSgvjTpRyI+D9FFxsOaymUCXtENCLI8Op5naqve cnPbI+7KoHLNgfP+Y4AHdLrDmhRGB+s= 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 C150E627D3; Tue, 11 Apr 2023 14:37:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11462C433D2; Tue, 11 Apr 2023 14:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681223828; bh=0tABut1wgcVqOORC6SjkhEn9chzMnRxYPBvizenz41c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lntjKiiqZL6UbCt/BYubnJScSkK71phIse7M0U/lbZ0038OMjKxYZ86HeesTUNRiW 6on5MlC3P7XAYgkRSTqi+5y4jfRKmMERr9fmB5rmT2g2nxB1OyYiqsFg07Fbjp7SaJ pxLUkZoPVRLV3lesysLW9ycHuy2mc0iJ2vqpsCcvIgg6TVIJcEW9FYcPzyLsIz4Q0c t18Z5idZUpbhweCcB5aHNZP3jJl4/NXMWsMrQI7f2lvwoKivfceipbq+9TywahTo+i mqrgqNEYWK1vf+bEmSZSLnC3n2tgkSZpsbghL49bnexSbyv0nAYLmKmEwJYMUkmnew 3esCI9rV5pXUw== From: Jeff Layton To: Alexander Viro , Christian Brauner , "Darrick J. Wong" , Hugh Dickins , Andrew Morton , Dave Chinner , Chuck Lever Cc: 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: [RFC PATCH 2/3][RESEND] shmem: mark for high-res timestamps on next update after getattr Date: Tue, 11 Apr 2023 10:37:01 -0400 Message-Id: <20230411143702.64495-3-jlayton@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411143702.64495-1-jlayton@kernel.org> References: <20230411143702.64495-1-jlayton@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 86336140019 X-Rspam-User: X-Stat-Signature: wtt1oih34czffmea1kuceo7ihdtxedko X-HE-Tag: 1681223829-173648 X-HE-Meta: U2FsdGVkX1//i4Un1zEhxdPWL30icEEhC4G2pmq6sMeU+GEKzAfUvzmxgbHM0KmdeKu2pdLmJVLbrSd2ALie6ZNmod/MK9MKXn7SVCpXybXN5xuVX+Z6+G/aax60u/TkqsfOp7FJX+IzHB7ctKviY62GxfJ/42X50Pw9IRBsaRDL9NmzEkJ1f12vsbC3CNuA0+F9vd1pIHvZAJwhzBBpLZGO0831iS8YiKEtMzpkY8Dy3V+MnaysIcUKbi34bT9m7fup8DEiefpXVz/oa/PEBOkjWvTHPrt739tM7d+Nc5R4LP23u7oJImLn5WhuX//9bhQ0PWRuLeb+C4OJMMuCyaLzY7lkWCVqqpJ368RqrdiFPD2NG1FaPbVZ8JisNowhjaCLJ/A2N1SjJnTB3N0ItWKo5Bz3XT0P+QeostPrTkxKEQPJtts6/vw99AjOYcUINMP6XUNsbzpLYG/l1I9e4POGrpujgTpNe1UrR6uZWFzlIOZWH5IC7awThuuqyILywziiiFdzQ0PkFKaXsDAUat4SVSERJUSYcXho3ZxH/v6qZSJB1z0vduekPdtnCxGJwyxPPP7wSd/9XueW/OPtaFrEtJIFYQFyFENKoROXOOPhFqrpVqTfUOmsjy8gG+TW7oPhMhB2PiPdHqPo/mv9wCEkxxha5Txp4XqW98YHJ97S5jR1q9ZLMlffa9YruT4cl6nGHP8Tw4RP/CvzMe/BLA4CdE1f9rBcvJRHFVZu4OkoofNOsne13O03lt+2YeCXhreFHjPyn3D6MUecLB71mlrfqYWQBG9fuLcmKmPU/BU184EV+5SawbIfb0hL7ot6mkx+7P45+ztHZQpFT98n1csj//3bFBLHdxS6RsFBRPmYQKoThf1V36oRfZ2dsAjofLa+58PZDOtT+jCwAJ3tVaMVcmi9nfheL0yAAb4xxdfkhKnE8yxtkSYy0w/TdGtLM52+N4QHtBsQW4DeLPx HKo04CrI pKYaiI5fU0G2bRIveQaRYKsJlttOvL2mTd70CF/9F59xNGqfPTIBZb4c6kvuBzWP6hRdTwg0BHPnZFO4vn49+7HlwT+2IN3imMRM7l/O2w5q4NTMzQm+1iq3eXFHixAQLdLFcAUtgDNdFb49BqiJDmtVbbARLo+7vHR6yoCOE05P92zf9mbCe1KPT4QJSIT6ANQyOHm1bLFvy4G7SOJOXelKk4FTP+UUKAc7JWFM9kK38k0gU21AcnzwbBoHiJc4BeBdSDoTVq0ZQDKP3cBk2fbOywRPR4eCzLVWGcLMlJEyB32gEH9wFIZLZEiOYRp43wzW/7aEY8+++2pweCcX6pmy2BeuggZyIcqtP4c3kad9RDc8= 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: When the mtime or ctime is being queried via getattr, ensure that we mark the inode for a high-res timestamp update on the next pass. Also, switch to current_cmtime for other c/mtime updates. Signed-off-by: Jeff Layton --- mm/shmem.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 448f393d8ab2..75dd09492c36 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_cmtime(inode); inode_inc_iversion(inode); } EXPORT_SYMBOL_GPL(shmem_truncate_range); @@ -1065,7 +1065,10 @@ static int shmem_getattr(struct mnt_idmap *idmap, stat->attributes_mask |= (STATX_ATTR_APPEND | STATX_ATTR_IMMUTABLE | STATX_ATTR_NODUMP); + generic_fillattr(idmap, inode, stat); + if (request_mask & (STATX_CTIME|STATX_MTIME)) + fill_cmtime_and_mark(inode, stat); if (shmem_is_huge(inode, 0, false, NULL, 0)) stat->blksize = HPAGE_PMD_SIZE; @@ -1136,7 +1139,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_cmtime(inode); if (update_mtime) inode->i_mtime = inode->i_ctime; inode_inc_iversion(inode); @@ -2361,7 +2364,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_cmtime(inode); inode->i_generation = get_random_u32(); info = SHMEM_I(inode); memset(info, 0, (char *)inode - (char *)info); @@ -2940,7 +2943,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_cmtime(dir); inode_inc_iversion(dir); d_instantiate(dentry, inode); dget(dentry); /* Extra count - pin the dentry in core */ @@ -3016,7 +3019,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_cmtime(inode); inode_inc_iversion(dir); inc_nlink(inode); ihold(inode); /* New dentry reference */ @@ -3034,7 +3037,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_cmtime(inode); inode_inc_iversion(dir); drop_nlink(inode); dput(dentry); /* Undo the count from "create" - this does all the work */ @@ -3124,7 +3127,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_cmtime(old_dir); inode_inc_iversion(old_dir); inode_inc_iversion(new_dir); return 0; @@ -3178,7 +3181,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_cmtime(dir); inode_inc_iversion(dir); d_instantiate(dentry, inode); dget(dentry); @@ -3250,7 +3253,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_cmtime(inode); inode_inc_iversion(inode); return 0; } @@ -3320,7 +3323,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_cmtime(inode); inode_inc_iversion(inode); } return err; From patchwork Tue Apr 11 14:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13207696 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 EB8CFC77B70 for ; Tue, 11 Apr 2023 14:37:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C80F28000D; Tue, 11 Apr 2023 10:37:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39E5228000C; Tue, 11 Apr 2023 10:37:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21AED28000D; Tue, 11 Apr 2023 10:37:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1109828000C for ; Tue, 11 Apr 2023 10:37:13 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id ACA62C0DC0 for ; Tue, 11 Apr 2023 14:37:12 +0000 (UTC) X-FDA: 80669362704.14.54564AD Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id EEB64180008 for ; Tue, 11 Apr 2023 14:37:10 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cQNlku1p; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681223831; 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=VVCfke3ZCxYsghQLpATwfwjekyzkEVZd5h7+Voop3jo=; b=JOcsLsrdzJyvESvhE9rCp0ztDg2hnV4ZgIY81fBHpy66rEqaT22w4qd7l17SdYQqI1WYEe 3Cl5AR2lfp3NzbdbQdDugFZM7Ai4D7mfpu+d0nkbd0ybL8aBo31FWEWEKKcCtun8GhP+xK oyfXu53ZiznFBUXiAsuShyt3JOVPeHY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cQNlku1p; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681223831; a=rsa-sha256; cv=none; b=IW3vdfIx9pJCOCKVoHzkYJlj4UyH5Wiao1DRL2UdopRMci28o12puaXsrFu6D7eJPcXtOd /LdwGRaw9+YJoyxMaXyrEiqKuHaZwJ276Q3qbeu6ZI1GU4jzu6jMXvSkMdbAcjdK/txy0u hkGsAqwd89Xb7S+2x8d+Pu4KRoBLfOc= 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 283FF627A7; Tue, 11 Apr 2023 14:37:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EC48C4339B; Tue, 11 Apr 2023 14:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681223829; bh=6y1YeGPH/VDzbluu556WvHbrgod71MAnILEUbvu4oy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cQNlku1pazVGncUWRx6qcHm6ifnv8sATVSHRKxJ+yY9eE7eZUTJ1MvQPtsi6GmZQh CIci0d5QfRGC+dn021LTgnJrIA7miBSo+7bvIROxUDMGpstq9TFdp6YPoP8yCErw5J ANLVN5W6Vjyqz+/dCCiya7aeQLN4jsUaghqIvPNn8u8V+fAdJATUbb4O61i6xzbhDR gqaprupHoJDVo5yOrqqQmQgXPx9YlX1UqTDqn/8x+OhA73X/k5OLF2xQ0F9Mr54kwy nT8/LqdngILXsJDLLui6MLofTHvAepeYHJwEHQhFKE91V2z/utO5dt2Nj+T55loUBF lxvpzL8s6FpCA== From: Jeff Layton To: Alexander Viro , Christian Brauner , "Darrick J. Wong" , Hugh Dickins , Andrew Morton , Dave Chinner , Chuck Lever Cc: 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: [RFC PATCH 3/3][RESEND] xfs: mark the inode for high-res timestamp update in getattr Date: Tue, 11 Apr 2023 10:37:02 -0400 Message-Id: <20230411143702.64495-4-jlayton@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411143702.64495-1-jlayton@kernel.org> References: <20230411143702.64495-1-jlayton@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: EEB64180008 X-Stat-Signature: ka94aaqdkbhmcb33zcnixrcxxk98umg9 X-HE-Tag: 1681223830-838388 X-HE-Meta: U2FsdGVkX18VZVshKSpFsBpNVq7rnXHAbYFRHitO3cqQ+zMfACRjkXCzkzOw7vt4n6ZK2QJIFyAr9pi1/E5dQGbq8mFUkrb0IK7ObWBLJs3bKB3htnD/TYd/i7n43fFeK2hNK+kDNLnVqVcrh7qNu4UmjRuCbrIrXWDlrec4pKpMMZ7QpExx5Fhtz2Z54YoizNHUfYD7KDPHiq5bywIjwYKKwe0fY8L8BLcFijOvSB7m8/RKN2jTk8spf0Z7ZpugvBeofyJLfoPocv7Mn333rwXUJbw1YWKyPO/jes7+HsnXDsMdEN+ZIXoFUewmdxf8PomAhqeK0ZMRmWpIhgcLIryCVNmvYhe4mNT+b3dkKSxGnovGdSsHXh1uG3Wos1pWvqNOO3QK9vLta/Arh5OqefbhhVhkYkHpEvZ2prb/zLaiRnTJD4UL8XWJNq90nJ9tojxOpYeQmvitRkkTWaLzktCtKLilkeY6ynrbE2QbbPfZA/LbmQbCBWuPbjIYCozUS5ACVrj7w64aV4yxB5YPAVylPmGuIL41dne3bQlXh3/WR0dfCoIaWY6ceZEDGIWlpXJo0Cb4JzvyDYZHBTKLNLSk8ViV4H+tNvT8HRB00XRW9pDIfceyRRVMwVsZ5Won16YA0Edzcz7VE2EbGrRmfzW/x2/IKwqP3TGypmgGwzrIo3a3800hK9dyDDYTbEoIsTRMu3CIUQ28VqDOqJyBaJ7ji8bnh65IHSPuoWJ1b0Rn+axJjDLKd/9yCu3AYHZdO3DnHXDNBJCF1bKgIb891+TpgS19PVQInpBimVMU0V4IgKOPBU7cCvLdM2zVtybpDpWPbAK6g3k2B9vWGju9QIfuj/zmErw+gXQABEbnPRtMVsCEsbAZQQhTMlmvnYoukDL9v1xhytGmouRvhO5ki34KZDTSfGm4KKs2XzGooFo1VZfk+inPLaIIPMxbLkeOPzNm4xp3iItBMOrDVLn cvyy7mLP 2WKO24s9wn7mXV6ctrPY/Jk9Yp7AlIVpZUg3TXFsJJih10eNqNEpTtLIAdFYbevs2fDTUrWxiF7g/lcg0dtU3a1NatCr6ZRBRpdSr7h3Nmhgk715xi7BNLHQZl3ETzbdQivt+Nhz6PPwncipgWfcbdW2X7lzNG41Hir2UnoAsAF+95BjUaE4NVUsAQ5jmEZGSAPD++G7iVUBbOIzPIRMNU1/E5AaZ+d1Cx+QA/iIlP7Rbu0ddxrbVIDlcTGoSkSAjqwlZh9+UMYYdC9Jv2p7Go9eAIxX+nhjqOWeWlUMy5tagB1JMvz0Hly96P7EGqw56jFVisK8HyIHS2geVza7YXMCdtpDG+xAbYcoG 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: When the mtime or ctime is being queried via getattr, ensure that we mark the inode for a high-res timestamp update on the next pass. Also, switch to current_cmtime for other c/mtime updates. With this change, we're better off having the NFS server just ignore the i_version field and have it use the ctime instead, so clear the STATX_CHANGE_COOKIE flag in the result mask in ->getattr. Signed-off-by: Jeff Layton --- fs/xfs/libxfs/xfs_trans_inode.c | 2 +- fs/xfs/xfs_acl.c | 2 +- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_iops.c | 15 ++++++++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c index 8b5547073379..9ad7c229c617 100644 --- a/fs/xfs/libxfs/xfs_trans_inode.c +++ b/fs/xfs/libxfs/xfs_trans_inode.c @@ -63,7 +63,7 @@ xfs_trans_ichgtime( ASSERT(tp); ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); - tv = current_time(inode); + tv = current_cmtime(inode); if (flags & XFS_ICHGTIME_MOD) inode->i_mtime = tv; diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 791db7d9c849..461adc58cf8c 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -233,7 +233,7 @@ xfs_acl_set_mode( xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); inode->i_mode = mode; - inode->i_ctime = current_time(inode); + inode->i_ctime = current_cmtime(inode); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); if (xfs_has_wsync(mp)) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 5808abab786c..80f9d731e261 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -843,7 +843,7 @@ xfs_init_new_inode( ip->i_df.if_nextents = 0; ASSERT(ip->i_nblocks == 0); - tv = current_time(inode); + tv = current_cmtime(inode); inode->i_mtime = tv; inode->i_atime = tv; inode->i_ctime = tv; diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 24718adb3c16..a0b07f90e16c 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -565,6 +565,15 @@ xfs_vn_getattr( if (xfs_is_shutdown(mp)) return -EIO; + /* + * XFS uses the i_version infrastructure to track any change to + * the inode, including atime updates. This means that the i_version + * returned by getattr doesn't conform to what the callers expect. + * Clear it here so that nfsd will fake up a change cookie from the + * ctime instead. + */ + stat->result_mask &= ~STATX_CHANGE_COOKIE; + stat->size = XFS_ISIZE(ip); stat->dev = inode->i_sb->s_dev; stat->mode = inode->i_mode; @@ -573,8 +582,8 @@ xfs_vn_getattr( stat->gid = vfsgid_into_kgid(vfsgid); stat->ino = ip->i_ino; stat->atime = inode->i_atime; - stat->mtime = inode->i_mtime; - stat->ctime = inode->i_ctime; + if (request_mask & (STATX_CTIME|STATX_MTIME)) + fill_cmtime_and_mark(inode, stat); stat->blocks = XFS_FSB_TO_BB(mp, ip->i_nblocks + ip->i_delayed_blks); if (xfs_has_v3inodes(mp)) { @@ -917,7 +926,7 @@ xfs_setattr_size( if (newsize != oldsize && !(iattr->ia_valid & (ATTR_CTIME | ATTR_MTIME))) { iattr->ia_ctime = iattr->ia_mtime = - current_time(inode); + current_cmtime(inode); iattr->ia_valid |= ATTR_CTIME | ATTR_MTIME; }