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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC3E4C28B2B for ; Wed, 17 Aug 2022 13:06:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239701AbiHQNGf (ORCPT ); Wed, 17 Aug 2022 09:06:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239703AbiHQNGK (ORCPT ); Wed, 17 Aug 2022 09:06:10 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFD6C642D8; Wed, 17 Aug 2022 06:04:48 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 57E8820378; Wed, 17 Aug 2022 13:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1660741482; 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=+pJ0deJlpWZW4G06psvgX4kivHBlgg7ellidQHGh5nA=; b=s7WSqe+Ec3Ao2Dgk5CMGGOSfAtKuymVpP1bIUkch4iQziN6ADAOVWv5zyaMxeD5PyVwHNi Su2nVBY8bX8eGxXo1rnLgQruSvNp8wGM0SEMp5l6QoVVk4w3q90c7UI6CIFP4AyFGNTrw2 n1cVCDnBL707bLcf1vUcwyNk6yIxmyM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1660741482; 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=+pJ0deJlpWZW4G06psvgX4kivHBlgg7ellidQHGh5nA=; b=WZbWCaTkxNNYLdWq4XjBXW/hmu99eMZ324GWtGu9Vmlgy3GsSx73WYbuHbAXsJFskEfnZL xxA3wAdzQrZpYWCA== Received: from quack3.suse.cz (unknown [10.100.224.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id D78242C175; Wed, 17 Aug 2022 13:04:41 +0000 (UTC) Received: by quack3.suse.cz (Postfix, from userid 1000) id 0DF6FA066B; Wed, 17 Aug 2022 15:04:41 +0200 (CEST) Date: Wed, 17 Aug 2022 15:04:41 +0200 From: Jan Kara To: Jeff Layton Cc: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, Lukas Czerner , Jan Kara , Christian Brauner Subject: Re: [PATCH] ext4: fix i_version handling in ext4 Message-ID: <20220817130441.qigqv62wj6lrvxfc@quack3> References: <20220816131522.42467-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220816131522.42467-1-jlayton@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Tue 16-08-22 09:15:22, Jeff Layton wrote: > ext4 currently updates the i_version counter when the atime is updated > during a read. This is less than ideal as it can cause unnecessary cache > invalidations with NFSv4. The increment in ext4_mark_iloc_dirty is also > problematic since it can also corrupt the i_version counter for > ea_inodes. > > We aren't bumping the file times in ext4_mark_iloc_dirty, so changing > the i_version there seems wrong, and is the cause of both problems. > Remove that callsite and add increments to the setattr and setxattr > codepaths (at the same time that we update the ctime). The i_version > bump that already happens during timestamp updates should take care of > the rest. > > Cc: Lukas Czerner > Cc: Jan Kara > Cc: Christian Brauner > Signed-off-by: Jeff Layton After some verification (which was not completely trivial e.g. for directories) I agree all cases should be covered. Feel free to add: Reviewed-by: Jan Kara Honza > --- > fs/ext4/inode.c | 10 +++++----- > fs/ext4/xattr.c | 2 ++ > 2 files changed, 7 insertions(+), 5 deletions(-) > > I think this patch should probably supersede Lukas' patch entitled: > > ext4: don't increase iversion counter for ea_inodes > > This will also mean that we'll need to respin the patch to turn on the > i_version counter unconditionally in ext4 (though that should be > trivial). > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index 601214453c3a..a70921df89a5 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -5342,6 +5342,7 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, > int error, rc = 0; > int orphan = 0; > const unsigned int ia_valid = attr->ia_valid; > + bool inc_ivers = IS_IVERSION(inode); > > if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) > return -EIO; > @@ -5425,8 +5426,8 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, > return -EINVAL; > } > > - if (IS_I_VERSION(inode) && attr->ia_size != inode->i_size) > - inode_inc_iversion(inode); > + if (attr->ia_size == inode->i_size) > + inc_ivers = false; > > if (shrink) { > if (ext4_should_order_data(inode)) { > @@ -5528,6 +5529,8 @@ int ext4_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, > } > > if (!error) { > + if (inc_ivers) > + inode_inc_iversion(inode); > setattr_copy(mnt_userns, inode, attr); > mark_inode_dirty(inode); > } > @@ -5731,9 +5734,6 @@ int ext4_mark_iloc_dirty(handle_t *handle, > } > ext4_fc_track_inode(handle, inode); > > - if (IS_I_VERSION(inode)) > - inode_inc_iversion(inode); > - > /* the do_update_inode consumes one bh->b_count */ > get_bh(iloc->bh); > > diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c > index 533216e80fa2..4d84919d1c9c 100644 > --- a/fs/ext4/xattr.c > +++ b/fs/ext4/xattr.c > @@ -2412,6 +2412,8 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, > if (!error) { > ext4_xattr_update_super_block(handle, inode->i_sb); > inode->i_ctime = current_time(inode); > + if (IS_IVERSION(inode)) > + inode_inc_iversion(inode); > if (!value) > no_expand = 0; > error = ext4_mark_iloc_dirty(handle, inode, &is.iloc); > -- > 2.37.2 > -- Jan Kara SUSE Labs, CR