From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A751C3C343D; Tue, 28 Apr 2026 07:12:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777360344; cv=none; b=oh6+fWnA4Jyhbfc/VQw1r1qDmdmp03WCjQZtbHmGrqFtRx3eHVSuNQ9Gna27CkUa8YhgFB/Oo9hPz9qZKlH8T4b9cnL5GcrFTmstNz1D73dYq+XOomDgGimJ3Sv1wzt9uaZf1j2ko1amyen5kfa4l9CB3VwYRRial1qsgG8FqME= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777360344; c=relaxed/simple; bh=IpELrrWBBc/KUMvnBP0dZemm86j1sS7cGtIsGZak/jE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rGx2ZjT7tjtcgV/UbkTfZgk4VvcDSc+p6miRE8IiQppOXX/kSEV5vTCQl42aFmqPqTrAAvtvEH2wgVc17sfzht1/Ya5BstAclsbxWjjqAmHl7As0H3qUqX3/B+AltNKCx6n08HIke5cWSfoJl7A17dYfaEYUarYu6Jd/7abAmGE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=q70paX8X; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="q70paX8X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B590C2BCAF; Tue, 28 Apr 2026 07:12:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777360344; bh=IpELrrWBBc/KUMvnBP0dZemm86j1sS7cGtIsGZak/jE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=q70paX8XjIfvliPPVYNnyB6QhXXcE0py4acazUbeTtSDuq3K0j0OaeZ5VXv+NsMDG RyGGCqFZCevcnAotBuM2Ha9Ffln14qbTgAgDL2aGqJPJKlDiSPFngoUMKuzloyY97l fA0UGPHoKE5q9OCXfxHqzVWrq5sp4iRKx1+Vg+axUVhUoV2sSqmNqpKLM8AjAygNSe lOUAB4O99g7QG+20PhE+b1EXZP+orIK0N9HUL5kqdiWqkJbHtWPiIEB5xHP1fAybBc 3BzOtCyZYhdYfWL10+pWNMP3k/lk77S5XlOu+BjdwBAzxWVTJMMsPXkOtivU8gjUTQ 1Or9tGUEJeqqw== From: Jeff Layton Date: Tue, 28 Apr 2026 08:10:10 +0100 Subject: [PATCH v3 26/28] nfsd: properly track requested child attributes Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260428-dir-deleg-v3-26-5a0780ba9def@kernel.org> References: <20260428-dir-deleg-v3-0-5a0780ba9def@kernel.org> In-Reply-To: <20260428-dir-deleg-v3-0-5a0780ba9def@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Chuck Lever , Alexander Aring , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Jonathan Corbet , Shuah Khan , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Amir Goldstein Cc: Calum Mackay , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nfs@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3821; i=jlayton@kernel.org; h=from:subject:message-id; bh=IpELrrWBBc/KUMvnBP0dZemm86j1sS7cGtIsGZak/jE=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp8F1UEHV4sbuJarLFKKG7OMt0C44GkiKa/FfDb NqyEuLZP9uJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCafBdVAAKCRAADmhBGVaC FQltD/9JBsYkxZRFd+E02dGIaCCTVCw4NOkNf31EJGFeuu/3bZFx4h/W/4/qKD6ChxE/xFORVUU k2j6JqWHPSK8H4ulbMXEyAzTHQ1UmHWfbtB36SAR0QRUzojTivVG0KD+0ibj3/VBSmBjBxrA5RY quVoQjcgZOszTxoWOHuG5HuD+qm81Ku7iDdpJBHYepu+v+wowJewCUEQeH6WjCsganF9HlD5OeH hWWTYpAqLarTT0XqF41XHS2X7hQkOgVOmxNF71HLY7OBqN9HGzFVszex2qGw3lCY8Swt5EBO+yg +ecIjOZWeHupcxK9UrWLYPgpw7fKM4Z8sGUcMFMqFEmJ8/mptofmO0uByM24WiJDFow6XWIKnWW fS2Bos9sANfzhmg1rCP7eTe3Yc2oNz0C/tRiwMYHSH4UDNqzChT++OsYiOd+/+W1DzxSGdZgSXn Q44HYd/28O33n2dZniezjSkugWu9WiR15z5YdJWqSF4DtyeJMwDG331BUTIZXZ9bDmVRV2eK/Ge y/b06r498LB+PQsrilbzkML8WtWIGCxh9aMBTOwIH7dZLt353bqVp+K8A1hUQjhIjzy6OCXk+O+ z7q7SoJaFqSs5FLP7HOlzaCyHYGVfGd/u/bR+8eajzuQxkXgKX4IMCYL4gfmL/it1vhL5Rv3ZEB XViwpXCulQgyxtw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Track the union of requested and supported child attributes in the delegation, and only encode the attributes in that union when sending add/remove/rename updates. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4proc.c | 2 ++ fs/nfsd/nfs4state.c | 18 ++++++++++++++++++ fs/nfsd/nfs4xdr.c | 15 ++++++--------- fs/nfsd/state.h | 3 +++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 01e3bf9e1839..a807a55dddf9 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2553,6 +2553,8 @@ nfsd4_get_dir_delegation(struct svc_rqst *rqstp, gdd->gddrnf_status = GDD4_OK; memcpy(&gdd->gddr_stateid, &dd->dl_stid.sc_stateid, sizeof(gdd->gddr_stateid)); + gdd->gddr_child_attributes[0] = dd->dl_child_attrs[0]; + gdd->gddr_child_attributes[1] = dd->dl_child_attrs[1]; nfs4_put_stid(&dd->dl_stid); return nfs_ok; } diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3050980a778c..d2b3283c0d31 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -9808,6 +9808,21 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct dentry *dentry, return status; } +#define GDD_WORD0_CHILD_ATTRS (FATTR4_WORD0_TYPE | \ + FATTR4_WORD0_CHANGE | \ + FATTR4_WORD0_SIZE | \ + FATTR4_WORD0_FILEID | \ + FATTR4_WORD0_FILEHANDLE) + +#define GDD_WORD1_CHILD_ATTRS (FATTR4_WORD1_MODE | \ + FATTR4_WORD1_NUMLINKS | \ + FATTR4_WORD1_RAWDEV | \ + FATTR4_WORD1_SPACE_USED | \ + FATTR4_WORD1_TIME_ACCESS | \ + FATTR4_WORD1_TIME_METADATA | \ + FATTR4_WORD1_TIME_MODIFY | \ + FATTR4_WORD1_TIME_CREATE) + /** * nfsd_get_dir_deleg - attempt to get a directory delegation * @cstate: compound state @@ -9877,6 +9892,9 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstate, dp->dl_stid.sc_export = exp_get(cstate->current_fh.fh_export); + dp->dl_child_attrs[0] = gdd->gdda_child_attributes[0] & GDD_WORD0_CHILD_ATTRS; + dp->dl_child_attrs[1] = gdd->gdda_child_attributes[1] & GDD_WORD1_CHILD_ATTRS; + fl = nfs4_alloc_init_lease(dp, gdd->gddr_notification[0]); if (!fl) goto out_put_stid; diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 5d7d8545c904..bd1142590d2b 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4183,18 +4183,15 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne, struct xdr_stream *xdr, args.change_attr = nfsd4_change_attribute(&args.stat); - attrmask[0] = FATTR4_WORD0_TYPE | FATTR4_WORD0_CHANGE | - FATTR4_WORD0_SIZE | FATTR4_WORD0_FILEID; - attrmask[1] = FATTR4_WORD1_MODE | FATTR4_WORD1_NUMLINKS | FATTR4_WORD1_RAWDEV | - FATTR4_WORD1_SPACE_USED | FATTR4_WORD1_TIME_ACCESS | - FATTR4_WORD1_TIME_METADATA | FATTR4_WORD1_TIME_MODIFY; + attrmask[0] = dp->dl_child_attrs[0]; + attrmask[1] = dp->dl_child_attrs[1]; attrmask[2] = 0; - if (setup_notify_fhandle(dentry, fi, nf, &args)) - attrmask[0] |= FATTR4_WORD0_FILEHANDLE; + if (!setup_notify_fhandle(dentry, fi, nf, &args)) + attrmask[0] &= ~FATTR4_WORD0_FILEHANDLE; - if (args.stat.result_mask & STATX_BTIME) - attrmask[1] |= FATTR4_WORD1_TIME_CREATE; + if (!(args.stat.result_mask & STATX_BTIME)) + attrmask[1] &= ~FATTR4_WORD1_TIME_CREATE; ne->ne_attrs.attrmask.count = 2; ne->ne_attrs.attr_vals.data = (u8 *)xdr->p; diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index caa3f5f78dc1..cb1ac3248fe8 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -284,6 +284,9 @@ struct nfs4_delegation { struct timespec64 dl_atime; struct timespec64 dl_mtime; struct timespec64 dl_ctime; + + /* For dir delegations */ + uint32_t dl_child_attrs[2]; }; static inline bool deleg_is_read(u32 dl_type) -- 2.54.0