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 529C9C3F6B0 for ; Wed, 3 Aug 2022 13:04:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236448AbiHCNEV (ORCPT ); Wed, 3 Aug 2022 09:04:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233605AbiHCNEU (ORCPT ); Wed, 3 Aug 2022 09:04:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B58D314D24; Wed, 3 Aug 2022 06:04:19 -0700 (PDT) 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 5029061487; Wed, 3 Aug 2022 13:04:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E32BBC433D6; Wed, 3 Aug 2022 13:04:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659531858; bh=Fzk5Iqnk+EOfUwFRRTQFq201SGbNR2Dqr2a2myv9gM8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=pFGIUYdv3ZPKqmwkZ8D5zniElh4ievjb2EMsjFfDlaI4sFhrvD7ce+HPCVQKkKEt5 iG7kg6ZT1GjxBbmeES5Qz8D/yAJrjceQAIC3KJoCF+JH0JDKQwoap33iitGmSi/l0L udJck410omixyMfM0nnr1M/xmTUf9BXYwK03//JQs45Cf6rKxy0jW9VPZRd45GpykR sKv5F4W4d6obmdE5+DnpWKgKe3+rgFMvLt5le3ZmqvsGqURKi1Mf+hfm7QFXWXqpBj cg0yrlzB2LZqZuM4SbSOnXBai/SYE0CNE+RSedf7XY52gjYnwYW0SALT9E8hezDQer CK2m8PuanV6ag== Message-ID: <7b38161256590c5a01e4bd0dec721318cff330fb.camel@kernel.org> Subject: Re: [PATCH v3 3/3] ext4: unconditionally enable the i_version counter From: Jeff Layton To: Lukas Czerner , linux-ext4@vger.kernel.org Cc: tytso@mit.edu, linux-fsdevel@vger.kernel.org, Dave Chinner , Benjamin Coddington , Christoph Hellwig , "Darrick J . Wong" Date: Wed, 03 Aug 2022 09:04:16 -0400 In-Reply-To: <20220803105340.17377-3-lczerner@redhat.com> References: <20220803105340.17377-1-lczerner@redhat.com> <20220803105340.17377-3-lczerner@redhat.com> Content-Type: text/plain; charset="ISO-8859-15" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.44.3 (3.44.3-1.fc36) MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Wed, 2022-08-03 at 12:53 +0200, Lukas Czerner wrote: > From: Jeff Layton >=20 > The original i_version implementation was pretty expensive, requiring a > log flush on every change. Because of this, it was gated behind a mount > option (implemented via the MS_I_VERSION mountoption flag). >=20 > Commit ae5e165d855d (fs: new API for handling inode->i_version) made the > i_version flag much less expensive, so there is no longer a performance > penalty from enabling it. xfs and btrfs already enable it > unconditionally when the on-disk format can support it. >=20 > Have ext4 ignore the SB_I_VERSION flag, and just enable it > unconditionally. While we're in here, remove the handling of > Opt_i_version as well, since we're almost to 5.20 anyway. >=20 > Ideally, we'd couple this change with a way to disable the i_version > counter (just in case), but the way the iversion mount option was > implemented makes that difficult to do. We'd need to add a new mount > option altogether or do something with tune2fs. That's probably best > left to later patches if it turns out to be needed. >=20 > [ Removed leftover bits of i_version from ext4_apply_options() since it > now can't ever be set in ctx->mask_s_flags -- lczerner ] >=20 > Cc: Dave Chinner > Cc: Benjamin Coddington > Cc: Christoph Hellwig > Cc: Darrick J. Wong > Signed-off-by: Jeff Layton > Signed-off-by: Lukas Czerner > --- > v3: Removed leftover bits of i_version from ext4_apply_options >=20 > fs/ext4/inode.c | 5 ++--- > fs/ext4/super.c | 21 ++++----------------- > 2 files changed, 6 insertions(+), 20 deletions(-) >=20 > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index b76554124224..acd00300a697 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -5411,7 +5411,7 @@ int ext4_setattr(struct user_namespace *mnt_userns,= struct dentry *dentry, > return -EINVAL; > } > =20 > - if (IS_I_VERSION(inode) && attr->ia_size !=3D inode->i_size) > + if (attr->ia_size !=3D inode->i_size) > inode_inc_iversion(inode); > =20 > if (shrink) { > @@ -5721,8 +5721,7 @@ int ext4_mark_iloc_dirty(handle_t *handle, > * ea_inodes are using i_version for storing reference count, don't > * mess with it > */ > - if (IS_I_VERSION(inode) && > - !(EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL)) > + if (!(EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL)) > inode_inc_iversion(inode); > =20 > /* the do_update_inode consumes one bh->b_count */ > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 845f2f8aee5f..4c3e6021e772 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -1585,7 +1585,7 @@ enum { > Opt_inlinecrypt, > Opt_usrjquota, Opt_grpjquota, Opt_quota, > Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, > - Opt_usrquota, Opt_grpquota, Opt_prjquota, Opt_i_version, > + Opt_usrquota, Opt_grpquota, Opt_prjquota, > Opt_dax, Opt_dax_always, Opt_dax_inode, Opt_dax_never, > Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_warn_on_error, > Opt_nowarn_on_error, Opt_mblk_io_submit, Opt_debug_want_extra_isize, > @@ -1694,7 +1694,6 @@ static const struct fs_parameter_spec ext4_param_sp= ecs[] =3D { > fsparam_flag ("barrier", Opt_barrier), > fsparam_u32 ("barrier", Opt_barrier), > fsparam_flag ("nobarrier", Opt_nobarrier), > - fsparam_flag ("i_version", Opt_i_version), > fsparam_flag ("dax", Opt_dax), > fsparam_enum ("dax", Opt_dax_type, ext4_param_dax), > fsparam_u32 ("stripe", Opt_stripe), > @@ -2140,11 +2139,6 @@ static int ext4_parse_param(struct fs_context *fc,= struct fs_parameter *param) > case Opt_abort: > ctx_set_mount_flag(ctx, EXT4_MF_FS_ABORTED); > return 0; > - case Opt_i_version: > - ext4_msg(NULL, KERN_WARNING, deprecated_msg, param->key, "5.20"); > - ext4_msg(NULL, KERN_WARNING, "Use iversion instead\n"); > - ctx_set_flags(ctx, SB_I_VERSION); > - return 0; > case Opt_inlinecrypt: > #ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT > ctx_set_flags(ctx, SB_INLINECRYPT); > @@ -2814,14 +2808,6 @@ static void ext4_apply_options(struct fs_context *= fc, struct super_block *sb) > sb->s_flags &=3D ~ctx->mask_s_flags; > sb->s_flags |=3D ctx->vals_s_flags; > =20 > - /* > - * i_version differs from common mount option iversion so we have > - * to let vfs know that it was set, otherwise it would get cleared > - * on remount > - */ > - if (ctx->mask_s_flags & SB_I_VERSION) > - fc->sb_flags |=3D SB_I_VERSION; > - > #define APPLY(X) ({ if (ctx->spec & EXT4_SPEC_##X) sbi->X =3D ctx->X; }) > APPLY(s_commit_interval); > APPLY(s_stripe); > @@ -2970,8 +2956,6 @@ static int _ext4_show_options(struct seq_file *seq,= struct super_block *sb, > SEQ_OPTS_PRINT("min_batch_time=3D%u", sbi->s_min_batch_time); > if (nodefs || sbi->s_max_batch_time !=3D EXT4_DEF_MAX_BATCH_TIME) > SEQ_OPTS_PRINT("max_batch_time=3D%u", sbi->s_max_batch_time); > - if (sb->s_flags & SB_I_VERSION) > - SEQ_OPTS_PUTS("i_version"); > if (nodefs || sbi->s_stripe) > SEQ_OPTS_PRINT("stripe=3D%lu", sbi->s_stripe); > if (nodefs || EXT4_MOUNT_DATA_FLAGS & > @@ -4630,6 +4614,9 @@ static int __ext4_fill_super(struct fs_context *fc,= struct super_block *sb) > sb->s_flags =3D (sb->s_flags & ~SB_POSIXACL) | > (test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0); > =20 > + /* i_version is always enabled now */ > + sb->s_flags |=3D SB_I_VERSION; > + > if (le32_to_cpu(es->s_rev_level) =3D=3D EXT4_GOOD_OLD_REV && > (ext4_has_compat_features(sb) || > ext4_has_ro_compat_features(sb) || Looks good to me. Thanks for picking this up, Lukas! --=20 Jeff Layton