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 1F970C001DB for ; Tue, 8 Aug 2023 09:25:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 506646B0071; Tue, 8 Aug 2023 05:25:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 48F5B8D0003; Tue, 8 Aug 2023 05:25:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E1998D0001; Tue, 8 Aug 2023 05:25:16 -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 183D56B0071 for ; Tue, 8 Aug 2023 05:25:16 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A80B21A0C93 for ; Tue, 8 Aug 2023 09:25:15 +0000 (UTC) X-FDA: 81100403790.11.5BA25DD Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf29.hostedemail.com (Postfix) with ESMTP id 8B64B120012 for ; Tue, 8 Aug 2023 09:25:13 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ix372cs3; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=nz47Gajx; spf=pass (imf29.hostedemail.com: domain of jack@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691486713; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1DEnEiKO284zxT4/+fvA4uuffbMofkDORo642+Wc/io=; b=CKIswxdn38hxRle4hkgh9FWZZuLAVwVp9UnxFOPvLSK4hBqnUmHmllay03qlfzQIUlylpw vUAppIOaY48E+yAJDsgTZdRZnBLSlknvldNzKsspUn2PIFBYqUQ9JU+bEs1eXMhxWYyo3d rBAK4ihcyLlaH1Fiy+duTr57YGn6Qgs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691486713; a=rsa-sha256; cv=none; b=G0eVjw+7f4Y8ONLop/Y+J84/3oXr5JKZceBQOfY99f3J5QjBz2GDtSJA6G0OT7dlM2838k 4T9Usiww0+RA81vN7B3Cw2WAR9bQhKgP8xBKR2jDHPLSw4XiXFTrPwIJq+HOrDwTiCsCUH aMeALRJ6iLDkPndBJ60sE7hdAXCm/CU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ix372cs3; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=nz47Gajx; spf=pass (imf29.hostedemail.com: domain of jack@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EE16022481; Tue, 8 Aug 2023 09:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1691486712; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1DEnEiKO284zxT4/+fvA4uuffbMofkDORo642+Wc/io=; b=ix372cs3mbIkTWg1MsYpwEmHKxymfpU2fRqMoB3bdsY5L5+d88wTzMILXUNjN2Hey8brqp /zdSMsRPF0pQ9mO8VTms56EAKaxrkXcWWBEAdzVrBPrId8dDBBUjH8L2jH5yiaPdY8XiST M7jwu5Zs1qGSi0jn9fW7GgGyREZQvck= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1691486712; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1DEnEiKO284zxT4/+fvA4uuffbMofkDORo642+Wc/io=; b=nz47GajxRXd1Kr3p+NB1XcBjrQKYlyuj0q3UvQcQR7hQOVOIMR3ZkrS9KehXlRYW0RhdS3 rOQzce0ROF9jIWAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D531F13451; Tue, 8 Aug 2023 09:25:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SiMINPcJ0mSNFwAAMHmgww (envelope-from ); Tue, 08 Aug 2023 09:25:11 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 5F488A0769; Tue, 8 Aug 2023 11:25:11 +0200 (CEST) Date: Tue, 8 Aug 2023 11:25:11 +0200 From: Jan Kara To: Jeff Layton Cc: Alexander Viro , Christian Brauner , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Howells , Marc Dionne , Chris Mason , Josef Bacik , David Sterba , Xiubo Li , Ilya Dryomov , Jan Harkes , coda@cs.cmu.edu, Tyler Hicks , Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Namjae Jeon , Sungjong Seo , Jan Kara , Theodore Ts'o , Andreas Dilger , Jaegeuk Kim , OGAWA Hirofumi , Miklos Szeredi , Bob Peterson , Andreas Gruenbacher , Greg Kroah-Hartman , Tejun Heo , Trond Myklebust , Anna Schumaker , Konstantin Komarov , Mark Fasheh , Joel Becker , Joseph Qi , Mike Marshall , Martin Brandenburg , Luis Chamberlain , Kees Cook , Iurii Zaikin , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , Sergey Senozhatsky , Richard Weinberger , Hans de Goede , Hugh Dickins , Andrew Morton , Amir Goldstein , "Darrick J. Wong" , Benjamin Coddington , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, ecryptfs@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, devel@lists.orangefs.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-mtd@lists.infradead.org, linux-mm@kvack.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org Subject: Re: [PATCH v7 03/13] fs: drop the timespec64 arg from generic_update_time Message-ID: <20230808092511.jh4lxer2dztdajpo@quack3> References: <20230807-mgctime-v7-0-d1dec143a704@kernel.org> <20230807-mgctime-v7-3-d1dec143a704@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230807-mgctime-v7-3-d1dec143a704@kernel.org> X-Stat-Signature: uzktwyuk7zjnn4ktqb7otjw9ajf3w6j7 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 8B64B120012 X-Rspam-User: X-HE-Tag: 1691486713-413575 X-HE-Meta: U2FsdGVkX1/JGSANCVM4hir5Oi/8anXnV/rus9LcIbytGH5HtlyMoFLppyqUDzQlYVq9Kh/jGKdTW9j4yLmv4j1610GgRJSJ2Y+q1xbLtd8Iiig/X/DB1LtjGfWM7dS9IPk3WPMGOwmtp9ZRycMw75+3R8NUoEet32CdP+eIaXbgzn8dZ7+TEMh82Kh415V/OTu9vmA7xVqYdVfjICr/EBQO/FsAZQ7XSwcDQw1A3XHbAWTvRm/9iwcO+qUO4c1skc7wrqAPdM11hjRA8PAsLDxig0WBm3bIh7+/7J+sjv4Im3ZleYp6ugH7Q0f6LrdY254VjvW+CYA4HxNtak7Z81R+bt5EsxSNGnnwqko/XCPzwe3YI+Dlewv7ZsfJ4Mr6l7ErS1niOkosuHlkZCuHGRhHTl6324tXd7ppv415v8BlSVcIXMiG5LPWTFLrbJ3d4GSOzTIFBXri307GJWKQkdb2P4ujQqHPmS1UEjaoT9DptYpCmtOrmoT/KbqQ9fBAc0nP0lgFVBgAjrmyMbHPsMb6aXL22X+B6c8o8Iip61v9e+KFBR9i8jiIvb86a8cXqQJwOmPNMUwt/l+4eAe3SKHuSejLAyUlMHfW/IxEUD653jM+2PYeSaoL8TgcwUj7m+nk1OjBD/A84+5AWrKPAxF4idehr0pj6P4TD168YNIaj11toXJyRHlNC2i9T99dk714hTowRvpTkznCjQ2JC/0q1WWFHI2+cn46ZewJ/Xrs+0CWClrTFnWO7zrOMssPAfNtSD3KCC6VjZRunTugY1Ii7sWOKYmqmbRiBphc7Km4MkmeKkPZ28hpPMayNj4X4Q3pz0QncSmtiWiCalRVJKEWSTtItipZUZh/aRxkKo0CUtQIzV0QyeQ6ef5smwZeJ2EjuNEdwDnR0HMelPuiPpXXMW0b426vLrKVoPMD+P3hlpitIcNbGVEFzeY7t379nDwKopPQyHPhVeoQCAC +GVGBA/B pDozDMe2YiKcUV2hCgByevYiAjyweR8WpUAlT6GAWZxAmY8XIIrBtwjKPGJ3Xk+5PPyuh1Q1C7WPdQNb7AF+h8/5elGrCDKt5r6B2JSHSbUFaPaxozkYd0uYMnKeqo5nev7b7vwT2/U/2ACB6I0XtgK05f91qvkDzXaqnFSLcBZmZlUL1FyUNWxKjkhsYpnrqhxxVFQoJA7pmRojTNacoIp2e0dCslZ3jB1WzfpwZKj4PQA523NZAS2PBHlIIphUqNgcYxikt3HeZix/wNC4KGn2VxDbM77rMhvQVxVH+ckUqHVFFII0OY0Ko5n3qVN9Zh5c1d6eIG9XyDkv3nfhPWLQiV4xpEgrAALwU+jKx7AH2h+o= 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: On Mon 07-08-23 15:38:34, Jeff Layton wrote: > In future patches we're going to change how the ctime is updated > to keep track of when it has been queried. The way that the update_time > operation works (and a lot of its callers) make this difficult, since > they grab a timestamp early and then pass it down to eventually be > copied into the inode. > > All of the existing update_time callers pass in the result of > current_time() in some fashion. Drop the "time" parameter from > generic_update_time, and rework it to fetch its own timestamp. > > This change means that an update_time could fetch a different timestamp > than was seen in inode_needs_update_time. update_time is only ever > called with one of two flag combinations: Either S_ATIME is set, or > S_MTIME|S_CTIME|S_VERSION are set. > > With this change we now treat the flags argument as an indicator that > some value needed to be updated when last checked, rather than an > indication to update specific timestamps. > > Rework the logic for updating the timestamps and put it in a new > inode_update_timestamps helper that other update_time routines can use. > S_ATIME is as treated as we always have, but if any of the other three > are set, then we attempt to update all three. > > Also, some callers of generic_update_time need to know what timestamps > were actually updated. Change it to return an S_* flag mask to indicate > that and rework the callers to expect it. > > Signed-off-by: Jeff Layton Looks good to me. Feel free to add: Reviewed-by: Jan Kara Honza > --- > fs/gfs2/inode.c | 3 +- > fs/inode.c | 84 +++++++++++++++++++++++++++++++++++++++++------------ > fs/orangefs/inode.c | 3 +- > fs/ubifs/file.c | 6 ++-- > fs/xfs/xfs_iops.c | 6 ++-- > include/linux/fs.h | 3 +- > 6 files changed, 80 insertions(+), 25 deletions(-) > > diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c > index 200cabf3b393..f1f04557aa21 100644 > --- a/fs/gfs2/inode.c > +++ b/fs/gfs2/inode.c > @@ -2155,7 +2155,8 @@ static int gfs2_update_time(struct inode *inode, struct timespec64 *time, > if (error) > return error; > } > - return generic_update_time(inode, time, flags); > + generic_update_time(inode, flags); > + return 0; > } > > static const struct inode_operations gfs2_file_iops = { > diff --git a/fs/inode.c b/fs/inode.c > index 3fc251bfaf73..e07e45f6cd01 100644 > --- a/fs/inode.c > +++ b/fs/inode.c > @@ -1881,29 +1881,76 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, > return 0; > } > > -int generic_update_time(struct inode *inode, struct timespec64 *time, int flags) > +/** > + * inode_update_timestamps - update the timestamps on the inode > + * @inode: inode to be updated > + * @flags: S_* flags that needed to be updated > + * > + * The update_time function is called when an inode's timestamps need to be > + * updated for a read or write operation. This function handles updating the > + * actual timestamps. It's up to the caller to ensure that the inode is marked > + * dirty appropriately. > + * > + * In the case where any of S_MTIME, S_CTIME, or S_VERSION need to be updated, > + * attempt to update all three of them. S_ATIME updates can be handled > + * independently of the rest. > + * > + * Returns a set of S_* flags indicating which values changed. > + */ > +int inode_update_timestamps(struct inode *inode, int flags) > { > - int dirty_flags = 0; > + int updated = 0; > + struct timespec64 now; > + > + if (flags & (S_MTIME|S_CTIME|S_VERSION)) { > + struct timespec64 ctime = inode_get_ctime(inode); > > - if (flags & (S_ATIME | S_CTIME | S_MTIME)) { > - if (flags & S_ATIME) > - inode->i_atime = *time; > - if (flags & S_CTIME) > - inode_set_ctime_to_ts(inode, *time); > - if (flags & S_MTIME) > - inode->i_mtime = *time; > - > - if (inode->i_sb->s_flags & SB_LAZYTIME) > - dirty_flags |= I_DIRTY_TIME; > - else > - dirty_flags |= I_DIRTY_SYNC; > + now = inode_set_ctime_current(inode); > + if (!timespec64_equal(&now, &ctime)) > + updated |= S_CTIME; > + if (!timespec64_equal(&now, &inode->i_mtime)) { > + inode->i_mtime = now; > + updated |= S_MTIME; > + } > + if (IS_I_VERSION(inode) && inode_maybe_inc_iversion(inode, updated)) > + updated |= S_VERSION; > + } else { > + now = current_time(inode); > } > > - if ((flags & S_VERSION) && inode_maybe_inc_iversion(inode, false)) > - dirty_flags |= I_DIRTY_SYNC; > + if (flags & S_ATIME) { > + if (!timespec64_equal(&now, &inode->i_atime)) { > + inode->i_atime = now; > + updated |= S_ATIME; > + } > + } > + return updated; > +} > +EXPORT_SYMBOL(inode_update_timestamps); > + > +/** > + * generic_update_time - update the timestamps on the inode > + * @inode: inode to be updated > + * @flags: S_* flags that needed to be updated > + * > + * The update_time function is called when an inode's timestamps need to be > + * updated for a read or write operation. In the case where any of S_MTIME, S_CTIME, > + * or S_VERSION need to be updated we attempt to update all three of them. S_ATIME > + * updates can be handled done independently of the rest. > + * > + * Returns a S_* mask indicating which fields were updated. > + */ > +int generic_update_time(struct inode *inode, int flags) > +{ > + int updated = inode_update_timestamps(inode, flags); > + int dirty_flags = 0; > > + if (updated & (S_ATIME|S_MTIME|S_CTIME)) > + dirty_flags = inode->i_sb->s_flags & SB_LAZYTIME ? I_DIRTY_TIME : I_DIRTY_SYNC; > + if (updated & S_VERSION) > + dirty_flags |= I_DIRTY_SYNC; > __mark_inode_dirty(inode, dirty_flags); > - return 0; > + return updated; > } > EXPORT_SYMBOL(generic_update_time); > > @@ -1915,7 +1962,8 @@ int inode_update_time(struct inode *inode, struct timespec64 *time, int flags) > { > if (inode->i_op->update_time) > return inode->i_op->update_time(inode, time, flags); > - return generic_update_time(inode, time, flags); > + generic_update_time(inode, flags); > + return 0; > } > EXPORT_SYMBOL(inode_update_time); > > diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c > index a52c30e80f45..3afa2a69bc63 100644 > --- a/fs/orangefs/inode.c > +++ b/fs/orangefs/inode.c > @@ -903,9 +903,10 @@ int orangefs_permission(struct mnt_idmap *idmap, > int orangefs_update_time(struct inode *inode, struct timespec64 *time, int flags) > { > struct iattr iattr; > + > gossip_debug(GOSSIP_INODE_DEBUG, "orangefs_update_time: %pU\n", > get_khandle_from_ino(inode)); > - generic_update_time(inode, time, flags); > + flags = generic_update_time(inode, flags); > memset(&iattr, 0, sizeof iattr); > if (flags & S_ATIME) > iattr.ia_valid |= ATTR_ATIME; > diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c > index 436b27d7c58f..df9086b19cd0 100644 > --- a/fs/ubifs/file.c > +++ b/fs/ubifs/file.c > @@ -1387,8 +1387,10 @@ int ubifs_update_time(struct inode *inode, struct timespec64 *time, > .dirtied_ino_d = ALIGN(ui->data_len, 8) }; > int err, release; > > - if (!IS_ENABLED(CONFIG_UBIFS_ATIME_SUPPORT)) > - return generic_update_time(inode, time, flags); > + if (!IS_ENABLED(CONFIG_UBIFS_ATIME_SUPPORT)) { > + generic_update_time(inode, flags); > + return 0; > + } > > err = ubifs_budget_space(c, &req); > if (err) > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > index 3a9363953ef2..731f45391baa 100644 > --- a/fs/xfs/xfs_iops.c > +++ b/fs/xfs/xfs_iops.c > @@ -1042,8 +1042,10 @@ xfs_vn_update_time( > > if (inode->i_sb->s_flags & SB_LAZYTIME) { > if (!((flags & S_VERSION) && > - inode_maybe_inc_iversion(inode, false))) > - return generic_update_time(inode, now, flags); > + inode_maybe_inc_iversion(inode, false))) { > + generic_update_time(inode, flags); > + return 0; > + } > > /* Capture the iversion update that just occurred */ > log_flags |= XFS_ILOG_CORE; > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 85977cdeda94..bb3c2c4f871f 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -2343,7 +2343,8 @@ extern int current_umask(void); > > extern void ihold(struct inode * inode); > extern void iput(struct inode *); > -extern int generic_update_time(struct inode *, struct timespec64 *, int); > +int inode_update_timestamps(struct inode *inode, int flags); > +int generic_update_time(struct inode *, int); > > /* /sys/fs */ > extern struct kobject *fs_kobj; > > -- > 2.41.0 > -- Jan Kara SUSE Labs, CR