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 F39F9CDB47D for ; Wed, 11 Oct 2023 19:12:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233170AbjJKTMD (ORCPT ); Wed, 11 Oct 2023 15:12:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232224AbjJKTMD (ORCPT ); Wed, 11 Oct 2023 15:12:03 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A34598F; Wed, 11 Oct 2023 12:12:01 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42383C433C7; Wed, 11 Oct 2023 19:12:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697051521; bh=It2LkzgcfBOst3Wh1aN+gatu/fkADJhMweGlc+NHALo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Jl0E2PjdjeYZKN2MtbJugaZFPdz1gVb9M8/mUf7FTUOljrlilqjgJ3290JLNNH+HM ngKoDfORErP1av+MAmOHOUgTQzOkbvxWnCcmQEs2m/gDCBpu5hSHYlwOA6YHTIjbVm o0xxEsJVYt3JOYOYNxVqWHIo67BkwQ6F+pfLYnbgAb1Q51oWUAfUi9voF6kjVIeeYU ldlfvPiIimOfIDq4ug9Yh19SXYlqzBk7AjAF+TwvnDMk2dQ6ih8O4s/EInSXbuw3mv 4IyiMMXEIXYzE9Hie20sHLDp3NNuwil1/26+OJRA+O3jaaMkF53MA1bk/gpeZ3VTOi p1fHUdFXDvxTg== Date: Wed, 11 Oct 2023 12:12:00 -0700 From: "Darrick J. Wong" To: Jeff Layton Cc: Chandan Babu R , Chuck Lever , linux-nfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, brauner@kernel.org Subject: Re: [PATCH] xfs: reinstate the old i_version counter as STATX_CHANGE_COOKIE Message-ID: <20231011191200.GA21277@frogsfrogsfrogs> References: <20230929-xfs-iversion-v1-1-38587d7b5a52@kernel.org> <20231011154938.GL21298@frogsfrogsfrogs> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Wed, Oct 11, 2023 at 11:51:08AM -0400, Jeff Layton wrote: > On Wed, 2023-10-11 at 08:49 -0700, Darrick J. Wong wrote: > > On Wed, Oct 11, 2023 at 09:09:38AM -0400, Jeff Layton wrote: > > > On Fri, 2023-09-29 at 14:43 -0400, Jeff Layton wrote: > > > > The handling of STATX_CHANGE_COOKIE was moved into generic_fillattr in > > > > commit 0d72b92883c6 (fs: pass the request_mask to generic_fillattr), but > > > > we didn't account for the fact that xfs doesn't call generic_fillattr at > > > > all. > > > > > > > > Make XFS report its i_version as the STATX_CHANGE_COOKIE. > > > > > > > > Fixes: 0d72b92883c6 (fs: pass the request_mask to generic_fillattr) > > > > Signed-off-by: Jeff Layton > > > > --- > > > > I had hoped to fix this in a better way with the multigrain patches, but > > > > it's taking longer than expected (if it even pans out at this point). > > > > > > > > Until then, make sure we use XFS's i_version as the STATX_CHANGE_COOKIE, > > > > even if it's bumped due to atime updates. Too many invalidations is > > > > preferable to not enough. > > > > --- > > > > fs/xfs/xfs_iops.c | 5 +++++ > > > > 1 file changed, 5 insertions(+) > > > > > > > > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > > > > index 1c1e6171209d..2b3b05c28e9e 100644 > > > > --- a/fs/xfs/xfs_iops.c > > > > +++ b/fs/xfs/xfs_iops.c > > > > @@ -584,6 +584,11 @@ 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. > > > > > > > > --- > > > > base-commit: df964ce9ef9fea10cf131bf6bad8658fde7956f6 > > > > change-id: 20230929-xfs-iversion-819fa2c18591 > > > > > > > > Best regards, > > > > > > Ping? > > > > > > This patch is needed in v6.6 to prevent a regression when serving XFS > > > via NFSD. I'd prefer this go in via the xfs tree, but let me know if > > > you need me to get this merged this via a different one. > > > > Oh! Right, this is needed because the "hide a state in the high bit of > > tv_nsec" stuff got reverted in -rc3, correct? So now nfsd needs some > > way to know that something changed in the file, and better to have too > > many client invalidations than not enough? And I guess bumping > > i_version will keep nfsd sane for now? > > > > If the answers are [yes, yes, yes] then: > > Reviewed-by: Darrick J. Wong > > Yes, yes, and yes. Can you guys shepherd this into mainline? Chandan, can you queue this (and the other xfs fixes I sent) for -rc6? --D > Thanks for the R-b! > -- > Jeff Layton >