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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00A07C3DA45 for ; Thu, 11 Jul 2024 19:14:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 730D16B008C; Thu, 11 Jul 2024 15:14:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E1016B0092; Thu, 11 Jul 2024 15:14:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A88A6B0095; Thu, 11 Jul 2024 15:14:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3CC9A6B008C for ; Thu, 11 Jul 2024 15:14:39 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DF3941C11B3 for ; Thu, 11 Jul 2024 19:14:38 +0000 (UTC) X-FDA: 82328423436.26.FCDEC2C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id 3006F4001D for ; Thu, 11 Jul 2024 19:14:37 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jscyT2Cd; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720725252; a=rsa-sha256; cv=none; b=rKhoshb7QV1Hj8Mw7gnPbvA5wvPnf/uor+nqy/cCtQWsdEn9HZYW3dah2rycCEUQ+SpL22 Z13v48L2tZwuW+A+UITtbyDEMOepMIlJL+CV3A5miRCEUNMe6P+mOE2Vj2xjnfaAJ+etUh /EpuzvLwMth/Bvxbe/0mqh+W3gC5WdU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jscyT2Cd; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720725252; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=o6JVUgZxfTNSbU8DbuGevibydhqBk8jPrLvCZwnS9ac=; b=new2dqn7zqdB3FPU9ZPyjEl6dAADWxyyriXsKAT6n8gMIsKdHuILzQE1cXCfPArJT8FYhR 68HbNk2uXSZy/A5o5Qd5h2ia6kwcq66KsJM0lsEUobo0SOl1UYjeQhKHWT40/7J91MgopR rvElpcB1CqYsPURnWJwrjdRDwp60LrM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 015B661DE5; Thu, 11 Jul 2024 19:14:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D8AAC116B1; Thu, 11 Jul 2024 19:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720725275; bh=k/OHcGq3qy9i4BOpijhg3Eu+RQkPhrOuSU3W+B0FQDs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jscyT2CdSjxLa9j+k2JK95F6KykwH3G9DAE6wlbdLdQy/i7Oa4QpQzPBdPfxhXmga 7K3/vDracPX0CcC2CeEscVT3rcqfVVhlOoz8zviplLQ/0LvQtmRC3C483RTwQA3Qae swtQPAFSJ8nlMcsh/geDSWJFpzUyGcQTzaOQcQcr1yRzcab6mdiF6AiogmLuqyK4rq wCz0n/tB+egXpZwbfeA3lyCjlvzcd7Ph58VIUv8YhlrmfzKPralGiY6DvYTrLUqE+b qTdRD1QDO7g4WnfpIsNqFel5fjv3btW7iAZX2fPVVVmASe2ol0/OFrJru697Oh+osu +aDp1jhscnIhw== Date: Thu, 11 Jul 2024 12:14:35 -0700 From: "Darrick J. Wong" To: Jeff Layton Cc: Alexander Viro , Christian Brauner , Jan Kara , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Chandan Babu R , Theodore Ts'o , Andreas Dilger , Chris Mason , Josef Bacik , David Sterba , Hugh Dickins , Andrew Morton , Jonathan Corbet , Dave Chinner , Andi Kleen , Christoph Hellwig , Uros Bizjak , Kent Overstreet , Arnd Bergmann , Randy Dunlap , kernel-team@fb.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-doc@vger.kernel.org Subject: Re: [PATCH v5 6/9] xfs: switch to multigrain timestamps Message-ID: <20240711191435.GV1998502@frogsfrogsfrogs> References: <20240711-mgtime-v5-0-37bb5b465feb@kernel.org> <20240711-mgtime-v5-6-37bb5b465feb@kernel.org> <20240711150920.GU1998502@frogsfrogsfrogs> <95a135dcec10423b9bcb9f53a1420d80b4afdba7.camel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <95a135dcec10423b9bcb9f53a1420d80b4afdba7.camel@kernel.org> X-Rspamd-Queue-Id: 3006F4001D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 5ewotxxoadgjhb6emts5yd6etu5xodi3 X-HE-Tag: 1720725276-445473 X-HE-Meta: U2FsdGVkX19BL1mmVowN9mTItUKsADfTPYGTWURH1t+EyQBtPmlusnmzJ4HXaDXn7mapddtbEKfvHgCZtz499lfkKa1LWBix1c6ZG5ZGjrUYPv9MGojX5eyMw/zy+vn81K57G7TM8t81TR1v/qo2+kMLGxeBg5Nxw2kQCKUjLebgxhzslLnTYFdSDcnZmLzx2QLEhP0rRIFM77sHyXbU138kmwfgqm1ROoZFCxcskC3DinGz3ZqLios7BWLX4a1aldexfVKTzvAnuOqjF8Ajs/w7/jn8k7ovv+3DNAuw2z//7GHfuLGYZ8+wHqKjMy2P1OIkgpxCHnsYPEk9VWXmCFN0n54ec/C4xpLKzMfHaP29LkqDp7qsGY2v/FFtgkAE5MNDV/XPj7NfBi60rKMc2lt9crZ1bdelPKdXv5qfDI1eNw6F6eFWG/PibtgGl0rCZV0mQPM18/h2RRAIvFskwWCX36FLnfatn2UvuhVlwizCvf9Es9j9l2GhniKVb9QiTWQywzNCeyyk7jZmou+MIGnle9FWZH6/oaXxAPiVvKxrmBZ8DinFIPFvbx2Fkpc0685F918+tdaFERCl7H2zNQd1WwQ/GKQvFouLCG3Y9kU09fSFnVZFeMTHlypdoZLMbXim1/MFws/x2eoS95D+nXnmyd3VkywGCgpcIuLHBbSG86m4WPU7T/C8n37S9IBqAdf4CCgoNeeVoyAr/i0jskTYq5RyjeW2hVQKCJUrpCX+JySOTtlfuASEKvpezkHsS40LbjkFtoKJx1LoRF2//5YAJZ6iBmX00Tv1MVQvYw8e16hic0rSHYrH6H6kLnNxTUJv7ohNCBR2+h/EOuLksxdPZDCHsvA+Mr/68cEXqKRNK6tbY0ObwsZus+/gN6x2vb0VghfVqvEMKZj+Ei9elPSSSxcdjzEL5IodCnzB6nhUtaAMe1AbiMNjcFIWPShQ+t0DblXbV6BgkE/nEj3 xaTGeQi1 yXTUweaPNzrSA5v+uAcDTwyNf/ZBIpnFRT9jXD5Wv9ndBFaWQhRg8zRdJMv4umCUUJqo/kOHBmz9tF2ldOf/HBT+jAwnbxnZKMx6xnG6xivjS2jGWbk97Lr0W3xTz2RIAjwaFw+6dvOL4wrfH1WryvxWUKZb/IyITsfId7q+17SrLGUkXqDR72unvLo2f/pdUIckp5NDRv4WC4NuggXWvYc+8z0OaQ3o340+I14/bkJemBzU6vSvGVdNlSJ9X0LoSTjad9vQhO0HXMfeChpP6hEfeAYx4Pviilg+QsG5grSXsjWg30iNZeg/z6g== 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: List-Subscribe: List-Unsubscribe: On Thu, Jul 11, 2024 at 11:58:59AM -0400, Jeff Layton wrote: > On Thu, 2024-07-11 at 08:09 -0700, Darrick J. Wong wrote: > > On Thu, Jul 11, 2024 at 07:08:10AM -0400, Jeff Layton wrote: > > > Enable multigrain timestamps, which should ensure that there is an > > > apparent change to the timestamp whenever it has been written after > > > being actively observed via getattr. > > > > > > Also, anytime the mtime changes, the ctime must also change, and those > > > are now the only two options for xfs_trans_ichgtime. Have that function > > > unconditionally bump the ctime, and ASSERT that XFS_ICHGTIME_CHG is > > > always set. > > > > > > Finally, stop setting STATX_CHANGE_COOKIE in getattr, since the ctime > > > should give us better semantics now. > > > > Following up on "As long as the fs isn't touching i_ctime_nsec directly, > > you shouldn't need to worry about this" from: > > https://lore.kernel.org/linux-xfs/cae5c28f172ac57b7eaaa98a00b23f342f01ba64.camel@kernel.org/ > > > > xfs /does/ touch i_ctime_nsec directly when it's writing inodes to disk. > > From xfs_inode_to_disk, see: > > > > to->di_ctime = xfs_inode_to_disk_ts(ip, inode_get_ctime(inode)); > > > > AFAICT, inode_get_ctime itself remains unchanged, and still returns > > inode->__i_ctime, right?  In which case it's returning a raw timespec64, > > which can include the QUERIED flag in tv_nsec, right? > > > > No, in the first patch in the series, inode_get_ctime becomes this: > > #define I_CTIME_QUERIED ((u32)BIT(31)) > > static inline time64_t inode_get_ctime_sec(const struct inode *inode) > { > return inode->i_ctime_sec; > } > > static inline long inode_get_ctime_nsec(const struct inode *inode) > { > return inode->i_ctime_nsec & ~I_CTIME_QUERIED; > } > > static inline struct timespec64 inode_get_ctime(const struct inode *inode) > { > struct timespec64 ts = { .tv_sec = inode_get_ctime_sec(inode), > .tv_nsec = inode_get_ctime_nsec(inode) }; > > return ts; > } Doh! I forgot that this has already been soaking in the vfs tree: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/include/linux/fs.h?h=next-20240711&id=3aa63a569c64e708df547a8913c84e64a06e7853 > ...which should ensure that you never store the QUERIED bit. So yep, we're fine here. Sorry about the noise; this was the very subtle clue in the diff that the change had already been applied: static inline struct timespec64 inode_get_ctime(const struct inode *inode) @@ -1626,13 +1637,7 @@ static inline struct timespec64 inode_get_ctime(const struct inode *inode) return ts; } (Doh doh doh doh doh...) > > Now let's look at the consumer: > > > > static inline xfs_timestamp_t > > xfs_inode_to_disk_ts( > > struct xfs_inode *ip, > > const struct timespec64 tv) > > { > > struct xfs_legacy_timestamp *lts; > > xfs_timestamp_t ts; > > > > if (xfs_inode_has_bigtime(ip)) > > return cpu_to_be64(xfs_inode_encode_bigtime(tv)); > > > > lts = (struct xfs_legacy_timestamp *)&ts; > > lts->t_sec = cpu_to_be32(tv.tv_sec); > > lts->t_nsec = cpu_to_be32(tv.tv_nsec); > > > > return ts; > > } > > > > For the !bigtime case (aka before we added y2038 support) the queried > > flag gets encoded into the tv_nsec field since xfs doesn't filter the > > queried flag. > > > > For the bigtime case, the timespec is turned into an absolute nsec count > > since the xfs epoch (which is the minimum timestamp possible under the > > old encoding scheme): > > > > static inline uint64_t xfs_inode_encode_bigtime(struct timespec64 tv) > > { > > return xfs_unix_to_bigtime(tv.tv_sec) * NSEC_PER_SEC + tv.tv_nsec; > > } > > > > Here we'd also be mixing in the QUERIED flag, only now we've encoded a > > time that's a second in the future.  I think the solution is to add a: > > > > static inline struct timespec64 > > inode_peek_ctime(const struct inode *inode) > > { > > return (struct timespec64){ > > .tv_sec = inode->__i_ctime.tv_sec, > > .tv_nsec = inode->__i_ctime.tv_nsec & ~I_CTIME_QUERIED, > > }; > > } > > > > similar to what inode_peek_iversion does for iversion; and then > > xfs_inode_to_disk can do: > > > > to->di_ctime = xfs_inode_to_disk_ts(ip, inode_peek_ctime(inode)); > > > > which would prevent I_CTIME_QUERIED from going out to disk. > > > > At load time, xfs_inode_from_disk uses inode_set_ctime_to_ts so I think > > xfs won't accidentally introduce QUERIED when it's loading an inode from > > disk. > > > > > > Also already done in this patchset: > > struct timespec64 inode_set_ctime_to_ts(struct inode *inode, struct timespec64 ts) > { > inode->i_ctime_sec = ts.tv_sec; > inode->i_ctime_nsec = ts.tv_nsec & ~I_CTIME_QUERIED; > trace_inode_set_ctime_to_ts(inode, &ts); > return ts; > } > EXPORT_SYMBOL(inode_set_ctime_to_ts); > > Basically, we never want to store or fetch the QUERIED flag from disk, > and since it's in an unused bit, we can just universally mask it off > when dealing with "external" users of it. > > One caveat -- I am using the sign bit for the QUERIED flag, so I'm > assuming that no one should ever pass inode_set_ctime_to_ts a negative > tv_nsec value. > > Maybe I should add a WARN_ON_ONCE here to check for that? It seems > nonsensical, but you never know... Well in theory filesystems should validate incoming timestamps and reject tv_nsec with the high bit set, but I'd bet there's a filesystem out there that allows negative nanoseconds, even if the kernel will never pass it such a thing. ;) > > > Signed-off-by: Jeff Layton > > > --- > > >  fs/xfs/libxfs/xfs_trans_inode.c |  6 +++--- > > >  fs/xfs/xfs_iops.c               | 10 +++------- > > >  fs/xfs/xfs_super.c              |  2 +- > > >  3 files changed, 7 insertions(+), 11 deletions(-) > > > > > > diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c > > > index 69fc5b981352..1f3639bbf5f0 100644 > > > --- a/fs/xfs/libxfs/xfs_trans_inode.c > > > +++ b/fs/xfs/libxfs/xfs_trans_inode.c > > > @@ -62,12 +62,12 @@ xfs_trans_ichgtime( > > >   ASSERT(tp); > > >   xfs_assert_ilocked(ip, XFS_ILOCK_EXCL); > > >   > > > - tv = current_time(inode); > > > + /* If the mtime changes, then ctime must also change */ > > > + ASSERT(flags & XFS_ICHGTIME_CHG); > > >   > > > + tv = inode_set_ctime_current(inode); > > >   if (flags & XFS_ICHGTIME_MOD) > > >   inode_set_mtime_to_ts(inode, tv); > > > - if (flags & XFS_ICHGTIME_CHG) > > > - inode_set_ctime_to_ts(inode, tv); > > >   if (flags & XFS_ICHGTIME_CREATE) > > >   ip->i_crtime = tv; And as I mentioned elsewhere in this thread, 6.11 contains a change to make it so that xfs_trans_ichgtime can set the access time. That breaks the old assertion that XFS_ICHGTIME_CHG is always set, but I think we can work around that easily. if (flags & XFS_ICHGTIME_CHG) tv = inode_set_ctime_current(inode); else tv = current_time(inode); --D > > >  } > > > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > > > index a00dcbc77e12..d25872f818fa 100644 > > > --- a/fs/xfs/xfs_iops.c > > > +++ b/fs/xfs/xfs_iops.c > > > @@ -592,8 +592,9 @@ xfs_vn_getattr( > > >   stat->gid = vfsgid_into_kgid(vfsgid); > > >   stat->ino = ip->i_ino; > > >   stat->atime = inode_get_atime(inode); > > > - stat->mtime = inode_get_mtime(inode); > > > - stat->ctime = inode_get_ctime(inode); > > > + > > > + fill_mg_cmtime(stat, request_mask, inode); > > > + > > >   stat->blocks = XFS_FSB_TO_BB(mp, ip->i_nblocks + ip->i_delayed_blks); > > >   > > >   if (xfs_has_v3inodes(mp)) { > > > @@ -603,11 +604,6 @@ xfs_vn_getattr( > > >   } > > >   } > > >   > > > - if ((request_mask & STATX_CHANGE_COOKIE) && IS_I_VERSION(inode)) { > > > - stat->change_cookie = inode_query_iversion(inode); > > > - stat->result_mask |= STATX_CHANGE_COOKIE; > > > - } > > > - > > >   /* > > >   * Note: If you add another clause to set an attribute flag, please > > >   * update attributes_mask below. > > > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > > > index 27e9f749c4c7..210481b03fdb 100644 > > > --- a/fs/xfs/xfs_super.c > > > +++ b/fs/xfs/xfs_super.c > > > @@ -2052,7 +2052,7 @@ static struct file_system_type xfs_fs_type = { > > >   .init_fs_context = xfs_init_fs_context, > > >   .parameters = xfs_fs_parameters, > > >   .kill_sb = xfs_kill_sb, > > > - .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP, > > > + .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME, > > >  }; > > >  MODULE_ALIAS_FS("xfs"); > > >   > > > > > > -- > > > 2.45.2 > > > > > -- > Jeff Layton