From nobody Tue Jun 16 06:04:11 2026 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 BFE643290BD; Thu, 16 Apr 2026 17:35:38 +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=1776360938; cv=none; b=cesrovXyJPWs4dm6syxROMnE57DXr2q1H6A0w4j8DxzqBN6AjFnhyX/iHo5f6zkdwVVS0aSk1SbuvRQJxYRjCIyD9Sa0VBx2W3XPUQBd2Qu7KtCsr2J6nOdKO0A00n9+8+szWKd1Q2MjUi7AhshK7uBb9SOmFDcpfFCrWSRu1pA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360938; c=relaxed/simple; bh=hy4fR49cODLkMnwvsyfpWAIKbslQm/A1Of95HRTY4zw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bb70nbERDXsOlOkIc9LUBiyNPnaHW8OhnBcpP6lzt60prcucM6Gs66FegXTF1kCXKlGUtaxYzXxDP188vO9Jduds8SS0sSbUP3KHYNQ9oDJCN13wyDk5a0Nc0q9yZoPUWfmnBzaOz5G9bYiUaUSlyXg5xUTqHSDTDHqZo+T8syY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lWFdwN3Q; 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="lWFdwN3Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7FDCC2BCB4; Thu, 16 Apr 2026 17:35:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360938; bh=hy4fR49cODLkMnwvsyfpWAIKbslQm/A1Of95HRTY4zw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lWFdwN3Q/UAcn+C9CPQOTQ7HzyxJ/ZaQziZD8AX5+wVEQeYJyTT0+TlGxY4nILHyC ap9FppbFW7EtK1kaR5He183m+28Ii802rqrmTmRovnFWzr4z7HVtHkkuQuokV4PwnD DeT2LYj7KT9mHQjRpce1WOEwMZX951j9K7jIHHHAPGUEirshQTFs57fAInqjcLtzMp 4yT2oz8X4DMY+2v7ZiCf7YqWmJY9oeq6kDOuaiSR8/isDV/ZFQgTerf4Tpw8C4ZWI/ UgPkWm/V82V6iDZLk56VOaFmE6TgpOUbC7NsJJAbvLiPT/MfXqb8x3ttX7wNXNpNQq qiHmMqES5B8Yg== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:02 -0700 Subject: [PATCH v2 01/28] filelock: pass current blocking lease to trace_break_lease_block() rather than "new_fl" Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-1-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=1258; i=jlayton@kernel.org; h=from:subject:message-id; bh=hy4fR49cODLkMnwvsyfpWAIKbslQm/A1Of95HRTY4zw=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3hB23T2zAbHeOnnfCrcnRyrngbcnJWhRUKd m+66UY+Iu6JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4QAKCRAADmhBGVaC FRSoEACIDDlDdkmYmszQjlyr9wdSKQE472tRHa7ievqqfQ91rFc0oYwedW0ggwNyo3J1sHRmP6T KahTB2oITsZBiCortO3WRAzQ7Ja48UC82phe480AgKBKm3aQuhIzP4i2OXjFVFf3ryWMX97DVXh 7UaQALqRKUcya4Tqc1jAg5ox+gvVM8peSp0ANFFBe8OIG/wQ9HLihfkb3+LewzKqOR3hIFw/Z4v 1MJOM1K0Ie8Vsfn43DwhmxEzbaYIwDOsRiaXdQZoqAwll5L8xaC73lmVRCmvC4ld9pbRRuaeYUo e3aj9eB7sqfcqRUir/eh4iqkZGw6WWTVSfAGTR9fAjomlIqSuiBoete71mh5w2yHOvS2izge9We Qrspflv5LRyuFu+q2SfC0xgb/E4ldEGR1TN9G2a3bkLjBvG9m4LW4F6+CHbh3GLv51Cj6xkF+gc FmrQvGyH9zd2Y/TK5bppBpXw1Z1ENWUQBQEeKR0CF0blMVYz4A3iBHrpB3z+DScp0c4wVTUeOxj DElw42o+1eNQAtoIoEsWjO4KOmEBjd6ZeSBCsXeU61fYcOfIH3ZjmdpzNvHTQhfc36ODxs0klFe 0IGPi1G22jA7bxNrsWuDF1Niw2a4J3BcGd6qPZAE02eVF5cfWHETHoVXA0AmRdyjigQ2Zzp2fE5 E66rDcWSYfi0RYw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The break_lease_block tracepoint currently just shows the type of "new_fl", which we can predict from the "flags" value. Switch it to display info about "fl" instead, as that's the file_lease on which the code is blocking. For trace_break_lease_unblock(), pass it a NULL pointer. "fl" may have been freed by that point, and passing it the info in new_fl is deceptive. Signed-off-by: Jeff Layton --- fs/locks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index 8e44b1f6c15a..d82c5be7aa5b 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1691,7 +1691,7 @@ int __break_lease(struct inode *inode, unsigned int f= lags) } else break_time++; locks_insert_block(&fl->c, &new_fl->c, leases_conflict); - trace_break_lease_block(inode, new_fl); + trace_break_lease_block(inode, fl); spin_unlock(&ctx->flc_lock); percpu_up_read(&file_rwsem); =20 @@ -1702,7 +1702,7 @@ int __break_lease(struct inode *inode, unsigned int f= lags) =20 percpu_down_read(&file_rwsem); spin_lock(&ctx->flc_lock); - trace_break_lease_unblock(inode, new_fl); + trace_break_lease_unblock(inode, NULL); __locks_delete_block(&new_fl->c); if (error >=3D 0) { /* --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 5195B33555B; Thu, 16 Apr 2026 17:35:39 +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=1776360941; cv=none; b=QvG2JdCG/PaMWmk7kPEvlI2SZ93CfqD4osnl6Rnf/8JryoYD5ixVrre/GYiaD/G13jQOOEJtCFP8IZf1v8PjxOy+v6L6MKP+3LtcQxfdsMRfufJD8zVeS/YP/RJPLSYUsb222n0Zm7etsvmhYXC/XPkKGyCwf52pz+oKkwtkhQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360941; c=relaxed/simple; bh=pB0N2i+uhHtG08aLQau3aXhTlxfd8Ebh8CUN+lCF0/4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DHRRhppCmHkEqDGH+fuT5D7bMwaBQGzEFPT0RVJGLMCW0jf9ymCJ+FGWzw/hx5V6ghxQHvvuy5TL8tLUe8+vwtPfZcT37BSHr1jeXwu9ogP41lrmpqy9nBywQm7UKxqj9B3YkJdAv6kn5/UB+sKnpdqnTgTGgZ4RypYJGhdSir0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Of8khSPk; 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="Of8khSPk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7755C2BCC6; Thu, 16 Apr 2026 17:35:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360939; bh=pB0N2i+uhHtG08aLQau3aXhTlxfd8Ebh8CUN+lCF0/4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Of8khSPkxuR3w6zqy5QqZtezEvT05iGVcD4aT3rFnFmtTqzHifFgju1p3vvQx6LgN NW4Hraj8E6/7VyQxJR8tObNisP2Sf3GGHQJqLpWVcvqDfrIRlHqtcjnLz9034lsry0 n1Sam8hPAxV/jBNDVG/3Z/ewYBDW8ri4YdoAskxzKIX4/GxH+SUnotWQIIeOEppw1K 7PuHL8UbtWZ0o7D8EtXfdYIiXTwCl8dP/vdrU6CPsGZSzMBds3XfbvDvRUk5sqcKWj MlbZgZdAB9oA09D2u5h0bv1W4AEBY31kF3K9rrnKzgp+GOhLrfo3bbbHj3SfurT9/y wYQsAKjyE9nyw== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:03 -0700 Subject: [PATCH v2 02/28] filelock: add support for ignoring deleg breaks for dir change events Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-2-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=16023; i=jlayton@kernel.org; h=from:subject:message-id; bh=pB0N2i+uhHtG08aLQau3aXhTlxfd8Ebh8CUN+lCF0/4=; b=kA0DAAoBAA5oQRlWghUByyZiAGnhHeGglkaFf/0b9fO0/HZ4XOyrAGseBw3z2N4NQc5OXVQjz IkCMwQAAQoAHRYhBEvA17JEcbKhhOr10wAOaEEZVoIVBQJp4R3hAAoJEAAOaEEZVoIVpZAQAItM +Awe8bD7PZjdnhxEutLlNgpO7nrtVuswLQkgNfAjeFYf8CJZHWol3ChSfPFZ96AIbWRlFMmy/5U 5KQR7lFFcUaywOSPG8g/U5Nm6F4DLstZ/GZXFVQbV3qVCvI5BEpPl0RjjBmKNgem5LIjci6ShWW jSYmqHubsnCgvXaW8c2pnM4FJfxfO9BJJ5wWtR790fq1WdUB8m7jL9c1MILCMk9uN8l1VwxU9qD 7P2MijHU1JGAE2sOP8FBaankwfI5dBuXsiQq1KZhI16njFJbLr1O++jW4C4CY9xc8271b/wia3d XETcc3OlT8nMKDAXBCz6i5g2vwJGQZDCFkDi34nvWYvGc7zCDyrmH1x1sdDqa1HkUp+/GSJG44m ynmV3ojEWLk+mc5Pythheb+cHmmx9KXY5oJMsC62JzBeDwdowOlYARU99bVhS+/Yt+sdbrXyaqx fQXFMIP0Ien6+eBoO1CqyhTQs5iwFRFhHh9y6kSUHO3Qx+aHmng9F7ZJaXNgwBai/5MhTMrzr6y /x5hOYHn10PBIfwgL4fLDC4tdJT6jPBiwRo+QLfCTCJuJzjs3oXt48l/ZHTyEwHXWk9M9VY7oLd y/VEEt2CX2X4YM+4/4UMChBBC1KLd4sGDF1DillF/+m5qalfnOmIe55IVT+eMXTW9Gvn/DQ5Tg7 EFXyL X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 If a NFS client requests a directory delegation with a notification bitmask covering directory change events, the server shouldn't recall the delegation. Instead the client will be notified of the change after the fact. Add support for ignoring lease breaks on directory changes. Add a new flags parameter to try_break_deleg() and teach __break_lease how to ignore certain types of delegation break events. Signed-off-by: Jeff Layton --- fs/attr.c | 2 +- fs/locks.c | 82 ++++++++++++++++++++++++++++---------= ---- fs/namei.c | 31 +++++++++------- fs/posix_acl.c | 4 +- fs/xattr.c | 4 +- include/linux/filelock.h | 53 ++++++++++++++++++-------- include/trace/events/filelock.h | 5 ++- 7 files changed, 120 insertions(+), 61 deletions(-) diff --git a/fs/attr.c b/fs/attr.c index e7d7c6d19fe9..28744f0e9ff4 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -547,7 +547,7 @@ int notify_change(struct mnt_idmap *idmap, struct dentr= y *dentry, * breaking the delegation in this case. */ if (!(ia_valid & ATTR_DELEG)) { - error =3D try_break_deleg(inode, delegated_inode); + error =3D try_break_deleg(inode, 0, delegated_inode); if (error) return error; } diff --git a/fs/locks.c b/fs/locks.c index d82c5be7aa5b..8b5958f34b61 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1583,29 +1583,63 @@ static bool leases_conflict(struct file_lock_core *= lc, struct file_lock_core *bc } =20 static bool -any_leases_conflict(struct inode *inode, struct file_lease *breaker) +ignore_dir_deleg_break(struct file_lease *fl, unsigned int flags) { - struct file_lock_context *ctx =3D inode->i_flctx; - struct file_lock_core *flc; + if ((flags & LEASE_BREAK_DIR_CREATE) && (fl->c.flc_flags & FL_IGN_DIR_CRE= ATE)) + return true; + if ((flags & LEASE_BREAK_DIR_DELETE) && (fl->c.flc_flags & FL_IGN_DIR_DEL= ETE)) + return true; + if ((flags & LEASE_BREAK_DIR_RENAME) && (fl->c.flc_flags & FL_IGN_DIR_REN= AME)) + return true; + + return false; +} + +static unsigned int +break_lease_flags_to_type(unsigned int flags) +{ + if (flags & LEASE_BREAK_LEASE) + return FL_LEASE; + else if (flags & LEASE_BREAK_DELEG) + return FL_DELEG; + else if (flags & LEASE_BREAK_LAYOUT) + return FL_LAYOUT; + else + return 0; + +} + +static struct file_lease * +first_visible_lease(struct inode *inode, struct file_lease *new_fl, unsign= ed int flags) +{ + struct file_lock_context *ctx =3D locks_inode_context(inode); + struct file_lease *fl; =20 lockdep_assert_held(&ctx->flc_lock); =20 - list_for_each_entry(flc, &ctx->flc_lease, flc_list) { - if (leases_conflict(flc, &breaker->c)) - return true; + list_for_each_entry(fl, &ctx->flc_lease, c.flc_list) { + if (!leases_conflict(&fl->c, &new_fl->c)) + continue; + if (S_ISDIR(inode->i_mode) && ignore_dir_deleg_break(fl, flags)) + continue; + return fl; } - return false; + return NULL; } =20 + /** - * __break_lease - revoke all outstanding leases on file - * @inode: the inode of the file to return - * @flags: LEASE_BREAK_* flags + * __break_lease - revoke all outstanding leases on file + * @inode: the inode of the file to return + * @flags: LEASE_BREAK_* flags * - * break_lease (inlined for speed) has checked there already is at least - * some kind of lock (maybe a lease) on this file. Leases are broken on - * a call to open() or truncate(). This function can block waiting for the - * lease break unless you specify LEASE_BREAK_NONBLOCK. + * break_lease (inlined for speed) has checked there already is at least + * some kind of lock (maybe a lease) on this file. Leases and Delegations + * are broken on a call to open() or truncate(). Delegations are also + * broken on any event that would change the ctime. Directory delegations + * are broken whenever the directory changes (unless the delegation is set + * up to ignore the event). This function can block waiting for the lease + * break unless you specify LEASE_BREAK_NONBLOCK. */ int __break_lease(struct inode *inode, unsigned int flags) { @@ -1617,13 +1651,8 @@ int __break_lease(struct inode *inode, unsigned int = flags) bool want_write =3D !(flags & LEASE_BREAK_OPEN_RDONLY); int error =3D 0; =20 - if (flags & LEASE_BREAK_LEASE) - type =3D FL_LEASE; - else if (flags & LEASE_BREAK_DELEG) - type =3D FL_DELEG; - else if (flags & LEASE_BREAK_LAYOUT) - type =3D FL_LAYOUT; - else + type =3D break_lease_flags_to_type(flags); + if (!type) return -EINVAL; =20 new_fl =3D lease_alloc(NULL, type, want_write ? F_WRLCK : F_RDLCK); @@ -1642,7 +1671,7 @@ int __break_lease(struct inode *inode, unsigned int f= lags) =20 time_out_leases(inode, &dispose); =20 - if (!any_leases_conflict(inode, new_fl)) + if (!first_visible_lease(inode, new_fl, flags)) goto out; =20 break_time =3D 0; @@ -1655,6 +1684,8 @@ int __break_lease(struct inode *inode, unsigned int f= lags) list_for_each_entry_safe(fl, tmp, &ctx->flc_lease, c.flc_list) { if (!leases_conflict(&fl->c, &new_fl->c)) continue; + if (S_ISDIR(inode->i_mode) && ignore_dir_deleg_break(fl, flags)) + continue; if (want_write) { if (fl->c.flc_flags & FL_UNLOCK_PENDING) continue; @@ -1670,7 +1701,8 @@ int __break_lease(struct inode *inode, unsigned int f= lags) locks_delete_lock_ctx(&fl->c, &dispose); } =20 - if (list_empty(&ctx->flc_lease)) + fl =3D first_visible_lease(inode, new_fl, flags); + if (!fl) goto out; =20 if (flags & LEASE_BREAK_NONBLOCK) { @@ -1680,7 +1712,6 @@ int __break_lease(struct inode *inode, unsigned int f= lags) } =20 restart: - fl =3D list_first_entry(&ctx->flc_lease, struct file_lease, c.flc_list); break_time =3D fl->fl_break_time; if (break_time !=3D 0) { if (time_after(jiffies, break_time)) { @@ -1711,7 +1742,8 @@ int __break_lease(struct inode *inode, unsigned int f= lags) */ if (error =3D=3D 0) time_out_leases(inode, &dispose); - if (any_leases_conflict(inode, new_fl)) + fl =3D first_visible_lease(inode, new_fl, flags); + if (fl) goto restart; error =3D 0; } diff --git a/fs/namei.c b/fs/namei.c index 9e5500dad14f..e3cbd9f877bd 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -4176,7 +4176,7 @@ int vfs_create(struct mnt_idmap *idmap, struct dentry= *dentry, umode_t mode, error =3D security_inode_create(dir, dentry, mode); if (error) return error; - error =3D try_break_deleg(dir, di); + error =3D try_break_deleg(dir, LEASE_BREAK_DIR_CREATE, di); if (error) return error; error =3D dir->i_op->create(idmap, dir, dentry, mode, true); @@ -4475,7 +4475,7 @@ static struct dentry *lookup_open(struct nameidata *n= d, struct file *file, /* Negative dentry, just create the file */ if (!dentry->d_inode && (open_flag & O_CREAT)) { /* but break the directory lease first! */ - error =3D try_break_deleg(dir_inode, delegated_inode); + error =3D try_break_deleg(dir_inode, LEASE_BREAK_DIR_CREATE, delegated_i= node); if (error) goto out_dput; =20 @@ -5091,7 +5091,7 @@ int vfs_mknod(struct mnt_idmap *idmap, struct inode *= dir, if (error) return error; =20 - error =3D try_break_deleg(dir, delegated_inode); + error =3D try_break_deleg(dir, LEASE_BREAK_DIR_CREATE, delegated_inode); if (error) return error; =20 @@ -5232,7 +5232,7 @@ struct dentry *vfs_mkdir(struct mnt_idmap *idmap, str= uct inode *dir, if (max_links && dir->i_nlink >=3D max_links) goto err; =20 - error =3D try_break_deleg(dir, delegated_inode); + error =3D try_break_deleg(dir, LEASE_BREAK_DIR_CREATE, delegated_inode); if (error) goto err; =20 @@ -5337,7 +5337,7 @@ int vfs_rmdir(struct mnt_idmap *idmap, struct inode *= dir, if (error) goto out; =20 - error =3D try_break_deleg(dir, delegated_inode); + error =3D try_break_deleg(dir, LEASE_BREAK_DIR_DELETE, delegated_inode); if (error) goto out; =20 @@ -5467,10 +5467,10 @@ int vfs_unlink(struct mnt_idmap *idmap, struct inod= e *dir, else { error =3D security_inode_unlink(dir, dentry); if (!error) { - error =3D try_break_deleg(dir, delegated_inode); + error =3D try_break_deleg(dir, LEASE_BREAK_DIR_DELETE, delegated_inode); if (error) goto out; - error =3D try_break_deleg(target, delegated_inode); + error =3D try_break_deleg(target, 0, delegated_inode); if (error) goto out; error =3D dir->i_op->unlink(dir, dentry); @@ -5614,7 +5614,7 @@ int vfs_symlink(struct mnt_idmap *idmap, struct inode= *dir, if (error) return error; =20 - error =3D try_break_deleg(dir, delegated_inode); + error =3D try_break_deleg(dir, LEASE_BREAK_DIR_CREATE, delegated_inode); if (error) return error; =20 @@ -5745,9 +5745,9 @@ int vfs_link(struct dentry *old_dentry, struct mnt_id= map *idmap, else if (max_links && inode->i_nlink >=3D max_links) error =3D -EMLINK; else { - error =3D try_break_deleg(dir, delegated_inode); + error =3D try_break_deleg(dir, LEASE_BREAK_DIR_CREATE, delegated_inode); if (!error) - error =3D try_break_deleg(inode, delegated_inode); + error =3D try_break_deleg(inode, 0, delegated_inode); if (!error) error =3D dir->i_op->link(old_dentry, dir, new_dentry); } @@ -6011,21 +6011,24 @@ int vfs_rename(struct renamedata *rd) old_dir->i_nlink >=3D max_links) goto out; } - error =3D try_break_deleg(old_dir, delegated_inode); + error =3D try_break_deleg(old_dir, + old_dir =3D=3D new_dir ? LEASE_BREAK_DIR_RENAME : + LEASE_BREAK_DIR_DELETE, + delegated_inode); if (error) goto out; if (new_dir !=3D old_dir) { - error =3D try_break_deleg(new_dir, delegated_inode); + error =3D try_break_deleg(new_dir, LEASE_BREAK_DIR_CREATE, delegated_ino= de); if (error) goto out; } if (!is_dir) { - error =3D try_break_deleg(source, delegated_inode); + error =3D try_break_deleg(source, 0, delegated_inode); if (error) goto out; } if (target && !new_is_dir) { - error =3D try_break_deleg(target, delegated_inode); + error =3D try_break_deleg(target, 0, delegated_inode); if (error) goto out; } diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 12591c95c925..b4bfe4ddf64e 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -1126,7 +1126,7 @@ int vfs_set_acl(struct mnt_idmap *idmap, struct dentr= y *dentry, if (error) goto out_inode_unlock; =20 - error =3D try_break_deleg(inode, &delegated_inode); + error =3D try_break_deleg(inode, 0, &delegated_inode); if (error) goto out_inode_unlock; =20 @@ -1234,7 +1234,7 @@ int vfs_remove_acl(struct mnt_idmap *idmap, struct de= ntry *dentry, if (error) goto out_inode_unlock; =20 - error =3D try_break_deleg(inode, &delegated_inode); + error =3D try_break_deleg(inode, 0, &delegated_inode); if (error) goto out_inode_unlock; =20 diff --git a/fs/xattr.c b/fs/xattr.c index 3e49e612e1ba..6b67a6e76eeb 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -288,7 +288,7 @@ __vfs_setxattr_locked(struct mnt_idmap *idmap, struct d= entry *dentry, if (error) goto out; =20 - error =3D try_break_deleg(inode, delegated_inode); + error =3D try_break_deleg(inode, 0, delegated_inode); if (error) goto out; =20 @@ -546,7 +546,7 @@ __vfs_removexattr_locked(struct mnt_idmap *idmap, if (error) goto out; =20 - error =3D try_break_deleg(inode, delegated_inode); + error =3D try_break_deleg(inode, 0, delegated_inode); if (error) goto out; =20 diff --git a/include/linux/filelock.h b/include/linux/filelock.h index 5f0a2fb31450..9dd4e67a6f30 100644 --- a/include/linux/filelock.h +++ b/include/linux/filelock.h @@ -4,19 +4,22 @@ =20 #include =20 -#define FL_POSIX 1 -#define FL_FLOCK 2 -#define FL_DELEG 4 /* NFSv4 delegation */ -#define FL_ACCESS 8 /* not trying to lock, just looking */ -#define FL_EXISTS 16 /* when unlocking, test for existence */ -#define FL_LEASE 32 /* lease held on this file */ -#define FL_CLOSE 64 /* unlock on close */ -#define FL_SLEEP 128 /* A blocking lock */ -#define FL_DOWNGRADE_PENDING 256 /* Lease is being downgraded */ -#define FL_UNLOCK_PENDING 512 /* Lease is being broken */ -#define FL_OFDLCK 1024 /* lock is "owned" by struct file */ -#define FL_LAYOUT 2048 /* outstanding pNFS layout */ -#define FL_RECLAIM 4096 /* reclaiming from a reboot server */ +#define FL_POSIX BIT(0) /* POSIX lock */ +#define FL_FLOCK BIT(1) /* BSD lock */ +#define FL_DELEG BIT(2) /* NFSv4 delegation */ +#define FL_ACCESS BIT(3) /* not trying to lock, just looking */ +#define FL_EXISTS BIT(4) /* when unlocking, test for existence */ +#define FL_LEASE BIT(5) /* file lease */ +#define FL_CLOSE BIT(6) /* unlock on close */ +#define FL_SLEEP BIT(7) /* A blocking lock */ +#define FL_DOWNGRADE_PENDING BIT(8) /* Lease is being downgraded */ +#define FL_UNLOCK_PENDING BIT(9) /* Lease is being broken */ +#define FL_OFDLCK BIT(10) /* POSIX lock "owned" by struct file */ +#define FL_LAYOUT BIT(11) /* outstanding pNFS layout */ +#define FL_RECLAIM BIT(12) /* reclaiming from a reboot server */ +#define FL_IGN_DIR_CREATE BIT(13) /* ignore DIR_CREATE events */ +#define FL_IGN_DIR_DELETE BIT(14) /* ignore DIR_DELETE events */ +#define FL_IGN_DIR_RENAME BIT(15) /* ignore DIR_RENAME events */ =20 #define FL_CLOSE_POSIX (FL_POSIX | FL_CLOSE) =20 @@ -222,6 +225,10 @@ struct file_lease *locks_alloc_lease(void); #define LEASE_BREAK_LAYOUT BIT(2) // break layouts only #define LEASE_BREAK_NONBLOCK BIT(3) // non-blocking break #define LEASE_BREAK_OPEN_RDONLY BIT(4) // readonly open event +#define LEASE_BREAK_DIR_CREATE BIT(5) // dir deleg create event +#define LEASE_BREAK_DIR_DELETE BIT(6) // dir deleg delete event +#define LEASE_BREAK_DIR_RENAME BIT(7) // dir deleg rename event + =20 int __break_lease(struct inode *inode, unsigned int flags); void lease_get_mtime(struct inode *, struct timespec64 *time); @@ -516,12 +523,26 @@ static inline bool is_delegated(struct delegated_inod= e *di) return di->di_inode; } =20 -static inline int try_break_deleg(struct inode *inode, +/** + * try_break_deleg - do a non-blocking delegation break + * @inode: inode that should have its delegations broken + * @flags: extra LEASE_BREAK_* flags to pass to break_deleg() + * @di: returns pointer to delegated inode (may be NULL) + * + * Break delegations in a non-blocking fashion. If there are + * outstanding delegations and @di is set, then an extra reference + * will be taken on @inode and @di->di_inode will be populated so + * that it may be waited upon. + * + * Returns 0 if there is no need to wait or an error. If -EWOULDBLOCK + * is returned, then @di will be populated (if non-NULL). + */ +static inline int try_break_deleg(struct inode *inode, unsigned int flags, struct delegated_inode *di) { int ret; =20 - ret =3D break_deleg(inode, LEASE_BREAK_NONBLOCK); + ret =3D break_deleg(inode, flags | LEASE_BREAK_NONBLOCK); if (ret =3D=3D -EWOULDBLOCK && di) { di->di_inode =3D inode; ihold(inode); @@ -574,7 +595,7 @@ static inline int break_deleg(struct inode *inode, unsi= gned int flags) return 0; } =20 -static inline int try_break_deleg(struct inode *inode, +static inline int try_break_deleg(struct inode *inode, unsigned int flags, struct delegated_inode *delegated_inode) { return 0; diff --git a/include/trace/events/filelock.h b/include/trace/events/fileloc= k.h index 370016c38a5b..ef4bb0afb86a 100644 --- a/include/trace/events/filelock.h +++ b/include/trace/events/filelock.h @@ -28,7 +28,10 @@ { FL_DOWNGRADE_PENDING, "FL_DOWNGRADE_PENDING" }, \ { FL_UNLOCK_PENDING, "FL_UNLOCK_PENDING" }, \ { FL_OFDLCK, "FL_OFDLCK" }, \ - { FL_RECLAIM, "FL_RECLAIM"}) + { FL_RECLAIM, "FL_RECLAIM" }, \ + { FL_IGN_DIR_CREATE, "FL_IGN_DIR_CREATE" }, \ + { FL_IGN_DIR_DELETE, "FL_IGN_DIR_DELETE" }, \ + { FL_IGN_DIR_RENAME, "FL_IGN_DIR_RENAME" }) =20 #define show_fl_type(val) \ __print_symbolic(val, \ --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 51860335554; Thu, 16 Apr 2026 17:35:40 +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=1776360941; cv=none; b=IaKUopuiUvCJKIXPMoc/RWA0s6/buHBc0ouJQzWzXb62wQAP4u3kQRFob6s2XRWaeMV9kQEZyaTEXdT7FgXHafKMEvImQMw4eBnKnDDNXSmMP2wJ9p7oJC/F2pDzYSlTvailw72jjPT6eS0+GSV3l2Qnof76apf8vhxJZc00Ook= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360941; c=relaxed/simple; bh=JPuUub7ZoVIR3lKaHdVQ99YpUWe8z2ubqieFVVVxAmU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FFFEnGsktfv/UwLnFu0dzbp0xXnifezBv4Jyi1nrgnNIHQYf2Z7OwFUSlw82sWFRfI5bPJ1Qdx6Erhhi/bnEE6n0Z5PRcKYk3k0AMn4Pr3zptOEt80X6cFlEgXv4B0LNtHKAOyD/GQkjKzcolc3bw2ZVIG0F5n3WdyRks8xTGA8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NJZNcGH0; 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="NJZNcGH0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89C05C2BCB8; Thu, 16 Apr 2026 17:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360940; bh=JPuUub7ZoVIR3lKaHdVQ99YpUWe8z2ubqieFVVVxAmU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NJZNcGH0kf0c4iQoCjif3NQ4hczSmLnHXeIPBNSCfXKWIcyeUjcFh+4M2Y27ZfTpD mHMCOyXrxmPeJm4ITv3dcP2//zcvx8K/pRJRkVrFHdQFuJXC8l9XBVbyJA40Ubufcg Vu9muF4mgO99joN15HwLmllInhT+1KdxlKb/fNgHI18/EE0nmcEoJb/q5HF0B2G2Mt B+TN9UEBNKjUKw0G7IVaSEVBponlH1gRcdDflFe1SWpnGD4azo2XwFnd66/xOezQab 3+2cRHOvvlA2/ZmNEkWfiB6nPX3lRP1PhH5BHrnPcN4360XycG22qxZSSq02teM7bn mwLQ9BT8Puwbg== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:04 -0700 Subject: [PATCH v2 03/28] filelock: add a tracepoint to start of break_lease() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-3-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=2144; i=jlayton@kernel.org; h=from:subject:message-id; bh=JPuUub7ZoVIR3lKaHdVQ99YpUWe8z2ubqieFVVVxAmU=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3hhDHtZ2kdmL1V/EJQPbDZuO3kgR4jcEy7J i7ej4j/0vGJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4QAKCRAADmhBGVaC FUJ6D/0c1hJyv1gKxxIoafujMCgQe0/RImc+hwNc+tdYdG1Y0YIZ6yR/R9fNMyYLeqVoUIRfzCL raJtveA+S0f0xCOVCDbTsN84j/k0DTqPZGKQysmLkoaxLA7BN8b7tnDOykku0NnYDiCLfYFEqdQ ss2nnluZ2Q+XxUZ7LBlAnx+T6aRnqwK8xMf7GHg2Jr8KG5op+6Lz4vuvlWvyI04gVTGYGOgp6sU BCXKRQ/D1l2YsTeB8++DlrsIZVRlyMe7ssMXdxySCEQd18b3m4yJGVM8aWh5/a/ZXHZ52E7IBPQ QkXiJrQ0ml/E2Y79EUfbwiT6Yzl3oCyc6xctngYIJYXHNwPfUnlgX4q4Xjo17M88Fn5BkQABT7j C2B77M1ZTG5tBvApEK2MMvtd8k1mPV5EvJ++KGLvaD7Ok0YGUyKKHQT1KLkYyY+Bhp/Ixh58W51 Q2HfnNfDnBUGD9v989ncYyXSYtH0Sr1Ygl2fY14gGzCA4anfKApTd7NA0n4orFysXODNMsGGSUU hCyqwSsOFr0zmE4Ssbini4UwW6O12A4UVduR46l9ZSUu48rJLxsfsLuuFH9dqy5dT86xpNhEnRx mQjfJKaaaZXrFTeJnksPF2s7BZQw3ck8j7LHYQkz/PWnGEhtTerntZkmjAp7W0mp+lRwL85VJkx OyieSAgSPTUnoaA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 ...mostly to show the LEASE_BREAK_* flags. Reviewed-by: Jan Kara Signed-off-by: Jeff Layton --- fs/locks.c | 2 ++ include/trace/events/filelock.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/fs/locks.c b/fs/locks.c index 8b5958f34b61..792c3920b33a 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1651,6 +1651,8 @@ int __break_lease(struct inode *inode, unsigned int f= lags) bool want_write =3D !(flags & LEASE_BREAK_OPEN_RDONLY); int error =3D 0; =20 + trace_break_lease(inode, flags); + type =3D break_lease_flags_to_type(flags); if (!type) return -EINVAL; diff --git a/include/trace/events/filelock.h b/include/trace/events/fileloc= k.h index ef4bb0afb86a..fff0ee2d452d 100644 --- a/include/trace/events/filelock.h +++ b/include/trace/events/filelock.h @@ -120,6 +120,39 @@ DEFINE_EVENT(filelock_lock, flock_lock_inode, TP_PROTO(struct inode *inode, struct file_lock *fl, int ret), TP_ARGS(inode, fl, ret)); =20 +#define show_lease_break_flags(val) \ + __print_flags(val, "|", \ + { LEASE_BREAK_LEASE, "LEASE" }, \ + { LEASE_BREAK_DELEG, "DELEG" }, \ + { LEASE_BREAK_LAYOUT, "LAYOUT" }, \ + { LEASE_BREAK_NONBLOCK, "NONBLOCK" }, \ + { LEASE_BREAK_OPEN_RDONLY, "OPEN_RDONLY" }, \ + { LEASE_BREAK_DIR_CREATE, "DIR_CREATE" }, \ + { LEASE_BREAK_DIR_DELETE, "DIR_DELETE" }, \ + { LEASE_BREAK_DIR_RENAME, "DIR_RENAME" }) + +TRACE_EVENT(break_lease, + TP_PROTO(struct inode *inode, unsigned int flags), + + TP_ARGS(inode, flags), + + TP_STRUCT__entry( + __field(unsigned long, i_ino) + __field(dev_t, s_dev) + __field(unsigned int, flags) + ), + + TP_fast_assign( + __entry->s_dev =3D inode->i_sb->s_dev; + __entry->i_ino =3D inode->i_ino; + __entry->flags =3D flags; + ), + + TP_printk("dev=3D0x%x:0x%x ino=3D0x%lx flags=3D%s", + MAJOR(__entry->s_dev), MINOR(__entry->s_dev), + __entry->i_ino, show_lease_break_flags(__entry->flags)) +); + DECLARE_EVENT_CLASS(filelock_lease, TP_PROTO(struct inode *inode, struct file_lease *fl), =20 --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 51783331A4C; Thu, 16 Apr 2026 17:35:41 +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=1776360941; cv=none; b=eYe5I4mcR4auikM+Nnkh/zvvSW2WUEWrsvydJYpz6lPPHrepP0V1FIBBsHbtBI9RR0KMztDX5/ui2HzKNE0nDSFt5Y5PlSWD3aafMCoL+nP4Q8Wp+V6k/m8aD6P0cn/al6+RqmqxPu/K/ZUtNCZ88XR+KtW2cPalal7FuTWBrMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360941; c=relaxed/simple; bh=Z6rw+qotRNoi947YYJDbytbTTUU2Qh+ITj4J1EtYoTc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IeSNGiHwHLuybOleqadd17s8FEIJeG6edauihoIrmWH4UkOAD+8jwNOyKTAgBT2IVOAgd9BWILvrYq3UFa3jpdnCErHG0mgfTTtpXPKCFOdSPAn/nNYb1dWuQh7zXmRFG8DSdS3PQZV2OJ9TqsmoF/PtvJSs5YsejADcUi/GpRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nB+npK/5; 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="nB+npK/5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58668C2BCB0; Thu, 16 Apr 2026 17:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360941; bh=Z6rw+qotRNoi947YYJDbytbTTUU2Qh+ITj4J1EtYoTc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nB+npK/5AUmlpcBlR3loUds30VYw1bcYmsytHjCvKBTjR5AyBqcJ9IKzavM/u9+l2 e1aMHd3mwMpRw/tdzfCuUMVevc6qMaj+5bWFqMEvhjP9EIiH10zhq7T9OzmVDm6Dgx /BBaX30vaqYl6oldmLuesR/ldYEGmgtzpVa8d/4/BOo2MijpgAuIQ5eZpUaDzCu0yb 6EgGUEwsSI41Oo7Fp4PHC2bkPl8qolYlICnr9e24hjrOw3bTfYE7InbTWMtBK9hOXF V9Xp4oiKtVf/n4omoM/pVc/MpbRkzzTH0mVjNGkzNoNk/RIUY28yaMhc84R5ChLePy 6BQ064XqqwZ9A== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:05 -0700 Subject: [PATCH v2 04/28] filelock: add an inode_lease_ignore_mask helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-4-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=2251; i=jlayton@kernel.org; h=from:subject:message-id; bh=Z6rw+qotRNoi947YYJDbytbTTUU2Qh+ITj4J1EtYoTc=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3izrjJLMf/CvpujB15OqjdOFBHFAlWZ9brn AoYQONh+9qJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4gAKCRAADmhBGVaC FWGUD/9a73g7s0beUr7v0CphMarQ+zT9kxBfuAD+wgsFT72A5SVYLKaH9i77EwTuTymcbxlx1SZ anomX1ig7VUkOP0FbOMEtYLtJGRSTJn+cSUBt2YfnScuMIoZYrTJMcpm8imMyBhlri61pSQcgV4 9d+i2MOlqUGgM69uoYrV07eV87q0GWUPXSIufgpLQwAVaFPCVpbWVOcVQv88T+MSr7QJYWyqZgB NKXU7Zgr1IIvw2As0Gn6bjYdar1nGn0V8U5bue1VKqHdxtil6bxeeMhpr7Ltf7+/qvPDuXHW4oB pIYawKuaMtAloj/CTJGIFB2kOaXfZRCyNbqHZElOVNwyju9Uj+LJdWdyQOBji7Z5uLgxM1OY6wE exvvvGduXvOEAi/C7XFqY2kGqciCCTZ/zSk3v4uNNAluVxCo/x7JXuXnXnR7e+JsKMF4NVE0maY +DOJjAzTQo2bohoYOQ7dEuzJJymsTLceXHXhoIEwMFZmy+eNYuhMHyLe+0B3z+SxVifQmIP3O6N koB6hcOOqEZ7EILjxruQJGfnehjvYqJ9fRb8/nVvj87rnEVRS9fZdzR1KENfn76xay/bDi8rh70 X/WHdXOjiXuXWA1sqk2GCRWdHkmNW9MCYVOiEJdkRm8cEEDHRLH6Iwdqsfp5vLh6kmC2xsNMyXC cCKwMSUicWpEdHQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add a new routine that returns a mask of all dir change events that are currently ignored by any leases. nfsd will use this to determine how to configure the fsnotify_mark mask. Reviewed-by: Jan Kara Signed-off-by: Jeff Layton --- fs/locks.c | 32 ++++++++++++++++++++++++++++++++ include/linux/filelock.h | 1 + 2 files changed, 33 insertions(+) diff --git a/fs/locks.c b/fs/locks.c index 792c3920b33a..61f64b261282 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1582,6 +1582,38 @@ static bool leases_conflict(struct file_lock_core *l= c, struct file_lock_core *bc return rc; } =20 +#define IGNORE_MASK (FL_IGN_DIR_CREATE | FL_IGN_DIR_DELETE | FL_IGN_DIR_RE= NAME) + +/** + * inode_lease_ignore_mask - return union of all ignored inode events for = this inode + * @inode: inode of which to get ignore mask + * + * Walk the list of leases, and return the result of all of + * their FL_IGN_DIR_* bits or'ed together. + */ +u32 +inode_lease_ignore_mask(struct inode *inode) +{ + struct file_lock_context *ctx; + struct file_lock_core *flc; + u32 mask =3D 0; + + ctx =3D locks_inode_context(inode); + if (!ctx) + return 0; + + spin_lock(&ctx->flc_lock); + list_for_each_entry(flc, &ctx->flc_lease, flc_list) { + mask |=3D flc->flc_flags & IGNORE_MASK; + /* If we already have everything, we can stop */ + if (mask =3D=3D IGNORE_MASK) + break; + } + spin_unlock(&ctx->flc_lock); + return mask; +} +EXPORT_SYMBOL_GPL(inode_lease_ignore_mask); + static bool ignore_dir_deleg_break(struct file_lease *fl, unsigned int flags) { diff --git a/include/linux/filelock.h b/include/linux/filelock.h index 9dd4e67a6f30..6e125902c58a 100644 --- a/include/linux/filelock.h +++ b/include/linux/filelock.h @@ -236,6 +236,7 @@ int generic_setlease(struct file *, int, struct file_le= ase **, void **priv); int kernel_setlease(struct file *, int, struct file_lease **, void **); int vfs_setlease(struct file *, int, struct file_lease **, void **); int lease_modify(struct file_lease *, int, struct list_head *); +u32 inode_lease_ignore_mask(struct inode *inode); =20 struct notifier_block; int lease_register_notifier(struct notifier_block *); --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 E434233688D; Thu, 16 Apr 2026 17:35:41 +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=1776360942; cv=none; b=f6g8tkXbCM+zCQJYGftuQz7bOHwfYvD1QITDYuJzuTicdZh1K6QRRh/DCCYOXekV9cfbLhl9A5XRHfnn4ktpPfx5eJTDV6e/An+M9rczi05sdqMWCcUP/nUDqlvvT5xi06pjWYYQmFyby5PTv2pFID9sVKon4IOxNJqcu8xJqM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360942; c=relaxed/simple; bh=R9/KzrvxYF+4HefdcqVALy0RSfXF1sXeb+jfYdn8ZC4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EeaYX6bQE+02ZajB4BCQ+zocy6hecdjd2AJEY+xg+TA2VwOHyUq4o8fyVIopzcsLhVxaaH0rTYOLaIoQPf1od20n0w0PAF3V2TtNjPWsJ3LLdkMIlZU4ZG8mwBc53/PmgrZ0GQl/tVIW9zrh4g+JOpGWbeCisg3Xkq2rD2xyP/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y/f/dG8f; 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="Y/f/dG8f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26F25C2BCB5; Thu, 16 Apr 2026 17:35:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360941; bh=R9/KzrvxYF+4HefdcqVALy0RSfXF1sXeb+jfYdn8ZC4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Y/f/dG8fjaPkXewYTR48yfAteWcMqzLSv6AYSAv2b27HUvDq3gJIBfIzhCkFpVLl4 +x4FrK+YxLaUuWm5mwlUIyA6QytvvKgG65cWEzlgS2jWI7msKe/kyo5TvN0//96ulC la/sl7nw6r0PxuWYXZFtUGkSe7XCCfgTgC5Etw+sMMk7WsiLl+0lQ9oasUl/WBLcMU BG+47EqnPQOeewJQBzCsQI5VLXwesXMVBRZjkMgN/tYSPOpqiSYJVFgBHq4riH6LZ1 9NMZ1vLaEpY0fBEFzpH7hHEtMJ6G1+dZX/5rSNNr+INF9xwY5xKGHO8sIwHRmR+VP2 sMj74S8/EF2EA== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:06 -0700 Subject: [PATCH v2 05/28] fsnotify: new tracepoint in fsnotify() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-5-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=4161; i=jlayton@kernel.org; h=from:subject:message-id; bh=R9/KzrvxYF+4HefdcqVALy0RSfXF1sXeb+jfYdn8ZC4=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3isBcKAZx/y9q3gnPFeIoBe4jcPQE6b3R2T kJWIdp+us6JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4gAKCRAADmhBGVaC FRfkEACgId4LV7zIg+FpqVPrtl2adQ3hZRcbA0FVnYLtLmqVgihoqZZKtcCBWeyzzCxbNSVH91C ABi/9cYoOeo67BggHD5GcGhGBMg466OQltsAklVHbDgvaXwKrDj5uW/g1ViRkI+HLjZ8Brfi2e+ 8rux9Hj28SRSuRHiKM8TVTqsdDD8yj3K+lHoLjQ8N7cn/qjT0rkezP13Y9U8W/ptVIONKKYT9Ic MDQjeWYoC0gZk5TnHMOmyS2bPkuo9s4Q7hjXktOfOD4Q60bo6weifOBj56ZLyuirQe+H6AHoA4u 4VIfrmH/09J4CjRglDFqVeXMUdny8gImesJYntjmOM6rcDgWCUK5++9lrPMbKyJrdUP0Bfzp6Mo 8BdubwNJI2FrWDpzmvbj7tVtWctrnGsMu3DEfrFnYoADuwbn0hD2OFQP48LKYGdEdTd5p75bF6m 5cdpt/7ZuH9yUlRqkEwBEHdVuT54u4YBA021cUpNs7O7Ewv+SoLsjxDdLdcJXNUSnXyIBrEiIzi +IN6Ab5JqoJ0WYf1dli78Dqmzq3RJosP5hu9n6v+V/y3Ipqj2MbEO8/TwoBZa1wpAd5gocLTBx5 eejGaY85O6Jw/n2Y8wf8atQCaRmb+afKe5RBkkVfnZ4+SZQAWTAlgK6bbCYymY3wmdc5cjmX43r m14mfYPl+fxBcjQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add a tracepoint so we can see exactly how this is being called. Signed-off-by: Jeff Layton Reviewed-by: Jan Kara --- fs/notify/fsnotify.c | 5 ++++ include/trace/events/fsnotify.h | 51 +++++++++++++++++++++++++++++++++++++= ++++ include/trace/misc/fsnotify.h | 35 ++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+) diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index 9995de1710e5..5448738635f6 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c @@ -14,6 +14,9 @@ #include #include "fsnotify.h" =20 +#define CREATE_TRACE_POINTS +#include + /* * Clear all of the marks on an inode when it is being evicted from core */ @@ -504,6 +507,8 @@ int fsnotify(__u32 mask, const void *data, int data_typ= e, struct inode *dir, int ret =3D 0; __u32 test_mask, marks_mask =3D 0; =20 + trace_fsnotify(mask, data, data_type, dir, file_name, inode, cookie); + if (path) mnt =3D real_mount(path->mnt); =20 diff --git a/include/trace/events/fsnotify.h b/include/trace/events/fsnotif= y.h new file mode 100644 index 000000000000..341bbd57a39b --- /dev/null +++ b/include/trace/events/fsnotify.h @@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM fsnotify + +#if !defined(_TRACE_FSNOTIFY_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_FSNOTIFY_H + +#include + +#include + +TRACE_EVENT(fsnotify, + TP_PROTO(__u32 mask, const void *data, int data_type, + struct inode *dir, const struct qstr *file_name, + struct inode *inode, u32 cookie), + + TP_ARGS(mask, data, data_type, dir, file_name, inode, cookie), + + TP_STRUCT__entry( + __field(__u32, mask) + __field(unsigned long, dir_ino) + __field(unsigned long, ino) + __field(dev_t, s_dev) + __field(int, data_type) + __field(u32, cookie) + __string(file_name, file_name ? (const char *)file_name->name : "") + ), + + TP_fast_assign( + __entry->mask =3D mask; + __entry->dir_ino =3D dir ? dir->i_ino : 0; + __entry->ino =3D inode ? inode->i_ino : 0; + __entry->s_dev =3D dir ? dir->i_sb->s_dev : + inode ? inode->i_sb->s_dev : 0; + __entry->data_type =3D data_type; + __entry->cookie =3D cookie; + __assign_str(file_name); + ), + + TP_printk("dev=3D%d:%d dir=3D%lu ino=3D%lu data_type=3D%d cookie=3D0x%x m= ask=3D0x%x %s name=3D%s", + MAJOR(__entry->s_dev), MINOR(__entry->s_dev), + __entry->dir_ino, __entry->ino, + __entry->data_type, __entry->cookie, + __entry->mask, show_fsnotify_mask(__entry->mask), + __get_str(file_name)) +); + +#endif /* _TRACE_FSNOTIFY_H */ + +/* This part must be outside protection */ +#include diff --git a/include/trace/misc/fsnotify.h b/include/trace/misc/fsnotify.h new file mode 100644 index 000000000000..a201e1bd6d8c --- /dev/null +++ b/include/trace/misc/fsnotify.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Display helpers for fsnotify events + */ + +#include + +#define show_fsnotify_mask(mask) \ + __print_flags(mask, "|", \ + { FS_ACCESS, "ACCESS" }, \ + { FS_MODIFY, "MODIFY" }, \ + { FS_ATTRIB, "ATTRIB" }, \ + { FS_CLOSE_WRITE, "CLOSE_WRITE" }, \ + { FS_CLOSE_NOWRITE, "CLOSE_NOWRITE" }, \ + { FS_OPEN, "OPEN" }, \ + { FS_MOVED_FROM, "MOVED_FROM" }, \ + { FS_MOVED_TO, "MOVED_TO" }, \ + { FS_CREATE, "CREATE" }, \ + { FS_DELETE, "DELETE" }, \ + { FS_DELETE_SELF, "DELETE_SELF" }, \ + { FS_MOVE_SELF, "MOVE_SELF" }, \ + { FS_OPEN_EXEC, "OPEN_EXEC" }, \ + { FS_UNMOUNT, "UNMOUNT" }, \ + { FS_Q_OVERFLOW, "Q_OVERFLOW" }, \ + { FS_ERROR, "ERROR" }, \ + { FS_OPEN_PERM, "OPEN_PERM" }, \ + { FS_ACCESS_PERM, "ACCESS_PERM" }, \ + { FS_OPEN_EXEC_PERM, "OPEN_EXEC_PERM" }, \ + { FS_PRE_ACCESS, "PRE_ACCESS" }, \ + { FS_MNT_ATTACH, "MNT_ATTACH" }, \ + { FS_MNT_DETACH, "MNT_DETACH" }, \ + { FS_EVENT_ON_CHILD, "EVENT_ON_CHILD" }, \ + { FS_RENAME, "RENAME" }, \ + { FS_DN_MULTISHOT, "DN_MULTISHOT" }, \ + { FS_ISDIR, "ISDIR" }) --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 D1E6F33B97A; Thu, 16 Apr 2026 17:35:42 +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=1776360942; cv=none; b=oDXSamsmejLzzDh+aBpQA9Uk+2FmEs6NIAnFfcrwVEygccsHDHQvLz4+dkcuAaL4/O1FdOPFU/oO7e65pLGk1tGCd82duQsPp4vXIpo/k8N6rFyoNA8YcRpyp3DdtVo4yCuF55/ZGOyy9/R8cD56k1Efa5fcdxMemI28lOBGbpY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360942; c=relaxed/simple; bh=QYnTQk4yeAHXc+6yMFnWPX8zgPoiv5NdKWBT0A6sQOA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZI9WU0beypkduusEF+h71bkJID7P5dhWOe0PVjVdJ7S5QvxgWOl0NWZU6IYuVIUXXNrDEAt2bfAgKRS9gBaGRc5/LbMnghI/5Q/E/y7S/l3Zi7KKXcG4145K+Q/KaWIrSIExrrk+h969lq/NIPNPkThriBibydleQM3nXpUH12Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KK1C1xFD; 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="KK1C1xFD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9E01C2BCC6; Thu, 16 Apr 2026 17:35:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360942; bh=QYnTQk4yeAHXc+6yMFnWPX8zgPoiv5NdKWBT0A6sQOA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=KK1C1xFDFVfxhthGtdt04dTxbQLSwZjuz81cWkz5UdOhXQqKwqR0t87P81DtaVnYk 66Bvh5BYw4c6nyZ5dRFEgCFWgv7Ml/u3nHjGbhzzUsZDcmvuGIxvLHqxiCPO67o/58 VINpCqwl4YFPQSC5FA3FjQWKG70rQzMjeTnr7fH2mr3Lu5Y7+5E+jAWoQdB7qgUZga 2AiI5+JrtPe24LGE360HDSbAKFaELfrTcrA0SMq+QYAKBUaXmlBtz76h55DlaY4NRC a7lUEleO3IerkfnBtrdZRMbXj1lRqJ5vDfxVZMecmE6RVPrjOHkeHpCKBBgXzIT8nR sWRA2FM58AZqg== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:07 -0700 Subject: [PATCH v2 06/28] fsnotify: add fsnotify_modify_mark_mask() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-6-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=2430; i=jlayton@kernel.org; h=from:subject:message-id; bh=QYnTQk4yeAHXc+6yMFnWPX8zgPoiv5NdKWBT0A6sQOA=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3ihTEuKBrx6WNpP3fQWXnzu0yHuC/VFlE/O cKT03kNObGJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4gAKCRAADmhBGVaC FTS/D/95o0I08Ue8Lw7PdFJMjiMu1Acf31Ou3RkhXPUyV58k0YSaHBS1o2mtgx7Chss4xv604jK YavPerg6aIxMPEtGXG73k61H8I6Y8REvKjpPDQWGFRyudfkceBP4OBwpEGyoWG2JX2xGt+hvf13 U+eRv2VHg+kRKUnP/pykkOOhjoeLb3UdAVGtCM9krsNKW06xtJZhCEUen+6N08EKO2bHt3VxLVi frGOsocZRzJVd8U665c97WWtZ1OogQOX29vAvAXRUELIcd127BXsX66/l57yD2oF/O3lVlg3ju7 tyakBsWZMgNwJ6rA8RTBcxt5qMbF34Ti2i9TO6klBthOo27/WVcQghvFN49aQ1HExmvK4JnApQ1 UCjm02sGz4rV7533REzVUzH39owKCyENr8JTJo9yHEUWDvzO7Y1oDLMcgPA5383T00ZWsmsmcFy gMcDO6aTnbKZTuDExGqHQgh+b0BU8lIafN9OxtK5IS9Txt4qx19WTBU6+mBV/pCmCsT03Njid20 qsyHs8SFJ+BtBjErV73hymS/qptKVfCe6yHO1VedI0s/LawDgeYbdzFPNxs8OWaJCEUZW/ZQf5s KnAdjZbXSebDtY1t8VbfF8ixsn7GsOeBG6RfpDaz0JVdLBgS+mnwOEM2+hg6BgLC/H0Df6+c/xy JBmPI3g2/8G9aUA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 nfsd needs to be able to modify the mask on an existing mark when new directory delegations are set or unset. Add an exported function that allows the caller to set and clear bits in the mark->mask, and does the recalculation if something changed. Suggested-by: Jan Kara Reviewed-by: Jan Kara Signed-off-by: Jeff Layton --- fs/notify/mark.c | 29 +++++++++++++++++++++++++++++ include/linux/fsnotify_backend.h | 1 + 2 files changed, 30 insertions(+) diff --git a/fs/notify/mark.c b/fs/notify/mark.c index c2ed5b11b0fe..b1e73c6fd382 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c @@ -310,6 +310,35 @@ void fsnotify_recalc_mask(struct fsnotify_mark_connect= or *conn) fsnotify_conn_set_children_dentry_flags(conn); } =20 +/** + * fsnotify_modify_mark_mask - set and/or clear flags in a mark's mask + * @mark: mark to be modified + * @set: bits to be set in mask + * @clear: bits to be cleared in mask + * + * Modify a fsnotify_mark mask as directed, and update its associated conn. + * The caller is expected to hold a reference to the mark. + */ +void fsnotify_modify_mark_mask(struct fsnotify_mark *mark, u32 set, u32 cl= ear) +{ + bool recalc =3D false; + u32 mask; + + WARN_ON_ONCE(clear & set); + + spin_lock(&mark->lock); + mask =3D mark->mask; + mark->mask |=3D set; + mark->mask &=3D ~clear; + if (mark->mask !=3D mask) + recalc =3D true; + spin_unlock(&mark->lock); + + if (recalc) + fsnotify_recalc_mask(mark->connector); +} +EXPORT_SYMBOL_GPL(fsnotify_modify_mark_mask); + /* Free all connectors queued for freeing once SRCU period ends */ static void fsnotify_connector_destroy_workfn(struct work_struct *work) { diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_back= end.h index 95985400d3d8..66e185bd1b1b 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h @@ -917,6 +917,7 @@ extern void fsnotify_get_mark(struct fsnotify_mark *mar= k); extern void fsnotify_put_mark(struct fsnotify_mark *mark); extern void fsnotify_finish_user_wait(struct fsnotify_iter_info *iter_info= ); extern bool fsnotify_prepare_user_wait(struct fsnotify_iter_info *iter_inf= o); +extern void fsnotify_modify_mark_mask(struct fsnotify_mark *mark, u32 set,= u32 clear); =20 static inline void fsnotify_init_event(struct fsnotify_event *event) { --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 D7BDE393DC2; Thu, 16 Apr 2026 17:35:43 +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=1776360943; cv=none; b=MLBqJjxodBmMOgA4WtUxdj0ILI6bCPV5xCoIzGpP8yiWE0YbQTo5c+ZnsI3RFEasAxFCpS1uj0fxJiqMNNaAtzNwj7qNi3BVg8B/l0GMDrfcHjFqK9naFvSBAuCWiVIpxwl73kl2K8Z3j0hHNs8d3tu49Bca2jEo6HU4ll42fUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360943; c=relaxed/simple; bh=umta9lJOOxbQRnfhihN9L/gicaIZYJJzuXCSGw/CyLI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RUa9xODpqL0KJj/1s1p3BsPCm/GUXrboNxkFXssj+WNL3CoPaaQ4Ju/4l3kkIMiyxgmJu6/qOUV0Lf+r6HDWDztEdD5Uv5LZLWuN4f9q5oYwP0kp7RQrj3iwAmZe+pd0SDu/RcRunFjIfSDew/HvQ2BAwYkgxRj1ow2qCUsObjg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aG0DNSGr; 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="aG0DNSGr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C202CC2BCB0; Thu, 16 Apr 2026 17:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360943; bh=umta9lJOOxbQRnfhihN9L/gicaIZYJJzuXCSGw/CyLI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aG0DNSGr7HLm+ExGN0tmfe08g6yFSjZBmYmG0f+vOYCBUfcjMTNnjM4UeuSuVvG3m cxNxBZSl4VOsY4gHVmYrQIasD8Tohr3o2cXcqboxKTxCxK6MejBNM78gud/rWIkfJy WYR8/s0kbNDTNwgfuti0YHMmEJUC11vuXLRoGx8O7On0lLI5ruDh05/0Vg1byo431b IlIAiFm8CktWOl44MaT1XiuOau40XSKXznjVgM9oiqsOWNLbindn+0FU0dkrKbtd6i 2tdXQCWCHQ2w8RNehGOg/fUtEcXlzTuYdp3pv+jb6a/G3isRGNvhYM80Mva9rH/0ul +z8k4/pLEyi/A== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:08 -0700 Subject: [PATCH v2 07/28] fsnotify: add FSNOTIFY_EVENT_RENAME data type Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-7-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=4476; i=jlayton@kernel.org; h=from:subject:message-id; bh=umta9lJOOxbQRnfhihN9L/gicaIZYJJzuXCSGw/CyLI=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3jVOcuVAwa6kZYphaIfJyv5Js/gWq3AiJEX iD2147H72+JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4wAKCRAADmhBGVaC FUsgD/4jbEcaQxKHvHlp8LzkDknyOls4SSdIWUHQxWrvGNNIoAdDvIFOkw3P209ZK/e/4sRdEQ/ p8PjIHyB7e2W9tVrblbC6pBtMKG1KQ9e5W95us3FO/BQTXh6VNJF+r1oK/NY+d2BhtERG+OSxuQ ReCbOr0ZaWY7TN3OyxJUWCKh7pxB333HWm7jyD1iLQltBvNPh5rWqf1p2MqRWrSIcvL4l6QT1I/ nobsSNPMRgD+EQvMkS4TtwzrgLfJpE+JJnxzf+9DplR65vZVy27v+bxD4QPO5W6JTYlzanOSsOh StvITUc5i3kn6P3/RPX9d9i7hvAmLjkIEt2mInTPQeNqatt0AmqZOHK3SCPSdPqxJJWZl5TRYwp 4iiBX/qNqHwrUJ61ETlQvIQwYcFWwBc5KwEEbwdOmGs0gyJRJuw/PfiGtQ89Z3mUC8YTIrFcSDy CrAUAe3UHtBdXm/+NpyN+wErNhFaRi2TFmqp+3h0gAmoBEqSf+gsNT+BXHca2+YXe1eFjKAaN7j lRlduxn0FflbpijUOenEdl4ln91G8HwIWQhfL2WV71I+psb7a9uSroblCemCGhkXBZNIJ7OAP+D A0KHkmxYoDlCD3o7lwgJfKiKyxdq1/MhB9L4N192TEI/7/hhoXqEYpayjX00Vn59FtU/Ad4VX7D 8p4ztOIBGo/vTeQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add a new fsnotify_rename_data struct and FSNOTIFY_EVENT_RENAME data type that carries both the moved dentry and the inode that was overwritten by the rename (if any). Update fsnotify_data_inode(), fsnotify_data_dentry(), and fsnotify_data_sb() to handle the new type, and add a new fsnotify_data_rename_target() helper for extracting the overwritten target inode. Update fsnotify_move() to use the new data type for FS_RENAME and FS_MOVED_TO events, passing the overwritten target inode through the event data. FS_MOVED_FROM is unchanged since the source directory doesn't need overwrite information. This is done so that fsnotify consumers like nfsd can atomically observe the overwritten file when a rename replaces an existing entry, without needing a separate FS_DELETE event. Assisted-by: Claude (Anthropic Claude Code) Signed-off-by: Jeff Layton Reviewed-by: Amir Goldstein Reviewed-by: Jan Kara --- include/linux/fsnotify.h | 8 ++++++-- include/linux/fsnotify_backend.h | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index 079c18bcdbde..bda798bc67bc 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -257,6 +257,10 @@ static inline void fsnotify_move(struct inode *old_dir= , struct inode *new_dir, __u32 new_dir_mask =3D FS_MOVED_TO; __u32 rename_mask =3D FS_RENAME; const struct qstr *new_name =3D &moved->d_name; + struct fsnotify_rename_data rd =3D { + .moved =3D moved, + .target =3D target, + }; =20 if (isdir) { old_dir_mask |=3D FS_ISDIR; @@ -265,12 +269,12 @@ static inline void fsnotify_move(struct inode *old_di= r, struct inode *new_dir, } =20 /* Event with information about both old and new parent+name */ - fsnotify_name(rename_mask, moved, FSNOTIFY_EVENT_DENTRY, + fsnotify_name(rename_mask, &rd, FSNOTIFY_EVENT_RENAME, old_dir, old_name, 0); =20 fsnotify_name(old_dir_mask, source, FSNOTIFY_EVENT_INODE, old_dir, old_name, fs_cookie); - fsnotify_name(new_dir_mask, source, FSNOTIFY_EVENT_INODE, + fsnotify_name(new_dir_mask, &rd, FSNOTIFY_EVENT_RENAME, new_dir, new_name, fs_cookie); =20 if (target) diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_back= end.h index 66e185bd1b1b..f8c8fb7f34ae 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h @@ -311,6 +311,7 @@ enum fsnotify_data_type { FSNOTIFY_EVENT_DENTRY, FSNOTIFY_EVENT_MNT, FSNOTIFY_EVENT_ERROR, + FSNOTIFY_EVENT_RENAME, }; =20 struct fs_error_report { @@ -335,6 +336,11 @@ struct fsnotify_mnt { u64 mnt_id; }; =20 +struct fsnotify_rename_data { + struct dentry *moved; /* the dentry that was renamed */ + struct inode *target; /* inode overwritten by rename, or NULL */ +}; + static inline struct inode *fsnotify_data_inode(const void *data, int data= _type) { switch (data_type) { @@ -348,6 +354,8 @@ static inline struct inode *fsnotify_data_inode(const v= oid *data, int data_type) return d_inode(file_range_path(data)->dentry); case FSNOTIFY_EVENT_ERROR: return ((struct fs_error_report *)data)->inode; + case FSNOTIFY_EVENT_RENAME: + return d_inode(((const struct fsnotify_rename_data *)data)->moved); default: return NULL; } @@ -363,6 +371,8 @@ static inline struct dentry *fsnotify_data_dentry(const= void *data, int data_typ return ((const struct path *)data)->dentry; case FSNOTIFY_EVENT_FILE_RANGE: return file_range_path(data)->dentry; + case FSNOTIFY_EVENT_RENAME: + return ((struct fsnotify_rename_data *)data)->moved; default: return NULL; } @@ -395,6 +405,8 @@ static inline struct super_block *fsnotify_data_sb(cons= t void *data, return file_range_path(data)->dentry->d_sb; case FSNOTIFY_EVENT_ERROR: return ((struct fs_error_report *) data)->sb; + case FSNOTIFY_EVENT_RENAME: + return ((const struct fsnotify_rename_data *)data)->moved->d_sb; default: return NULL; } @@ -430,6 +442,14 @@ static inline struct fs_error_report *fsnotify_data_er= ror_report( } } =20 +static inline struct inode *fsnotify_data_rename_target(const void *data, + int data_type) +{ + if (data_type =3D=3D FSNOTIFY_EVENT_RENAME) + return ((const struct fsnotify_rename_data *)data)->target; + return NULL; +} + static inline const struct file_range *fsnotify_data_file_range( const void *data, int data_type) --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 D51A13A16A6; Thu, 16 Apr 2026 17:35:44 +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=1776360945; cv=none; b=ldm0BrSr/l9IEMgBP1jrOrlmpm3b7K2QDPdEi+3dcuf8OR5ZKOSNs+1yFG8Glu6mEcffjqDKstFAJcCzosRECVSYcUQpQQSPQPFLTQmQL4ww9M12PqLsDsnyp06cc/PzBhvqQe5KsKPDBsvgvzdw9tF2EAPbhSYweWwk0fQJeQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360945; c=relaxed/simple; bh=8AWV9g9nNbAzIUfizkPyGOFE9nEceUpI/1oajrzco/8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RljdcXix6EMNBHRUVpcL3Jn5eJFIBrOwQRvxStzY0HZSBRhp7kFWhWerrdjASQSgcN/xfBmv8MkXM2aDi2LILpmxpUZFth6wIpzQCtDkpEezB6matJFo89ynnbi1Gtib+77xkVycsB5q5kjqyeimspYfi5j77cwYtoYgAGqun+E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WuwELF/w; 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="WuwELF/w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93B3BC2BCC4; Thu, 16 Apr 2026 17:35:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360944; bh=8AWV9g9nNbAzIUfizkPyGOFE9nEceUpI/1oajrzco/8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WuwELF/w4jzj0M1YVd5+EU40QttqzVgF5u2PdpluMLi/zTioBAw9Q7OqzDZ/pNlxA anoKcndIwgv1HVT+fzwOOL/BrcoVupjEuxdos7x9/8n3zURW0g+ozddbrHUGst51bZ U12Kx9/G1fv9Tf2Meun8dp83GtzT8WJEcyprzjjjVA2iKRqfZviD1uyHmrqK2Gz9zU /f3kJAXoDjRgcZHH+9WRrxELgXEbcZSJlHQ8u4KD9DgVvQc44eOuF8960u5B9i3pW9 rVPAfqlJ/VQOKVUW8o1fzdHly6WRyLJmq6W2zf702Y7lfp2C68UjVqZ0+vq+Cyyv30 cBS+vBRu2U0Mg== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:09 -0700 Subject: [PATCH v2 08/28] nfsd: check fl_lmops in nfsd_breaker_owns_lease() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-8-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=1106; i=jlayton@kernel.org; h=from:subject:message-id; bh=8AWV9g9nNbAzIUfizkPyGOFE9nEceUpI/1oajrzco/8=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3jEcvH35WurmxVY0AQR+jHLEXucAm4yURcQ arvpQtoGvCJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4wAKCRAADmhBGVaC FWGhD/sG1pZ/4q2wwdvup665wVoNk9P8EfUUgBhNw6kbxPkeRlkDfiVor8r8Pn6Xn70hTGfvFEq gVTyFF+fUa3AZLB+o3OMsq68+rfHlKc/8A9rsa4D/C4NijoNFNNg9lFB8KeR5JbC+JAmBZ8H9KM YUeL6CCki24ZmQa/DfqmFP4zJXcEPr2c8Nzrm+4OsZMJunZSEOYsVCV6TU8WOPsCGVk+JMAQ2Vz FzIl92Ol8u/POcuREAQ5H6mc7PC388CB+SZp6Ah1U+edGrLhiroO7NtVDMfMpKOPU883NkdKBqg 1RTpeD0u0C5cEmSlrnwcjEP9jQfdsRTMtWChbbdh64EDKe/XHCyltxrlWqPyg+wkr6FHSvrQYn+ NmB5B3YczoETui2MCD7FGQB4cPLJqwcHcQTF9/3yqy8xnIGXjs7U0exW+pScENRzeBGLZsGJ+n0 tnfupU1l7iiQugWsAbKql2EwiMc6RO0wcVi0alSkRAuPRV3yeDhjD8e7HNXSEXuo8LAFLTnYYTz ww0bnbceXovnaBBQeJIjxU1PMu/bC1QL8MqbEG+bIrsOp8YFQprP5FqoSZW8LCJb8rVge0756lU DgpEqSQfbsyL3G8jlZj3EBxg2ZBMh+wqkqw+Q/eFbBHyJ6EfZb722g9vD7epGeIkYUyRpCVO8Ha DPr5CKzt6RVzaHw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Any lease created by nfsd will have its fl_lmops set to nfsd_lease_mng_ops. Do a quick check for that first when testing whether the lease breaker owns the lease. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c75d3940188c..35f5c098717e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -91,6 +91,8 @@ static void _free_cpntf_state_locked(struct nfsd_net *nn,= struct nfs4_cpntf_stat static void nfsd4_file_hash_remove(struct nfs4_file *fi); static void deleg_reaper(struct nfsd_net *nn); =20 +static const struct lease_manager_operations nfsd_lease_mng_ops; + /* Locking: */ =20 enum nfsd4_st_mutex_lock_subclass { @@ -5655,6 +5657,10 @@ static bool nfsd_breaker_owns_lease(struct file_leas= e *fl) struct svc_rqst *rqst; struct nfs4_client *clp; =20 + /* Only nfsd leases */ + if (fl->fl_lmops !=3D &nfsd_lease_mng_ops) + return false; + rqst =3D nfsd_current_rqst(); if (!nfsd_v4client(rqst)) return false; --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 984FB3A6EF3; Thu, 16 Apr 2026 17:35:45 +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=1776360945; cv=none; b=NFWMEBf06djgJyzW9pVLrA+ByDSPl5to9TSUqgWC2Z/aB6e2dHc13hKZHvvUQyv1r+oAoaKNopUBvsaM2a+vm/soqGqbyO/MOvqfuljoJ8sxQa+Mn91NkWn/WDYga4MVM9PhRISEtDNA48/ob0ML8f0diAeS0Q8C2568H/F2Qic= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360945; c=relaxed/simple; bh=eeLOOGHbagjJAiOqi14UZrlR6ke5QtiKLpwRU37IZLE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GIQGevaZeUbziRvJZZ6vc6GGegVhuIfmMSnwxBXpgVY/tozTKAort0IIJ6hGwivT9ajqh0gKUTbmO/02ydKpTqWtPxWM3T6WaQ89Szsqd5BrqG3YTw/9Z9PYuQG4iEw/ustJ+QKmXBkUEASwYWETOxDqO7eWwYNyJ0QK1uPFrjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lQ5/ne3p; 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="lQ5/ne3p" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 653A6C2BCB7; Thu, 16 Apr 2026 17:35:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360945; bh=eeLOOGHbagjJAiOqi14UZrlR6ke5QtiKLpwRU37IZLE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lQ5/ne3pBeTMtJgS7971qNV6oi1figqoAecCQiOmk6gZGjXRxlc7Jo4JrPAako7IG Ei1x1uhadeNEKmDW5Ll56tc9bdTHLS0v0+TmnDQFk+8ZARiElCwixLq8O8ebAVYpRw DhyfkW98VhQoRQnLN3XOcv8NC0k+NA51MEZaRVdbRVQ0a+zwk8CK8IsKPjqG/bC2Vx GsNd1N4yrL6gdejyF2fZoVm8w1vi/Ks+77RoDuZ6pOT8pKu5mJbeUXNMfgaiLgMk6g +u+T4DhkvfFlE9Z3NiHRUG0VybSZcjFrnw/X1QNa1Dy2i2BpelDL7KiLv5g0j+pRkV kqrl/uRpiVjww== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:10 -0700 Subject: [PATCH v2 09/28] nfsd: add protocol support for CB_NOTIFY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-9-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=49615; i=jlayton@kernel.org; h=from:subject:message-id; bh=eeLOOGHbagjJAiOqi14UZrlR6ke5QtiKLpwRU37IZLE=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3jjXB/yzVuUiax6VUYt1wWJfi5HArnERMSl QXaMvP7zFWJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4wAKCRAADmhBGVaC FVOqD/9XkEtG5CC1pZG28ZfqDx126c1bX3jKIetvF2d7m6cJzXcdZH2hvHKfSMcOaiE4E2TYaMm MKpGu0+SsrAJav4Lx2/LrxoUKiqfUJ6CNXJ3qJ7W961AQVhpWXDlfwWdGHOREdFEJnNJWRcgPXQ xRmYaINgCMGM3vR+HYF70g3zH8n7VN9HBoLFySWzSZ3oeG6zQrx6Nltcynau8p78GKO5aWbKQYE WFbBVScyszTaefoZ+rX9Cggxl39pb5VFqjGJg2yNxP5WsPn/IPymgzTvle3XDOQaeQeLpCSxmUO fumXGWx15LbKLPIjp6m1Lcuu4QOTZeBqGgpcUIQaaj7nuolj3OjrUTwZkUnW5XRLNQnufdZHTwZ c7M2KWgroQ9Jbe1KqD7r1QuMnna2lE4dmOSvxrMdOCpSo6QpzxjEBOpj8k03WOJ6dR3iuIhT7L+ AhOWXYfl1tahIl7khIZJqUCS+ft5FKEsflKac35j9o/WtuTaf9jeGy+pTOXhiO+IaM/s43qdJWU iuEZEHVv6yvzxFpKwQ0wIXUug01JoJNVpiwujWski7v3SQWANcIyE+xTGuFehUyeWUn4T6N3W4j Lv2qYemcpawtMlTWusH+AFQAYR5mFk6lPYZAI0bn8UCbTptO4fMt4CwQKJIKFV3s5dPZwdJL2DQ ranTZK6UjL9Ct2w== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add the necessary bits to nfs4_1.x and remove the duplicate definitions from nfs4.h and the uapi nfs4 header. Regenerate the xdr files. Note that regenerating these files caused conflicts with the definitions of NFS4_VERIFIER_SIZE and NFS4_FHSIZE in include/uapi/linux/nfs4.h. These constants are defined by the RFC, and are not part of the kernel API. They have been removed. Userspace consumers who require those constants should plan to get them from more authoritative sources. Signed-off-by: Jeff Layton --- Documentation/sunrpc/xdr/nfs4_1.x | 250 ++++++++++++++- fs/nfsd/nfs4xdr_gen.c | 590 +++++++++++++++++++++++++++++++= +++- fs/nfsd/nfs4xdr_gen.h | 20 +- fs/nfsd/trace.h | 1 + include/linux/nfs4.h | 127 -------- include/linux/sunrpc/xdrgen/nfs4_1.h | 280 ++++++++++++++++- include/uapi/linux/nfs4.h | 2 - 7 files changed, 1129 insertions(+), 141 deletions(-) diff --git a/Documentation/sunrpc/xdr/nfs4_1.x b/Documentation/sunrpc/xdr/n= fs4_1.x index 5b45547b2ebc..632f5b579c39 100644 --- a/Documentation/sunrpc/xdr/nfs4_1.x +++ b/Documentation/sunrpc/xdr/nfs4_1.x @@ -45,19 +45,165 @@ pragma header nfs4; /* * Basic typedefs for RFC 1832 data type definitions */ -typedef hyper int64_t; -typedef unsigned int uint32_t; +typedef int int32_t; +typedef unsigned int uint32_t; +typedef hyper int64_t; +typedef unsigned hyper uint64_t; + +const NFS4_VERIFIER_SIZE =3D 8; +const NFS4_FHSIZE =3D 128; + +enum nfsstat4 { + NFS4_OK =3D 0, /* everything is okay */ + NFS4ERR_PERM =3D 1, /* caller not privileged */ + NFS4ERR_NOENT =3D 2, /* no such file/directory */ + NFS4ERR_IO =3D 5, /* hard I/O error */ + NFS4ERR_NXIO =3D 6, /* no such device */ + NFS4ERR_ACCESS =3D 13, /* access denied */ + NFS4ERR_EXIST =3D 17, /* file already exists */ + NFS4ERR_XDEV =3D 18, /* different filesystems */ + + /* + * Please do not allocate value 19; it was used in NFSv3 + * and we do not want a value in NFSv3 to have a different + * meaning in NFSv4.x. + */ + + NFS4ERR_NOTDIR =3D 20, /* should be a directory */ + NFS4ERR_ISDIR =3D 21, /* should not be directory */ + NFS4ERR_INVAL =3D 22, /* invalid argument */ + NFS4ERR_FBIG =3D 27, /* file exceeds server max */ + NFS4ERR_NOSPC =3D 28, /* no space on filesystem */ + NFS4ERR_ROFS =3D 30, /* read-only filesystem */ + NFS4ERR_MLINK =3D 31, /* too many hard links */ + NFS4ERR_NAMETOOLONG =3D 63, /* name exceeds server max */ + NFS4ERR_NOTEMPTY =3D 66, /* directory not empty */ + NFS4ERR_DQUOT =3D 69, /* hard quota limit reached*/ + NFS4ERR_STALE =3D 70, /* file no longer exists */ + NFS4ERR_BADHANDLE =3D 10001,/* Illegal filehandle */ + NFS4ERR_BAD_COOKIE =3D 10003,/* READDIR cookie is stale */ + NFS4ERR_NOTSUPP =3D 10004,/* operation not supported */ + NFS4ERR_TOOSMALL =3D 10005,/* response limit exceeded */ + NFS4ERR_SERVERFAULT =3D 10006,/* undefined server error */ + NFS4ERR_BADTYPE =3D 10007,/* type invalid for CREATE */ + NFS4ERR_DELAY =3D 10008,/* file "busy" - retry */ + NFS4ERR_SAME =3D 10009,/* nverify says attrs same */ + NFS4ERR_DENIED =3D 10010,/* lock unavailable */ + NFS4ERR_EXPIRED =3D 10011,/* lock lease expired */ + NFS4ERR_LOCKED =3D 10012,/* I/O failed due to lock */ + NFS4ERR_GRACE =3D 10013,/* in grace period */ + NFS4ERR_FHEXPIRED =3D 10014,/* filehandle expired */ + NFS4ERR_SHARE_DENIED =3D 10015,/* share reserve denied */ + NFS4ERR_WRONGSEC =3D 10016,/* wrong security flavor */ + NFS4ERR_CLID_INUSE =3D 10017,/* clientid in use */ + + /* NFS4ERR_RESOURCE is not a valid error in NFSv4.1 */ + NFS4ERR_RESOURCE =3D 10018,/* resource exhaustion */ + + NFS4ERR_MOVED =3D 10019,/* filesystem relocated */ + NFS4ERR_NOFILEHANDLE =3D 10020,/* current FH is not set */ + NFS4ERR_MINOR_VERS_MISMATCH=3D 10021,/* minor vers not supp */ + NFS4ERR_STALE_CLIENTID =3D 10022,/* server has rebooted */ + NFS4ERR_STALE_STATEID =3D 10023,/* server has rebooted */ + NFS4ERR_OLD_STATEID =3D 10024,/* state is out of sync */ + NFS4ERR_BAD_STATEID =3D 10025,/* incorrect stateid */ + NFS4ERR_BAD_SEQID =3D 10026,/* request is out of seq. */ + NFS4ERR_NOT_SAME =3D 10027,/* verify - attrs not same */ + NFS4ERR_LOCK_RANGE =3D 10028,/* overlapping lock range */ + NFS4ERR_SYMLINK =3D 10029,/* should be file/directory*/ + NFS4ERR_RESTOREFH =3D 10030,/* no saved filehandle */ + NFS4ERR_LEASE_MOVED =3D 10031,/* some filesystem moved */ + NFS4ERR_ATTRNOTSUPP =3D 10032,/* recommended attr not sup*/ + NFS4ERR_NO_GRACE =3D 10033,/* reclaim outside of grace*/ + NFS4ERR_RECLAIM_BAD =3D 10034,/* reclaim error at server */ + NFS4ERR_RECLAIM_CONFLICT=3D 10035,/* conflict on reclaim */ + NFS4ERR_BADXDR =3D 10036,/* XDR decode failed */ + NFS4ERR_LOCKS_HELD =3D 10037,/* file locks held at CLOSE*/ + NFS4ERR_OPENMODE =3D 10038,/* conflict in OPEN and I/O*/ + NFS4ERR_BADOWNER =3D 10039,/* owner translation bad */ + NFS4ERR_BADCHAR =3D 10040,/* utf-8 char not supported*/ + NFS4ERR_BADNAME =3D 10041,/* name not supported */ + NFS4ERR_BAD_RANGE =3D 10042,/* lock range not supported*/ + NFS4ERR_LOCK_NOTSUPP =3D 10043,/* no atomic up/downgrade */ + NFS4ERR_OP_ILLEGAL =3D 10044,/* undefined operation */ + NFS4ERR_DEADLOCK =3D 10045,/* file locking deadlock */ + NFS4ERR_FILE_OPEN =3D 10046,/* open file blocks op. */ + NFS4ERR_ADMIN_REVOKED =3D 10047,/* lockowner state revoked */ + NFS4ERR_CB_PATH_DOWN =3D 10048,/* callback path down */ + + /* NFSv4.1 errors start here. */ + + NFS4ERR_BADIOMODE =3D 10049, + NFS4ERR_BADLAYOUT =3D 10050, + NFS4ERR_BAD_SESSION_DIGEST =3D 10051, + NFS4ERR_BADSESSION =3D 10052, + NFS4ERR_BADSLOT =3D 10053, + NFS4ERR_COMPLETE_ALREADY =3D 10054, + NFS4ERR_CONN_NOT_BOUND_TO_SESSION =3D 10055, + NFS4ERR_DELEG_ALREADY_WANTED =3D 10056, + NFS4ERR_BACK_CHAN_BUSY =3D 10057,/*backchan reqs outstanding*/ + NFS4ERR_LAYOUTTRYLATER =3D 10058, + NFS4ERR_LAYOUTUNAVAILABLE =3D 10059, + NFS4ERR_NOMATCHING_LAYOUT =3D 10060, + NFS4ERR_RECALLCONFLICT =3D 10061, + NFS4ERR_UNKNOWN_LAYOUTTYPE =3D 10062, + NFS4ERR_SEQ_MISORDERED =3D 10063,/* unexpected seq.ID in req*/ + NFS4ERR_SEQUENCE_POS =3D 10064,/* [CB_]SEQ. op not 1st op */ + NFS4ERR_REQ_TOO_BIG =3D 10065,/* request too big */ + NFS4ERR_REP_TOO_BIG =3D 10066,/* reply too big */ + NFS4ERR_REP_TOO_BIG_TO_CACHE =3D10067,/* rep. not all cached*/ + NFS4ERR_RETRY_UNCACHED_REP =3D10068,/* retry & rep. uncached*/ + NFS4ERR_UNSAFE_COMPOUND =3D10069,/* retry/recovery too hard */ + NFS4ERR_TOO_MANY_OPS =3D 10070,/*too many ops in [CB_]COMP*/ + NFS4ERR_OP_NOT_IN_SESSION =3D10071,/* op needs [CB_]SEQ. op */ + NFS4ERR_HASH_ALG_UNSUPP =3D 10072, /* hash alg. not supp. */ + /* Error 10073 is unused. */ + NFS4ERR_CLIENTID_BUSY =3D 10074,/* clientid has state */ + NFS4ERR_PNFS_IO_HOLE =3D 10075,/* IO to _SPARSE file hole */ + NFS4ERR_SEQ_FALSE_RETRY=3D 10076,/* Retry !=3D original req. */ + NFS4ERR_BAD_HIGH_SLOT =3D 10077,/* req has bad highest_slot*/ + NFS4ERR_DEADSESSION =3D 10078,/*new req sent to dead sess*/ + NFS4ERR_ENCR_ALG_UNSUPP=3D 10079,/* encr alg. not supp. */ + NFS4ERR_PNFS_NO_LAYOUT =3D 10080,/* I/O without a layout */ + NFS4ERR_NOT_ONLY_OP =3D 10081,/* addl ops not allowed */ + NFS4ERR_WRONG_CRED =3D 10082,/* op done by wrong cred */ + NFS4ERR_WRONG_TYPE =3D 10083,/* op on wrong type object */ + NFS4ERR_DIRDELEG_UNAVAIL=3D10084,/* delegation not avail. */ + NFS4ERR_REJECT_DELEG =3D 10085,/* cb rejected delegation */ + NFS4ERR_RETURNCONFLICT =3D 10086,/* layout get before return*/ + NFS4ERR_DELEG_REVOKED =3D 10087, /* deleg./layout revoked */ + NFS4ERR_PARTNER_NOTSUPP =3D 10088, + NFS4ERR_PARTNER_NO_AUTH =3D 10089, + NFS4ERR_UNION_NOTSUPP =3D 10090, + NFS4ERR_OFFLOAD_DENIED =3D 10091, + NFS4ERR_WRONG_LFS =3D 10092, + NFS4ERR_BADLABEL =3D 10093, + NFS4ERR_OFFLOAD_NO_REQS =3D 10094, + NFS4ERR_NOXATTR =3D 10095, + NFS4ERR_XATTR2BIG =3D 10096, + + /* always set this to one more than the last one in the enum */ + NFS4ERR_FIRST_FREE =3D 10097 +}; =20 /* * Basic data types */ +typedef opaque attrlist4<>; typedef uint32_t bitmap4<>; +typedef opaque verifier4[NFS4_VERIFIER_SIZE]; +typedef uint64_t nfs_cookie4; +typedef opaque nfs_fh4; =20 typedef opaque utf8string<>; typedef utf8string utf8str_cis; typedef utf8string utf8str_cs; typedef utf8string utf8str_mixed; =20 +typedef utf8str_cs component4; +typedef utf8str_cs linktext4; +typedef component4 pathname4<>; + /* * Timeval */ @@ -66,6 +212,21 @@ struct nfstime4 { uint32_t nseconds; }; =20 +/* + * File attribute container + */ +struct fattr4 { + bitmap4 attrmask; + attrlist4 attr_vals; +}; + +/* + * Stateid + */ +struct stateid4 { + uint32_t seqid; + opaque other[12]; +}; =20 /* * The following content was extracted from draft-ietf-nfsv4-delstid @@ -245,3 +406,88 @@ const FATTR4_ACL_TRUEFORM =3D 89; const FATTR4_ACL_TRUEFORM_SCOPE =3D 90; const FATTR4_POSIX_DEFAULT_ACL =3D 91; const FATTR4_POSIX_ACCESS_ACL =3D 92; + +/* + * Directory notification types. + */ +enum notify_type4 { + NOTIFY4_CHANGE_CHILD_ATTRS =3D 0, + NOTIFY4_CHANGE_DIR_ATTRS =3D 1, + NOTIFY4_REMOVE_ENTRY =3D 2, + NOTIFY4_ADD_ENTRY =3D 3, + NOTIFY4_RENAME_ENTRY =3D 4, + NOTIFY4_CHANGE_COOKIE_VERIFIER =3D 5 +}; + +/* Changed entry information. */ +struct notify_entry4 { + component4 ne_file; + fattr4 ne_attrs; +}; + +/* Previous entry information */ +struct prev_entry4 { + notify_entry4 pe_prev_entry; + /* what READDIR returned for this entry */ + nfs_cookie4 pe_prev_entry_cookie; +}; + +struct notify_remove4 { + notify_entry4 nrm_old_entry; + nfs_cookie4 nrm_old_entry_cookie; +}; +pragma public notify_remove4; + +struct notify_add4 { + /* + * Information on object + * possibly renamed over. + */ + notify_remove4 nad_old_entry<1>; + notify_entry4 nad_new_entry; + /* what READDIR would have returned for this entry */ + nfs_cookie4 nad_new_entry_cookie<1>; + prev_entry4 nad_prev_entry<1>; + bool nad_last_entry; +}; +pragma public notify_add4; + +struct notify_attr4 { + notify_entry4 na_changed_entry; +}; +pragma public notify_attr4; + +struct notify_rename4 { + notify_remove4 nrn_old_entry; + notify_add4 nrn_new_entry; +}; +pragma public notify_rename4; + +struct notify_verifier4 { + verifier4 nv_old_cookieverf; + verifier4 nv_new_cookieverf; +}; + +/* + * Objects of type notify_<>4 and + * notify_device_<>4 are encoded in this. + */ +typedef opaque notifylist4<>; + +struct notify4 { + /* composed from notify_type4 or notify_deviceid_type4 */ + bitmap4 notify_mask; + notifylist4 notify_vals; +}; + +struct CB_NOTIFY4args { + stateid4 cna_stateid; + nfs_fh4 cna_fh; + notify4 cna_changes<>; +}; +pragma public CB_NOTIFY4args; + +struct CB_NOTIFY4res { + nfsstat4 cnr_status; +}; +pragma public CB_NOTIFY4res; diff --git a/fs/nfsd/nfs4xdr_gen.c b/fs/nfsd/nfs4xdr_gen.c index 824497051b87..5e656d6bbb8e 100644 --- a/fs/nfsd/nfs4xdr_gen.c +++ b/fs/nfsd/nfs4xdr_gen.c @@ -1,16 +1,16 @@ // SPDX-License-Identifier: GPL-2.0 // Generated by xdrgen. Manual edits will be lost. // XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x -// XDR specification modification time: Thu Jan 8 23:12:07 2026 +// XDR specification modification time: Wed Mar 25 11:39:22 2026 =20 #include =20 #include "nfs4xdr_gen.h" =20 static bool __maybe_unused -xdrgen_decode_int64_t(struct xdr_stream *xdr, int64_t *ptr) +xdrgen_decode_int32_t(struct xdr_stream *xdr, int32_t *ptr) { - return xdrgen_decode_hyper(xdr, ptr); + return xdrgen_decode_int(xdr, ptr); } =20 static bool __maybe_unused @@ -19,6 +19,155 @@ xdrgen_decode_uint32_t(struct xdr_stream *xdr, uint32_t= *ptr) return xdrgen_decode_unsigned_int(xdr, ptr); } =20 +static bool __maybe_unused +xdrgen_decode_int64_t(struct xdr_stream *xdr, int64_t *ptr) +{ + return xdrgen_decode_hyper(xdr, ptr); +} + +static bool __maybe_unused +xdrgen_decode_uint64_t(struct xdr_stream *xdr, uint64_t *ptr) +{ + return xdrgen_decode_unsigned_hyper(xdr, ptr); +} + +static bool __maybe_unused +xdrgen_decode_nfsstat4(struct xdr_stream *xdr, nfsstat4 *ptr) +{ + u32 val; + + if (xdr_stream_decode_u32(xdr, &val) < 0) + return false; + /* Compiler may optimize to a range check for dense enums */ + switch (val) { + case NFS4_OK: + case NFS4ERR_PERM: + case NFS4ERR_NOENT: + case NFS4ERR_IO: + case NFS4ERR_NXIO: + case NFS4ERR_ACCESS: + case NFS4ERR_EXIST: + case NFS4ERR_XDEV: + case NFS4ERR_NOTDIR: + case NFS4ERR_ISDIR: + case NFS4ERR_INVAL: + case NFS4ERR_FBIG: + case NFS4ERR_NOSPC: + case NFS4ERR_ROFS: + case NFS4ERR_MLINK: + case NFS4ERR_NAMETOOLONG: + case NFS4ERR_NOTEMPTY: + case NFS4ERR_DQUOT: + case NFS4ERR_STALE: + case NFS4ERR_BADHANDLE: + case NFS4ERR_BAD_COOKIE: + case NFS4ERR_NOTSUPP: + case NFS4ERR_TOOSMALL: + case NFS4ERR_SERVERFAULT: + case NFS4ERR_BADTYPE: + case NFS4ERR_DELAY: + case NFS4ERR_SAME: + case NFS4ERR_DENIED: + case NFS4ERR_EXPIRED: + case NFS4ERR_LOCKED: + case NFS4ERR_GRACE: + case NFS4ERR_FHEXPIRED: + case NFS4ERR_SHARE_DENIED: + case NFS4ERR_WRONGSEC: + case NFS4ERR_CLID_INUSE: + case NFS4ERR_RESOURCE: + case NFS4ERR_MOVED: + case NFS4ERR_NOFILEHANDLE: + case NFS4ERR_MINOR_VERS_MISMATCH: + case NFS4ERR_STALE_CLIENTID: + case NFS4ERR_STALE_STATEID: + case NFS4ERR_OLD_STATEID: + case NFS4ERR_BAD_STATEID: + case NFS4ERR_BAD_SEQID: + case NFS4ERR_NOT_SAME: + case NFS4ERR_LOCK_RANGE: + case NFS4ERR_SYMLINK: + case NFS4ERR_RESTOREFH: + case NFS4ERR_LEASE_MOVED: + case NFS4ERR_ATTRNOTSUPP: + case NFS4ERR_NO_GRACE: + case NFS4ERR_RECLAIM_BAD: + case NFS4ERR_RECLAIM_CONFLICT: + case NFS4ERR_BADXDR: + case NFS4ERR_LOCKS_HELD: + case NFS4ERR_OPENMODE: + case NFS4ERR_BADOWNER: + case NFS4ERR_BADCHAR: + case NFS4ERR_BADNAME: + case NFS4ERR_BAD_RANGE: + case NFS4ERR_LOCK_NOTSUPP: + case NFS4ERR_OP_ILLEGAL: + case NFS4ERR_DEADLOCK: + case NFS4ERR_FILE_OPEN: + case NFS4ERR_ADMIN_REVOKED: + case NFS4ERR_CB_PATH_DOWN: + case NFS4ERR_BADIOMODE: + case NFS4ERR_BADLAYOUT: + case NFS4ERR_BAD_SESSION_DIGEST: + case NFS4ERR_BADSESSION: + case NFS4ERR_BADSLOT: + case NFS4ERR_COMPLETE_ALREADY: + case NFS4ERR_CONN_NOT_BOUND_TO_SESSION: + case NFS4ERR_DELEG_ALREADY_WANTED: + case NFS4ERR_BACK_CHAN_BUSY: + case NFS4ERR_LAYOUTTRYLATER: + case NFS4ERR_LAYOUTUNAVAILABLE: + case NFS4ERR_NOMATCHING_LAYOUT: + case NFS4ERR_RECALLCONFLICT: + case NFS4ERR_UNKNOWN_LAYOUTTYPE: + case NFS4ERR_SEQ_MISORDERED: + case NFS4ERR_SEQUENCE_POS: + case NFS4ERR_REQ_TOO_BIG: + case NFS4ERR_REP_TOO_BIG: + case NFS4ERR_REP_TOO_BIG_TO_CACHE: + case NFS4ERR_RETRY_UNCACHED_REP: + case NFS4ERR_UNSAFE_COMPOUND: + case NFS4ERR_TOO_MANY_OPS: + case NFS4ERR_OP_NOT_IN_SESSION: + case NFS4ERR_HASH_ALG_UNSUPP: + case NFS4ERR_CLIENTID_BUSY: + case NFS4ERR_PNFS_IO_HOLE: + case NFS4ERR_SEQ_FALSE_RETRY: + case NFS4ERR_BAD_HIGH_SLOT: + case NFS4ERR_DEADSESSION: + case NFS4ERR_ENCR_ALG_UNSUPP: + case NFS4ERR_PNFS_NO_LAYOUT: + case NFS4ERR_NOT_ONLY_OP: + case NFS4ERR_WRONG_CRED: + case NFS4ERR_WRONG_TYPE: + case NFS4ERR_DIRDELEG_UNAVAIL: + case NFS4ERR_REJECT_DELEG: + case NFS4ERR_RETURNCONFLICT: + case NFS4ERR_DELEG_REVOKED: + case NFS4ERR_PARTNER_NOTSUPP: + case NFS4ERR_PARTNER_NO_AUTH: + case NFS4ERR_UNION_NOTSUPP: + case NFS4ERR_OFFLOAD_DENIED: + case NFS4ERR_WRONG_LFS: + case NFS4ERR_BADLABEL: + case NFS4ERR_OFFLOAD_NO_REQS: + case NFS4ERR_NOXATTR: + case NFS4ERR_XATTR2BIG: + case NFS4ERR_FIRST_FREE: + break; + default: + return false; + } + *ptr =3D val; + return true; +} + +static bool __maybe_unused +xdrgen_decode_attrlist4(struct xdr_stream *xdr, attrlist4 *ptr) +{ + return xdrgen_decode_opaque(xdr, ptr, 0); +} + static bool __maybe_unused xdrgen_decode_bitmap4(struct xdr_stream *xdr, bitmap4 *ptr) { @@ -30,6 +179,24 @@ xdrgen_decode_bitmap4(struct xdr_stream *xdr, bitmap4 *= ptr) return true; } =20 +static bool __maybe_unused +xdrgen_decode_verifier4(struct xdr_stream *xdr, verifier4 *ptr) +{ + return xdr_stream_decode_opaque_fixed(xdr, ptr, NFS4_VERIFIER_SIZE) =3D= =3D 0; +} + +static bool __maybe_unused +xdrgen_decode_nfs_cookie4(struct xdr_stream *xdr, nfs_cookie4 *ptr) +{ + return xdrgen_decode_uint64_t(xdr, ptr); +} + +static bool __maybe_unused +xdrgen_decode_nfs_fh4(struct xdr_stream *xdr, nfs_fh4 *ptr) +{ + return xdrgen_decode_opaque(xdr, ptr, NFS4_FHSIZE); +} + static bool __maybe_unused xdrgen_decode_utf8string(struct xdr_stream *xdr, utf8string *ptr) { @@ -54,6 +221,29 @@ xdrgen_decode_utf8str_mixed(struct xdr_stream *xdr, utf= 8str_mixed *ptr) return xdrgen_decode_utf8string(xdr, ptr); } =20 +static bool __maybe_unused +xdrgen_decode_component4(struct xdr_stream *xdr, component4 *ptr) +{ + return xdrgen_decode_utf8str_cs(xdr, ptr); +} + +static bool __maybe_unused +xdrgen_decode_linktext4(struct xdr_stream *xdr, linktext4 *ptr) +{ + return xdrgen_decode_utf8str_cs(xdr, ptr); +} + +static bool __maybe_unused +xdrgen_decode_pathname4(struct xdr_stream *xdr, pathname4 *ptr) +{ + if (xdr_stream_decode_u32(xdr, &ptr->count) < 0) + return false; + for (u32 i =3D 0; i < ptr->count; i++) + if (!xdrgen_decode_component4(xdr, &ptr->element[i])) + return false; + return true; +} + static bool __maybe_unused xdrgen_decode_nfstime4(struct xdr_stream *xdr, struct nfstime4 *ptr) { @@ -64,6 +254,26 @@ xdrgen_decode_nfstime4(struct xdr_stream *xdr, struct n= fstime4 *ptr) return true; } =20 +static bool __maybe_unused +xdrgen_decode_fattr4(struct xdr_stream *xdr, struct fattr4 *ptr) +{ + if (!xdrgen_decode_bitmap4(xdr, &ptr->attrmask)) + return false; + if (!xdrgen_decode_attrlist4(xdr, &ptr->attr_vals)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_decode_stateid4(struct xdr_stream *xdr, struct stateid4 *ptr) +{ + if (!xdrgen_decode_uint32_t(xdr, &ptr->seqid)) + return false; + if (xdr_stream_decode_opaque_fixed(xdr, ptr->other, 12) < 0) + return false; + return true; +} + static bool __maybe_unused xdrgen_decode_fattr4_offline(struct xdr_stream *xdr, fattr4_offline *ptr) { @@ -366,9 +576,160 @@ xdrgen_decode_fattr4_posix_access_acl(struct xdr_stre= am *xdr, fattr4_posix_acces */ =20 static bool __maybe_unused -xdrgen_encode_int64_t(struct xdr_stream *xdr, const int64_t value) +xdrgen_decode_notify_type4(struct xdr_stream *xdr, notify_type4 *ptr) { - return xdrgen_encode_hyper(xdr, value); + u32 val; + + if (xdr_stream_decode_u32(xdr, &val) < 0) + return false; + /* Compiler may optimize to a range check for dense enums */ + switch (val) { + case NOTIFY4_CHANGE_CHILD_ATTRS: + case NOTIFY4_CHANGE_DIR_ATTRS: + case NOTIFY4_REMOVE_ENTRY: + case NOTIFY4_ADD_ENTRY: + case NOTIFY4_RENAME_ENTRY: + case NOTIFY4_CHANGE_COOKIE_VERIFIER: + break; + default: + return false; + } + *ptr =3D val; + return true; +} + +static bool __maybe_unused +xdrgen_decode_notify_entry4(struct xdr_stream *xdr, struct notify_entry4 *= ptr) +{ + if (!xdrgen_decode_component4(xdr, &ptr->ne_file)) + return false; + if (!xdrgen_decode_fattr4(xdr, &ptr->ne_attrs)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_decode_prev_entry4(struct xdr_stream *xdr, struct prev_entry4 *ptr) +{ + if (!xdrgen_decode_notify_entry4(xdr, &ptr->pe_prev_entry)) + return false; + if (!xdrgen_decode_nfs_cookie4(xdr, &ptr->pe_prev_entry_cookie)) + return false; + return true; +} + +bool +xdrgen_decode_notify_remove4(struct xdr_stream *xdr, struct notify_remove4= *ptr) +{ + if (!xdrgen_decode_notify_entry4(xdr, &ptr->nrm_old_entry)) + return false; + if (!xdrgen_decode_nfs_cookie4(xdr, &ptr->nrm_old_entry_cookie)) + return false; + return true; +} + +bool +xdrgen_decode_notify_add4(struct xdr_stream *xdr, struct notify_add4 *ptr) +{ + if (xdr_stream_decode_u32(xdr, &ptr->nad_old_entry.count) < 0) + return false; + if (ptr->nad_old_entry.count > 1) + return false; + for (u32 i =3D 0; i < ptr->nad_old_entry.count; i++) + if (!xdrgen_decode_notify_remove4(xdr, &ptr->nad_old_entry.element[i])) + return false; + if (!xdrgen_decode_notify_entry4(xdr, &ptr->nad_new_entry)) + return false; + if (xdr_stream_decode_u32(xdr, &ptr->nad_new_entry_cookie.count) < 0) + return false; + if (ptr->nad_new_entry_cookie.count > 1) + return false; + for (u32 i =3D 0; i < ptr->nad_new_entry_cookie.count; i++) + if (!xdrgen_decode_nfs_cookie4(xdr, &ptr->nad_new_entry_cookie.element[i= ])) + return false; + if (xdr_stream_decode_u32(xdr, &ptr->nad_prev_entry.count) < 0) + return false; + if (ptr->nad_prev_entry.count > 1) + return false; + for (u32 i =3D 0; i < ptr->nad_prev_entry.count; i++) + if (!xdrgen_decode_prev_entry4(xdr, &ptr->nad_prev_entry.element[i])) + return false; + if (!xdrgen_decode_bool(xdr, &ptr->nad_last_entry)) + return false; + return true; +} + +bool +xdrgen_decode_notify_attr4(struct xdr_stream *xdr, struct notify_attr4 *pt= r) +{ + if (!xdrgen_decode_notify_entry4(xdr, &ptr->na_changed_entry)) + return false; + return true; +} + +bool +xdrgen_decode_notify_rename4(struct xdr_stream *xdr, struct notify_rename4= *ptr) +{ + if (!xdrgen_decode_notify_remove4(xdr, &ptr->nrn_old_entry)) + return false; + if (!xdrgen_decode_notify_add4(xdr, &ptr->nrn_new_entry)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_decode_notify_verifier4(struct xdr_stream *xdr, struct notify_verif= ier4 *ptr) +{ + if (!xdrgen_decode_verifier4(xdr, &ptr->nv_old_cookieverf)) + return false; + if (!xdrgen_decode_verifier4(xdr, &ptr->nv_new_cookieverf)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_decode_notifylist4(struct xdr_stream *xdr, notifylist4 *ptr) +{ + return xdrgen_decode_opaque(xdr, ptr, 0); +} + +static bool __maybe_unused +xdrgen_decode_notify4(struct xdr_stream *xdr, struct notify4 *ptr) +{ + if (!xdrgen_decode_bitmap4(xdr, &ptr->notify_mask)) + return false; + if (!xdrgen_decode_notifylist4(xdr, &ptr->notify_vals)) + return false; + return true; +} + +bool +xdrgen_decode_CB_NOTIFY4args(struct xdr_stream *xdr, struct CB_NOTIFY4args= *ptr) +{ + if (!xdrgen_decode_stateid4(xdr, &ptr->cna_stateid)) + return false; + if (!xdrgen_decode_nfs_fh4(xdr, &ptr->cna_fh)) + return false; + if (xdr_stream_decode_u32(xdr, &ptr->cna_changes.count) < 0) + return false; + for (u32 i =3D 0; i < ptr->cna_changes.count; i++) + if (!xdrgen_decode_notify4(xdr, &ptr->cna_changes.element[i])) + return false; + return true; +} + +bool +xdrgen_decode_CB_NOTIFY4res(struct xdr_stream *xdr, struct CB_NOTIFY4res *= ptr) +{ + if (!xdrgen_decode_nfsstat4(xdr, &ptr->cnr_status)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_encode_int32_t(struct xdr_stream *xdr, const int32_t value) +{ + return xdrgen_encode_int(xdr, value); } =20 static bool __maybe_unused @@ -377,6 +738,30 @@ xdrgen_encode_uint32_t(struct xdr_stream *xdr, const u= int32_t value) return xdrgen_encode_unsigned_int(xdr, value); } =20 +static bool __maybe_unused +xdrgen_encode_int64_t(struct xdr_stream *xdr, const int64_t value) +{ + return xdrgen_encode_hyper(xdr, value); +} + +static bool __maybe_unused +xdrgen_encode_uint64_t(struct xdr_stream *xdr, const uint64_t value) +{ + return xdrgen_encode_unsigned_hyper(xdr, value); +} + +static bool __maybe_unused +xdrgen_encode_nfsstat4(struct xdr_stream *xdr, nfsstat4 value) +{ + return xdr_stream_encode_u32(xdr, value) =3D=3D XDR_UNIT; +} + +static bool __maybe_unused +xdrgen_encode_attrlist4(struct xdr_stream *xdr, const attrlist4 value) +{ + return xdr_stream_encode_opaque(xdr, value.data, value.len) >=3D 0; +} + static bool __maybe_unused xdrgen_encode_bitmap4(struct xdr_stream *xdr, const bitmap4 value) { @@ -388,6 +773,24 @@ xdrgen_encode_bitmap4(struct xdr_stream *xdr, const bi= tmap4 value) return true; } =20 +static bool __maybe_unused +xdrgen_encode_verifier4(struct xdr_stream *xdr, const verifier4 value) +{ + return xdr_stream_encode_opaque_fixed(xdr, value, NFS4_VERIFIER_SIZE) >= =3D 0; +} + +static bool __maybe_unused +xdrgen_encode_nfs_cookie4(struct xdr_stream *xdr, const nfs_cookie4 value) +{ + return xdrgen_encode_uint64_t(xdr, value); +} + +static bool __maybe_unused +xdrgen_encode_nfs_fh4(struct xdr_stream *xdr, const nfs_fh4 value) +{ + return xdr_stream_encode_opaque(xdr, value.data, value.len) >=3D 0; +} + static bool __maybe_unused xdrgen_encode_utf8string(struct xdr_stream *xdr, const utf8string value) { @@ -412,6 +815,29 @@ xdrgen_encode_utf8str_mixed(struct xdr_stream *xdr, co= nst utf8str_mixed value) return xdrgen_encode_utf8string(xdr, value); } =20 +static bool __maybe_unused +xdrgen_encode_component4(struct xdr_stream *xdr, const component4 value) +{ + return xdrgen_encode_utf8str_cs(xdr, value); +} + +static bool __maybe_unused +xdrgen_encode_linktext4(struct xdr_stream *xdr, const linktext4 value) +{ + return xdrgen_encode_utf8str_cs(xdr, value); +} + +static bool __maybe_unused +xdrgen_encode_pathname4(struct xdr_stream *xdr, const pathname4 value) +{ + if (xdr_stream_encode_u32(xdr, value.count) !=3D XDR_UNIT) + return false; + for (u32 i =3D 0; i < value.count; i++) + if (!xdrgen_encode_component4(xdr, value.element[i])) + return false; + return true; +} + static bool __maybe_unused xdrgen_encode_nfstime4(struct xdr_stream *xdr, const struct nfstime4 *valu= e) { @@ -422,6 +848,26 @@ xdrgen_encode_nfstime4(struct xdr_stream *xdr, const s= truct nfstime4 *value) return true; } =20 +static bool __maybe_unused +xdrgen_encode_fattr4(struct xdr_stream *xdr, const struct fattr4 *value) +{ + if (!xdrgen_encode_bitmap4(xdr, value->attrmask)) + return false; + if (!xdrgen_encode_attrlist4(xdr, value->attr_vals)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_encode_stateid4(struct xdr_stream *xdr, const struct stateid4 *valu= e) +{ + if (!xdrgen_encode_uint32_t(xdr, value->seqid)) + return false; + if (xdr_stream_encode_opaque_fixed(xdr, value->other, 12) < 0) + return false; + return true; +} + static bool __maybe_unused xdrgen_encode_fattr4_offline(struct xdr_stream *xdr, const fattr4_offline = value) { @@ -567,3 +1013,137 @@ xdrgen_encode_fattr4_posix_access_acl(struct xdr_str= eam *xdr, const fattr4_posix return false; return true; } + +static bool __maybe_unused +xdrgen_encode_notify_type4(struct xdr_stream *xdr, notify_type4 value) +{ + return xdr_stream_encode_u32(xdr, value) =3D=3D XDR_UNIT; +} + +static bool __maybe_unused +xdrgen_encode_notify_entry4(struct xdr_stream *xdr, const struct notify_en= try4 *value) +{ + if (!xdrgen_encode_component4(xdr, value->ne_file)) + return false; + if (!xdrgen_encode_fattr4(xdr, &value->ne_attrs)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_encode_prev_entry4(struct xdr_stream *xdr, const struct prev_entry4= *value) +{ + if (!xdrgen_encode_notify_entry4(xdr, &value->pe_prev_entry)) + return false; + if (!xdrgen_encode_nfs_cookie4(xdr, value->pe_prev_entry_cookie)) + return false; + return true; +} + +bool +xdrgen_encode_notify_remove4(struct xdr_stream *xdr, const struct notify_r= emove4 *value) +{ + if (!xdrgen_encode_notify_entry4(xdr, &value->nrm_old_entry)) + return false; + if (!xdrgen_encode_nfs_cookie4(xdr, value->nrm_old_entry_cookie)) + return false; + return true; +} + +bool +xdrgen_encode_notify_add4(struct xdr_stream *xdr, const struct notify_add4= *value) +{ + if (value->nad_old_entry.count > 1) + return false; + if (xdr_stream_encode_u32(xdr, value->nad_old_entry.count) !=3D XDR_UNIT) + return false; + for (u32 i =3D 0; i < value->nad_old_entry.count; i++) + if (!xdrgen_encode_notify_remove4(xdr, &value->nad_old_entry.element[i])) + return false; + if (!xdrgen_encode_notify_entry4(xdr, &value->nad_new_entry)) + return false; + if (value->nad_new_entry_cookie.count > 1) + return false; + if (xdr_stream_encode_u32(xdr, value->nad_new_entry_cookie.count) !=3D XD= R_UNIT) + return false; + for (u32 i =3D 0; i < value->nad_new_entry_cookie.count; i++) + if (!xdrgen_encode_nfs_cookie4(xdr, value->nad_new_entry_cookie.element[= i])) + return false; + if (value->nad_prev_entry.count > 1) + return false; + if (xdr_stream_encode_u32(xdr, value->nad_prev_entry.count) !=3D XDR_UNIT) + return false; + for (u32 i =3D 0; i < value->nad_prev_entry.count; i++) + if (!xdrgen_encode_prev_entry4(xdr, &value->nad_prev_entry.element[i])) + return false; + if (!xdrgen_encode_bool(xdr, value->nad_last_entry)) + return false; + return true; +} + +bool +xdrgen_encode_notify_attr4(struct xdr_stream *xdr, const struct notify_att= r4 *value) +{ + if (!xdrgen_encode_notify_entry4(xdr, &value->na_changed_entry)) + return false; + return true; +} + +bool +xdrgen_encode_notify_rename4(struct xdr_stream *xdr, const struct notify_r= ename4 *value) +{ + if (!xdrgen_encode_notify_remove4(xdr, &value->nrn_old_entry)) + return false; + if (!xdrgen_encode_notify_add4(xdr, &value->nrn_new_entry)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_encode_notify_verifier4(struct xdr_stream *xdr, const struct notify= _verifier4 *value) +{ + if (!xdrgen_encode_verifier4(xdr, value->nv_old_cookieverf)) + return false; + if (!xdrgen_encode_verifier4(xdr, value->nv_new_cookieverf)) + return false; + return true; +} + +static bool __maybe_unused +xdrgen_encode_notifylist4(struct xdr_stream *xdr, const notifylist4 value) +{ + return xdr_stream_encode_opaque(xdr, value.data, value.len) >=3D 0; +} + +static bool __maybe_unused +xdrgen_encode_notify4(struct xdr_stream *xdr, const struct notify4 *value) +{ + if (!xdrgen_encode_bitmap4(xdr, value->notify_mask)) + return false; + if (!xdrgen_encode_notifylist4(xdr, value->notify_vals)) + return false; + return true; +} + +bool +xdrgen_encode_CB_NOTIFY4args(struct xdr_stream *xdr, const struct CB_NOTIF= Y4args *value) +{ + if (!xdrgen_encode_stateid4(xdr, &value->cna_stateid)) + return false; + if (!xdrgen_encode_nfs_fh4(xdr, value->cna_fh)) + return false; + if (xdr_stream_encode_u32(xdr, value->cna_changes.count) !=3D XDR_UNIT) + return false; + for (u32 i =3D 0; i < value->cna_changes.count; i++) + if (!xdrgen_encode_notify4(xdr, &value->cna_changes.element[i])) + return false; + return true; +} + +bool +xdrgen_encode_CB_NOTIFY4res(struct xdr_stream *xdr, const struct CB_NOTIFY= 4res *value) +{ + if (!xdrgen_encode_nfsstat4(xdr, value->cnr_status)) + return false; + return true; +} diff --git a/fs/nfsd/nfs4xdr_gen.h b/fs/nfsd/nfs4xdr_gen.h index 1c487f1a11ab..503fe2ccba51 100644 --- a/fs/nfsd/nfs4xdr_gen.h +++ b/fs/nfsd/nfs4xdr_gen.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Generated by xdrgen. Manual edits will be lost. */ /* XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x */ -/* XDR specification modification time: Thu Jan 8 23:12:07 2026 */ +/* XDR specification modification time: Wed Mar 25 11:39:22 2026 */ =20 #ifndef _LINUX_XDRGEN_NFS4_1_DECL_H #define _LINUX_XDRGEN_NFS4_1_DECL_H @@ -32,4 +32,22 @@ bool xdrgen_decode_posixaceperm4(struct xdr_stream *xdr,= posixaceperm4 *ptr); bool xdrgen_encode_posixaceperm4(struct xdr_stream *xdr, const posixaceper= m4 value); =20 =20 +bool xdrgen_decode_notify_remove4(struct xdr_stream *xdr, struct notify_re= move4 *ptr); +bool xdrgen_encode_notify_remove4(struct xdr_stream *xdr, const struct not= ify_remove4 *value); + +bool xdrgen_decode_notify_add4(struct xdr_stream *xdr, struct notify_add4 = *ptr); +bool xdrgen_encode_notify_add4(struct xdr_stream *xdr, const struct notify= _add4 *value); + +bool xdrgen_decode_notify_attr4(struct xdr_stream *xdr, struct notify_attr= 4 *ptr); +bool xdrgen_encode_notify_attr4(struct xdr_stream *xdr, const struct notif= y_attr4 *value); + +bool xdrgen_decode_notify_rename4(struct xdr_stream *xdr, struct notify_re= name4 *ptr); +bool xdrgen_encode_notify_rename4(struct xdr_stream *xdr, const struct not= ify_rename4 *value); + +bool xdrgen_decode_CB_NOTIFY4args(struct xdr_stream *xdr, struct CB_NOTIFY= 4args *ptr); +bool xdrgen_encode_CB_NOTIFY4args(struct xdr_stream *xdr, const struct CB_= NOTIFY4args *value); + +bool xdrgen_decode_CB_NOTIFY4res(struct xdr_stream *xdr, struct CB_NOTIFY4= res *ptr); +bool xdrgen_encode_CB_NOTIFY4res(struct xdr_stream *xdr, const struct CB_N= OTIFY4res *value); + #endif /* _LINUX_XDRGEN_NFS4_1_DECL_H */ diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index a13d18447324..60cacf64181c 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -1677,6 +1677,7 @@ TRACE_EVENT(nfsd_cb_setup_err, { OP_CB_RECALL, "CB_RECALL" }, \ { OP_CB_LAYOUTRECALL, "CB_LAYOUTRECALL" }, \ { OP_CB_RECALL_ANY, "CB_RECALL_ANY" }, \ + { OP_CB_NOTIFY, "CB_NOTIFY" }, \ { OP_CB_NOTIFY_LOCK, "CB_NOTIFY_LOCK" }, \ { OP_CB_OFFLOAD, "CB_OFFLOAD" }) =20 diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index d87be1f25273..44e5e9fa12e1 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -171,133 +171,6 @@ Needs to be updated if more operations are defined in= future.*/ #define LAST_NFS42_OP OP_REMOVEXATTR #define LAST_NFS4_OP LAST_NFS42_OP =20 -enum nfsstat4 { - NFS4_OK =3D 0, - NFS4ERR_PERM =3D 1, - NFS4ERR_NOENT =3D 2, - NFS4ERR_IO =3D 5, - NFS4ERR_NXIO =3D 6, - NFS4ERR_ACCESS =3D 13, - NFS4ERR_EXIST =3D 17, - NFS4ERR_XDEV =3D 18, - /* Unused/reserved 19 */ - NFS4ERR_NOTDIR =3D 20, - NFS4ERR_ISDIR =3D 21, - NFS4ERR_INVAL =3D 22, - NFS4ERR_FBIG =3D 27, - NFS4ERR_NOSPC =3D 28, - NFS4ERR_ROFS =3D 30, - NFS4ERR_MLINK =3D 31, - NFS4ERR_NAMETOOLONG =3D 63, - NFS4ERR_NOTEMPTY =3D 66, - NFS4ERR_DQUOT =3D 69, - NFS4ERR_STALE =3D 70, - NFS4ERR_BADHANDLE =3D 10001, - NFS4ERR_BAD_COOKIE =3D 10003, - NFS4ERR_NOTSUPP =3D 10004, - NFS4ERR_TOOSMALL =3D 10005, - NFS4ERR_SERVERFAULT =3D 10006, - NFS4ERR_BADTYPE =3D 10007, - NFS4ERR_DELAY =3D 10008, - NFS4ERR_SAME =3D 10009, - NFS4ERR_DENIED =3D 10010, - NFS4ERR_EXPIRED =3D 10011, - NFS4ERR_LOCKED =3D 10012, - NFS4ERR_GRACE =3D 10013, - NFS4ERR_FHEXPIRED =3D 10014, - NFS4ERR_SHARE_DENIED =3D 10015, - NFS4ERR_WRONGSEC =3D 10016, - NFS4ERR_CLID_INUSE =3D 10017, - NFS4ERR_RESOURCE =3D 10018, - NFS4ERR_MOVED =3D 10019, - NFS4ERR_NOFILEHANDLE =3D 10020, - NFS4ERR_MINOR_VERS_MISMATCH =3D 10021, - NFS4ERR_STALE_CLIENTID =3D 10022, - NFS4ERR_STALE_STATEID =3D 10023, - NFS4ERR_OLD_STATEID =3D 10024, - NFS4ERR_BAD_STATEID =3D 10025, - NFS4ERR_BAD_SEQID =3D 10026, - NFS4ERR_NOT_SAME =3D 10027, - NFS4ERR_LOCK_RANGE =3D 10028, - NFS4ERR_SYMLINK =3D 10029, - NFS4ERR_RESTOREFH =3D 10030, - NFS4ERR_LEASE_MOVED =3D 10031, - NFS4ERR_ATTRNOTSUPP =3D 10032, - NFS4ERR_NO_GRACE =3D 10033, - NFS4ERR_RECLAIM_BAD =3D 10034, - NFS4ERR_RECLAIM_CONFLICT =3D 10035, - NFS4ERR_BADXDR =3D 10036, - NFS4ERR_LOCKS_HELD =3D 10037, - NFS4ERR_OPENMODE =3D 10038, - NFS4ERR_BADOWNER =3D 10039, - NFS4ERR_BADCHAR =3D 10040, - NFS4ERR_BADNAME =3D 10041, - NFS4ERR_BAD_RANGE =3D 10042, - NFS4ERR_LOCK_NOTSUPP =3D 10043, - NFS4ERR_OP_ILLEGAL =3D 10044, - NFS4ERR_DEADLOCK =3D 10045, - NFS4ERR_FILE_OPEN =3D 10046, - NFS4ERR_ADMIN_REVOKED =3D 10047, - NFS4ERR_CB_PATH_DOWN =3D 10048, - - /* nfs41 */ - NFS4ERR_BADIOMODE =3D 10049, - NFS4ERR_BADLAYOUT =3D 10050, - NFS4ERR_BAD_SESSION_DIGEST =3D 10051, - NFS4ERR_BADSESSION =3D 10052, - NFS4ERR_BADSLOT =3D 10053, - NFS4ERR_COMPLETE_ALREADY =3D 10054, - NFS4ERR_CONN_NOT_BOUND_TO_SESSION =3D 10055, - NFS4ERR_DELEG_ALREADY_WANTED =3D 10056, - NFS4ERR_BACK_CHAN_BUSY =3D 10057, /* backchan reqs outstanding */ - NFS4ERR_LAYOUTTRYLATER =3D 10058, - NFS4ERR_LAYOUTUNAVAILABLE =3D 10059, - NFS4ERR_NOMATCHING_LAYOUT =3D 10060, - NFS4ERR_RECALLCONFLICT =3D 10061, - NFS4ERR_UNKNOWN_LAYOUTTYPE =3D 10062, - NFS4ERR_SEQ_MISORDERED =3D 10063, /* unexpected seq.id in req */ - NFS4ERR_SEQUENCE_POS =3D 10064, /* [CB_]SEQ. op not 1st op */ - NFS4ERR_REQ_TOO_BIG =3D 10065, /* request too big */ - NFS4ERR_REP_TOO_BIG =3D 10066, /* reply too big */ - NFS4ERR_REP_TOO_BIG_TO_CACHE =3D 10067, /* rep. not all cached */ - NFS4ERR_RETRY_UNCACHED_REP =3D 10068, /* retry & rep. uncached */ - NFS4ERR_UNSAFE_COMPOUND =3D 10069, /* retry/recovery too hard */ - NFS4ERR_TOO_MANY_OPS =3D 10070, /* too many ops in [CB_]COMP */ - NFS4ERR_OP_NOT_IN_SESSION =3D 10071, /* op needs [CB_]SEQ. op */ - NFS4ERR_HASH_ALG_UNSUPP =3D 10072, /* hash alg. not supp. */ - /* Error 10073 is unused. */ - NFS4ERR_CLIENTID_BUSY =3D 10074, /* clientid has state */ - NFS4ERR_PNFS_IO_HOLE =3D 10075, /* IO to _SPARSE file hole */ - NFS4ERR_SEQ_FALSE_RETRY =3D 10076, /* retry not original */ - NFS4ERR_BAD_HIGH_SLOT =3D 10077, /* sequence arg bad */ - NFS4ERR_DEADSESSION =3D 10078, /* persistent session dead */ - NFS4ERR_ENCR_ALG_UNSUPP =3D 10079, /* SSV alg mismatch */ - NFS4ERR_PNFS_NO_LAYOUT =3D 10080, /* direct I/O with no layout */ - NFS4ERR_NOT_ONLY_OP =3D 10081, /* bad compound */ - NFS4ERR_WRONG_CRED =3D 10082, /* permissions:state change */ - NFS4ERR_WRONG_TYPE =3D 10083, /* current operation mismatch */ - NFS4ERR_DIRDELEG_UNAVAIL =3D 10084, /* no directory delegation */ - NFS4ERR_REJECT_DELEG =3D 10085, /* on callback */ - NFS4ERR_RETURNCONFLICT =3D 10086, /* outstanding layoutreturn */ - NFS4ERR_DELEG_REVOKED =3D 10087, /* deleg./layout revoked */ - - /* nfs42 */ - NFS4ERR_PARTNER_NOTSUPP =3D 10088, - NFS4ERR_PARTNER_NO_AUTH =3D 10089, - NFS4ERR_UNION_NOTSUPP =3D 10090, - NFS4ERR_OFFLOAD_DENIED =3D 10091, - NFS4ERR_WRONG_LFS =3D 10092, - NFS4ERR_BADLABEL =3D 10093, - NFS4ERR_OFFLOAD_NO_REQS =3D 10094, - - /* xattr (RFC8276) */ - NFS4ERR_NOXATTR =3D 10095, - NFS4ERR_XATTR2BIG =3D 10096, - - /* can be used for internal errors */ - NFS4ERR_FIRST_FREE -}; - /* error codes for internal client use */ #define NFS4ERR_RESET_TO_MDS 12001 #define NFS4ERR_RESET_TO_PNFS 12002 diff --git a/include/linux/sunrpc/xdrgen/nfs4_1.h b/include/linux/sunrpc/xd= rgen/nfs4_1.h index 4ac54bdbd335..f761c3ddb4c7 100644 --- a/include/linux/sunrpc/xdrgen/nfs4_1.h +++ b/include/linux/sunrpc/xdrgen/nfs4_1.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Generated by xdrgen. Manual edits will be lost. */ /* XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x */ -/* XDR specification modification time: Thu Jan 8 23:12:07 2026 */ +/* XDR specification modification time: Wed Mar 25 11:39:22 2026 */ =20 #ifndef _LINUX_XDRGEN_NFS4_1_DEF_H #define _LINUX_XDRGEN_NFS4_1_DEF_H @@ -9,15 +9,150 @@ #include #include =20 -typedef s64 int64_t; +typedef s32 int32_t; =20 typedef u32 uint32_t; =20 +typedef s64 int64_t; + +typedef u64 uint64_t; + +enum { NFS4_VERIFIER_SIZE =3D 8 }; + +enum { NFS4_FHSIZE =3D 128 }; + +enum nfsstat4 { + NFS4_OK =3D 0, + NFS4ERR_PERM =3D 1, + NFS4ERR_NOENT =3D 2, + NFS4ERR_IO =3D 5, + NFS4ERR_NXIO =3D 6, + NFS4ERR_ACCESS =3D 13, + NFS4ERR_EXIST =3D 17, + NFS4ERR_XDEV =3D 18, + NFS4ERR_NOTDIR =3D 20, + NFS4ERR_ISDIR =3D 21, + NFS4ERR_INVAL =3D 22, + NFS4ERR_FBIG =3D 27, + NFS4ERR_NOSPC =3D 28, + NFS4ERR_ROFS =3D 30, + NFS4ERR_MLINK =3D 31, + NFS4ERR_NAMETOOLONG =3D 63, + NFS4ERR_NOTEMPTY =3D 66, + NFS4ERR_DQUOT =3D 69, + NFS4ERR_STALE =3D 70, + NFS4ERR_BADHANDLE =3D 10001, + NFS4ERR_BAD_COOKIE =3D 10003, + NFS4ERR_NOTSUPP =3D 10004, + NFS4ERR_TOOSMALL =3D 10005, + NFS4ERR_SERVERFAULT =3D 10006, + NFS4ERR_BADTYPE =3D 10007, + NFS4ERR_DELAY =3D 10008, + NFS4ERR_SAME =3D 10009, + NFS4ERR_DENIED =3D 10010, + NFS4ERR_EXPIRED =3D 10011, + NFS4ERR_LOCKED =3D 10012, + NFS4ERR_GRACE =3D 10013, + NFS4ERR_FHEXPIRED =3D 10014, + NFS4ERR_SHARE_DENIED =3D 10015, + NFS4ERR_WRONGSEC =3D 10016, + NFS4ERR_CLID_INUSE =3D 10017, + NFS4ERR_RESOURCE =3D 10018, + NFS4ERR_MOVED =3D 10019, + NFS4ERR_NOFILEHANDLE =3D 10020, + NFS4ERR_MINOR_VERS_MISMATCH =3D 10021, + NFS4ERR_STALE_CLIENTID =3D 10022, + NFS4ERR_STALE_STATEID =3D 10023, + NFS4ERR_OLD_STATEID =3D 10024, + NFS4ERR_BAD_STATEID =3D 10025, + NFS4ERR_BAD_SEQID =3D 10026, + NFS4ERR_NOT_SAME =3D 10027, + NFS4ERR_LOCK_RANGE =3D 10028, + NFS4ERR_SYMLINK =3D 10029, + NFS4ERR_RESTOREFH =3D 10030, + NFS4ERR_LEASE_MOVED =3D 10031, + NFS4ERR_ATTRNOTSUPP =3D 10032, + NFS4ERR_NO_GRACE =3D 10033, + NFS4ERR_RECLAIM_BAD =3D 10034, + NFS4ERR_RECLAIM_CONFLICT =3D 10035, + NFS4ERR_BADXDR =3D 10036, + NFS4ERR_LOCKS_HELD =3D 10037, + NFS4ERR_OPENMODE =3D 10038, + NFS4ERR_BADOWNER =3D 10039, + NFS4ERR_BADCHAR =3D 10040, + NFS4ERR_BADNAME =3D 10041, + NFS4ERR_BAD_RANGE =3D 10042, + NFS4ERR_LOCK_NOTSUPP =3D 10043, + NFS4ERR_OP_ILLEGAL =3D 10044, + NFS4ERR_DEADLOCK =3D 10045, + NFS4ERR_FILE_OPEN =3D 10046, + NFS4ERR_ADMIN_REVOKED =3D 10047, + NFS4ERR_CB_PATH_DOWN =3D 10048, + NFS4ERR_BADIOMODE =3D 10049, + NFS4ERR_BADLAYOUT =3D 10050, + NFS4ERR_BAD_SESSION_DIGEST =3D 10051, + NFS4ERR_BADSESSION =3D 10052, + NFS4ERR_BADSLOT =3D 10053, + NFS4ERR_COMPLETE_ALREADY =3D 10054, + NFS4ERR_CONN_NOT_BOUND_TO_SESSION =3D 10055, + NFS4ERR_DELEG_ALREADY_WANTED =3D 10056, + NFS4ERR_BACK_CHAN_BUSY =3D 10057, + NFS4ERR_LAYOUTTRYLATER =3D 10058, + NFS4ERR_LAYOUTUNAVAILABLE =3D 10059, + NFS4ERR_NOMATCHING_LAYOUT =3D 10060, + NFS4ERR_RECALLCONFLICT =3D 10061, + NFS4ERR_UNKNOWN_LAYOUTTYPE =3D 10062, + NFS4ERR_SEQ_MISORDERED =3D 10063, + NFS4ERR_SEQUENCE_POS =3D 10064, + NFS4ERR_REQ_TOO_BIG =3D 10065, + NFS4ERR_REP_TOO_BIG =3D 10066, + NFS4ERR_REP_TOO_BIG_TO_CACHE =3D 10067, + NFS4ERR_RETRY_UNCACHED_REP =3D 10068, + NFS4ERR_UNSAFE_COMPOUND =3D 10069, + NFS4ERR_TOO_MANY_OPS =3D 10070, + NFS4ERR_OP_NOT_IN_SESSION =3D 10071, + NFS4ERR_HASH_ALG_UNSUPP =3D 10072, + NFS4ERR_CLIENTID_BUSY =3D 10074, + NFS4ERR_PNFS_IO_HOLE =3D 10075, + NFS4ERR_SEQ_FALSE_RETRY =3D 10076, + NFS4ERR_BAD_HIGH_SLOT =3D 10077, + NFS4ERR_DEADSESSION =3D 10078, + NFS4ERR_ENCR_ALG_UNSUPP =3D 10079, + NFS4ERR_PNFS_NO_LAYOUT =3D 10080, + NFS4ERR_NOT_ONLY_OP =3D 10081, + NFS4ERR_WRONG_CRED =3D 10082, + NFS4ERR_WRONG_TYPE =3D 10083, + NFS4ERR_DIRDELEG_UNAVAIL =3D 10084, + NFS4ERR_REJECT_DELEG =3D 10085, + NFS4ERR_RETURNCONFLICT =3D 10086, + NFS4ERR_DELEG_REVOKED =3D 10087, + NFS4ERR_PARTNER_NOTSUPP =3D 10088, + NFS4ERR_PARTNER_NO_AUTH =3D 10089, + NFS4ERR_UNION_NOTSUPP =3D 10090, + NFS4ERR_OFFLOAD_DENIED =3D 10091, + NFS4ERR_WRONG_LFS =3D 10092, + NFS4ERR_BADLABEL =3D 10093, + NFS4ERR_OFFLOAD_NO_REQS =3D 10094, + NFS4ERR_NOXATTR =3D 10095, + NFS4ERR_XATTR2BIG =3D 10096, + NFS4ERR_FIRST_FREE =3D 10097, +}; + +typedef enum nfsstat4 nfsstat4; + +typedef opaque attrlist4; + typedef struct { u32 count; uint32_t *element; } bitmap4; =20 +typedef u8 verifier4[NFS4_VERIFIER_SIZE]; + +typedef uint64_t nfs_cookie4; + +typedef opaque nfs_fh4; + typedef opaque utf8string; =20 typedef utf8string utf8str_cis; @@ -26,11 +161,30 @@ typedef utf8string utf8str_cs; =20 typedef utf8string utf8str_mixed; =20 +typedef utf8str_cs component4; + +typedef utf8str_cs linktext4; + +typedef struct { + u32 count; + component4 *element; +} pathname4; + struct nfstime4 { int64_t seconds; uint32_t nseconds; }; =20 +struct fattr4 { + bitmap4 attrmask; + attrlist4 attr_vals; +}; + +struct stateid4 { + uint32_t seqid; + u8 other[12]; +}; + typedef bool fattr4_offline; =20 enum { FATTR4_OFFLINE =3D 83 }; @@ -216,11 +370,98 @@ enum { FATTR4_POSIX_DEFAULT_ACL =3D 91 }; =20 enum { FATTR4_POSIX_ACCESS_ACL =3D 92 }; =20 -#define NFS4_int64_t_sz \ - (XDR_hyper) +enum notify_type4 { + NOTIFY4_CHANGE_CHILD_ATTRS =3D 0, + NOTIFY4_CHANGE_DIR_ATTRS =3D 1, + NOTIFY4_REMOVE_ENTRY =3D 2, + NOTIFY4_ADD_ENTRY =3D 3, + NOTIFY4_RENAME_ENTRY =3D 4, + NOTIFY4_CHANGE_COOKIE_VERIFIER =3D 5, +}; + +typedef enum notify_type4 notify_type4; + +struct notify_entry4 { + component4 ne_file; + struct fattr4 ne_attrs; +}; + +struct prev_entry4 { + struct notify_entry4 pe_prev_entry; + nfs_cookie4 pe_prev_entry_cookie; +}; + +struct notify_remove4 { + struct notify_entry4 nrm_old_entry; + nfs_cookie4 nrm_old_entry_cookie; +}; + +struct notify_add4 { + struct { + u32 count; + struct notify_remove4 *element; + } nad_old_entry; + struct notify_entry4 nad_new_entry; + struct { + u32 count; + nfs_cookie4 *element; + } nad_new_entry_cookie; + struct { + u32 count; + struct prev_entry4 *element; + } nad_prev_entry; + bool nad_last_entry; +}; + +struct notify_attr4 { + struct notify_entry4 na_changed_entry; +}; + +struct notify_rename4 { + struct notify_remove4 nrn_old_entry; + struct notify_add4 nrn_new_entry; +}; + +struct notify_verifier4 { + verifier4 nv_old_cookieverf; + verifier4 nv_new_cookieverf; +}; + +typedef opaque notifylist4; + +struct notify4 { + bitmap4 notify_mask; + notifylist4 notify_vals; +}; + +struct CB_NOTIFY4args { + struct stateid4 cna_stateid; + nfs_fh4 cna_fh; + struct { + u32 count; + struct notify4 *element; + } cna_changes; +}; + +struct CB_NOTIFY4res { + nfsstat4 cnr_status; +}; + +#define NFS4_int32_t_sz \ + (XDR_int) #define NFS4_uint32_t_sz \ (XDR_unsigned_int) +#define NFS4_int64_t_sz \ + (XDR_hyper) +#define NFS4_uint64_t_sz \ + (XDR_unsigned_hyper) +#define NFS4_nfsstat4_sz (XDR_int) +#define NFS4_attrlist4_sz (XDR_unsigned_int) #define NFS4_bitmap4_sz (XDR_unsigned_int) +#define NFS4_verifier4_sz (XDR_QUADLEN(NFS4_VERIFIER_SIZE)) +#define NFS4_nfs_cookie4_sz \ + (NFS4_uint64_t_sz) +#define NFS4_nfs_fh4_sz (XDR_unsigned_int + XDR_QUADLEN(NF= S4_FHSIZE)) #define NFS4_utf8string_sz (XDR_unsigned_int) #define NFS4_utf8str_cis_sz \ (NFS4_utf8string_sz) @@ -228,8 +469,17 @@ enum { FATTR4_POSIX_ACCESS_ACL =3D 92 }; (NFS4_utf8string_sz) #define NFS4_utf8str_mixed_sz \ (NFS4_utf8string_sz) +#define NFS4_component4_sz \ + (NFS4_utf8str_cs_sz) +#define NFS4_linktext4_sz \ + (NFS4_utf8str_cs_sz) +#define NFS4_pathname4_sz (XDR_unsigned_int) #define NFS4_nfstime4_sz \ (NFS4_int64_t_sz + NFS4_uint32_t_sz) +#define NFS4_fattr4_sz \ + (NFS4_bitmap4_sz + NFS4_attrlist4_sz) +#define NFS4_stateid4_sz \ + (NFS4_uint32_t_sz + XDR_QUADLEN(12)) #define NFS4_fattr4_offline_sz \ (XDR_bool) #define NFS4_open_arguments4_sz \ @@ -259,5 +509,27 @@ enum { FATTR4_POSIX_ACCESS_ACL =3D 92 }; (NFS4_aclscope4_sz) #define NFS4_fattr4_posix_default_acl_sz (XDR_unsigned_int) #define NFS4_fattr4_posix_access_acl_sz (XDR_unsigned_int) +#define NFS4_notify_type4_sz (XDR_int) +#define NFS4_notify_entry4_sz \ + (NFS4_component4_sz + NFS4_fattr4_sz) +#define NFS4_prev_entry4_sz \ + (NFS4_notify_entry4_sz + NFS4_nfs_cookie4_sz) +#define NFS4_notify_remove4_sz \ + (NFS4_notify_entry4_sz + NFS4_nfs_cookie4_sz) +#define NFS4_notify_add4_sz \ + (XDR_unsigned_int + (1 * (NFS4_notify_remove4_sz)) + NFS4_notify_entry4_s= z + XDR_unsigned_int + (1 * (NFS4_nfs_cookie4_sz)) + XDR_unsigned_int + (1 = * (NFS4_prev_entry4_sz)) + XDR_bool) +#define NFS4_notify_attr4_sz \ + (NFS4_notify_entry4_sz) +#define NFS4_notify_rename4_sz \ + (NFS4_notify_remove4_sz + NFS4_notify_add4_sz) +#define NFS4_notify_verifier4_sz \ + (NFS4_verifier4_sz + NFS4_verifier4_sz) +#define NFS4_notifylist4_sz (XDR_unsigned_int) +#define NFS4_notify4_sz \ + (NFS4_bitmap4_sz + NFS4_notifylist4_sz) +#define NFS4_CB_NOTIFY4args_sz \ + (NFS4_stateid4_sz + NFS4_nfs_fh4_sz + XDR_unsigned_int) +#define NFS4_CB_NOTIFY4res_sz \ + (NFS4_nfsstat4_sz) =20 #endif /* _LINUX_XDRGEN_NFS4_1_DEF_H */ diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h index 4273e0249fcb..289205b53a08 100644 --- a/include/uapi/linux/nfs4.h +++ b/include/uapi/linux/nfs4.h @@ -17,11 +17,9 @@ #include =20 #define NFS4_BITMAP_SIZE 3 -#define NFS4_VERIFIER_SIZE 8 #define NFS4_STATEID_SEQID_SIZE 4 #define NFS4_STATEID_OTHER_SIZE 12 #define NFS4_STATEID_SIZE (NFS4_STATEID_SEQID_SIZE + NFS4_STATEID_OTHER_SI= ZE) -#define NFS4_FHSIZE 128 #define NFS4_MAXPATHLEN PATH_MAX #define NFS4_MAXNAMLEN NAME_MAX #define NFS4_OPAQUE_LIMIT 1024 --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 654DD3ACF1C; Thu, 16 Apr 2026 17:35:46 +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=1776360946; cv=none; b=TxZhR4JSo92Vca7eQ0bCScpe3KPWx67h/CIM5MMlO4mZShycnmSZSKHMWcVD4gHrJ4H12ZMGsY2WwH2QRz6tts612VEDm8D+fdspNmZ0fTRO6wsN8eF5J4YrukhDjZZ4jzpoXaOcJcqdlAkeO8ik/g0KwxPmTA6nzq/kpAfxGIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360946; c=relaxed/simple; bh=s72czDExX6Nxo4FsO43XYOw6JoIhVcsInWaSiqS9x8k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CsVCwQwzb9s1Y1wTxXlFBhRHrFIsmZFbUnN5Cc6PRaPxhpKdUDsUy/hLBf8Om1EIvPZZ7otPJaeUfxEWyS607xQmf+9W6rQvPiuoJAgVQfuWHk/d8tOKPs6IKBXFJwqPzjg8AXB+RUCEr4iFd4xyW0wp7p1xpTH0LcLoZUos6RE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ANgzSFhX; 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="ANgzSFhX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39FDBC2BCC4; Thu, 16 Apr 2026 17:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360945; bh=s72czDExX6Nxo4FsO43XYOw6JoIhVcsInWaSiqS9x8k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ANgzSFhXrbVb4+xnerodzNxIwcs5AMdKVShiEOh5TXKWgO9pXAEtQe8arjp0O/qXe Fa6TPbAaZpwDV+L2FutfOi5uMbt+gh/0G+G/GGwyfd4RF4vWQNj8GBjpvJWrZuC8Fp ZhzD+MUV9Ksf1MDTiX8w3K3TjUI6lKeSio4RPudq495/poCnbz5RDC4N9U4EMv7kXI AH9MtHNm5yaCnLQLPz/X4Ty1QqsZjP51QI4+0V/+GW1FGvmrnWL++yFBHIb9/aLtVV TrjKysNSfPTkw4qmjh1ZlpX/BbBGL67ZuAZeyXHUEpKlUUwbd1bhEsscuDB+omCItL RKoHRfRJ1SbEw== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:11 -0700 Subject: [PATCH v2 10/28] nfs_common: add new NOTIFY4_* flags proposed in RFC8881bis Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-10-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=4154; i=jlayton@kernel.org; h=from:subject:message-id; bh=s72czDExX6Nxo4FsO43XYOw6JoIhVcsInWaSiqS9x8k=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3j7Hy5Wn95eisJxtj3jfs2G6WKH8cEL4LJF OE+WOC+bTCJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd4wAKCRAADmhBGVaC FXkyD/9lRyJEwEkZbdZj7urgA+FdDABIlP5uRnue5NOx7d+C5yBdldCq0V3tO8/MR31Fg18PNmD IWTsU4MGHrY37D3Ibng/tV/fmAk34L5O/MWDd03S65e8Iey2EdV4rYqQlMdpotlAhARq5MOGr5c 2WiDotb22fkBbA8rlIzFF1aGo85TuvF+V3GFqWvT2qwE79toxEO/kWDns/6YmeDm3Jdat23cwjE RY9qEIf89vAX/axsn2n5zMmIChBhcKQx0foZh+/X3P9i4PA5agi85AQwBkgsh8GwqBX+EY5zrfM WBwXgLIEMvsQAANDmtJAA/CJAi8us4nohyPZcd1ynm/14Fyw8SCC8bQRfvvpxPFqv9OcrlQBuMR rUxMLdHAxcOUbaS3ss6jYZ6X1X08/HlLjXl5CoWFtBGvit0NdF4K85bKza0cjtw9/8/PENCJRMd fUKmzpVxGeAvPC0QBwKU0oB+3TwNtcfgae2dy4vwtrTFkq58Yi2jIMOd/eIZU76JFGo0UedMeO3 xQyKis32S64Xg+g9jUWmhY3cM3zzSdWha+PJqwzUiXnoEQaRaMWEXE10IxhdwivVRYgHMrx13Ve kVzYrcRlHvcOBy+qvgmXH8qvE1pXvl3+V80lN5MXtHlCeDbkFcJGO5nftb3AJS9d8QqkKq4v1nY yQruVEWAhEAk0nQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 RFC8881bis adds some new flags to GET_DIR_DELEGATION that we very much need to support. Signed-off-by: Jeff Layton --- Documentation/sunrpc/xdr/nfs4_1.x | 16 +++++++++++++++- fs/nfsd/nfs4xdr_gen.c | 13 ++++++++++++- fs/nfsd/nfs4xdr_gen.h | 2 +- include/linux/sunrpc/xdrgen/nfs4_1.h | 13 ++++++++++++- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Documentation/sunrpc/xdr/nfs4_1.x b/Documentation/sunrpc/xdr/n= fs4_1.x index 632f5b579c39..aa14b590b524 100644 --- a/Documentation/sunrpc/xdr/nfs4_1.x +++ b/Documentation/sunrpc/xdr/nfs4_1.x @@ -416,7 +416,21 @@ enum notify_type4 { NOTIFY4_REMOVE_ENTRY =3D 2, NOTIFY4_ADD_ENTRY =3D 3, NOTIFY4_RENAME_ENTRY =3D 4, - NOTIFY4_CHANGE_COOKIE_VERIFIER =3D 5 + NOTIFY4_CHANGE_COOKIE_VERIFIER =3D 5, + /* + * Added in NFSv4.1 bis document + */ + NOTIFY4_GFLAG_EXTEND =3D 6, + NOTIFY4_AUFLAG_VALID =3D 7, + NOTIFY4_AUFLAG_USER =3D 8, + NOTIFY4_AUFLAG_GROUP =3D 9, + NOTIFY4_AUFLAG_OTHER =3D 10, + NOTIFY4_CHANGE_AUTH =3D 11, + NOTIFY4_CFLAG_ORDER =3D 12, + NOTIFY4_AUFLAG_GANOW =3D 13, + NOTIFY4_AUFLAG_GALATER =3D 14, + NOTIFY4_CHANGE_GA =3D 15, + NOTIFY4_CHANGE_AMASK =3D 16 }; =20 /* Changed entry information. */ diff --git a/fs/nfsd/nfs4xdr_gen.c b/fs/nfsd/nfs4xdr_gen.c index 5e656d6bbb8e..80369139ef7e 100644 --- a/fs/nfsd/nfs4xdr_gen.c +++ b/fs/nfsd/nfs4xdr_gen.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 // Generated by xdrgen. Manual edits will be lost. // XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x -// XDR specification modification time: Wed Mar 25 11:39:22 2026 +// XDR specification modification time: Wed Mar 25 11:40:02 2026 =20 #include =20 @@ -590,6 +590,17 @@ xdrgen_decode_notify_type4(struct xdr_stream *xdr, not= ify_type4 *ptr) case NOTIFY4_ADD_ENTRY: case NOTIFY4_RENAME_ENTRY: case NOTIFY4_CHANGE_COOKIE_VERIFIER: + case NOTIFY4_GFLAG_EXTEND: + case NOTIFY4_AUFLAG_VALID: + case NOTIFY4_AUFLAG_USER: + case NOTIFY4_AUFLAG_GROUP: + case NOTIFY4_AUFLAG_OTHER: + case NOTIFY4_CHANGE_AUTH: + case NOTIFY4_CFLAG_ORDER: + case NOTIFY4_AUFLAG_GANOW: + case NOTIFY4_AUFLAG_GALATER: + case NOTIFY4_CHANGE_GA: + case NOTIFY4_CHANGE_AMASK: break; default: return false; diff --git a/fs/nfsd/nfs4xdr_gen.h b/fs/nfsd/nfs4xdr_gen.h index 503fe2ccba51..092a1ed399c7 100644 --- a/fs/nfsd/nfs4xdr_gen.h +++ b/fs/nfsd/nfs4xdr_gen.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Generated by xdrgen. Manual edits will be lost. */ /* XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x */ -/* XDR specification modification time: Wed Mar 25 11:39:22 2026 */ +/* XDR specification modification time: Wed Mar 25 11:40:02 2026 */ =20 #ifndef _LINUX_XDRGEN_NFS4_1_DECL_H #define _LINUX_XDRGEN_NFS4_1_DECL_H diff --git a/include/linux/sunrpc/xdrgen/nfs4_1.h b/include/linux/sunrpc/xd= rgen/nfs4_1.h index f761c3ddb4c7..537504069f24 100644 --- a/include/linux/sunrpc/xdrgen/nfs4_1.h +++ b/include/linux/sunrpc/xdrgen/nfs4_1.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Generated by xdrgen. Manual edits will be lost. */ /* XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x */ -/* XDR specification modification time: Wed Mar 25 11:39:22 2026 */ +/* XDR specification modification time: Wed Mar 25 11:40:02 2026 */ =20 #ifndef _LINUX_XDRGEN_NFS4_1_DEF_H #define _LINUX_XDRGEN_NFS4_1_DEF_H @@ -377,6 +377,17 @@ enum notify_type4 { NOTIFY4_ADD_ENTRY =3D 3, NOTIFY4_RENAME_ENTRY =3D 4, NOTIFY4_CHANGE_COOKIE_VERIFIER =3D 5, + NOTIFY4_GFLAG_EXTEND =3D 6, + NOTIFY4_AUFLAG_VALID =3D 7, + NOTIFY4_AUFLAG_USER =3D 8, + NOTIFY4_AUFLAG_GROUP =3D 9, + NOTIFY4_AUFLAG_OTHER =3D 10, + NOTIFY4_CHANGE_AUTH =3D 11, + NOTIFY4_CFLAG_ORDER =3D 12, + NOTIFY4_AUFLAG_GANOW =3D 13, + NOTIFY4_AUFLAG_GALATER =3D 14, + NOTIFY4_CHANGE_GA =3D 15, + NOTIFY4_CHANGE_AMASK =3D 16, }; =20 typedef enum notify_type4 notify_type4; --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 F0C993264DF; Thu, 16 Apr 2026 17:35:46 +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=1776360947; cv=none; b=LOuvl/GSIyZiTU1UusamN/f9UnX9tk1rZglROkx+7TObh+/fTq/3GShWTtqM69+nb+McvvRMEHbnuQ0ShxqzUYEp2aUp4MqMCGE7fB2C7Dx8u2DPLV7Y9pKYAluUW3IOgcy/a0Ai0Z4KGaGirql8NeeM8YBO0YLJHwQ9xA9U/Qk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360947; c=relaxed/simple; bh=tTquUQjAs7X3Y76/uPUM1voj0FXU+cwoVHWvPbEVL/4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pbe+3wXxddEzHAYUjRtz3qKx55Kha+/C/E+k+qN97sh4z5lb2J7fNPZHp1rOI9mqt3o8Edj3N1kmhBNbqeYcQFE10iGVoACHpC/KqASQBXpJDzDqPMHTIZOKXwvggrNBREXT/iGVlS+2Qcc0CxITY9qSq2EXF2cOxblxHxcOPnY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=auDqlz+D; 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="auDqlz+D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09942C2BCB4; Thu, 16 Apr 2026 17:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360946; bh=tTquUQjAs7X3Y76/uPUM1voj0FXU+cwoVHWvPbEVL/4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=auDqlz+DROY3AG6lnpTvnQY5iuNi+kdDH14V9I4aH4HNszMzUga7OaaO4P0mpvkmC By7BcvLrYzFeeAZyPB2VbllNZZ/kTNsfco7u+mhb9/hbI6YY60/bVP4TNLwGA74580 yRWIYyCKkAdy00X78wwsDZFX/XXumZ2VYSjT/kECE2MDLk7/9/ihubcxqciNnx2Z4A W1STaNdU45N4itWGD/ywklRK4Pwu8NS2IgisP4pmzx179+xEId4JPBAwZFZL2RdQ6x 2a8VNnsp5NSuYnRPicpyRff1+8mufJsFZLwlkCOUDIfoNcWrYVCM/lR0V/+NFuxYuH uVHYt9gup/Rlw== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:12 -0700 Subject: [PATCH v2 11/28] nfsd: allow nfsd to get a dir lease with an ignore mask Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-11-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=2342; i=jlayton@kernel.org; h=from:subject:message-id; bh=tTquUQjAs7X3Y76/uPUM1voj0FXU+cwoVHWvPbEVL/4=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3k3vk9pm3Uvbsvokm+IM38JXSAcz4SJ+GtL ZV0A+DmylCJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5AAKCRAADmhBGVaC FZbUD/sG6J4vjbSYTFAcWEn3LQuzs1IJCQUdItYJpVHJSHqgydZyJ0eYyXffcsxRQ5SzzRvnU8O nMcVY6Z2BCcCyoI4EIlAzXANjogK910LThIHantUqZQAMUT5HLsy8x/fAslV0Ec7hu/u47/qO5D 0G+yA0C7Lekp8xL0Gwl6ufvbwd1b3bAUmquu8TioPpQV3EG9Jj14NKVRus70FO2ZLLrUwiT9pwk 2J//skBauH+PFf5CCuCdM80N1YzORSFK1y2crJVWG21NpqKxST/f8ipafATG3Uu+RyF2XXmm0ye ePF26t8SMkiND/mLgbCKc1hfXJZ8fDRLhFHPTPrCOL2DBxL2V2Z0fv7yQdNBB7bOfLeiVy1874c ecmhaxxTnVlroNPVAV98+EXJOkHnbXaRZyJauVyP5jezmzNHIwxfZdJLZPWkN4QLLHPwPPFddxT 2Jcx4vcv9HVSuwjUuavknmzRpK0qG6qD8ddukL21NrhTYoCnSwoNzLCIXf77+SLNyL9CbRkfro2 PUDc8D3JtQZ4i1jHe/p2KerFTbCV+abbg8GGo25x9eYjM0SJn1zhp08aLKNNd4hAKa3viAwvQXK 8R8yIiUnzf2sVETJNiY5GTiq4L3PIySfDs+MiRizBlpH5wWdsxeJqof8sO300VPsLBpRBpFvDv5 6wnO7coVCLtSH2Q== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 When requesting a directory lease, enable the FL_IGN_DIR_* bits that correspond to the requested notification types. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 35f5c098717e..bd7e4f9cdaa5 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -6040,7 +6040,22 @@ static bool nfsd4_cb_channel_good(struct nfs4_client= *clp) return clp->cl_minorversion && clp->cl_cb_state =3D=3D NFSD4_CB_UNKNOWN; } =20 -static struct file_lease *nfs4_alloc_init_lease(struct nfs4_delegation *dp) +static unsigned int +nfsd_notify_to_ignore(u32 notify) +{ + unsigned int mask =3D 0; + + if (notify & BIT(NOTIFY4_REMOVE_ENTRY)) + mask |=3D FL_IGN_DIR_DELETE; + if (notify & BIT(NOTIFY4_ADD_ENTRY)) + mask |=3D FL_IGN_DIR_CREATE; + if (notify & BIT(NOTIFY4_RENAME_ENTRY)) + mask |=3D FL_IGN_DIR_RENAME; + + return mask; +} + +static struct file_lease *nfs4_alloc_init_lease(struct nfs4_delegation *dp= , u32 notify) { struct file_lease *fl; =20 @@ -6048,7 +6063,7 @@ static struct file_lease *nfs4_alloc_init_lease(struc= t nfs4_delegation *dp) if (!fl) return NULL; fl->fl_lmops =3D &nfsd_lease_mng_ops; - fl->c.flc_flags =3D FL_DELEG; + fl->c.flc_flags =3D FL_DELEG | nfsd_notify_to_ignore(notify); fl->c.flc_type =3D deleg_is_read(dp->dl_type) ? F_RDLCK : F_WRLCK; fl->c.flc_owner =3D (fl_owner_t)dp; fl->c.flc_pid =3D current->tgid; @@ -6265,7 +6280,7 @@ nfs4_set_delegation(struct nfsd4_open *open, struct n= fs4_ol_stateid *stp, if (stp->st_stid.sc_export) dp->dl_stid.sc_export =3D exp_get(stp->st_stid.sc_export); =20 - fl =3D nfs4_alloc_init_lease(dp); + fl =3D nfs4_alloc_init_lease(dp, 0); if (!fl) goto out_clnt_odstate; =20 @@ -9634,12 +9649,11 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cst= ate, dp->dl_stid.sc_export =3D exp_get(cstate->current_fh.fh_export); =20 - fl =3D nfs4_alloc_init_lease(dp); + fl =3D nfs4_alloc_init_lease(dp, gdd->gddr_notification[0]); if (!fl) goto out_put_stid; =20 - status =3D kernel_setlease(nf->nf_file, - fl->c.flc_type, &fl, NULL); + status =3D kernel_setlease(nf->nf_file, fl->c.flc_type, &fl, NULL); if (fl) locks_free_lease(fl); if (status) --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 B7E703BD22E; Thu, 16 Apr 2026 17:35:47 +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=1776360947; cv=none; b=GmlHE5CD6uyBRKALL0qyDW6vww0GgDqmoRSnpg+9bo3jUrN3h+1rDsGDKvzYexGZn7iwiBMu9md+yJQtkQxtei4frR7ZjwGHchkMo/giYn2fRM/8uUf6kQmw5/McTTBiVWi40fm5W63e81SN6PfgcDZn6+Ag6hBuxadqxaV/Us8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360947; c=relaxed/simple; bh=9G/ip8vcVyOFHKvuu+8SPrBglYdUuTi3uOEL/o3qwLM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Se9/JXNtI3o2Ulsleu6LINs0zKVw+qPI7QX60SV84x2PXi9GCoZbdol1temx4T3ykR+pLGeNixMLBdt5Y5HhZFelwCMtDxHSN8OWlfXtwKKdVqo7Y3wgDwZMKB/CBOmLuG94Vn3aeF1xdRFc7Iw/eVLME0jZtg1CBK7g+VP5MLM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CZ3Ni/xm; 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="CZ3Ni/xm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC73DC2BCB7; Thu, 16 Apr 2026 17:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360947; bh=9G/ip8vcVyOFHKvuu+8SPrBglYdUuTi3uOEL/o3qwLM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CZ3Ni/xmBOVUqLTKP2GSGNIt8KEdum6eBGdcg9+Iow6Ljla3Xpbi6U623098ABrkd WXAz1YB7XSJSOh6uVfxR/kERRuEV4o91Xm+K3sFoqtyRy9J0WmL2qE/zWfFdHs8ZKX zF9cKx0+oyF3/yrXNi3OGYlbnJMFt6lXnpY/1O75WX/3i/sMv9zrN/2ICH+vOVY5iC Oe6tbSVz6T3HxB7h+VnlgSb4k4WQMB4aIuiCDkW0C8xQBrZ2nEVpvlcRq9IrQBAMrP DuEz14HWfa1StK1Yz2niXq+4kQOvA8OBRoiBdO6XLp3Ixvcp+iD5y7bYCn6tIbM7Ha pkF1zm84KxrUA== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:13 -0700 Subject: [PATCH v2 12/28] nfsd: update the fsnotify mark when setting or removing a dir delegation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-12-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=2096; i=jlayton@kernel.org; h=from:subject:message-id; bh=9G/ip8vcVyOFHKvuu+8SPrBglYdUuTi3uOEL/o3qwLM=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3kZ4HmgzmGKOhLVLMhD9W3b4OOkjdcobFJO xCwV2K8smmJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5AAKCRAADmhBGVaC FX8sEADGgZOtLsVACMdauTymO+jpJSdtr14tviPJJ+0W82d8KUOYNSJMQLCO1cZu9DKfsy4u5yZ F88G2E7t4+XnWbkJ369M+6FaQvTHnv2VF15ug+OfohOusjM1Qr/v1sVq141mUT4BgkLNDHaFXtM gWZUa422E/bPK0dQY/KUcsmNOkZBG7dzKVfEyqs9DKIeuDe47HqRqE6Gg/qB95EMHpXmlb7NrMa eju5K9pgU4lWI3nmwyoNIM97kWYe54VlwdFgn1mx1up2aaqgeC5reffUSXHmL2JhGgY9OI3R9xE GqGwLvS4XvsNPe0JpHK8bcZyAPvTRNAPABmeTrDw0pAAmZw5lwiriAELDHVr17iIxH1VdSKOyi8 qOM6W0T6IjniN7xBSs8lmmf748Jpurg69BXOvy9RcXqaiBOgaqCRA2WFu67lvVtNBQZJgZ548q/ N6cKB05uKaeK5ZtSYqNmYGnz1f1jNvGMKPxdWuCGiNYkmO2yNSBiFjW40rVQ4cncVCPsih7ZAu2 r/hzhlrzJnDbUdmYDBibVsHe91VITs+9GFBfbFP2rG+5qI+zmYN2B1ZFuIyaTwJlevTLSQH/X5/ aTT26dPdUOn0ZfcVPTkxk4yArYApeJSCMAxqJ4211PQ1a/S0uOjx/hZtY6+lmGYwoDswEiCiweu 87mFfI8kJjMzAXg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add a new helper function that will update the mask on the nfsd_file's fsnotify_mark to be a union of all current directory delegations on an inode. Call that when directory delegations are added or removed. Reviewed-by: Jan Kara Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index bd7e4f9cdaa5..6adce94e9fdb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1260,6 +1260,37 @@ static void nfsd4_finalize_deleg_timestamps(struct n= fs4_delegation *dp, struct f } } =20 +static void nfsd_fsnotify_recalc_mask(struct nfsd_file *nf) +{ + struct fsnotify_mark *mark =3D &nf->nf_mark->nfm_mark; + struct inode *inode =3D file_inode(nf->nf_file); + u32 lease_mask, set =3D 0, clear =3D 0; + + /* This is only needed when adding or removing dir delegs */ + if (!S_ISDIR(inode->i_mode)) + return; + + /* Set up notifications for any ignored delegation events */ + lease_mask =3D inode_lease_ignore_mask(inode); + + if (lease_mask & FL_IGN_DIR_CREATE) + set |=3D FS_CREATE | FS_MOVED_TO; + else + clear |=3D FS_CREATE | FS_MOVED_TO; + + if (lease_mask & FL_IGN_DIR_DELETE) + set |=3D FS_DELETE | FS_MOVED_FROM; + else + clear |=3D FS_DELETE | FS_MOVED_FROM; + + if (lease_mask & FL_IGN_DIR_RENAME) + set |=3D FS_RENAME; + else + clear |=3D FS_RENAME; + + fsnotify_modify_mark_mask(mark, set, clear); +} + static void nfs4_unlock_deleg_lease(struct nfs4_delegation *dp) { struct nfs4_file *fp =3D dp->dl_stid.sc_file; @@ -1269,6 +1300,7 @@ static void nfs4_unlock_deleg_lease(struct nfs4_deleg= ation *dp) =20 nfsd4_finalize_deleg_timestamps(dp, nf->nf_file); kernel_setlease(nf->nf_file, F_UNLCK, NULL, (void **)&dp); + nfsd_fsnotify_recalc_mask(nf); put_deleg_file(fp); } =20 @@ -9674,6 +9706,7 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstat= e, =20 if (!status) { put_nfs4_file(fp); + nfsd_fsnotify_recalc_mask(nf); return dp; } =20 --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 297CC3E0223; Thu, 16 Apr 2026 17:35:48 +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=1776360949; cv=none; b=P/cZuu/eREE+99uAm9i0BLNOOdA/lXKr6aX5M3r1iXBZBSYnNG/scbGhRTWmzxADh3h2kAhljww+CSyRIeECzVf9D5RlG5om4oUEjtPURNGr6roTC41hFs6Tb+oUKKyXo1D/1jypj0G1bhFYp0UZoZtNBprQqdkZmo1I2Hvf6iM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360949; c=relaxed/simple; bh=XjDY8pX1SvhyeaXF/SNjQwVDaDzVuDyjzYhQHrc++bY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DW07cQiomh8MQJtKFEiQC+UtPvvFs/kGNZxLXKhJQBOo47OZTHWmY94GCyHiGisWCTgULzfvl69RYZMR3J5rtznHIywSNhcDqPKphN2sxyGNa8CFdto3S1/yiXdwDiGmEA8w5aP6XnGYNMffRUCBnpVwKJcUiMYF2bLZ9SjfjiI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rFvbphuu; 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="rFvbphuu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A837C2BCC7; Thu, 16 Apr 2026 17:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360948; bh=XjDY8pX1SvhyeaXF/SNjQwVDaDzVuDyjzYhQHrc++bY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rFvbphuugrUTmeW5NaQjsuTqsYXcyYj+R4tu0DQScFP2Sslyc9EVsN8u6AIdGb38f Zy1zA5t/qJUeNK9uxP8mfnwWioK4E1pQNRuxgSKlsO3ysPnf35o2bPsCwu9isTzN6r Ov/Db67chWOldB4C3iZ7P5WciWq6hVRdF8yg/5kwG5yKpDCmhxBGi6pzjHGKwkbIIj 0pqO7WItiHltON8JLrneH+umbH6TX2/TScEu5eQa6g8HiOJAA6HgZjJU4x54MwBnaZ uYTrVVFmkLrkqqLfrt7SXvj0nPJG5id2n2TACJYpC5MgeTPPYItEIdWv6MwSoz5yCD ABZGQK2TUJ7RA== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:14 -0700 Subject: [PATCH v2 13/28] nfsd: make nfsd4_callback_ops->prepare operation bool return Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-13-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=3301; i=jlayton@kernel.org; h=from:subject:message-id; bh=XjDY8pX1SvhyeaXF/SNjQwVDaDzVuDyjzYhQHrc++bY=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3kF8bpcIb9ib8mi4RpaLW47vGpEj3slUp3z 6NiL5Ih9XSJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5AAKCRAADmhBGVaC FW/HD/0U47lATdOMiIaBzFo6qn1VdzvpT7WiuRxt14N+8yBzmwFr13YMPi9pZxavAZboaxjGjiL k1KC5qdt8KLL19v9NAlKBIhL7iMHXzmkoY3SX4s304UGKMPBOWLhyl+xx2ZIYzKw8xJ9CyOXl+L T/GBrndUQTSzOnmdHAvbX+3MsnfvDbKYIMND4ZXc2eheyKKv3ODMVsZ+TeAtOGcxx15/lOimjKQ t2tm+euZaopF/GCG+ZxGmntaMCCx/PgS3O3KBff1ktXey5zJTGlMt0A/JDIIS0fsGbqyD+4vDSy lJhsKpH/t+/+3M7inbdwR0800s43S7JKLPCtCDsuxsphJixmvleKiHkUCu1XzjJSNYPy6zucKxI DI4uJHqTX+JqqUqIGZ2BKuFTvHu+Vor/Z9Z6rFk0ulrMt1AKVNzBtrkxkOVz5vtLZXXvpTwIszK lmK7yISoDUslWU4spdXTYwaNJBE0HyEoMZIXVj3Gv3TNJ5vk7fMDwc6dhqcD2bnwlwQVGyA4dYe NeRborp/UsPJGYJlHfeppeEF3mXJG1H29S7YWFEY9LM2UDUYeBRZ5aAVgDnBmX1Kgf6ZE8N3XR2 Noc6VYrvEO3nEk0dmqpIX5hgsrvvqJAEUVjFHdRoXZ0yOLmUa+duJXw2YscDp23//+ydiUaANk4 yPmUz+nSaK0qJaA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 For a CB_NOTIFY operation, we need to stop processing the callback if an allocation fails. Change the ->prepare callback operation to return true if processing should continue, and false otherwise. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4callback.c | 5 ++++- fs/nfsd/nfs4layouts.c | 3 ++- fs/nfsd/nfs4state.c | 6 ++++-- fs/nfsd/state.h | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 50827405468d..25bbf5b8814d 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1715,7 +1715,10 @@ nfsd4_run_cb_work(struct work_struct *work) =20 if (!test_and_clear_bit(NFSD4_CALLBACK_REQUEUE, &cb->cb_flags)) { if (cb->cb_ops && cb->cb_ops->prepare) - cb->cb_ops->prepare(cb); + if (!cb->cb_ops->prepare(cb)) { + nfsd41_destroy_cb(cb); + return; + } } =20 cb->cb_msg.rpc_cred =3D clp->cl_cb_cred; diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index c550b83f4432..8974e3d85d75 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -654,7 +654,7 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls, st= ruct nfsd_file *file) } } =20 -static void +static bool nfsd4_cb_layout_prepare(struct nfsd4_callback *cb) { struct nfs4_layout_stateid *ls =3D @@ -663,6 +663,7 @@ nfsd4_cb_layout_prepare(struct nfsd4_callback *cb) mutex_lock(&ls->ls_mutex); nfs4_inc_and_copy_stateid(&ls->ls_recall_sid, &ls->ls_stid); mutex_unlock(&ls->ls_mutex); + return true; } =20 static int diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6adce94e9fdb..c0046fc3c1b1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -357,12 +357,13 @@ remove_blocked_locks(struct nfs4_lockowner *lo) } } =20 -static void +static bool nfsd4_cb_notify_lock_prepare(struct nfsd4_callback *cb) { struct nfsd4_blocked_lock *nbl =3D container_of(cb, struct nfsd4_blocked_lock, nbl_cb); locks_delete_block(&nbl->nbl_lock); + return true; } =20 static int @@ -5553,7 +5554,7 @@ bool nfsd_wait_for_delegreturn(struct svc_rqst *rqstp= , struct inode *inode) return timeo > 0; } =20 -static void nfsd4_cb_recall_prepare(struct nfsd4_callback *cb) +static bool nfsd4_cb_recall_prepare(struct nfsd4_callback *cb) { struct nfs4_delegation *dp =3D cb_to_delegation(cb); struct nfsd_net *nn =3D net_generic(dp->dl_stid.sc_client->net, @@ -5574,6 +5575,7 @@ static void nfsd4_cb_recall_prepare(struct nfsd4_call= back *cb) list_add_tail(&dp->dl_recall_lru, &nn->del_recall_lru); } spin_unlock(&nn->deleg_lock); + return true; } =20 static int nfsd4_cb_recall_done(struct nfsd4_callback *cb, diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 811c148f36fc..7d2afe7dcc3e 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -98,9 +98,9 @@ struct nfsd4_callback { }; =20 struct nfsd4_callback_ops { - void (*prepare)(struct nfsd4_callback *); - int (*done)(struct nfsd4_callback *, struct rpc_task *); - void (*release)(struct nfsd4_callback *); + bool (*prepare)(struct nfsd4_callback *cb); + int (*done)(struct nfsd4_callback *cb, struct rpc_task *task); + void (*release)(struct nfsd4_callback *cb); uint32_t opcode; }; =20 --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 5C3243E1217; Thu, 16 Apr 2026 17:35:49 +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=1776360949; cv=none; b=QgbKh0cYh8hBmI0ktMOijHxB8kec6KROrnz/EsJpHZVfHb0KMoxYIF92Uc6rxUXok+0kRwV5/nmIPUh+zjSpsEYfrf1b54NfF6sTY6K/C3hV+jmcYRxMr0c2wTkNwpQwIlB+AAEgRzLG4WRsMNIdgDRMilMUhBbNQL+JI/FMg0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360949; c=relaxed/simple; bh=QsfWLs2tuIZnRN7M+rne4mPXGqyvfLmtMwoip+RYIUc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lqIHGjA+rwdRSMSOvEpo35+xmmuIT1z78vrx1zE2FQ0K1VBEegN/ne/9rbHNIr9k8RcGt0W59gvtbG/spyhKGcd1nAXtDWI6LK9rTCsaZlPgMw03qQ19+kvzrsOMMvgEVLiLNfROhaoBa5yj1KVTR8i0ed03zM7KpUAO99j2D14= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e/wQMUsu; 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="e/wQMUsu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68D72C2BCC4; Thu, 16 Apr 2026 17:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360949; bh=QsfWLs2tuIZnRN7M+rne4mPXGqyvfLmtMwoip+RYIUc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=e/wQMUsuskXBZ98o6z2QFzNbdA3ag9Yc7Qies23QVRFtvCqtTwLajdRH9hmLWz464 z8YMTdk2aq3B407nOdELZCOuNHnzo5fXX6M9ZnoYEhMEzbYTQ7WzZOZQdQ5P4Lw+Ur N/tsAzQG0O8wZ5ucQAy0X6GXKXN/NRrx15gjvaz3sQe7aFreWdrR9jXVJnSWMSMAn7 JEQAL80KJGsjkvHCIIo/Iuon+FSJiFF+rt+43chyREpSzLr9dcsFd62uqwCUimY54V MryRsDsPJ/WFPfvVRmnmlqreIYgk59qF/yQ72vlARu21OQyeD16hr63Deg2SDYqSSK wmhu19imjaKcA== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:15 -0700 Subject: [PATCH v2 14/28] nfsd: add callback encoding and decoding linkages for CB_NOTIFY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-14-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=3990; i=jlayton@kernel.org; h=from:subject:message-id; bh=QsfWLs2tuIZnRN7M+rne4mPXGqyvfLmtMwoip+RYIUc=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3lWI50JIKNRsFVx4AGjMwire3Z5S7gS9ph3 8YukROLAsWJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5QAKCRAADmhBGVaC FXacD/4hDjhdSY++v+l4oCKXP9p0GHe7MfC8JrOE8cDCVXkJjYVLrhvfAZByA5xL6OwqLiohyR3 iKy0B//wV0vxrgKFClkwh/CNTolE5XO+v2NxKSdTeqaYFR4DlK4ysV8o4s5jilHzqVYqwubvZ6I ENIURQPAg+LuZ8euqCuBqa2tu4KA6Sr+OI8euvNHkTJVGENMCir5B2AqIKRowU1qUUSzFLgpare 2g6owzSbouvriWFANBJFnVea3FlBNRIvz9P2vezywTP5OiuW1TwQl7sE+O+41aUbzhsjeW4FMpi QiLImxkY5gEsHOA4hG6xY/ggtcyN1sMacnbkMdlORT5Tt/YlVSriYrLfL7p18USwdnR09FeUYJf CWhWxK+FuzrjtI1kSos4S9zNUonCQAifBzrH8TD3qzMaLbhCmvKqmFO4YCZZi0reUrbvXiXNsb9 l9/P451N37NYkauOava2Fc9hAMyGcziXxqedlI5TCznZ+ktBYssLLcLZHPmHCzfcKYdCJ8x+hRc I/57BryVe/17acFj4Lui/c1vzJVnkWVqk9X8zG/ECsOY/gTdL/WGMaF4FQu9GZN4RAQdRTQ1OV7 lgWO6O0zm9yq0+UwQkvARkkAuSbwuDhwA3RF18tZcz0gdt5OxQGJGkWjpvAI7FCb0WoqcwTw9i8 9HjLw7QpCrAFE8g== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add routines for encoding and decoding CB_NOTIFY messages. These call into the code generated by xdrgen to do the actual encoding and decoding. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4callback.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ fs/nfsd/state.h | 8 ++++++++ fs/nfsd/xdr4cb.h | 12 ++++++++++++ 3 files changed, 66 insertions(+) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 25bbf5b8814d..ea3e7deb06fa 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -865,6 +865,51 @@ static void encode_stateowner(struct xdr_stream *xdr, = struct nfs4_stateowner *so xdr_encode_opaque(p, so->so_owner.data, so->so_owner.len); } =20 +static void nfs4_xdr_enc_cb_notify(struct rpc_rqst *req, + struct xdr_stream *xdr, + const void *data) +{ + const struct nfsd4_callback *cb =3D data; + struct nfs4_cb_compound_hdr hdr =3D { + .ident =3D 0, + .minorversion =3D cb->cb_clp->cl_minorversion, + }; + struct CB_NOTIFY4args args =3D { }; + + WARN_ON_ONCE(hdr.minorversion =3D=3D 0); + + encode_cb_compound4args(xdr, &hdr); + encode_cb_sequence4args(xdr, cb, &hdr); + + /* + * FIXME: get stateid and fh from delegation. Inline the cna_changes + * buffer, and zero it. + */ + WARN_ON_ONCE(!xdrgen_encode_CB_NOTIFY4args(xdr, &args)); + + hdr.nops++; + encode_cb_nops(&hdr); +} + +static int nfs4_xdr_dec_cb_notify(struct rpc_rqst *rqstp, + struct xdr_stream *xdr, + void *data) +{ + struct nfsd4_callback *cb =3D data; + struct nfs4_cb_compound_hdr hdr; + int status; + + status =3D decode_cb_compound4res(xdr, &hdr); + if (unlikely(status)) + return status; + + status =3D decode_cb_sequence4res(xdr, cb); + if (unlikely(status || cb->cb_seq_status)) + return status; + + return decode_cb_op_status(xdr, OP_CB_NOTIFY, &cb->cb_status); +} + static void nfs4_xdr_enc_cb_notify_lock(struct rpc_rqst *req, struct xdr_stream *xdr, const void *data) @@ -1026,6 +1071,7 @@ static const struct rpc_procinfo nfs4_cb_procedures[]= =3D { #ifdef CONFIG_NFSD_PNFS PROC(CB_LAYOUT, COMPOUND, cb_layout, cb_layout), #endif + PROC(CB_NOTIFY, COMPOUND, cb_notify, cb_notify), PROC(CB_NOTIFY_LOCK, COMPOUND, cb_notify_lock, cb_notify_lock), PROC(CB_OFFLOAD, COMPOUND, cb_offload, cb_offload), PROC(CB_RECALL_ANY, COMPOUND, cb_recall_any, cb_recall_any), diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 7d2afe7dcc3e..22c9a1e7d8fd 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -190,6 +190,13 @@ struct nfs4_cb_fattr { u64 ncf_cur_fsize; }; =20 +/* + * FIXME: the current backchannel encoder can't handle a send buffer longer + * than a single page (see bc_alloc/bc_free). + */ +#define NOTIFY4_EVENT_QUEUE_SIZE 3 +#define NOTIFY4_PAGE_ARRAY_SIZE 1 + /* * Represents a delegation stateid. The nfs4_client holds references to th= ese * and they are put when it is being destroyed or when the delegation is @@ -774,6 +781,7 @@ enum nfsd4_cb_op { NFSPROC4_CLNT_CB_NOTIFY_LOCK, NFSPROC4_CLNT_CB_RECALL_ANY, NFSPROC4_CLNT_CB_GETATTR, + NFSPROC4_CLNT_CB_NOTIFY, }; =20 /* Returns true iff a is later than b: */ diff --git a/fs/nfsd/xdr4cb.h b/fs/nfsd/xdr4cb.h index f4e29c0c701c..b06d0170d7c4 100644 --- a/fs/nfsd/xdr4cb.h +++ b/fs/nfsd/xdr4cb.h @@ -33,6 +33,18 @@ cb_sequence_dec_sz + \ op_dec_sz) =20 +#define NFS4_enc_cb_notify_sz (cb_compound_enc_hdr_sz + \ + cb_sequence_enc_sz + \ + 1 + enc_stateid_sz + \ + enc_nfs4_fh_sz + \ + 1 + \ + NOTIFY4_EVENT_QUEUE_SIZE * \ + (2 + (NFS4_OPAQUE_LIMIT >> 2))) + +#define NFS4_dec_cb_notify_sz (cb_compound_dec_hdr_sz + \ + cb_sequence_dec_sz + \ + op_dec_sz) + #define NFS4_enc_cb_notify_lock_sz (cb_compound_enc_hdr_sz + \ cb_sequence_enc_sz + \ 2 + 1 + \ --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 563F83E3C6F; Thu, 16 Apr 2026 17:35:50 +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=1776360950; cv=none; b=DoFJ4TpciIhW0afz5kR7nEdqe3GHVs1jgPfAW/xkFd0rJeFqlH+rYKsFWAFdoLbtU6r4FoobXBfxTm0Ofn0c5s1+JI6/9yt9ADe7qBJ5ll3gpIt4AcVkYKIQ5IJx18QCONn62oKtrykVSP51xVnQwUFTkHAaZfeq/TWTlUUkVS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360950; c=relaxed/simple; bh=ypP3CfGJjjSK1PDf2+Wv7Uq4USbRmfLGwhsTPLxKXlM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lE++048Ms8zKzOXWycZsY2xQmSO7X0Yq3yxElLxUonjWGLiJLv/W3ok9tE6u78jax6eMtbrLcO65HrObZU+7JsIMPWKaogylP5vCCFKLiVVvuZxB/f1MAaOwKpgHKlj1javhx5cw2hY8LB13Y24vguAYSmsMw+8VEbpwQ6deAdc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Pat1cPFP; 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="Pat1cPFP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38C82C2BCB4; Thu, 16 Apr 2026 17:35:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360949; bh=ypP3CfGJjjSK1PDf2+Wv7Uq4USbRmfLGwhsTPLxKXlM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Pat1cPFPpqAc4nNJsv0KCvh1RpQK6Y302PHhXwhZ92Z0y2aiPfWydW1N2zNtd6I1P zbb4QH22e0nzdQqQQs+XqTjrZ6E/9P6SPogoAfUG9ZftkLwS6FOuUtf0QuFKtWUjcb FfUwXmWVRHXFQjVXkCml79z7it55cXHNtkkjrdpuKjK8Zwmt7dS7QkFhNX9pvmRU/m wJyl1Zo81YaLPxurWOf5mzR0qrXb5BS6+VjRYYxSrDc4Iqs6inFVpih1bVH47D7yei uyaOVQOztnJoyjUDuo/PmL6g/3XEmlUFbfd6s5V4mc47kykCxVO++Elgq8tI+sptFH bE+MqEFAFTi8Q== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:16 -0700 Subject: [PATCH v2 15/28] nfsd: use RCU to protect fi_deleg_file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-15-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=7844; i=jlayton@kernel.org; h=from:subject:message-id; bh=ypP3CfGJjjSK1PDf2+Wv7Uq4USbRmfLGwhsTPLxKXlM=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3lr4fUrNWGM9WNq8X3mKh3Uv6i2OJp9LjcR eadv7b/NGWJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5QAKCRAADmhBGVaC FTSkD/9Wb6a6JltEzEil2VOo4FzhJ7eLkmo4dAlBj9foon/QTKTU2kSDdUlkjf9T4l5+C3wkq8x Ld72LxLSdzsbFJhBl+8BLgSDgiIXbHuhykIHkoVpHYPECcwX1GbUW4cNFmwPCDRHbHNBc1v2JKN 5dr2v5evD8vQDRKTPHrs4wMcfWCP+SQIWj08zZhbUFgLFuH9HnbQVN+M5yjtkMmT6St6fd1jofC GGXi4wNYAworgU7yl0Oa7xJtzu4y8MRkQ56kCYA5ok25Z9Q1tGBtxa6QhMxlyZy9GRy/MDKIhE0 usRXh6ZI3e5W5Ml5PRn74kd5cXVBIrzdu4ilW3aIqRj8rxIB96Rd9BzKfqnEkUCLMKWn7GgWHwh VFoFOxu8ZXMIbfioVngNB7V6itSkVDxSn7mjR49kIaqhlu6llT8VluOuxm4rdgHIrl5kn+tVIEB 5KHNCzd7ON9BBFQqzHVullWZ6a0VQmpcZEozX910WTNzLkOvAnCypIL45Q/rwHqK0k8PpvhjYE9 Nl7bs0nrQQBufVZdjs9dmJhPHgljjoCmucOKVZAPX/djcuR3aqTRaUHiQbWAqUOXrSaUYJ4WS1u DRh+YgXrP9v4QrsGxS+DTfh1kQpeXWTGWeJdwFhwyx046/G9c0D9YpADQFo/dYP8IAOQTUYEreu mFfMax3J1V3PqkQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 fi_deleg_file can be NULLed by put_deleg_file() when fi_delegees drops to zero during delegation teardown (e.g. DELEGRETURN). Concurrent accesses from workqueue callbacks -- such as CB_NOTIFY -- can dereference a NULL pointer if they race with this teardown. Annotate fi_deleg_file with __rcu and convert all accessors to use proper RCU primitives: - rcu_assign_pointer() / RCU_INIT_POINTER() for stores - rcu_dereference_protected() for reads under fi_lock or where fi_delegees > 0 guarantees stability This prepares for a subsequent patch that will use rcu_read_lock + rcu_dereference + nfsd_file_get to safely acquire a reference from the CB_NOTIFY callback path without holding fi_lock. Assisted-by: Claude (Anthropic Claude Code) Signed-off-by: Jeff Layton --- fs/nfsd/nfs4layouts.c | 2 +- fs/nfsd/nfs4state.c | 40 ++++++++++++++++++++++++---------------- fs/nfsd/state.h | 2 +- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 8974e3d85d75..d32cc6b38c23 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -248,7 +248,7 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state = *cstate, NFSPROC4_CLNT_CB_LAYOUT); =20 if (parent->sc_type =3D=3D SC_TYPE_DELEG) - ls->ls_file =3D nfsd_file_get(fp->fi_deleg_file); + ls->ls_file =3D nfsd_file_get(rcu_dereference_protected(fp->fi_deleg_fil= e, 1)); else ls->ls_file =3D find_any_file(fp); BUG_ON(!ls->ls_file); diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c0046fc3c1b1..ef04e26b4f30 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1212,7 +1212,9 @@ static void put_deleg_file(struct nfs4_file *fp) =20 spin_lock(&fp->fi_lock); if (--fp->fi_delegees =3D=3D 0) { - swap(nf, fp->fi_deleg_file); + nf =3D rcu_dereference_protected(fp->fi_deleg_file, + lockdep_is_held(&fp->fi_lock)); + rcu_assign_pointer(fp->fi_deleg_file, NULL); swap(rnf, fp->fi_rdeleg_file); } spin_unlock(&fp->fi_lock); @@ -1295,7 +1297,7 @@ static void nfsd_fsnotify_recalc_mask(struct nfsd_fil= e *nf) static void nfs4_unlock_deleg_lease(struct nfs4_delegation *dp) { struct nfs4_file *fp =3D dp->dl_stid.sc_file; - struct nfsd_file *nf =3D fp->fi_deleg_file; + struct nfsd_file *nf =3D rcu_dereference_protected(fp->fi_deleg_file, 1); =20 WARN_ON_ONCE(!fp->fi_delegees); =20 @@ -3167,7 +3169,8 @@ static int nfs4_show_deleg(struct seq_file *s, struct= nfs4_stid *st) /* XXX: lease time, whether it's being recalled. */ =20 spin_lock(&nf->fi_lock); - file =3D nf->fi_deleg_file; + file =3D rcu_dereference_protected(nf->fi_deleg_file, + lockdep_is_held(&nf->fi_lock)); if (file) { seq_puts(s, ", "); nfs4_show_superblock(s, file); @@ -4949,7 +4952,7 @@ static void nfsd4_file_init(const struct svc_fh *fh, = struct nfs4_file *fp) INIT_LIST_HEAD(&fp->fi_delegations); INIT_LIST_HEAD(&fp->fi_clnt_odstate); fh_copy_shallow(&fp->fi_fhandle, &fh->fh_handle); - fp->fi_deleg_file =3D NULL; + RCU_INIT_POINTER(fp->fi_deleg_file, NULL); fp->fi_rdeleg_file =3D NULL; fp->fi_had_conflict =3D false; fp->fi_share_deny =3D 0; @@ -6101,7 +6104,7 @@ static struct file_lease *nfs4_alloc_init_lease(struc= t nfs4_delegation *dp, u32 fl->c.flc_type =3D deleg_is_read(dp->dl_type) ? F_RDLCK : F_WRLCK; fl->c.flc_owner =3D (fl_owner_t)dp; fl->c.flc_pid =3D current->tgid; - fl->c.flc_file =3D dp->dl_stid.sc_file->fi_deleg_file->nf_file; + fl->c.flc_file =3D rcu_dereference_protected(dp->dl_stid.sc_file->fi_dele= g_file, 1)->nf_file; return fl; } =20 @@ -6109,7 +6112,7 @@ static int nfsd4_check_conflicting_opens(struct nfs4_= client *clp, struct nfs4_file *fp) { struct nfs4_ol_stateid *st; - struct file *f =3D fp->fi_deleg_file->nf_file; + struct file *f =3D rcu_dereference_protected(fp->fi_deleg_file, 1)->nf_fi= le; struct inode *ino =3D file_inode(f); int writes; =20 @@ -6186,7 +6189,7 @@ nfsd4_verify_deleg_dentry(struct nfsd4_open *open, st= ruct nfs4_file *fp, =20 exp_put(exp); dput(child); - if (child !=3D file_dentry(fp->fi_deleg_file->nf_file)) + if (child !=3D file_dentry(rcu_dereference_protected(fp->fi_deleg_file, 1= )->nf_file)) return -EAGAIN; =20 return 0; @@ -6292,8 +6295,9 @@ nfs4_set_delegation(struct nfsd4_open *open, struct n= fs4_ol_stateid *stp, status =3D -EAGAIN; else if (nfsd4_verify_setuid_write(open, nf)) status =3D -EAGAIN; - else if (!fp->fi_deleg_file) { - fp->fi_deleg_file =3D nf; + else if (!rcu_dereference_protected(fp->fi_deleg_file, + lockdep_is_held(&fp->fi_lock))) { + rcu_assign_pointer(fp->fi_deleg_file, nf); /* increment early to prevent fi_deleg_file from being * cleared */ fp->fi_delegees =3D 1; @@ -6318,7 +6322,7 @@ nfs4_set_delegation(struct nfsd4_open *open, struct n= fs4_ol_stateid *stp, if (!fl) goto out_clnt_odstate; =20 - status =3D kernel_setlease(fp->fi_deleg_file->nf_file, + status =3D kernel_setlease(rcu_dereference_protected(fp->fi_deleg_file, 1= )->nf_file, fl->c.flc_type, &fl, NULL); if (fl) locks_free_lease(fl); @@ -6339,7 +6343,7 @@ nfs4_set_delegation(struct nfsd4_open *open, struct n= fs4_ol_stateid *stp, * Now that the deleg is set, check again to ensure that nothing * raced in and changed the mode while we weren't looking. */ - status =3D nfsd4_verify_setuid_write(open, fp->fi_deleg_file); + status =3D nfsd4_verify_setuid_write(open, rcu_dereference_protected(fp->= fi_deleg_file, 1)); if (status) goto out_unlock; =20 @@ -6360,7 +6364,8 @@ nfs4_set_delegation(struct nfsd4_open *open, struct n= fs4_ol_stateid *stp, =20 return dp; out_unlock: - kernel_setlease(fp->fi_deleg_file->nf_file, F_UNLCK, NULL, (void **)&dp); + kernel_setlease(rcu_dereference_protected(fp->fi_deleg_file, 1)->nf_file, + F_UNLCK, NULL, (void **)&dp); out_clnt_odstate: put_clnt_odstate(dp->dl_clnt_odstate); nfs4_put_stid(&dp->dl_stid); @@ -6517,8 +6522,9 @@ nfs4_open_delegation(struct svc_rqst *rqstp, struct n= fsd4_open *open, memcpy(&open->op_delegate_stateid, &dp->dl_stid.sc_stateid, sizeof(dp->dl= _stid.sc_stateid)); =20 if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE) { - struct file *f =3D dp->dl_stid.sc_file->fi_deleg_file->nf_file; + struct file *f; =20 + f =3D rcu_dereference_protected(dp->dl_stid.sc_file->fi_deleg_file, 1)->= nf_file; if (!nfsd4_add_rdaccess_to_wrdeleg(rqstp, open, fh, stp) || !nfs4_delegation_stat(dp, currentfh, &stat)) { nfs4_put_stid(&dp->dl_stid); @@ -9660,8 +9666,9 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstat= e, /* existing delegation? */ if (nfs4_delegation_exists(clp, fp)) { status =3D -EAGAIN; - } else if (!fp->fi_deleg_file) { - fp->fi_deleg_file =3D nfsd_file_get(nf); + } else if (!rcu_dereference_protected(fp->fi_deleg_file, + lockdep_is_held(&fp->fi_lock))) { + rcu_assign_pointer(fp->fi_deleg_file, nfsd_file_get(nf)); fp->fi_delegees =3D 1; } else { ++fp->fi_delegees; @@ -9713,7 +9720,8 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstat= e, } =20 /* Something failed. Drop the lease and clean up the stid */ - kernel_setlease(fp->fi_deleg_file->nf_file, F_UNLCK, NULL, (void **)&dp); + kernel_setlease(rcu_dereference_protected(fp->fi_deleg_file, 1)->nf_file, + F_UNLCK, NULL, (void **)&dp); out_put_stid: nfs4_put_stid(&dp->dl_stid); out_delegees: diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 22c9a1e7d8fd..eb5946b0999e 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -698,7 +698,7 @@ struct nfs4_file { */ atomic_t fi_access[2]; u32 fi_share_deny; - struct nfsd_file *fi_deleg_file; + struct nfsd_file __rcu *fi_deleg_file; struct nfsd_file *fi_rdeleg_file; int fi_delegees; struct knfsd_fh fi_fhandle; --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 E2AED3E3DA5; Thu, 16 Apr 2026 17:35:50 +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=1776360951; cv=none; b=BP3ZUFxNFW0miDNdAO8lUEEDVZlnxFQZ+jHLSP2+15tiIkADyKagC4mKjsJiXL1+/fi5qcI7xJt98VmZTbSVAMv9knSOS+IRnT3r8lvP/edsH6iPlqJsxZcoCKDT8HGjZLdLOLN2SN0TX3jVz8zQH4maMlZ2asX/Q2I0lJDW/x4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360951; c=relaxed/simple; bh=Nk+Hk9zcNVhLvAPUEL4gA5EfzqizEie4iShWDqU6Hfw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gLhZWTF3tmRUwL2BQ82+SV1rQ3jFDrveq1g3FEaOyiNeeioVDhA83njSUquOHRchUqci2Vod5RpcB+LRxVuU7lAcyE6xCeCygqsHmJSO82VKmDbuCo2FjIqbwhgaSyHw4aehz8SrT0sWbgUJyM5l48MPMAoWbnDAtI9tlEQ53RM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kj+7i0pU; 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="kj+7i0pU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 073ECC2BCB0; Thu, 16 Apr 2026 17:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360950; bh=Nk+Hk9zcNVhLvAPUEL4gA5EfzqizEie4iShWDqU6Hfw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kj+7i0pUwpDdWbjv7vvPoTye7Il5NTJB+i//3U6Qsmao2241WimsBi/lhnNMkELRj ZScINtKuWhUDBNk2Co0CdIOHscBPbHoxl2/+EoFn+xehGWR3imN1afL8hXalp91vK4 IJOlz8OYpEQQ1qgxC+EgpUgxDnw/JlSve1IXWfmRhM1Xr5AbFYnBEiIFRoNlN1ithA mtecqZ3d1/kca3ie8G4DBYQCW2np/9oelosm9kFYw4MUZ3IJuJ5JB69be+Z5usQfoh 1QjW+uJu72HIrLEO0vsykQLZ7rTW9IWPBHf7i8G6A0qXJvez+U+6PbFTzwCrJ+ae1e yLm25lMMT2VUA== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:17 -0700 Subject: [PATCH v2 16/28] nfsd: add data structures for handling CB_NOTIFY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-16-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=9015; i=jlayton@kernel.org; h=from:subject:message-id; bh=Nk+Hk9zcNVhLvAPUEL4gA5EfzqizEie4iShWDqU6Hfw=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3lqwKItNMQ/NB3i04nee6wIsTYntJCphsXG e7YySTNAliJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5QAKCRAADmhBGVaC FR0YEAC9I4QnglLLdayZd2OdQQkSO2kNpQfnsNDY3JJ2aMNsLW1G3GgrOiz4B8bWKznAp/fUGJ1 nrdbK2nFRuf4lXDQPaY27YNiIWbgQkqK8q29GcZeQ8Bs0zhAaVDcopcg4rM+kX2AeoWkJQNUWxv eULgxXP4mkAjE48X42H6fM+ANY0w4qGoUEb4vD8xQCGx1L+nYNcF8kYceSprnqDCGc9thXnwTqd 5bhzV/2OlTQff5bauE5v4Ovxi+gcHZ9o38Ojm4MK0+hgCJkU3zjowClg4CoYv3rcHMpoRZwPHwl JBjTg4maAu2lAit0nZhetYkVWKtJ7fc0gi3i5fFjpZLWf2bLd9tRj0nu0BHntknxWgRTlnb618a PDiX80teJKrDUfU4nFIOn+s2hEhAS1yb3zsvqI9+ToZ+282+Jl2Ipu4HJMiteqa1diPc8oZaVyy STwcplguQSinBIspCTXD/xok5wu5+3b9/Q1GG0Z2mNK7GZ1cbKTiulB/Fe29CrGA9JtLCzdnAxb bi5DWM8G2F+WKbc9uRcAGHaxaO/Fzi/73GaeDxkrPzmxrNqODP27uYYDPbabHfnF4fh3xmdx0QF n84hABUkCaRYyiZxan0EnL4dmzleaolUAdeLfhnuA4xc2PerWT0jOLFTLQF4fr+F1H/dga9YjE9 5NE1uYdEb93A1pg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add the data structures, allocation helpers, and callback operations needed for directory delegation CB_NOTIFY support: - struct nfsd_notify_event: carries fsnotify events for CB_NOTIFY - struct nfsd4_cb_notify: per-delegation state for notification handling - Union dl_cb_fattr with dl_cb_notify in nfs4_delegation since a delegation is either a regular file delegation or a directory delegation, never both Refactor alloc_init_deleg() into a common __alloc_init_deleg() base with a pluggable sc_free callback, and add alloc_init_dir_deleg() which allocates the page array and notify4 buffer needed for CB_NOTIFY encoding. Add skeleton nfsd4_cb_notify_ops with done/release handlers that will be filled in when the notification path is wired up. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 117 +++++++++++++++++++++++++++++++++++++++++++++---= ---- fs/nfsd/state.h | 46 ++++++++++++++++++++- 2 files changed, 147 insertions(+), 16 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ef04e26b4f30..eefce9e7c628 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -126,6 +126,7 @@ static void free_session(struct nfsd4_session *); static const struct nfsd4_callback_ops nfsd4_cb_recall_ops; static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops; static const struct nfsd4_callback_ops nfsd4_cb_getattr_ops; +static const struct nfsd4_callback_ops nfsd4_cb_notify_ops; =20 static struct workqueue_struct *laundry_wq; =20 @@ -1123,29 +1124,31 @@ static void block_delegations(struct knfsd_fh *fh) } =20 static struct nfs4_delegation * -alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp, - struct nfs4_clnt_odstate *odstate, u32 dl_type) +__alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp, + struct nfs4_clnt_odstate *odstate, u32 dl_type, + void (*sc_free)(struct nfs4_stid *)) { struct nfs4_delegation *dp; struct nfs4_stid *stid; long n; =20 - dprintk("NFSD alloc_init_deleg\n"); + if (delegation_blocked(&fp->fi_fhandle)) + return NULL; + n =3D atomic_long_inc_return(&num_delegations); if (n < 0 || n > max_delegations) goto out_dec; - if (delegation_blocked(&fp->fi_fhandle)) - goto out_dec; - stid =3D nfs4_alloc_stid(clp, deleg_slab, nfs4_free_deleg); + + stid =3D nfs4_alloc_stid(clp, deleg_slab, sc_free); if (stid =3D=3D NULL) goto out_dec; - dp =3D delegstateid(stid); =20 /* * delegation seqid's are never incremented. The 4.1 special * meaning of seqid 0 isn't meaningful, really, but let's avoid - * 0 anyway just for consistency and use 1: + * 0 anyway just for consistency and use 1. */ + dp =3D delegstateid(stid); dp->dl_stid.sc_stateid.si_generation =3D 1; INIT_LIST_HEAD(&dp->dl_perfile); INIT_LIST_HEAD(&dp->dl_perclnt); @@ -1155,19 +1158,75 @@ alloc_init_deleg(struct nfs4_client *clp, struct nf= s4_file *fp, dp->dl_type =3D dl_type; dp->dl_retries =3D 1; dp->dl_recalled =3D false; - nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client, - &nfsd4_cb_recall_ops, NFSPROC4_CLNT_CB_RECALL); - nfsd4_init_cb(&dp->dl_cb_fattr.ncf_getattr, dp->dl_stid.sc_client, - &nfsd4_cb_getattr_ops, NFSPROC4_CLNT_CB_GETATTR); - dp->dl_cb_fattr.ncf_file_modified =3D false; get_nfs4_file(fp); dp->dl_stid.sc_file =3D fp; + nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client, + &nfsd4_cb_recall_ops, NFSPROC4_CLNT_CB_RECALL); return dp; out_dec: atomic_long_dec(&num_delegations); return NULL; } =20 +static struct nfs4_delegation * +alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp, + struct nfs4_clnt_odstate *odstate, u32 dl_type) +{ + struct nfs4_delegation *dp; + + dp =3D __alloc_init_deleg(clp, fp, odstate, dl_type, nfs4_free_deleg); + if (!dp) + return NULL; + + nfsd4_init_cb(&dp->dl_cb_fattr.ncf_getattr, dp->dl_stid.sc_client, + &nfsd4_cb_getattr_ops, NFSPROC4_CLNT_CB_GETATTR); + dp->dl_cb_fattr.ncf_file_modified =3D false; + return dp; +} + +static void nfs4_free_dir_deleg(struct nfs4_stid *stid) +{ + struct nfs4_delegation *dp =3D delegstateid(stid); + struct nfsd4_cb_notify *ncn =3D &dp->dl_cb_notify; + int i; + + for (i =3D 0; i < ncn->ncn_evt_cnt; ++i) + nfsd_notify_event_put(ncn->ncn_evt[i]); + release_pages(ncn->ncn_pages, NOTIFY4_PAGE_ARRAY_SIZE); + kfree(ncn->ncn_nf); + nfs4_free_deleg(stid); +} + +static struct nfs4_delegation * +alloc_init_dir_deleg(struct nfs4_client *clp, struct nfs4_file *fp) +{ + struct nfs4_delegation *dp; + struct nfsd4_cb_notify *ncn; + int npages; + + dp =3D __alloc_init_deleg(clp, fp, NULL, NFS4_OPEN_DELEGATE_READ, nfs4_fr= ee_dir_deleg); + if (!dp) + return NULL; + + ncn =3D &dp->dl_cb_notify; + + npages =3D alloc_pages_bulk(GFP_KERNEL, NOTIFY4_PAGE_ARRAY_SIZE, ncn->ncn= _pages); + if (npages !=3D NOTIFY4_PAGE_ARRAY_SIZE) { + nfs4_put_stid(&dp->dl_stid); + return NULL; + } + + ncn->ncn_nf =3D kcalloc(NOTIFY4_EVENT_QUEUE_SIZE, sizeof(*ncn->ncn_nf), G= FP_KERNEL); + if (!ncn->ncn_nf) { + nfs4_put_stid(&dp->dl_stid); + return NULL; + } + spin_lock_init(&ncn->ncn_lock); + nfsd4_init_cb(&ncn->ncn_cb, dp->dl_stid.sc_client, + &nfsd4_cb_notify_ops, NFSPROC4_CLNT_CB_NOTIFY); + return dp; +} + void nfs4_put_stid(struct nfs4_stid *s) { @@ -3389,6 +3448,30 @@ nfsd4_cb_getattr_release(struct nfsd4_callback *cb) nfs4_put_stid(&dp->dl_stid); } =20 +static int +nfsd4_cb_notify_done(struct nfsd4_callback *cb, + struct rpc_task *task) +{ + switch (task->tk_status) { + case -NFS4ERR_DELAY: + rpc_delay(task, 2 * HZ); + return 0; + default: + return 1; + } +} + +static void +nfsd4_cb_notify_release(struct nfsd4_callback *cb) +{ + struct nfsd4_cb_notify *ncn =3D + container_of(cb, struct nfsd4_cb_notify, ncn_cb); + struct nfs4_delegation *dp =3D + container_of(ncn, struct nfs4_delegation, dl_cb_notify); + + nfs4_put_stid(&dp->dl_stid); +} + static const struct nfsd4_callback_ops nfsd4_cb_recall_any_ops =3D { .done =3D nfsd4_cb_recall_any_done, .release =3D nfsd4_cb_recall_any_release, @@ -3401,6 +3484,12 @@ static const struct nfsd4_callback_ops nfsd4_cb_geta= ttr_ops =3D { .opcode =3D OP_CB_GETATTR, }; =20 +static const struct nfsd4_callback_ops nfsd4_cb_notify_ops =3D { + .done =3D nfsd4_cb_notify_done, + .release =3D nfsd4_cb_notify_release, + .opcode =3D OP_CB_NOTIFY, +}; + static void nfs4_cb_getattr(struct nfs4_cb_fattr *ncf) { struct nfs4_delegation *dp =3D @@ -9683,7 +9772,7 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstat= e, =20 /* Try to set up the lease */ status =3D -ENOMEM; - dp =3D alloc_init_deleg(clp, fp, NULL, NFS4_OPEN_DELEGATE_READ); + dp =3D alloc_init_dir_deleg(clp, fp); if (!dp) goto out_delegees; if (cstate->current_fh.fh_export) diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index eb5946b0999e..500e07e47909 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -197,6 +197,44 @@ struct nfs4_cb_fattr { #define NOTIFY4_EVENT_QUEUE_SIZE 3 #define NOTIFY4_PAGE_ARRAY_SIZE 1 =20 +struct nfsd_notify_event { + refcount_t ne_ref; // refcount + u32 ne_mask; // FS_* mask from fsnotify callback + struct dentry *ne_dentry; // dentry reference to target + u32 ne_namelen; // length of ne_name + char ne_name[]; // name of dentry being changed +}; + +static inline struct nfsd_notify_event *nfsd_notify_event_get(struct nfsd_= notify_event *ne) +{ + refcount_inc(&ne->ne_ref); + return ne; +} + +static inline void nfsd_notify_event_put(struct nfsd_notify_event *ne) +{ + if (refcount_dec_and_test(&ne->ne_ref)) { + dput(ne->ne_dentry); + kfree(ne); + } +} + +/* + * Represents a directory delegation. The callback is for handling CB_NOTI= FYs. + * As notifications from fsnotify come in, allocate a new event, take the = ncn_lock, + * and add it to the ncn_evt queue. The CB_NOTIFY prepare handler will tak= e the + * lock, clean out the list and process it. + */ +struct nfsd4_cb_notify { + spinlock_t ncn_lock; // protects the evt queue and count + int ncn_evt_cnt; // count of events in ncn_evt + int ncn_nf_cnt; // count of valid entries in ncn_nf + struct nfsd_notify_event *ncn_evt[NOTIFY4_EVENT_QUEUE_SIZE]; // list of e= vents + struct page *ncn_pages[NOTIFY4_PAGE_ARRAY_SIZE]; // for encoding + struct notify4 *ncn_nf; // array of notify4's to be sent + struct nfsd4_callback ncn_cb; // notify4 callback +}; + /* * Represents a delegation stateid. The nfs4_client holds references to th= ese * and they are put when it is being destroyed or when the delegation is @@ -233,8 +271,12 @@ struct nfs4_delegation { bool dl_written; bool dl_setattr; =20 - /* for CB_GETATTR */ - struct nfs4_cb_fattr dl_cb_fattr; + union { + /* for CB_GETATTR */ + struct nfs4_cb_fattr dl_cb_fattr; + /* for CB_NOTIFY */ + struct nfsd4_cb_notify dl_cb_notify; + }; =20 /* For delegated timestamps */ struct timespec64 dl_atime; --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 C04243E4C9D; Thu, 16 Apr 2026 17:35:51 +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=1776360951; cv=none; b=X2LxnojjzuRq3ER6SBpuwpG0G/x+OxXl2KtgAf05jV5D55YMwfOzCsW9pJdDVuC/Hq9+lbBe3/as4J0Q/LEYTLPi8oSIS1EFFQ6AZ2KlLaTPzStXlJBuV7ACU5oFT8t4+KL0lP6aIdLmiwKam6LjuLkAp5QsXVDZsfJ7+86aT2g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360951; c=relaxed/simple; bh=IwwJYv7qNkeA9B0nBNwFNXyRqesPEAfw0jBvrgBBI8k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rVbAVawRP5UV5GUrP/TrsmmFmVngKG6P5QImxbIy0bzDNJIGILN4AX/K/KhDRBSf2c77LLw0q3C+PfFFduFNH7x4hLYfUEvWVEQvo2X2m8p46UpOoRKbspPyc/w+3wmQ3LJ5/ILaWAfyYfdJzaCwERTFc966DUwFUdr75K/49R0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E23o8Xrl; 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="E23o8Xrl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB642C2BCB9; Thu, 16 Apr 2026 17:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360951; bh=IwwJYv7qNkeA9B0nBNwFNXyRqesPEAfw0jBvrgBBI8k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=E23o8Xrl3IlIJFsddL/rAFmN9GHEXfvYkBHJmTmzKNwm+5B4VJTRH9Lo+4zis9Dj2 c8pQWbBTZDRwqB7iqinWRg28H4GvJJtMj5Zv+LTPBxqdU3iI3TCJYU964IinYlqWfl R8BUBAA5pTqSybvBefp33+GOJjS8jRt4Dz/G31nYS0hojMq7uT3B7pD31eeU8mnhqe QU8ePjytcGb22/BUI8QkCtYondYaPRvYAjrZmWhe+w23CdHxdccRt5TCDTQdxp2qVJ c9gBuuncrs40Js6q7jfK3NQGUlWoGyPTn0FD7MN2Br/apw4auW6gs5t+hntEp8NMi8 ZbaQkmaNFnNcg== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:18 -0700 Subject: [PATCH v2 17/28] nfsd: add notification handlers for dir events Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-17-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=23165; i=jlayton@kernel.org; h=from:subject:message-id; bh=IwwJYv7qNkeA9B0nBNwFNXyRqesPEAfw0jBvrgBBI8k=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3lSq7EBd4JWxP1x/HTTGisMN1j13NBa2Bfy AZpGGtyPpqJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5QAKCRAADmhBGVaC Fcb0D/9LQGW4t3q27eC/XApe98Lq2AttzJy3iVjNzFFaFIt/oeFZGXA0ntvBbee6yMvhd+ohvh6 BpriiBgnCZl1Nk/i+dKUJkLbLPC7RPxC0VCDoEeSIO3MoBi4LyY3nNNHFYV2e5GPuH1BCk6pwTU 7FX2oybYliH+EazvNc79VdZdjgb/Hq+f6bFCApME3R1W9Jrr8JHWn6aV6lohjVkQF97ITYlbb/0 m9gQJLMP3uimhtbRC5PvnELH/8Zq52DxBN/yIaEQg6QHwTCl3hx27JP2i42hzl0vZZQ3WPDI8Xa ufQvJAQmuVHh9N/vpDl83vRRsGiIjRxQnsVX1NByJ6w8E/jx5o24ySQ4ey32tkcTroOqJM52dPc eOhe20Qs8KLkTT4JS+J7vL2AfY7Wq+vNki/TDJvav8mwtjGkyNpE4II5ZsCALhTdY4Yis8urY9q vlVXc40tAJeGO0Qa3We8A6mTtzquLSjNgry+ue/wJ/F/rgnymxkd22buCVylgRfL5TWLXb1IHte SdwnETH1c5FQHz18yelzNhDcd2YgKiSJo8iAbHs/FUntD1hl8GwLn2nnQaIzLluFJO53tJGiIy9 Fs9sxcFbwQzWzQlOwe9BBLuLV/k+uPhxRisfdxBElw83ERpqB958cowPTUM59t2XEalEOZj0vt7 qYwMcCbHd8fOE/A== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add the necessary parts to accept a fsnotify callback for directory change event and create a CB_NOTIFY request for it. When a dir nfsd_file is created set a handle_event callback to handle the notification. Use that to allocate a nfsd_notify_event object and then hand off a reference to each delegation's CB_NOTIFY. If anything fails along the way, recall any affected delegations. Signed-off-by: Jeff Layton --- fs/nfsd/filecache.c | 70 ++++++++++--- fs/nfsd/nfs4callback.c | 19 +++- fs/nfsd/nfs4state.c | 268 +++++++++++++++++++++++++++++++++++++++++++++= ---- fs/nfsd/nfs4xdr.c | 121 ++++++++++++++++++++++ fs/nfsd/state.h | 4 + fs/nfsd/xdr4.h | 3 + 6 files changed, 443 insertions(+), 42 deletions(-) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 24511c3208db..be8f6d8a3ba0 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -72,6 +72,7 @@ static struct kmem_cache *nfsd_file_mark_slab; static struct list_lru nfsd_file_lru; static unsigned long nfsd_file_flags; static struct fsnotify_group *nfsd_file_fsnotify_group; +static struct fsnotify_group *nfsd_dir_fsnotify_group; static struct delayed_work nfsd_filecache_laundrette; static struct rhltable nfsd_file_rhltable ____cacheline_aligned_in_smp; @@ -147,7 +148,7 @@ static void nfsd_file_mark_put(struct nfsd_file_mark *nfm) { if (refcount_dec_and_test(&nfm->nfm_ref)) { - fsnotify_destroy_mark(&nfm->nfm_mark, nfsd_file_fsnotify_group); + fsnotify_destroy_mark(&nfm->nfm_mark, nfm->nfm_mark.group); fsnotify_put_mark(&nfm->nfm_mark); } } @@ -155,35 +156,37 @@ nfsd_file_mark_put(struct nfsd_file_mark *nfm) static struct nfsd_file_mark * nfsd_file_mark_find_or_create(struct inode *inode) { - int err; - struct fsnotify_mark *mark; struct nfsd_file_mark *nfm =3D NULL, *new; + struct fsnotify_group *group; + struct fsnotify_mark *mark; + int err; + + group =3D S_ISDIR(inode->i_mode) ? nfsd_dir_fsnotify_group : nfsd_file_fs= notify_group; =20 do { - fsnotify_group_lock(nfsd_file_fsnotify_group); - mark =3D fsnotify_find_inode_mark(inode, - nfsd_file_fsnotify_group); + fsnotify_group_lock(group); + mark =3D fsnotify_find_inode_mark(inode, group); if (mark) { nfm =3D nfsd_file_mark_get(container_of(mark, struct nfsd_file_mark, nfm_mark)); - fsnotify_group_unlock(nfsd_file_fsnotify_group); + fsnotify_group_unlock(group); if (nfm) { fsnotify_put_mark(mark); break; } /* Avoid soft lockup race with nfsd_file_mark_put() */ - fsnotify_destroy_mark(mark, nfsd_file_fsnotify_group); + fsnotify_destroy_mark(mark, group); fsnotify_put_mark(mark); } else { - fsnotify_group_unlock(nfsd_file_fsnotify_group); + fsnotify_group_unlock(group); } =20 /* allocate a new nfm */ new =3D kmem_cache_alloc(nfsd_file_mark_slab, GFP_KERNEL); if (!new) return NULL; - fsnotify_init_mark(&new->nfm_mark, nfsd_file_fsnotify_group); + fsnotify_init_mark(&new->nfm_mark, group); new->nfm_mark.mask =3D FS_ATTRIB|FS_DELETE_SELF; refcount_set(&new->nfm_ref, 1); =20 @@ -812,12 +815,36 @@ nfsd_file_fsnotify_handle_event(struct fsnotify_mark = *mark, u32 mask, return 0; } =20 +#ifdef CONFIG_NFSD_V4 +static int +nfsd_dir_fsnotify_handle_event(struct fsnotify_group *group, u32 mask, + const void *data, int data_type, struct inode *dir, + const struct qstr *name, u32 cookie, + struct fsnotify_iter_info *iter_info) +{ + return nfsd_handle_dir_event(mask, dir, data, data_type, name); +} +#else +static int +nfsd_dir_fsnotify_handle_event(struct fsnotify_group *group, u32 mask, + const void *data, int data_type, struct inode *dir, + const struct qstr *name, u32 cookie, + struct fsnotify_iter_info *iter_info) +{ + return 0; +} +#endif =20 static const struct fsnotify_ops nfsd_file_fsnotify_ops =3D { .handle_inode_event =3D nfsd_file_fsnotify_handle_event, .free_mark =3D nfsd_file_mark_free, }; =20 +static const struct fsnotify_ops nfsd_dir_fsnotify_ops =3D { + .handle_event =3D nfsd_dir_fsnotify_handle_event, + .free_mark =3D nfsd_file_mark_free, +}; + int nfsd_file_cache_init(void) { @@ -869,8 +896,7 @@ nfsd_file_cache_init(void) goto out_shrinker; } =20 - nfsd_file_fsnotify_group =3D fsnotify_alloc_group(&nfsd_file_fsnotify_ops, - 0); + nfsd_file_fsnotify_group =3D fsnotify_alloc_group(&nfsd_file_fsnotify_ops= , 0); if (IS_ERR(nfsd_file_fsnotify_group)) { pr_err("nfsd: unable to create fsnotify group: %ld\n", PTR_ERR(nfsd_file_fsnotify_group)); @@ -879,11 +905,23 @@ nfsd_file_cache_init(void) goto out_notifier; } =20 + nfsd_dir_fsnotify_group =3D fsnotify_alloc_group(&nfsd_dir_fsnotify_ops, = 0); + if (IS_ERR(nfsd_dir_fsnotify_group)) { + pr_err("nfsd: unable to create fsnotify group: %ld\n", + PTR_ERR(nfsd_dir_fsnotify_group)); + ret =3D PTR_ERR(nfsd_dir_fsnotify_group); + nfsd_dir_fsnotify_group =3D NULL; + goto out_notify_group; + } + INIT_DELAYED_WORK(&nfsd_filecache_laundrette, nfsd_file_gc_worker); out: if (ret) clear_bit(NFSD_FILE_CACHE_UP, &nfsd_file_flags); return ret; +out_notify_group: + fsnotify_put_group(nfsd_file_fsnotify_group); + nfsd_file_fsnotify_group =3D NULL; out_notifier: lease_unregister_notifier(&nfsd_file_lease_notifier); out_shrinker: @@ -1019,6 +1057,8 @@ nfsd_file_cache_shutdown(void) rcu_barrier(); fsnotify_put_group(nfsd_file_fsnotify_group); nfsd_file_fsnotify_group =3D NULL; + fsnotify_put_group(nfsd_dir_fsnotify_group); + nfsd_dir_fsnotify_group =3D NULL; kmem_cache_destroy(nfsd_file_slab); nfsd_file_slab =3D NULL; fsnotify_wait_marks_destroyed(); @@ -1223,10 +1263,8 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct = net *net, open_file: trace_nfsd_file_alloc(nf); =20 - if (type =3D=3D S_IFREG) - nf->nf_mark =3D nfsd_file_mark_find_or_create(inode); - - if (type !=3D S_IFREG || nf->nf_mark) { + nf->nf_mark =3D nfsd_file_mark_find_or_create(inode); + if (nf->nf_mark) { if (file) { get_file(file); nf->nf_file =3D file; diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index ea3e7deb06fa..1964a213f80e 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -870,21 +870,30 @@ static void nfs4_xdr_enc_cb_notify(struct rpc_rqst *r= eq, const void *data) { const struct nfsd4_callback *cb =3D data; + struct nfsd4_cb_notify *ncn =3D container_of(cb, struct nfsd4_cb_notify, = ncn_cb); + struct nfs4_delegation *dp =3D container_of(ncn, struct nfs4_delegation, = dl_cb_notify); struct nfs4_cb_compound_hdr hdr =3D { .ident =3D 0, .minorversion =3D cb->cb_clp->cl_minorversion, }; - struct CB_NOTIFY4args args =3D { }; + struct CB_NOTIFY4args args; + __be32 *p; =20 WARN_ON_ONCE(hdr.minorversion =3D=3D 0); =20 encode_cb_compound4args(xdr, &hdr); encode_cb_sequence4args(xdr, cb, &hdr); =20 - /* - * FIXME: get stateid and fh from delegation. Inline the cna_changes - * buffer, and zero it. - */ + p =3D xdr_reserve_space(xdr, 4); + *p =3D cpu_to_be32(OP_CB_NOTIFY); + + args.cna_stateid.seqid =3D dp->dl_stid.sc_stateid.si_generation; + memcpy(&args.cna_stateid.other, &dp->dl_stid.sc_stateid.si_opaque, + ARRAY_SIZE(args.cna_stateid.other)); + args.cna_fh.len =3D dp->dl_stid.sc_file->fi_fhandle.fh_size; + args.cna_fh.data =3D dp->dl_stid.sc_file->fi_fhandle.fh_raw; + args.cna_changes.count =3D ncn->ncn_nf_cnt; + args.cna_changes.element =3D ncn->ncn_nf; WARN_ON_ONCE(!xdrgen_encode_CB_NOTIFY4args(xdr, &args)); =20 hdr.nops++; diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index eefce9e7c628..f4d0e64be544 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -55,6 +55,7 @@ #include "netns.h" #include "pnfs.h" #include "filecache.h" +#include "nfs4xdr_gen.h" #include "trace.h" =20 #define NFSDDBG_FACILITY NFSDDBG_PROC @@ -3448,19 +3449,131 @@ nfsd4_cb_getattr_release(struct nfsd4_callback *cb) nfs4_put_stid(&dp->dl_stid); } =20 +static void nfsd_break_one_deleg(struct nfs4_delegation *dp) +{ + bool queued; + + if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &dp->dl_recall.cb_flags)) + return; + + /* + * We're assuming the state code never drops its reference + * without first removing the lease. Since we're in this lease + * callback (and since the lease code is serialized by the + * flc_lock) we know the server hasn't removed the lease yet, and + * we know it's safe to take a reference. + */ + refcount_inc(&dp->dl_stid.sc_count); + queued =3D nfsd4_run_cb(&dp->dl_recall); + WARN_ON_ONCE(!queued); + if (!queued) + refcount_dec(&dp->dl_stid.sc_count); +} + +static bool +nfsd4_cb_notify_prepare(struct nfsd4_callback *cb) +{ + struct nfsd4_cb_notify *ncn =3D container_of(cb, struct nfsd4_cb_notify, = ncn_cb); + struct nfs4_delegation *dp =3D container_of(ncn, struct nfs4_delegation, = dl_cb_notify); + struct nfsd_notify_event *events[NOTIFY4_EVENT_QUEUE_SIZE]; + struct xdr_buf xdr =3D { .buflen =3D PAGE_SIZE * NOTIFY4_PAGE_ARRAY_SIZE, + .pages =3D ncn->ncn_pages }; + struct xdr_stream stream; + struct nfsd_file *nf; + int count, i; + bool error =3D false; + + xdr_init_encode_pages(&stream, &xdr); + + spin_lock(&ncn->ncn_lock); + count =3D ncn->ncn_evt_cnt; + + /* spurious queueing? */ + if (count =3D=3D 0) { + spin_unlock(&ncn->ncn_lock); + return false; + } + + /* we can't keep up! */ + if (count > NOTIFY4_EVENT_QUEUE_SIZE) { + spin_unlock(&ncn->ncn_lock); + goto out_recall; + } + + memcpy(events, ncn->ncn_evt, sizeof(*events) * count); + ncn->ncn_evt_cnt =3D 0; + spin_unlock(&ncn->ncn_lock); + + rcu_read_lock(); + nf =3D nfsd_file_get(rcu_dereference(dp->dl_stid.sc_file->fi_deleg_file)); + rcu_read_unlock(); + if (!nf) { + for (i =3D 0; i < count; ++i) + nfsd_notify_event_put(events[i]); + goto out_recall; + } + + for (i =3D 0; i < count; ++i) { + struct nfsd_notify_event *nne =3D events[i]; + + if (!error) { + u32 *maskp =3D (u32 *)xdr_reserve_space(&stream, sizeof(*maskp)); + u8 *p; + + if (!maskp) { + error =3D true; + goto put_event; + } + + p =3D nfsd4_encode_notify_event(&stream, nne, dp, nf, maskp); + if (!p) { + pr_notice("Could not generate CB_NOTIFY from fsnotify mask 0x%x\n", + nne->ne_mask); + error =3D true; + goto put_event; + } + + ncn->ncn_nf[i].notify_mask.count =3D 1; + ncn->ncn_nf[i].notify_mask.element =3D maskp; + ncn->ncn_nf[i].notify_vals.data =3D p; + ncn->ncn_nf[i].notify_vals.len =3D (u8 *)stream.p - p; + } +put_event: + nfsd_notify_event_put(nne); + } + if (!error) { + ncn->ncn_nf_cnt =3D count; + nfsd_file_put(nf); + return true; + } + nfsd_file_put(nf); +out_recall: + nfsd_break_one_deleg(dp); + return false; +} + static int nfsd4_cb_notify_done(struct nfsd4_callback *cb, struct rpc_task *task) { + struct nfsd4_cb_notify *ncn =3D container_of(cb, struct nfsd4_cb_notify, = ncn_cb); + struct nfs4_delegation *dp =3D container_of(ncn, struct nfs4_delegation, = dl_cb_notify); + switch (task->tk_status) { case -NFS4ERR_DELAY: rpc_delay(task, 2 * HZ); return 0; default: + /* For any other hard error, recall the deleg */ + nfsd_break_one_deleg(dp); + fallthrough; + case 0: return 1; } } =20 +static void nfsd4_run_cb_notify(struct nfsd4_cb_notify *ncn); + static void nfsd4_cb_notify_release(struct nfsd4_callback *cb) { @@ -3469,6 +3582,9 @@ nfsd4_cb_notify_release(struct nfsd4_callback *cb) struct nfs4_delegation *dp =3D container_of(ncn, struct nfs4_delegation, dl_cb_notify); =20 + /* Drain events that arrived while this callback was in flight */ + if (ncn->ncn_evt_cnt > 0) + nfsd4_run_cb_notify(ncn); nfs4_put_stid(&dp->dl_stid); } =20 @@ -3485,6 +3601,7 @@ static const struct nfsd4_callback_ops nfsd4_cb_getat= tr_ops =3D { }; =20 static const struct nfsd4_callback_ops nfsd4_cb_notify_ops =3D { + .prepare =3D nfsd4_cb_notify_prepare, .done =3D nfsd4_cb_notify_done, .release =3D nfsd4_cb_notify_release, .opcode =3D OP_CB_NOTIFY, @@ -5717,27 +5834,6 @@ static const struct nfsd4_callback_ops nfsd4_cb_reca= ll_ops =3D { .opcode =3D OP_CB_RECALL, }; =20 -static void nfsd_break_one_deleg(struct nfs4_delegation *dp) -{ - bool queued; - - if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &dp->dl_recall.cb_flags)) - return; - - /* - * We're assuming the state code never drops its reference - * without first removing the lease. Since we're in this lease - * callback (and since the lease code is serialized by the - * flc_lock) we know the server hasn't removed the lease yet, and - * we know it's safe to take a reference. - */ - refcount_inc(&dp->dl_stid.sc_count); - queued =3D nfsd4_run_cb(&dp->dl_recall); - WARN_ON_ONCE(!queued); - if (!queued) - refcount_dec(&dp->dl_stid.sc_count); -} - /* Called from break_lease() with flc_lock held. */ static bool nfsd_break_deleg_cb(struct file_lease *fl) @@ -9818,3 +9914,133 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cst= ate, put_nfs4_file(fp); return ERR_PTR(status); } + +static void +nfsd4_run_cb_notify(struct nfsd4_cb_notify *ncn) +{ + struct nfs4_delegation *dp =3D container_of(ncn, struct nfs4_delegation, = dl_cb_notify); + + if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &ncn->ncn_cb.cb_flags)) + return; + + if (!refcount_inc_not_zero(&dp->dl_stid.sc_count)) + clear_bit(NFSD4_CALLBACK_RUNNING, &ncn->ncn_cb.cb_flags); + else + nfsd4_run_cb(&ncn->ncn_cb); +} + +static struct nfsd_notify_event * +alloc_nfsd_notify_event(u32 mask, const struct qstr *q, struct dentry *den= try, + struct inode *target) +{ + struct nfsd_notify_event *ne; + + ne =3D kmalloc(sizeof(*ne) + q->len + 1, GFP_KERNEL); + if (!ne) + return NULL; + + memcpy(&ne->ne_name, q->name, q->len); + refcount_set(&ne->ne_ref, 1); + ne->ne_mask =3D mask; + ne->ne_name[q->len] =3D '\0'; + ne->ne_namelen =3D q->len; + ne->ne_dentry =3D dget(dentry); + ne->ne_target =3D target; + if (ne->ne_target) + ihold(ne->ne_target); + return ne; +} + +static bool +should_notify_deleg(u32 mask, struct file_lease *fl) +{ + /* Don't notify the client generating the event */ + if (nfsd_breaker_owns_lease(fl)) + return false; + + /* Skip if this event wasn't ignored by the lease */ + if ((mask & FS_DELETE) && !(fl->c.flc_flags & FL_IGN_DIR_DELETE)) + return false; + if ((mask & FS_CREATE) && !(fl->c.flc_flags & FL_IGN_DIR_CREATE)) + return false; + if ((mask & FS_RENAME) && !(fl->c.flc_flags & FL_IGN_DIR_RENAME)) + return false; + + return true; +} + +static void +nfsd_recall_all_dir_delegs(const struct inode *dir) +{ + struct file_lock_context *ctx =3D locks_inode_context(dir); + struct file_lock_core *flc; + + spin_lock(&ctx->flc_lock); + list_for_each_entry(flc, &ctx->flc_lease, flc_list) { + struct file_lease *fl =3D container_of(flc, struct file_lease, c); + + if (fl->fl_lmops =3D=3D &nfsd_lease_mng_ops) + nfsd_break_deleg_cb(fl); + } + spin_unlock(&ctx->flc_lock); +} + +int +nfsd_handle_dir_event(u32 mask, const struct inode *dir, const void *data, + int data_type, const struct qstr *name) +{ + struct dentry *dentry =3D fsnotify_data_dentry(data, data_type); + struct inode *target =3D fsnotify_data_rename_target(data, data_type); + struct file_lock_context *ctx; + struct file_lock_core *flc; + struct nfsd_notify_event *evt; + + /* Normalize cross-dir rename events to create/delete */ + if (mask & FS_MOVED_FROM) { + mask &=3D ~FS_MOVED_FROM; + mask |=3D FS_DELETE; + } + if (mask & FS_MOVED_TO) { + mask &=3D ~FS_MOVED_TO; + mask |=3D FS_CREATE; + } + + /* Don't do anything if this is not an expected event */ + if (!(mask & (FS_CREATE|FS_DELETE|FS_RENAME))) + return 0; + + ctx =3D locks_inode_context(dir); + if (!ctx || list_empty(&ctx->flc_lease)) + return 0; + + evt =3D alloc_nfsd_notify_event(mask, name, dentry, target); + if (!evt) { + nfsd_recall_all_dir_delegs(dir); + return 0; + } + + spin_lock(&ctx->flc_lock); + list_for_each_entry(flc, &ctx->flc_lease, flc_list) { + struct file_lease *fl =3D container_of(flc, struct file_lease, c); + struct nfs4_delegation *dp =3D flc->flc_owner; + struct nfsd4_cb_notify *ncn =3D &dp->dl_cb_notify; + + if (!should_notify_deleg(mask, fl)) + continue; + + spin_lock(&ncn->ncn_lock); + if (ncn->ncn_evt_cnt >=3D NOTIFY4_EVENT_QUEUE_SIZE) { + /* We're generating notifications too fast. Recall. */ + spin_unlock(&ncn->ncn_lock); + nfsd_break_deleg_cb(fl); + continue; + } + ncn->ncn_evt[ncn->ncn_evt_cnt++] =3D nfsd_notify_event_get(evt); + spin_unlock(&ncn->ncn_lock); + + nfsd4_run_cb_notify(ncn); + } + spin_unlock(&ctx->flc_lock); + nfsd_notify_event_put(evt); + return 0; +} diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 2a0946c630e1..8af1e15e1102 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4098,6 +4098,127 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct = xdr_stream *xdr, goto out; } =20 +static bool +nfsd4_setup_notify_entry4(struct notify_entry4 *ne, struct xdr_stream *xdr, + struct dentry *dentry, struct nfs4_delegation *dp, + struct nfsd_file *nf, char *name, u32 namelen) +{ + uint32_t *attrmask; + + /* Reserve space for attrmask */ + attrmask =3D xdr_reserve_space(xdr, 3 * sizeof(uint32_t)); + if (!attrmask) + return false; + + ne->ne_file.data =3D name; + ne->ne_file.len =3D namelen; + ne->ne_attrs.attrmask.element =3D attrmask; + + attrmask[0] =3D 0; + attrmask[1] =3D 0; + attrmask[2] =3D 0; + ne->ne_attrs.attr_vals.data =3D NULL; + ne->ne_attrs.attr_vals.len =3D 0; + ne->ne_attrs.attrmask.count =3D 1; + return true; +} + +/** + * nfsd4_encode_notify_event - encode a notify + * @xdr: stream to which to encode the fattr4 + * @nne: nfsd_notify_event to encode + * @dp: delegation where the event occurred + * @nf: nfsd_file on which event occurred + * @notify_mask: pointer to word where notification mask should be set + * + * Encode @nne into @xdr. Returns a pointer to the start of the event, or = NULL if + * the event couldn't be encoded. The appropriate bit in the notify_mask w= ill also + * be set on success. + */ +u8 *nfsd4_encode_notify_event(struct xdr_stream *xdr, struct nfsd_notify_e= vent *nne, + struct nfs4_delegation *dp, struct nfsd_file *nf, + u32 *notify_mask) +{ + u8 *p =3D NULL; + + *notify_mask =3D 0; + + if (nne->ne_mask & FS_DELETE) { + struct notify_remove4 nr =3D { }; + + if (!nfsd4_setup_notify_entry4(&nr.nrm_old_entry, xdr, nne->ne_dentry, d= p, + nf, nne->ne_name, nne->ne_namelen)) + goto out_err; + p =3D (u8 *)xdr->p; + if (!xdrgen_encode_notify_remove4(xdr, &nr)) + goto out_err; + *notify_mask |=3D BIT(NOTIFY4_REMOVE_ENTRY); + } else if (nne->ne_mask & FS_CREATE) { + struct notify_add4 na =3D { }; + struct notify_remove4 old =3D { }; + + if (!nfsd4_setup_notify_entry4(&na.nad_new_entry, xdr, nne->ne_dentry, d= p, + nf, nne->ne_name, nne->ne_namelen)) + goto out_err; + + /* If a file was overwritten, report it in nad_old_entry */ + if (nne->ne_target) { + if (!nfsd4_setup_notify_entry4(&old.nrm_old_entry, xdr, + NULL, dp, nf, + nne->ne_name, nne->ne_namelen)) + goto out_err; + na.nad_old_entry.count =3D 1; + na.nad_old_entry.element =3D &old; + } + + p =3D (u8 *)xdr->p; + if (!xdrgen_encode_notify_add4(xdr, &na)) + goto out_err; + + *notify_mask |=3D BIT(NOTIFY4_ADD_ENTRY); + } else if (nne->ne_mask & FS_RENAME) { + struct notify_rename4 nr =3D { }; + struct notify_remove4 old =3D { }; + struct name_snapshot n; + bool ret; + + /* Don't send any attributes in the old_entry since they're the same in = new */ + if (!nfsd4_setup_notify_entry4(&nr.nrn_old_entry.nrm_old_entry, xdr, + NULL, dp, nf, nne->ne_name, + nne->ne_namelen)) + goto out_err; + + take_dentry_name_snapshot(&n, nne->ne_dentry); + ret =3D nfsd4_setup_notify_entry4(&nr.nrn_new_entry.nad_new_entry, xdr, + nne->ne_dentry, dp, nf, (char *)n.name.name, + n.name.len); + + /* If a file was overwritten, report it in nad_old_entry */ + if (ret && nne->ne_target) { + ret =3D nfsd4_setup_notify_entry4(&old.nrm_old_entry, xdr, + NULL, dp, nf, + (char *)n.name.name, n.name.len); + if (ret) { + nr.nrn_new_entry.nad_old_entry.count =3D 1; + nr.nrn_new_entry.nad_old_entry.element =3D &old; + } + } + + if (ret) { + p =3D (u8 *)xdr->p; + ret =3D xdrgen_encode_notify_rename4(xdr, &nr); + } + release_dentry_name_snapshot(&n); + if (!ret) + goto out_err; + *notify_mask |=3D BIT(NOTIFY4_RENAME_ENTRY); + } + return p; +out_err: + pr_warn("nfsd: unable to marshal notify_rename4 to xdr stream\n"); + return NULL; +} + static void svcxdr_init_encode_from_buffer(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p, int bytes) { diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 500e07e47909..570d66fc8297 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -201,6 +201,7 @@ struct nfsd_notify_event { refcount_t ne_ref; // refcount u32 ne_mask; // FS_* mask from fsnotify callback struct dentry *ne_dentry; // dentry reference to target + struct inode *ne_target; // inode overwritten by rename, or NULL u32 ne_namelen; // length of ne_name char ne_name[]; // name of dentry being changed }; @@ -214,6 +215,7 @@ static inline struct nfsd_notify_event *nfsd_notify_eve= nt_get(struct nfsd_notify static inline void nfsd_notify_event_put(struct nfsd_notify_event *ne) { if (refcount_dec_and_test(&ne->ne_ref)) { + iput(ne->ne_target); dput(ne->ne_dentry); kfree(ne); } @@ -897,6 +899,8 @@ bool nfsd4_has_active_async_copies(struct nfs4_client *= clp); extern struct nfs4_client_reclaim *nfs4_client_to_reclaim(struct xdr_netob= j name, struct xdr_netobj princhash, struct nfsd_net *nn); extern bool nfs4_has_reclaimed_state(struct xdr_netobj name, struct nfsd_n= et *nn); +int nfsd_handle_dir_event(u32 mask, const struct inode *dir, const void *d= ata, + int data_type, const struct qstr *name); =20 void put_nfs4_file(struct nfs4_file *fi); extern void nfs4_put_cpntf_state(struct nfsd_net *nn, diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index 417e9ad9fbb3..d276840aca50 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h @@ -955,6 +955,9 @@ __be32 nfsd4_encode_fattr_to_buf(__be32 **p, int words, struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, u32 *bmval, struct svc_rqst *, int ignore_crossmnt); +u8 *nfsd4_encode_notify_event(struct xdr_stream *xdr, struct nfsd_notify_e= vent *nne, + struct nfs4_delegation *dd, struct nfsd_file *nf, + u32 *notify_mask); extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *, union nfsd4_op_u *u); extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 6BEF63E557A; Thu, 16 Apr 2026 17:35:52 +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=1776360952; cv=none; b=TChMVJU43Hr7NMYsrG/ZjMcKJNrKdPxizMSt6MKTHU43y9HbkYu7UvQSV4nPxn+2gjs8h4MCOXNikZ0DtTrtHvOcA42BGSl6ZcVUDWmlDX0cGUpgXIpYnbBFYgR+gC0gxx5D+I+jyuIxooKmGK9T71Gm6QUgzQxMn+RoHqVhmyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360952; c=relaxed/simple; bh=mM6Q+CFzomu9wRc4F8gC1OVwVa/b0/30OWI+ofx9eGs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Um6hJVEZiVfpO9XG2cpR5CV51H/Go1ZGj3wGo+plDyvjnqqifzAw5OXeQg00M21jDyWu/n0Mt96q2Zu97JXt4kmhV+9ZIRhaWRNQyJTRF5qocK6bcBNPZOVxU5RoCsITc/dIu4p5BcZV6arblQ3dPH2wiHghd6p++xIYQ5Wgmrc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NB3+94mJ; 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="NB3+94mJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A6D8C2BCB5; Thu, 16 Apr 2026 17:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360952; bh=mM6Q+CFzomu9wRc4F8gC1OVwVa/b0/30OWI+ofx9eGs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NB3+94mJlNEmUib9JIMANr+fqOJnpKLM45sfDRnoNb3JFP80JEsGFakkN/ecZeh9z mjP/SH15M18nMTjw3/NJKtPXjvF8zdUYubmKie95kB6VJv73xsGETvN+0N3UeVImM2 We1uC9wxra/u+47GdhMBsZIYTZyHL+Wg9lZY7XiNa2qECAR1llZ0VYXvH991xwBLs9 8a2nSteHXBGovzkm6WzN4wernxj2tH04EjbZaKKH0mJJ94S777bgOH2lqzuxwKxEes e6BHn3jndMjHICBCLIdSpuo1xFewRmxfukRuAAKMaNbN9za+LXVbO37yGmeeEq1w+K hCpybMhewAhmQ== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:19 -0700 Subject: [PATCH v2 18/28] nfsd: add tracepoint to dir_event handler Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-18-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=1983; i=jlayton@kernel.org; h=from:subject:message-id; bh=mM6Q+CFzomu9wRc4F8gC1OVwVa/b0/30OWI+ofx9eGs=; b=kA0DAAoBAA5oQRlWghUByyZiAGnhHeagZg/j66Nm0reQL3vFTIff90GlFS9fJZFD7JKVCU5Tp IkCMwQAAQoAHRYhBEvA17JEcbKhhOr10wAOaEEZVoIVBQJp4R3mAAoJEAAOaEEZVoIVbmwQAIr9 c3JEz4qGZn3cW03fQyr6wP7A/mh4axVGypgUMFerUCl1DZ8ABHciwXjYOksT9uhFqJX4k4x3MQe vUOaM/OLrM5+jS9r7cPhZ8uFwguNEhermoOEFYGIoxjsholeKzCfWcSFNek/8x8N6nn9SVFKNqo 0sbRPCeZ4FHDRxAlVgt6drOsT/CIQkUZCZpiFpx2Z0+Kl9GqrMyROgQH3k7wDDdOFWMMo4s/7fp +FC+SCBZGQ/y32SHQ7FgEPMYfjWIZUsbgQ+7ML+o6BKV/Ww3r4g/Ka8Bbc537bCs7dCaUczS5kN /RCuNoySlbIsDhCDyYg+7e1COppfvhkhoRvtX2epR0V8sCZmPx7m7x8ZvusFCcbNiX6ZMxeMgqY eQADms0BpHfw58MDKY+Jky4erP55/dcjO6CccFp7AEb/mO66mO7kLesWEqw82gomuOWeAqXnj40 i9PryqUyTvhVMXG6r8ux/QfqNgMirL0KXFH+owmxVyzArVWLJo0ZgLF03RNNF1pg65N0ti7Ug90 zT3ZlXQSbFplZdvpai7nevkINpq2QnispMekxX762tLOqzT8eovWHhNDmSLPhODKeqXbgUB3bE/ vMvOks850/34P1DLc10I4DJb//6POrcWf+Aqj2x2Egt1UmM9m0Ofh8QMT8DaJm+5R1rh0sQVDs7 p9y0V X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Add some extra visibility around the fsnotify handlers. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 2 ++ fs/nfsd/trace.h | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f4d0e64be544..eba6da1072c0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -9995,6 +9995,8 @@ nfsd_handle_dir_event(u32 mask, const struct inode *d= ir, const void *data, struct file_lock_core *flc; struct nfsd_notify_event *evt; =20 + trace_nfsd_handle_dir_event(mask, dir, name); + /* Normalize cross-dir rename events to create/delete */ if (mask & FS_MOVED_FROM) { mask &=3D ~FS_MOVED_FROM; diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 60cacf64181c..b9119ff4253a 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include =20 @@ -1377,6 +1378,27 @@ TRACE_EVENT(nfsd_file_fsnotify_handle_event, __entry->nlink, __entry->mode, __entry->mask) ); =20 +TRACE_EVENT(nfsd_handle_dir_event, + TP_PROTO(u32 mask, const struct inode *dir, const struct qstr *name), + TP_ARGS(mask, dir, name), + TP_STRUCT__entry( + __field(u32, mask) + __field(dev_t, s_dev) + __field(ino_t, i_ino) + __string_len(name, name->name, name->len) + ), + TP_fast_assign( + __entry->mask =3D mask; + __entry->s_dev =3D dir->i_sb->s_dev; + __entry->i_ino =3D dir->i_ino; + __assign_str(name); + ), + TP_printk("inode=3D0x%x:0x%x:0x%lx mask=3D%s name=3D%s", + MAJOR(__entry->s_dev), MINOR(__entry->s_dev), + __entry->i_ino, show_fsnotify_mask(__entry->mask), + __get_str(name)) +); + DECLARE_EVENT_CLASS(nfsd_file_gc_class, TP_PROTO( const struct nfsd_file *nf --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 6DD1B3346B4; Thu, 16 Apr 2026 17:35:53 +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=1776360953; cv=none; b=eCs00Vss781MpC0FYTO7+PNC0zLt5Ql2WViAF5CrvzGPV3zrQRWUo3c0/DzOSnd60FFKexTlQ6vqOHrFMd+xwNYGJ2shWSSXqQEvZYhk2EZmp8FTVDX5BS0bjYsCzeyNMd2j2Y0MDTvomgfMm9iB8uffKS2iFtbLh/poucZHAMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360953; c=relaxed/simple; bh=Z4zXI+/IobxHZzp9dQaWHHuZTrII6y4E+PNc85tZohQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DAHKWge+la+XgbLqvNnCJfSPJowsl1eFQgnvfwAHmEnDdkWcD/fLXE+Z3QfaA2e/0xJfKN1Z0wX6pTp28tkJgnp6EvHiUN2hAsybXQYeAR4ZS5c8CiY0nUN6Gu2+CoIyBytcxXxUtxupE7uMwZLEfXh3OytGyn++vUCjjreRPQw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tctEIYJd; 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="tctEIYJd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AE5CC2BCC4; Thu, 16 Apr 2026 17:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360953; bh=Z4zXI+/IobxHZzp9dQaWHHuZTrII6y4E+PNc85tZohQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tctEIYJd3bUfGB57UGAbe8Pymec9X8bRK+gdgr1hFfHxdikw2GqnaNxI7DGjrLh/K K5Y/oU0K1XcVhcVbxA4fC/6mrvd4Bx+wXLKBxXzcp0TUPSsHJ8vcQf9C87r20kHlB5 aNe+f/vsu0ZE9FF30Cn/xz/U5NV657k8JelsoZZ+FRaKcvEEd+TUMu1GDGgKY8d5pR mof5xgXkfI2lypqsx9KV/ZNiKQrj6y94HWR0XKrZmLB3swfcBQJIN7vCI6/QvAUTb5 TBiIq86qypHVMNenuwM6aP9Gqp6asMeAkGo0E0nY8Y5HAyRXUz7vdrOpYb15qdRPSh PGJpUXQeSiSNA== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:20 -0700 Subject: [PATCH v2 19/28] nfsd: apply the notify mask to the delegation when requested Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-19-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=1720; i=jlayton@kernel.org; h=from:subject:message-id; bh=Z4zXI+/IobxHZzp9dQaWHHuZTrII6y4E+PNc85tZohQ=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3mXskgeu4rpA1iAyUvcphi0Go+X/Us8dmBy H/cB93+cBiJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5gAKCRAADmhBGVaC FdavD/0UpyKiznoUXgT9hM7wx3ql+BywYFs10pkLMMYfjKP+dqh04VZr0kunWWCP0FHAfRO7us0 kCMma/Xc5m+iGs2cpo9jKXMI9ZhH6R/js/uCf/T1ON8VqIUILDTOjjHfxFlsty/5l91NlqYePnB CbP3gmUoXX9F7uduXkV8ARE3vg9CSUZQlBCwKR8sdF5MAl/D5qWsnuOLDSoLUVROqqU+YRceWEK 09m/zWoorW1HBqt6ymMs2PqvvHnN5Lnu+ZtpviOKtO8iQOkeAieiGC8Nz9YoVC23JkaS4WSf+mh t6y3yJNKQg2PJlgevVRarcxudBkco8hZRjf7p3RT4lY1vUYSAizEaBm9IDEoZeu6MxTcNmJz3wu 9w13+fLKkUTjkDTEDHfSesrR72UaOn8enBx4fyln2aIS4as9KcfPvxnRooPRzno/fHt8D1GwTNe ytBtjLLuDjDhdNb3G01tBNVTe9pKBPS3GmfunFYoPIS9+IQDH74ab3jI5mM7Vww2xWi98JhmoXF ErV9FuHyamYH+WDc9I8tGKIXx7S9uFEapS8j4G5Q1lrUO4YOfY4ryJY0fIYj7aV4y397g4G9A1n c54vxhQOBYWDq7OH1VEIQkPXm61TxIg7iJYerrBpWxDt66uvXUR+3jdFK/8sY4/c+rndBWG2aHg FW3uFlr3E8FiZVg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 If the client requests a directory delegation with notifications enabled, set the appropriate return mask in gddr_notification[0]. This will ensure the lease acquisition sets the appropriate ignore mask. If the client doesn't set NOTIFY4_GFLAG_EXTEND, then don't offer any notifications, as nfsd won't provide directory offset information, and "classic" notifications require them. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4proc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 2797da8cc950..01e3bf9e1839 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2506,12 +2506,18 @@ nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_c= ompound_state *cstate, return status =3D=3D nfserr_same ? nfs_ok : status; } =20 +#define SUPPORTED_NOTIFY_MASK (BIT(NOTIFY4_REMOVE_ENTRY) | \ + BIT(NOTIFY4_ADD_ENTRY) | \ + BIT(NOTIFY4_RENAME_ENTRY) | \ + BIT(NOTIFY4_GFLAG_EXTEND)) + static __be32 nfsd4_get_dir_delegation(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, union nfsd4_op_u *u) { struct nfsd4_get_dir_delegation *gdd =3D &u->get_dir_delegation; + u32 requested =3D gdd->gdda_notification_types[0]; struct nfs4_delegation *dd; struct nfsd_file *nf; __be32 status; @@ -2520,6 +2526,12 @@ nfsd4_get_dir_delegation(struct svc_rqst *rqstp, if (status !=3D nfs_ok) return status; =20 + /* No notifications if you don't set NOTIFY4_GFLAG_EXTEND! */ + if (!(requested & BIT(NOTIFY4_GFLAG_EXTEND))) + requested =3D 0; + + gdd->gddr_notification[0] =3D requested & SUPPORTED_NOTIFY_MASK; + /* * RFC 8881, section 18.39.3 says: * --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 1A9BF3E9292; Thu, 16 Apr 2026 17:35:54 +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=1776360954; cv=none; b=CL0Mbs+z/av2Dmwk803jnsMOs4RDOYLmKxDmF5kZy16Tm6T+1zugX6GbQgyEwFps82ahD42A1hs2vpJOTUB3xZvIg6vUx6yFJmMTgxGxRRzrZEJyqPb6mUXGdc9+wkQGWyicUVexyL47ycxzEyNcOM2bv2AcCpyxZn9h75srQHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360954; c=relaxed/simple; bh=zc4I4aMHPzDjEQnh/xOeFfSGEX46qvOSZgvWobP7q3w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QPJYu2htIRsuJUocWCvq0N939WGkVi9y0A/FUkUd6dKCzztRHFkwgd5RPtG8QPD+NeeDMjMQuWe6awq20Q+yD/hKUlyDhu8cHgnO4upqcP8tA1+ECMOUVdXjKzLt5dqk0o/iLrn207fCkPvV9yvXroUezKhQ0xSoyKQMTjY9pZo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZAXIBWS+; 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="ZAXIBWS+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39653C2BCB9; Thu, 16 Apr 2026 17:35:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360953; bh=zc4I4aMHPzDjEQnh/xOeFfSGEX46qvOSZgvWobP7q3w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZAXIBWS+s8qMETo+o3Rkeh4+3QFWNFKmQdKNld5DkFmXETazs6EZNt1Jcw7bGt+hd e/vOnLdSremipMP+0AUQy2JiXPyszIRdyARt6oAttwf4joVyDIm3itltyEoJpGsy9W xC5hbINz7dblZTZqgT4Q/gEAFTxvTtu6x8PQEOx14tHRH5lNCbqXQhlapn48RNkGgY aBfGs2f301pTqdi3QIQ4xE2GXVHw772JBE5T0NwV2xoIShHQs/T/QmY5l/9tOj91Ls DzR6zsIrFf1LoE2txF07AHwDQtW2eZKWK6CP+FMkhXp/K4kbj4bVmrVPx27LjQISDi DRRGcbaBRa7Jg== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:21 -0700 Subject: [PATCH v2 20/28] nfsd: add helper to marshal a fattr4 from completed args Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-20-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=3351; i=jlayton@kernel.org; h=from:subject:message-id; bh=zc4I4aMHPzDjEQnh/xOeFfSGEX46qvOSZgvWobP7q3w=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3mHMIIJX+f6/jEMp+XBzMSIXqPW7IVqsdvj 2Gx1Z0Bp9OJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5gAKCRAADmhBGVaC FWUzD/95hQNUBoojlmqr8AyRZq+xFfciLcdZgS6klS5NdSJn+DIfRZh3hvuEVl5ceqQQewHJcWq tXWchgCghLjNnb8Yi28q6mZLSbpJ3lvYt+436dxh0pXmV4A/0B0Y8nu5HOAvab/PTy7evha9l8c RAlAUV6RIHVU0IU7rwDf37HPBQKHf+l4JKLCj9hW5MnCJzL32PWT2BEhNzy1nmNJYRSq8oIbU/U ZTnZdaYQKvESjcgCLSOSFsz1hFxXJtTq5kFXE0q0E8OrKwH51mOqL19llyeEe8qmNZReP+iB4Hg CiVcqotcMKrVB+dgu9NkjsKpjwHQe82SSQITDR3W/7Ds4WoWMjqk7F214aQ9l3rtzGZDpsMcP4l 8dG38dtLrlR22Rb0WwtOaXiWImsbHmPpB8reo6o/ZvaHQoaYifrqTD41lnMcMMOxf8cMVzsSHWc x5uzGMr4F/jHbx1VPUn5vfKHne3ujJ/smRmmm1Hp3L3KwjtVmpquMRd1GwWs8aBPJY64q8TFn6y heSTxRJsgR+ktFbvq1AyortS1kkyg4JUMOIipekeFn3k43Ydw3iq3ZJcC8x1F0KxqHGOmjVTsyF 1n0+jHalLePAZHN0dFYCKxWT3PqLM+JUqUD6fFjVpubtbS+1mdtS1tYdF81Rt6i99yUArRNg8NY /+eOtoeNepUp4eg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Break the loop that encodes the actual attr_vals field into a separate function. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 8af1e15e1102..b9b173ec7421 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3852,6 +3852,22 @@ static const nfsd4_enc_attr nfsd4_enc_fattr4_encode_= ops[] =3D { #endif }; =20 +static __be32 +nfsd4_encode_attr_vals(struct xdr_stream *xdr, u32 *attrmask, struct nfsd4= _fattr_args *args) +{ + DECLARE_BITMAP(attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)); + unsigned long bit; + __be32 status; + + bitmap_from_arr32(attr_bitmap, attrmask, ARRAY_SIZE(nfsd4_enc_fattr4_enco= de_ops)); + for_each_set_bit(bit, attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops= )) { + status =3D nfsd4_enc_fattr4_encode_ops[bit](xdr, args); + if (status !=3D nfs_ok) + return status; + } + return nfs_ok; +} + /* * Note: @fhp can be NULL; in this case, we might have to compose the file= handle * ourselves. @@ -3862,7 +3878,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xd= r_stream *xdr, struct dentry *dentry, const u32 *bmval, int ignore_crossmnt) { - DECLARE_BITMAP(attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)); struct nfs4_delegation *dp =3D NULL; struct nfsd4_fattr_args args; struct svc_fh *tempfh =3D NULL; @@ -3877,7 +3892,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xd= r_stream *xdr, .mnt =3D exp->ex_path.mnt, .dentry =3D dentry, }; - unsigned long bit; =20 WARN_ON_ONCE(bmval[1] & NFSD_WRITEONLY_ATTRS_WORD1); WARN_ON_ONCE(!nfsd_attrs_supported(minorversion, bmval)); @@ -4050,27 +4064,22 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct = xdr_stream *xdr, #endif /* CONFIG_NFSD_V4_POSIX_ACLS */ =20 /* attrmask */ - status =3D nfsd4_encode_bitmap4(xdr, attrmask[0], attrmask[1], - attrmask[2]); + status =3D nfsd4_encode_bitmap4(xdr, attrmask[0], attrmask[1], attrmask[2= ]); if (status) goto out; =20 /* attr_vals */ attrlen_offset =3D xdr->buf->len; - if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT))) - goto out_resource; - bitmap_from_arr32(attr_bitmap, attrmask, - ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)); - for_each_set_bit(bit, attr_bitmap, - ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)) { - status =3D nfsd4_enc_fattr4_encode_ops[bit](xdr, &args); - if (status !=3D nfs_ok) - goto out; + if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT))) { + status =3D nfserr_resource; + goto out; } - attrlen =3D cpu_to_be32(xdr->buf->len - attrlen_offset - XDR_UNIT); - write_bytes_to_xdr_buf(xdr->buf, attrlen_offset, &attrlen, XDR_UNIT); - status =3D nfs_ok; =20 + status =3D nfsd4_encode_attr_vals(xdr, attrmask, &args); + if (status =3D=3D nfs_ok) { + attrlen =3D cpu_to_be32(xdr->buf->len - attrlen_offset - XDR_UNIT); + write_bytes_to_xdr_buf(xdr->buf, attrlen_offset, &attrlen, XDR_UNIT); + } out: #ifdef CONFIG_NFSD_V4_POSIX_ACLS if (args.dpacl) @@ -4093,9 +4102,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xd= r_stream *xdr, out_nfserr: status =3D nfserrno(err); goto out; -out_resource: - status =3D nfserr_resource; - goto out; } =20 static bool --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 CD1FE3E9F8D; Thu, 16 Apr 2026 17:35:54 +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=1776360954; cv=none; b=iZFgo7JOfgBjAsfDe7KuL+ROUM/mYZmPBF8TIYorXmiwdfcDys4MGSFAO42djs2IXZXrgBkId5uckj2sel0GaWWVbzw/saADTInIwGH7Jfq+5Xn3deeKowe6yBf7MT53h9iPsnsZhGl0/zEh8QU397UCQBb0ynvUOv/TvSl0/Vg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360954; c=relaxed/simple; bh=K2ldbf6BYM/COXf9fXWWOXeQSvNqNCKWjcngztoWlgk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ktYbGA0D/CkTK1qNFMzXhvg/6PlNTcu7dNLsZAeuvReoy02nFb2ulAcmzAEs2YCBjsTsSSolvpwCJFdO2I3A/+q8fai3GKE3FDiueOv9a5W+PImqeU7ibliB1bDaX6GLUPFSARTTMVI7UT12dz/3tTHYSWx0e56mjGdEHlTxFoQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cnZAC47M; 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="cnZAC47M" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07D6DC2BCAF; Thu, 16 Apr 2026 17:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360954; bh=K2ldbf6BYM/COXf9fXWWOXeQSvNqNCKWjcngztoWlgk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cnZAC47MXuc73sWMch/yI8fRkOcaGz+arxfxglmy1nXVO7v7Ge/kJHFIOzz0EcyZS Bipn9lzyi382r1IpZmUNL5ueeB2DouuAO2U6JWcG5kBKgsLp2vd0Qgs9CVifAjqRPU Xm78pmSC61xXcdOcy5LiHNmTsDQAiooTpZwgFK+LeqqckLcJKY9G/dBkY01SaeEb+G ZJy6YgGgK/Gq0/hDlrZTok03iK1r21Zxw9ze0ug3ZWv0kt/zurbDVTdpDkc/IDDth/ CutR22S2OyQ/YNGCLLRFIAol3/UxiW6RXrWwZIsdBlkaR547AsGMLuyrIvptBs2b+Z fCH2Q8B6K2M8A== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:22 -0700 Subject: [PATCH v2 21/28] nfsd: allow nfsd4_encode_fattr4_change() to work with no export Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-21-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=846; i=jlayton@kernel.org; h=from:subject:message-id; bh=K2ldbf6BYM/COXf9fXWWOXeQSvNqNCKWjcngztoWlgk=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3mdRTKe+hDMq09KpDoKQs6mbheocA/eZ5oI 6Zb4j4z4KaJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5gAKCRAADmhBGVaC FXIMEACohJQC7PrWij/EMBa4ELiXqZfcvPGcnolVetflBXxVEf7ey3sg44S2hqngMKReqzC6l0a wGtA+q/NpSGuXBIOX0NmffcPjiP5PSSd6k+mCb7zWWhi7AumpsRA2Ijcodsd1YByF0b5tIXxiol f72kbQDDTGtz32voQoJh1wrYQwXA1Oegzp2m1ZVTUuYryXaAuZ7cUP6SQRU94Za1kr+y7j/6pW3 jJ7iWnmcVhVdUB/j86dhdb852uo26BBJT/Ur4/BDRgR6JI6/RZLMgW05efXHXqSpFVNoauXStk8 sczg5CNUbBvSoLIxHVVDxY1yCH37cR8LgEZtsVfvf0/e82yeMwyburrFY7dxZVFYOmQ1QSD324C OBVpkvvzwekz0yT6zet+/kbdexc11T3IaNE/O6SgT49wilMxMRsGyVUcg19OF0W82tZifYpyAl6 sBjA3pGYPhxoW9RpZgf5p0ZPn5T2fOtVSY4sPznXpcxd4CS/LMIkZ4x+/KgerFI+Dh40NnW5uo9 1CsFueaOsXnBrVL3jQVgg5HSKhw3V1Iubir/+WEfmSNFjxpEeW4OsFpChV3s/J3k+aIogoK5hop BU6TovOugNGpCNPcal1n55qMvikhC01EYB/NZWx6sYmJMLlFPR26MvG0yJu2CSZcsDuHpDvQL7y Yv2wAHTFlfP5UUA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 In the context of a CB_NOTIFY callback, we may not have easy access to a svc_export. nfsd will not currently grant a delegation on a the V4 root however, so this should be safe. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index b9b173ec7421..91681aea9d7f 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3257,7 +3257,7 @@ static __be32 nfsd4_encode_fattr4_change(struct xdr_s= tream *xdr, { const struct svc_export *exp =3D args->exp; =20 - if (unlikely(exp->ex_flags & NFSEXP_V4ROOT)) { + if (exp && unlikely(exp->ex_flags & NFSEXP_V4ROOT)) { u32 flush_time =3D convert_to_wallclock(exp->cd->flush_time); =20 if (xdr_stream_encode_u32(xdr, flush_time) !=3D XDR_UNIT) --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 9982F3EB81C; Thu, 16 Apr 2026 17:35:55 +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=1776360955; cv=none; b=cUVf2OJKDq/XHGpaKWpaEgSt69rUWgeJXBZaI6tNGmH+MbS4T34f86do4+M60cD2mjBnj/bLfzJG+BSczP8iE3djRDDTLGifIPGtyCA/CaBxb8vRX6CTkQCar8+Vj6tDihusWH/Jw5Th0JTzw4leFT5ePIBX8QmmCuKkIU3uXu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360955; c=relaxed/simple; bh=O4IgEHVmx1g75yBiydYCfYce6Kr1BVy53x3/Vnf7a1o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VY+Am9/VRLDATGYkssQ67xlwKdTV2O+qHpn2HGeCU57NbZDLG0bXek7EpsrJkegX5eAgtXRYqEa7ah4RnZCazGzlPg8l6eRROvmdMDdWHPY+29Pegec+L+EFqK7EsadF+CKVEIFwvqr7R19a15T3bzxsqI7BdytsPwe9QFvViLk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VmcouvKz; 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="VmcouvKz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB268C2BCB4; Thu, 16 Apr 2026 17:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360955; bh=O4IgEHVmx1g75yBiydYCfYce6Kr1BVy53x3/Vnf7a1o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=VmcouvKz6JhDfhJWdA+OXAEnQrIHQrSfeX65D5yZQJXwQ6rmiHWuJfO0HKNwTSaVi qI9G9VfaBCjiuOMA0dQPInHWRTxqq/0r3HtSEG1cGRv4UlyxSZ9wPdCRkfK8W0pY+p /3s3mIO3jWD3oI/au2AiM0Xzh+6fRX1UiZS+CQEEX859Y2hObv+j6GUs37reX3oT2A FfpIbjvKJsJSYI6OGs1p6UHJk+rDA+uV0eulAFl7PeegTO50EmwZl7xw2MNd8kOHaf aqXT8jRNkF910vrMCNo2HM66l2SGXMy8VNxYKyFPU06hgJC0jjFQEQAiPNz7oaBc8Z vhR7oHfDCOOCw== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:23 -0700 Subject: [PATCH v2 22/28] nfsd: send basic file attributes in CB_NOTIFY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-22-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=2682; i=jlayton@kernel.org; h=from:subject:message-id; bh=O4IgEHVmx1g75yBiydYCfYce6Kr1BVy53x3/Vnf7a1o=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3n8MZgmdJA7oHTPC5f0nGZ0qdFtvfvDwo/U WbZ+CHTt5KJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5wAKCRAADmhBGVaC FdCbEAC/ddTEmsCaoU6cO05JWy0jn6CwJ1puJN9qLhORTTks2H4I5DpmxtyFLGfluJBEQ2GQo29 JL6+U2nEyXcffvVwzTaYd4YYygklwRZzmdyJnWNVWhv2iHy8RJwM/j0ndaLhqjApNFkbjclAQGj +hd9nZ8RIQMn+svTHEKR2FDQc+Kb1J+Te71U9G7qjG3K73YptFnKXT1mtTx51LMz0BEvkLGjDNB QW9S8p7NTjsBVkwEjDknvwF1r/E3ik6HP0I4c2MkiiEKrDHez8trsRZloP+jo3mOuB1NhzxniRS t3Oe2+/pHi7ftoAzxX12ZOhvu+d3MlvG2DksyU3tdErdJvf6VsZKHwPnZBUb+YJJLPGN61AkIhg x3mLMIb9Gh9AwV6wo7+lINPZ4RNvXhc5yEskY1HX9YcUhXfwSa+3nKZXnMoA7HQqp/TALqfqgs0 0lWhdzkctVQPTlYbPDWnCr1mJA4aPEflYKrALxQIHrYaxhdkB74Ue2LbHOpvFWkSSCuUozHEJ9w CLjD8EAo4MtY5fMWIfcjfv7VWd2YnBGZhJjnhP059COPpdlcWsfTVsyssDZqzA++b/q0K3GHIbM 4MLzhorpT/CMj9KAavuXQ3a57m5j6ZDYgcGtt0RUh2Mq15jwEv751bcO87zxguMBWkr/S0smHvv etJZd+C1kJf8Fng== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 In addition to the filename, send attributes about the inode in a CB_NOTIFY event. This patch just adds a the basic inode information that can be acquired via GETATTR. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 91681aea9d7f..f85581ebbd10 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4104,12 +4104,21 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct = xdr_stream *xdr, goto out; } =20 +#define CB_NOTIFY_STATX_REQUEST_MASK (STATX_BASIC_STATS | \ + STATX_BTIME | \ + STATX_CHANGE_COOKIE) + static bool nfsd4_setup_notify_entry4(struct notify_entry4 *ne, struct xdr_stream *xdr, struct dentry *dentry, struct nfs4_delegation *dp, struct nfsd_file *nf, char *name, u32 namelen) { + struct path path =3D { .mnt =3D nf->nf_file->f_path.mnt, + .dentry =3D dentry }; + struct nfsd4_fattr_args args =3D { }; uint32_t *attrmask; + __be32 status; + int ret; =20 /* Reserve space for attrmask */ attrmask =3D xdr_reserve_space(xdr, 3 * sizeof(uint32_t)); @@ -4120,6 +4129,41 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne, = struct xdr_stream *xdr, ne->ne_file.len =3D namelen; ne->ne_attrs.attrmask.element =3D attrmask; =20 + /* FIXME: d_find_alias for inode ? */ + if (!path.dentry || !d_inode(path.dentry)) + goto noattrs; + + /* + * It is possible that the client was granted a delegation when a file + * was created. Note that we don't issue a CB_GETATTR here since stale + * attributes are presumably ok. + */ + ret =3D vfs_getattr(&path, &args.stat, CB_NOTIFY_STATX_REQUEST_MASK, AT_S= TATX_SYNC_AS_STAT); + if (ret) + goto noattrs; + + args.change_attr =3D nfsd4_change_attribute(&args.stat); + + attrmask[0] =3D FATTR4_WORD0_TYPE | FATTR4_WORD0_CHANGE | + FATTR4_WORD0_SIZE | FATTR4_WORD0_FILEID; + attrmask[1] =3D 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[2] =3D 0; + + if (args.stat.result_mask & STATX_BTIME) + attrmask[1] |=3D FATTR4_WORD1_TIME_CREATE; + + ne->ne_attrs.attrmask.count =3D 2; + ne->ne_attrs.attr_vals.data =3D (u8 *)xdr->p; + + status =3D nfsd4_encode_attr_vals(xdr, attrmask, &args); + if (status !=3D nfs_ok) + goto noattrs; + + ne->ne_attrs.attr_vals.len =3D (u8 *)xdr->p - ne->ne_attrs.attr_vals.data; + return true; +noattrs: attrmask[0] =3D 0; attrmask[1] =3D 0; attrmask[2] =3D 0; --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 AF2973ECBF0; Thu, 16 Apr 2026 17:35:56 +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=1776360956; cv=none; b=Sobr8BJ5ujsLMSl0avezrvwbtIUNYa6toq8dNeWok6FoaXfoR688pqI91TL8HdPs1k+0cqS8Qm1eg1XWqqXVVzTImxZxqN760kOz5EnhorflQm29CQ9mvwfHYLqbIOQmUNW8xa0GzTcfQmgTkd8EZpEy3NtWI7mLHMbcV+v55oI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360956; c=relaxed/simple; bh=Cr8l3NRbAfL4bnhBk5fPjSzCUeBfLwA6eSyNdpf5w1g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XHi3c52Jp2XppEJCqB2I0/8oE1JWY3M5wHqiI1Hb79bQ8Bb/PkSQ9/6MZUvwUGGaJ2sGUfzkKFEXtxwU9M5zY3pZC1M9yxUcTHMCGXU/ol8WdbXsEncX2+l72Bwuo95YgMF5dYrosUidqO3/UCb8nCEhQb+WbJsBuxzKqihOzCw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NGltAJYJ; 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="NGltAJYJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A777C2BCB0; Thu, 16 Apr 2026 17:35:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360956; bh=Cr8l3NRbAfL4bnhBk5fPjSzCUeBfLwA6eSyNdpf5w1g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NGltAJYJqKD0MEfrl3gGHGtuyMRyK4TcRUooIxZGzk+1UIwgFGIq/PrD0XMf84Glf H9hwtnr92bkZjqtaHmBHPAbOFBXBi3pmnBVgWKuSe61mAPszziV0rcMS3zvNCOre5P 3o8lmII7gA5kyqIj1MVtdoPGikA8C3haixzKRcQlWPVUvslzDil7G64dbYQKods/6B xgcI2+XlHM1ggaL8D4sVEnbQRvPiy1cNHo5cfzTihOqQ1ZcqiUPon7JL/tc5udiyJp OFvG6jpIpfHbTuLvGu9MLNf+dD7xOPAHUA3LuTcu6oe5ZjoM1qB2+TWY1XStNqCWhA 3EwhbbAf9t+hw== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:24 -0700 Subject: [PATCH v2 23/28] nfsd: allow encoding a filehandle into fattr4 without a svc_fh Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-23-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=2594; i=jlayton@kernel.org; h=from:subject:message-id; bh=Cr8l3NRbAfL4bnhBk5fPjSzCUeBfLwA6eSyNdpf5w1g=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3nMjZLGyUC+0LxUuVwpn/7N+VXYFy6Ccfxg XDQ5voA4/mJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5wAKCRAADmhBGVaC FaPDEADB7iNJj8kq8xgwc2Y3YRu2wd8N0hpPUtiuKwlMT0jKCVHkbg4TzMLbBREcivM33N496II K2ACOVrdkI2GntM4afMYhhE2mpe/780O7wMZBsND4IEBlezarFXJg+yhSAh3QQewKvBddm9wr7c s1pA0e/vu7w4in4tF2Jg5R862JBTogcdStV3fnYCOEXIwXI3XE49BzB0m73bXJsxLbmcyXlIx4x LJtnPFDKLF0vkszV9NOevYiVc6Ko/9zD761QcFZntrnt1XTl5betyIl4sLsU9xRNiw8jLxfT5mc exObwbytLtD1v++4t6WHnPnbAuc40v8+xX2u5OzcIdUzg4y8FGmtZq7oY8f/DRF0l7owh3zVeMh hOvVFeKBBtADbUbHYAjmVjlhxQvDASfeX3AFDKjBlRvLT3kNy5lvMK5VpC7Lo63ofZeEnAsyHWN vGQDes9sLcTF1WsH9VmylpMgTcUnx4/ZOXx/95TE5pQBuCO5rR7TpOx0MeFjf8h2/wlWCjri5MG +Owa/9cDmV+Ilt3OGitQjH3dr1jtTb4kMf/n1UTUdixfZPa4JNLnf4kqtYAjgEkO6PJzAFYvWLY fi6OuGhvJZxKbpBRA/ueWCqYSjvb41Y+eL82UDigM+cnx1Z5pvEpoFMlZvQN8OxkOqGtSrSgzoy 1//OxqLlKepP/kQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The current fattr4 encoder requires a svc_fh in order to encode the filehandle. This is not available in a CB_NOTIFY callback. Add a a new "fhandle" field to struct nfsd4_fattr_args and copy the filehandle into there from the svc_fh. CB_NOTIFY will populate it via other means. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index f85581ebbd10..a9cdf7a3f8b3 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2701,7 +2701,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) } =20 static __be32 nfsd4_encode_nfs_fh4(struct xdr_stream *xdr, - struct knfsd_fh *fh_handle) + const struct knfsd_fh *fh_handle) { return nfsd4_encode_opaque(xdr, fh_handle->fh_raw, fh_handle->fh_size); } @@ -3144,6 +3144,7 @@ struct nfsd4_fattr_args { struct svc_fh *fhp; struct svc_export *exp; struct dentry *dentry; + struct knfsd_fh fhandle; struct kstat stat; struct kstatfs statfs; struct nfs4_acl *acl; @@ -3359,7 +3360,7 @@ static __be32 nfsd4_encode_fattr4_acl(struct xdr_stre= am *xdr, static __be32 nfsd4_encode_fattr4_filehandle(struct xdr_stream *xdr, const struct nfsd4_fattr_args *args) { - return nfsd4_encode_nfs_fh4(xdr, &args->fhp->fh_handle); + return nfsd4_encode_nfs_fh4(xdr, &args->fhandle); } =20 static __be32 nfsd4_encode_fattr4_fileid(struct xdr_stream *xdr, @@ -3969,19 +3970,23 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct = xdr_stream *xdr, if (err) goto out_nfserr; } - if ((attrmask[0] & (FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FSID)) && - !fhp) { - tempfh =3D kmalloc_obj(struct svc_fh); - status =3D nfserr_jukebox; - if (!tempfh) - goto out; - fh_init(tempfh, NFS4_FHSIZE); - status =3D fh_compose(tempfh, exp, dentry, NULL); - if (status) - goto out; - args.fhp =3D tempfh; - } else - args.fhp =3D fhp; + + args.fhp =3D fhp; + if ((attrmask[0] & (FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FSID))) { + if (!args.fhp) { + tempfh =3D kmalloc_obj(struct svc_fh); + status =3D nfserr_jukebox; + if (!tempfh) + goto out; + fh_init(tempfh, NFS4_FHSIZE); + status =3D fh_compose(tempfh, exp, dentry, NULL); + if (status) + goto out; + args.fhp =3D tempfh; + } + if (args.fhp) + fh_copy_shallow(&args.fhandle, &args.fhp->fh_handle); + } =20 if (attrmask[0] & FATTR4_WORD0_ACL) { err =3D nfsd4_get_nfs4_acl(rqstp, dentry, &args.acl); --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 4F58B3ED132; Thu, 16 Apr 2026 17:35:57 +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=1776360957; cv=none; b=HHsm4QtITCduwvXxEho3z/Q8lxwhGhpEOIFfsP18ltKnZ3uFxNxf4dcQRUREQedoQIkhB1Tok1yGv+HKbu/bYun75mZWJ0UCYzQqzkHEo05ptfmYL+OnCF4JRUJ9rqlgbPGW4GIMdbXbAH47dLdKoWDMxF35q3LRXC99WOafI6A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360957; c=relaxed/simple; bh=EIx5+PmQa2niFbtXwVrSxp2CGvAuqlFZetkw9RuwCWs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kUP9uS15FIFWFg8/a4HathBDDFLgxnbOD6OIYm+ChHvrruwJZnyViA0mgX+Vm9l4zAEyY2guteB1asOcd0LF52wqq87XVQvBQdaYvpu+WHCWqBcMu8WZupgahpwwrjmjtPWogCMnIy0jRqgdYjyZ47JLqJu9jSx0yU6Vmza5UkA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ekjJldo7; 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="ekjJldo7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A5F5C2BCB5; Thu, 16 Apr 2026 17:35:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360957; bh=EIx5+PmQa2niFbtXwVrSxp2CGvAuqlFZetkw9RuwCWs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ekjJldo7kvgM+y2NSiD/Q0r3eoz9Z827a0NuNLaqVi3oDJYFt48TvwYZPb9UzTJLL hHPHxmedUPUF23kM44k9/mYZZlFkADOSpMxkcgu4H4zZbqBT/74m6nmcpWJ4Q6FKkc oigioKU0PBJsjWXAgvI7vJ7kOYSqlDta2vhpFe8jzaOjTLYgNeVMG60UjU96iqHOUS 6h/qUlg1M9QpQOhKHLiCj/U6kQAPnpbafDbGCkxnsEfuZVfpAz8hrzCKT7viHlsQaK U+GoKsTZFgexmQSz8LSvSBP2oD6U6v29u9cJuEBzhr7llVAvkoLdHQeeZSk8yamuW/ p6ZyMmFXQgsVQ== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:25 -0700 Subject: [PATCH v2 24/28] nfsd: add a fi_connectable flag to struct nfs4_file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-24-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=1426; i=jlayton@kernel.org; h=from:subject:message-id; bh=EIx5+PmQa2niFbtXwVrSxp2CGvAuqlFZetkw9RuwCWs=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3nfCp9rp6PaWVEKuLr6VaWBYljbpKRoWHpg 2BqbxzGAlqJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd5wAKCRAADmhBGVaC FQtqD/9LSZse6DkbIZowTu2888+9PKTpj+TgsMSWg+qru2KnQpROYdkkWkvsXiFjE8FlewSTTEY vnfGkKJ8TUrY83HWZwThYZmVTFHhKf71fQSZ3bqkqfiD354GPGc1Yomwd5IRJuwbFlQ1plwSMcX s4uxdy+eyYG3aEAqhiRvCElRlNYW4tMmq3QzWzVAg6g1jEvDeG/aSyOyQYbpThWPBbZnJD89uvb MopCN8uii0Jtz0ZiUJlFNQ4itYN3kuJDKpheoyJHNIm0PNkTadi+jeWzDwuxf2bDapjj3jMGkyE qTcLTKHaVGKsQSrggoJ+8ToqrWT+/MIuIEbHn9RLtqtk6/xUPhSAb/BvPxF8BBdJ9+9Z60ZmNAX hKrD6endgrSt5YkERPz7Xifs5UHfgvVPBVXiaAs8LyWjcEEJOSykqJ4SjAWc2eILqlKzd6LMuTE 0EHQrwQfPNuX3ZlIh6/q5B5gfakO5o/38k/JvHWWJgfU9ne2Cux1e2k9jCiLEjwyMhzOyUYAjXf z4iCtkgiCoqa70aoalkxhxIx16p8Lh+dun6U/a9apnqWV3/q6HzgJDo24Yrms3l2+43WO/s1Fyp Nr/NWO/6OATAFc3nSNbCk8anflIqVrhbWAEGsV9px+j7qp5B+y7PAVXKJBiTsTkximDk3S8e4mW WWR108oBuFGrFHQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 When encoding a filehandle for a CB_NOTIFY, there is no svc_export available, but the server needs to know whether to encode a connectable filehandle. Add a flag to the nfs4_file that tells whether the svc_export under which a directory delegation was acquired has subtree checking enabled, in which case it needs connectable filehandles. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 1 + fs/nfsd/state.h | 1 + 2 files changed, 2 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index eba6da1072c0..5f848c9910b8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5166,6 +5166,7 @@ static void nfsd4_file_init(const struct svc_fh *fh, = struct nfs4_file *fp) memset(fp->fi_access, 0, sizeof(fp->fi_access)); fp->fi_aliased =3D false; fp->fi_inode =3D d_inode(fh->fh_dentry); + fp->fi_connectable =3D !(fh->fh_export->ex_flags & NFSEXP_NOSUBTREECHECK); #ifdef CONFIG_NFSD_PNFS INIT_LIST_HEAD(&fp->fi_lo_states); atomic_set(&fp->fi_lo_recalls, 0); diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 570d66fc8297..caa3f5f78dc1 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -747,6 +747,7 @@ struct nfs4_file { int fi_delegees; struct knfsd_fh fi_fhandle; bool fi_had_conflict; + bool fi_connectable; #ifdef CONFIG_NFSD_PNFS struct list_head fi_lo_states; atomic_t fi_lo_recalls; --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 096913ED5D6; Thu, 16 Apr 2026 17:35:58 +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=1776360958; cv=none; b=Q21b1xrESpQK26yRg2yq5Tkb7bti2096EOycFJdQZM0JmMzgj7L/f92ni7v66dKORpgIZ5i+IjtCt+wd+i6cvDKqQZGIJ3D9D6z3y0i+zU9iS9r3TLHD9Wp3HXvMoQ9i2rFSixNBVfCp6L+jMXvZHAssXLJr0m4XPT8y+S0QgvQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360958; c=relaxed/simple; bh=FUFtdaMMYDWs09R3VPMt65ogwXEM4SC5NUOnEAc330c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fU5S7q5KXl90jSuQbk3MZRaitVbbasaibP3gfqg/XfHzWYRo5h6df4AVQTBiGF+ZxO2qd3zs7cOq7je+PV0T2eBAh2iP1tJLcsCHkyLHjSc+pG79qdBWpVP2ucuedCJtRyqqjsVQ3R7d6+TaDD8C3bZeuKy5qblBkx1A6w/S9J8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gcaV3nTB; 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="gcaV3nTB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 389A4C2BCB7; Thu, 16 Apr 2026 17:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360957; bh=FUFtdaMMYDWs09R3VPMt65ogwXEM4SC5NUOnEAc330c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gcaV3nTBm3Z4zkmnFhXIJ8DDusob2ODgZp5yXE5oco/xd7wJNCX7F5LxRd/QVqkCb p43KJ6u2g1cnebMf3DEZ7eL1TDT2yvyQ0jhsnqAhV78hU6YSlNKAiIuUA0SSta4jwK 003+9OxNkv8E0b9Csm7bWQisMF3PjY9KQTK4up3FQjgF8ULZe41zjvUwyhDdlGw1Mr XJfHD+WY+raD89BAvU4IIaSVSM3yRnBzOTAoMmJudDckq3B644JNR5alIV9++deHpP z7eJkhuN/EWXUaY3xlBgo9JjPN2DbIOr2U8efVWYvp8nLFNaIyYMYgFSUtaI3MVdlZ ezvAV1XUOeHBw== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:26 -0700 Subject: [PATCH v2 25/28] nfsd: add the filehandle to returned attributes in CB_NOTIFY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-25-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=2618; i=jlayton@kernel.org; h=from:subject:message-id; bh=FUFtdaMMYDWs09R3VPMt65ogwXEM4SC5NUOnEAc330c=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3o16+8svz8DEDAcO3+LdFZtIPx7pE/ZcLSY yIAWjLxeJ6JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd6AAKCRAADmhBGVaC FYwVEADWmFQetkV24KsDm1FfchcFrwzzjxcSX07myIPSISVO8GSCc/hOv/ByHSbzrNIrViw6Y8o kfQzYT0JLQC3YF+4K8AXx117hw/25VJ0We+HARjpSrXVu1hy+ChdgwKcFdUXM7BUdUbi04UE1gq aj+M9hSNip/SWakW219myqEfiBS+qumYwiyYpoLdlC+OP7wQKeqK0wwXgrBjz+cjFXsPZ7xRGe4 v86Y9HTUDFGQ+nA4sDl3VIq9djF4flo2ctUl3aX6wX3uprskzHA73yZiLJUXoZD516GhAm3Qzjx r8v92fgzwzPK+dATlupB2atSpedP1bDV+trGYWtLLvZJ9Srb/VdutSmoxGVADvM/S4lO2VI8vKQ n03Pzy8ojyY5OPqUeG4mu/rHoug+ZdKAX8mrSxNT3dfo5HNYCGXKPhd9DxSDYvq++c+dFfSVNCs mqg2Wo1kNvEF7w/9YRk/zPdHY9sRHmZfDeh5iy7+J8Vupu2izj5muly8ljwYYqfSUQbGGWKxim0 zxjDmXh7hdANz4FK8NX5uJGEZ/dJbDqkssCKnA+J/rb/EkH5UBfj+OgBievtwTe/bE85RVuGhDB 7ofuk187S6ncow39BhnCbL/vgG8YNENyC15lGqFFe9uqnZ5UAdplHIpl0rAMFID3jKO3X8OzHW5 9zDDMtCrO54sZ9w== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 nfsd's usual fh_compose routine requires a svc_export and fills out a svc_fh. In the context of a CB_NOTIFY there is no such export to consult. Add a new routine that composes a filehandle with only a parent filehandle and nfs4_file. Use that to fill out the fhandle field in the nfsd4_fattr_args. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index a9cdf7a3f8b3..5d7d8545c904 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4109,6 +4109,39 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct x= dr_stream *xdr, goto out; } =20 +static bool +setup_notify_fhandle(struct dentry *dentry, struct nfs4_file *fi, + struct nfsd_file *nf, struct nfsd4_fattr_args *args) +{ + int fileid_type, fsid_len, maxsize, flags =3D 0; + struct knfsd_fh *fhp =3D &args->fhandle; + struct inode *inode =3D d_inode(dentry); + struct inode *parent =3D NULL; + struct fid *fid; + + fsid_len =3D key_len(fi->fi_fhandle.fh_fsid_type); + fhp->fh_size =3D 4 + fsid_len; + + /* Copy first 4 bytes + fsid */ + memcpy(&fhp->fh_raw, &fi->fi_fhandle.fh_raw, fhp->fh_size); + + fid =3D (struct fid *)(fh_fsid(fhp) + fsid_len/4); + maxsize =3D (NFS4_FHSIZE - fhp->fh_size)/4; + + if (fi->fi_connectable && !S_ISDIR(inode->i_mode)) { + parent =3D d_inode(nf->nf_file->f_path.dentry); + flags =3D EXPORT_FH_CONNECTABLE; + } + + fileid_type =3D exportfs_encode_inode_fh(inode, fid, &maxsize, parent, fl= ags); + if (fileid_type < 0) + return false; + + fhp->fh_fileid_type =3D fileid_type; + fhp->fh_size +=3D maxsize * 4; + return true; +} + #define CB_NOTIFY_STATX_REQUEST_MASK (STATX_BASIC_STATS | \ STATX_BTIME | \ STATX_CHANGE_COOKIE) @@ -4118,6 +4151,7 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne, s= truct xdr_stream *xdr, struct dentry *dentry, struct nfs4_delegation *dp, struct nfsd_file *nf, char *name, u32 namelen) { + struct nfs4_file *fi =3D dp->dl_stid.sc_file; struct path path =3D { .mnt =3D nf->nf_file->f_path.mnt, .dentry =3D dentry }; struct nfsd4_fattr_args args =3D { }; @@ -4156,6 +4190,9 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne, s= truct xdr_stream *xdr, FATTR4_WORD1_TIME_METADATA | FATTR4_WORD1_TIME_MODIFY; attrmask[2] =3D 0; =20 + if (setup_notify_fhandle(dentry, fi, nf, &args)) + attrmask[0] |=3D FATTR4_WORD0_FILEHANDLE; + if (args.stat.result_mask & STATX_BTIME) attrmask[1] |=3D FATTR4_WORD1_TIME_CREATE; =20 --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 C5C6E3EE1D1; Thu, 16 Apr 2026 17:35:58 +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=1776360958; cv=none; b=CsaQhcXg61KT9n8sV6c+haK4PcdjC620OoYe6x2R5oLO6yBYGRBx6DPZejlPBedB3H264lZ88TwnBV10kni9VIiZplql6Nx+XCnzNWGIKHjm+y8xMivzdLatwhkN3VS+cM3u9A8ua6qq06wtCA6PUBhr5wJk/UJondXFM/5wsyQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360958; c=relaxed/simple; bh=ZicZK29vRjXVJniDOXihUcGQ+pKGYbnMNExhHc/VLz0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=d3tsk7d+HFo3pMSyhTXX7MNoYAOvQTPMb5c0vgvc95Qe7uQQ2g/PmvQcWiP/Or6fLlH/8VhhUOuYeNSQBoslmdfa/Nr17aLnqc4JdX9nU/o2UJThxUW2Vj/9P6vE7rnUFAGoq1unHMs4xPHGm127umKoH/RtpcQ7Qs8q3AJ/2AQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GFKhD1xM; 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="GFKhD1xM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06C11C2BCB4; Thu, 16 Apr 2026 17:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360958; bh=ZicZK29vRjXVJniDOXihUcGQ+pKGYbnMNExhHc/VLz0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GFKhD1xMass3Nz4lwvO0JSV5qtTti2LnflecGQZoGfR3qYhLn3iQUYrbNGl7DdFm+ l6rwgihLSMj7hIpXnvu9i56DmIrEjrYvrpRxo1eOQ1CeojtLH7ZMbZ7q/fgKy1kr82 m+/WY7vmvNeiyOsVOizUH2zuVCEclX2z4zWsgrQ+vGvq8v25Zwi0RJGJmJBraA2N3D rO7wywRDgQf3RbSojn/PztOxVXNLr4BEwIYqscfT3QCQaPWnBH5/8UUOyux6neHFhU bxqZC5aN+y7hb/Rh65EnWQj1YoVde4nxiSwNcrk30ou8Qsvv8hAq6uscZuOHNn5kZP uCGBBNSTzF+Cg== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:27 -0700 Subject: [PATCH v2 26/28] nfsd: properly track requested child attributes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-26-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=ZicZK29vRjXVJniDOXihUcGQ+pKGYbnMNExhHc/VLz0=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3omiuxOL+Nl+Tp4LGmmMe7LYWqbf5XuLHfW LB9NPaM+AKJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd6AAKCRAADmhBGVaC FTWPEACC6gobv1pGZf8CKd/MPlTSU8fPUfqq5kQ2eo4yscp3peVXzXKNOq7aQrJAJzaDkqy46Ec OQtOe89pxbdhsqCWRodo/GXkarCkDLwWopEOCA/MgOqb16vFeo8Qk8CzBc7mlHA2vQuYRiI6Smu c8hdptVMSI5FxPB/z93VlIhrT6SvFFXUXvnBO4ZiPHTnJxQWUXzkbM51fpdEsXR/rLMUW8Z3Av8 whtslb9vbUohlselj6Mikx2gIncW+R8VPe8IAE5+Uv5l5c8NKTyVZjmZljk5eAX60+JJJ8FpsIm 2BRUenU7VTYzXiBWosvJvtFqPnVBU2BEzr6O4ThKih2uVDhgu7r4rzYcxqcQ4KPEFFDVqwDuttj DxE1mJNlKZov8U6RPSRoy/TLSjFCA+hvDDFLqiUp8GIxlEuYz3/ZRmhfLDeaPSx/Xs9kA1xhw8T 8u4LoYAuiTVvnrcU7HTpxBrorjjYTW1GLFptOpQ1tUHCQvGLB/UY3Cex3RMp7jmvcE+a+1ijT23 dGQmVZTB7/BwV1xMAgNc+AmCH5ynh/7Bt8cDHvVU41xMzP4M15+FfSAIH/GekIEbS5ZabvHOE1A VrxCAX192kR/vBsxDYkxO+cD3RqHCEqSxby0ENKCZvWdzKlqYRhL/gmfUEu8d4UdRCk3dFSH6OF f2cAKQS77SrwM6Q== 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, =20 gdd->gddrnf_status =3D GDD4_OK; memcpy(&gdd->gddr_stateid, &dd->dl_stid.sc_stateid, sizeof(gdd->gddr_stat= eid)); + gdd->gddr_child_attributes[0] =3D dd->dl_child_attrs[0]; + gdd->gddr_child_attributes[1] =3D 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 5f848c9910b8..28e34f6c95e7 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -9807,6 +9807,21 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp,= struct dentry *dentry, return status; } =20 +#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 @@ -9876,6 +9891,9 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstat= e, dp->dl_stid.sc_export =3D exp_get(cstate->current_fh.fh_export); =20 + dp->dl_child_attrs[0] =3D gdd->gdda_child_attributes[0] & GDD_WORD0_CHILD= _ATTRS; + dp->dl_child_attrs[1] =3D gdd->gdda_child_attributes[1] & GDD_WORD1_CHILD= _ATTRS; + fl =3D 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, =20 args.change_attr =3D nfsd4_change_attribute(&args.stat); =20 - attrmask[0] =3D FATTR4_WORD0_TYPE | FATTR4_WORD0_CHANGE | - FATTR4_WORD0_SIZE | FATTR4_WORD0_FILEID; - attrmask[1] =3D 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] =3D dp->dl_child_attrs[0]; + attrmask[1] =3D dp->dl_child_attrs[1]; attrmask[2] =3D 0; =20 - if (setup_notify_fhandle(dentry, fi, nf, &args)) - attrmask[0] |=3D FATTR4_WORD0_FILEHANDLE; + if (!setup_notify_fhandle(dentry, fi, nf, &args)) + attrmask[0] &=3D ~FATTR4_WORD0_FILEHANDLE; =20 - if (args.stat.result_mask & STATX_BTIME) - attrmask[1] |=3D FATTR4_WORD1_TIME_CREATE; + if (!(args.stat.result_mask & STATX_BTIME)) + attrmask[1] &=3D ~FATTR4_WORD1_TIME_CREATE; =20 ne->ne_attrs.attrmask.count =3D 2; ne->ne_attrs.attr_vals.data =3D (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]; }; =20 static inline bool deleg_is_read(u32 dl_type) --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 D8DB53EF0BC; Thu, 16 Apr 2026 17:35:59 +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=1776360959; cv=none; b=gFzba3khCN3bb+9Xq5RK569VP6rRx7t/IZxayzG2kouhVI+l0yFkiz349tDneCrVooKSLLt83I14OfVUEqGdiH/siFVx0cJE34XJGs0U2s5LfVMQCulTLieXc1skkvS/Ks5IP1rFOeGSNh5+M8Yg5nB3giaZuR7Ld3CE+IcpKQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360959; c=relaxed/simple; bh=0GGTP9r3MB3k1smQnZg4Uv4fvOIn7tuPPgHIzcrDbOE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gmJZ/Fy0wUpxi5cTKyUskQFRC5J1LLWwHr2vz7IGjhl2zgN8Yi0C5ZE1g639GqMV+mc+fOZiX6nF0wxA4Jf5y+H8LGPf/sgoSXm7dfK18Dsccu1ItmPxHqUr5JDyRxFjrIT3oDqq2zT2us92wrR9qHRuYI/ybScETH1cWO2enhY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IDIZZoHS; 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="IDIZZoHS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8D6FC2BCAF; Thu, 16 Apr 2026 17:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360959; bh=0GGTP9r3MB3k1smQnZg4Uv4fvOIn7tuPPgHIzcrDbOE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IDIZZoHSzIz3dh6A3uYiZTe0xG+vzzSOYVsqHvvub6+/61eRhZWhbJeDkhsa7L+bo xIo8sSFWopvxTk4BjFcwfeEzULqZcQljc4h5y+I6OEuKtaGTiic6ZVreNoTYa0CYZs P0AmQ4BLB4zCCaat244k9K7tJfmH0Uj6yx46CFifGp8Evarc/RaSNw0HKCeQ3aHpuE lepEedEKQOgJZfg2euEEnIqFu+EUx1z9swFEpm2zivkPOvwt4jXaJcaTuqejdCH9gj BMdSy1BB6Yi+yqBGmnFedMhBb54YhiMPVRW2UC148XjHc17V7xAO3ocB4xC969UYYS yMH8FqZHXBWmQ== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:28 -0700 Subject: [PATCH v2 27/28] nfsd: track requested dir attributes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-27-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=3281; i=jlayton@kernel.org; h=from:subject:message-id; bh=0GGTP9r3MB3k1smQnZg4Uv4fvOIn7tuPPgHIzcrDbOE=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3opsiuoZ3PLu/ZCdoLxiWlOQsMqD1T7xYnr 4UJsNhq0xmJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd6AAKCRAADmhBGVaC FUoGD/4s7tCF3MmEJVOcLPUHU32gCHMs2zQyrtP1BXIGN5rp/cqIhBriAEHVi1eGu2HlM0+hIql YLiyA7usIzW998+GyVZSPr086ZtP8F0tcd6N6b2lDyN+LbVrUDBSs6sdOxgXX1fJjL5o/Vav41n dDbL5DUZyLs0X+xf4ZM7vI8RriC/dSDTn0UBQUoSG1vUoexpZYw3PioIiSuE1StjhW3cqFFNbAJ BJFbO54nVPe/qJ0J3xuwQ9pVGBvqoy07zeTAB6hq2flp0l9i54cvst85ABhqJGzy5o1vMWcwUrB wlSGs6jARfe5RYnYwyudek74b+X+l3TjX1V1H8ZsJ0vKRjyNJ2Df6vFAXsyFqz/+TJZ3f6laJoP /LPuZyP4Ji4TcJnKFQBonAVcMMAyGGrQp3Fxp8S98WDeNLJG1bNu7RZNjXBEFpZJ9j/WTtVh5df MYfU8dKWj/1Hj1/Zj3oU1jcwi7tU0Y8hrSUZjMxqhCX4s/lcwoF3jOZucSfGUc4PCtR9LjF18IM 6vJl6cRcYpy//cKi0w+Hc+oMpo0d2vNJnUE3QPJefW/MGzqO3uUxZy8Pylk5vq8EkVfF2NvV8x/ CS5/+qxpHXFZSKNLuCBafCMmyCf7mIbvpeVtdJbKjnTgyCGdQ8qjOBwkw0XnXn9fSwbmdP58dok +zb4m2XU24sgL3g== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Track the union of requested and supported dir 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 | 9 ++++++--- fs/nfsd/nfs4state.c | 14 +++++++++++++- fs/nfsd/state.h | 2 ++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index a807a55dddf9..e4717e1e3d93 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2506,9 +2506,10 @@ nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_co= mpound_state *cstate, return status =3D=3D nfserr_same ? nfs_ok : status; } =20 -#define SUPPORTED_NOTIFY_MASK (BIT(NOTIFY4_REMOVE_ENTRY) | \ - BIT(NOTIFY4_ADD_ENTRY) | \ - BIT(NOTIFY4_RENAME_ENTRY) | \ +#define SUPPORTED_NOTIFY_MASK (BIT(NOTIFY4_CHANGE_DIR_ATTRS) | \ + BIT(NOTIFY4_REMOVE_ENTRY) | \ + BIT(NOTIFY4_ADD_ENTRY) | \ + BIT(NOTIFY4_RENAME_ENTRY) | \ BIT(NOTIFY4_GFLAG_EXTEND)) =20 static __be32 @@ -2555,6 +2556,8 @@ nfsd4_get_dir_delegation(struct svc_rqst *rqstp, memcpy(&gdd->gddr_stateid, &dd->dl_stid.sc_stateid, sizeof(gdd->gddr_stat= eid)); gdd->gddr_child_attributes[0] =3D dd->dl_child_attrs[0]; gdd->gddr_child_attributes[1] =3D dd->dl_child_attrs[1]; + gdd->gddr_dir_attributes[0] =3D dd->dl_dir_attrs[0]; + gdd->gddr_dir_attributes[1] =3D dd->dl_dir_attrs[1]; nfs4_put_stid(&dd->dl_stid); return nfs_ok; } diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 28e34f6c95e7..32340a0669df 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -9822,6 +9822,15 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp,= struct dentry *dentry, FATTR4_WORD1_TIME_MODIFY | \ FATTR4_WORD1_TIME_CREATE) =20 +#define GDD_WORD0_DIR_ATTRS (FATTR4_WORD0_CHANGE | \ + FATTR4_WORD0_SIZE) + +#define GDD_WORD1_DIR_ATTRS (FATTR4_WORD1_NUMLINKS | \ + FATTR4_WORD1_SPACE_USED | \ + FATTR4_WORD1_TIME_ACCESS | \ + FATTR4_WORD1_TIME_METADATA | \ + FATTR4_WORD1_TIME_MODIFY) + /** * nfsd_get_dir_deleg - attempt to get a directory delegation * @cstate: compound state @@ -9891,10 +9900,13 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cst= ate, dp->dl_stid.sc_export =3D exp_get(cstate->current_fh.fh_export); =20 + dp->dl_notify_mask =3D gdd->gddr_notification[0]; dp->dl_child_attrs[0] =3D gdd->gdda_child_attributes[0] & GDD_WORD0_CHILD= _ATTRS; dp->dl_child_attrs[1] =3D gdd->gdda_child_attributes[1] & GDD_WORD1_CHILD= _ATTRS; + dp->dl_dir_attrs[0] =3D gdd->gdda_dir_attributes[0] & GDD_WORD0_DIR_ATTRS; + dp->dl_dir_attrs[1] =3D gdd->gdda_dir_attributes[1] & GDD_WORD1_DIR_ATTRS; =20 - fl =3D nfs4_alloc_init_lease(dp, gdd->gddr_notification[0]); + fl =3D nfs4_alloc_init_lease(dp, dp->dl_notify_mask); if (!fl) goto out_put_stid; =20 diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index cb1ac3248fe8..4c5848285378 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -286,7 +286,9 @@ struct nfs4_delegation { struct timespec64 dl_ctime; =20 /* For dir delegations */ + uint32_t dl_notify_mask; uint32_t dl_child_attrs[2]; + uint32_t dl_dir_attrs[2]; }; =20 static inline bool deleg_is_read(u32 dl_type) --=20 2.53.0 From nobody Tue Jun 16 06:04:11 2026 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 958B13EF654; Thu, 16 Apr 2026 17:36:00 +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=1776360960; cv=none; b=AuOVvwXFEs7MnNBAQeky5kA8TpIzWDZ5vkhMXsNqPoxAsFLc9WtqfTMkC3nfYb3oUfKKAdk4M/cMEo7msoTQD8DMDuac3lI6GJZ79olOiJpZRh4nUarP9t+skxz2c3faCylKti23c1jlOQjbs0j5mgASPcASBvqeBjB9NE7qt40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776360960; c=relaxed/simple; bh=ljfjy/b8w/hQplBxEbpZFyap3tO+DH6nJOLLAPUxDOQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TG8EMg4Eon9OnB1XVIaiIZPP+QQ6cvuu1GjnZYsb361Y7RNsVQeAgVrnC6gQeER8kywzVNtHOIBjYok6ko3hWl307ckRq8wRF3iMPCkYe966n2SWhPfLj0QGHPbQ7+PuoCslpoyT5DfGyEnu4hp0akian+5zKNSz+I3ky+mdAco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LDTwdR9r; 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="LDTwdR9r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95FF1C2BCB0; Thu, 16 Apr 2026 17:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776360960; bh=ljfjy/b8w/hQplBxEbpZFyap3tO+DH6nJOLLAPUxDOQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LDTwdR9rcYpC+PWYmtTySZmkJeRG5rBy1KRbtNgA6wqrZncoy0QoIy59/YIHJFUlL 2S7eoYl9/9inXlHzl8+zzXXZ3F4xvcd6H0H0J2iCqr/sNtmB8Ci2pN8YbRyLe2sBCI 7Lu7F7w1USJtrqNRyghKhbzq4+k/Hh5UaydGVpkFKCZqfk/lXEnXwlywdIrZDsIjQa vf530ESYqvA00pwYGuVbZLhy4USxXUJPGgMmL86l+relJEXJZ6oz91klryk17QMznJ cKEdSfdx5IrdDq9EL3tDv/6NGA/QjNNx1wLs3OF5Jpnou4Ji2aRGJLW/qAj14z+RdX AT0/v/Mf9Xt1w== From: Jeff Layton Date: Thu, 16 Apr 2026 10:35:29 -0700 Subject: [PATCH v2 28/28] nfsd: add support to CB_NOTIFY for dir attribute changes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260416-dir-deleg-v2-28-851426a550f6@kernel.org> References: <20260416-dir-deleg-v2-0-851426a550f6@kernel.org> In-Reply-To: <20260416-dir-deleg-v2-0-851426a550f6@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=6108; i=jlayton@kernel.org; h=from:subject:message-id; bh=ljfjy/b8w/hQplBxEbpZFyap3tO+DH6nJOLLAPUxDOQ=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBp4R3o2LhexlgAJoX8NHPQ6gcu2NLN9f1xovT1r rInPTWLFfeJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaeEd6AAKCRAADmhBGVaC FYe/D/9PtdrLY15JLTr0DUze9xwoP99KYUiS2/zWUe0U684BJLG8RpLaymBBMCHbq3udqHAXiz7 1YFMmfWqM2mb1VkEHSzdlSdPIzcu0W+L0PhZKtDqUuB2J61zwocSlYpbdgRCWA2RaF+4EWDlo2R d+xBOyZ3mTL1FeMxuZSqF33E4XatpwcVGlT5jxFA9qHmvTaS8ohxTim860A7RHV+VsKX10NDWIh FlKg24QwR16vcD5yACCAXY7CrH0toYCSEy9o7xDNKe+OqZ5U8RgwUuwvZtweXZE2/11sOxE0NCL jFZWSUATUAsefIRW4odMDNHJb0jP2oTeJ6UdKIpquRC2LVrWLZd4b4ETCFVoRdAaDQaVL9T+WlN hTTPSL/NvKIjaXMQM/LYpAGZ9P/QgXg4EVAQZ8iSr1D4kZnkKrjswh3vdRYGXclaevuoUphIX1e ziN4vy51Patf4ZB8M9fua6T8ZOZshsI//uPWW2R9s75HKc+kd/6TmPc+i9wsWchIAkbuay0keqJ 3hwC9u1lQ8VbSpxw0H0h9HproOAYSpb3N7OodTjGd9y8tszRMTDYIkACNKFksKpFSbj8a5fb3Zy wOs806UAiPX/7gD5dphPXdjHfSv+Q9dGLqntF2mRhMwGE5WeUDeYYZBfn/Adm3vzq3bqewCYZPP b7JQkZOjy/rFs4A== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 If the client requested dir attribute change notifications, send those alongside any set of add/remove/rename events. Note that the server will still recall the delegation on a SETATTR, so these are only sent for changes to child dirents. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 25 ++++++++++++++++++++-- fs/nfsd/nfs4xdr.c | 61 +++++++++++++++++++++++++++++++++++++++++++++----= ---- fs/nfsd/xdr4.h | 2 ++ 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 32340a0669df..5eca7899c48d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3478,10 +3478,15 @@ nfsd4_cb_notify_prepare(struct nfsd4_callback *cb) struct nfsd_notify_event *events[NOTIFY4_EVENT_QUEUE_SIZE]; struct xdr_buf xdr =3D { .buflen =3D PAGE_SIZE * NOTIFY4_PAGE_ARRAY_SIZE, .pages =3D ncn->ncn_pages }; + int limit =3D NOTIFY4_EVENT_QUEUE_SIZE; struct xdr_stream stream; struct nfsd_file *nf; - int count, i; bool error =3D false; + int count, i; + + /* Save a slot for dir attr update if requested */ + if (dp->dl_notify_mask & BIT(NOTIFY4_CHANGE_DIR_ATTRS)) + --limit; =20 xdr_init_encode_pages(&stream, &xdr); =20 @@ -3495,7 +3500,7 @@ nfsd4_cb_notify_prepare(struct nfsd4_callback *cb) } =20 /* we can't keep up! */ - if (count > NOTIFY4_EVENT_QUEUE_SIZE) { + if (count > limit) { spin_unlock(&ncn->ncn_lock); goto out_recall; } @@ -3542,6 +3547,22 @@ nfsd4_cb_notify_prepare(struct nfsd4_callback *cb) nfsd_notify_event_put(nne); } if (!error) { + if (dp->dl_notify_mask & BIT(NOTIFY4_CHANGE_DIR_ATTRS)) { + u32 *maskp =3D (u32 *)xdr_reserve_space(&stream, sizeof(*maskp)); + + if (maskp) { + u8 *p =3D nfsd4_encode_dir_attr_change(&stream, dp, nf); + + if (p) { + *maskp =3D BIT(NOTIFY4_CHANGE_DIR_ATTRS); + ncn->ncn_nf[count].notify_mask.count =3D 1; + ncn->ncn_nf[count].notify_mask.element =3D maskp; + ncn->ncn_nf[count].notify_vals.data =3D p; + ncn->ncn_nf[count].notify_vals.len =3D (u8 *)stream.p - p; + ++count; + } + } + } ncn->ncn_nf_cnt =3D count; nfsd_file_put(nf); return true; diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index bd1142590d2b..73f2fdf929ed 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4152,11 +4152,11 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne,= struct xdr_stream *xdr, struct nfsd_file *nf, char *name, u32 namelen) { struct nfs4_file *fi =3D dp->dl_stid.sc_file; - struct path path =3D { .mnt =3D nf->nf_file->f_path.mnt, - .dentry =3D dentry }; + struct path path =3D nf->nf_file->f_path; struct nfsd4_fattr_args args =3D { }; uint32_t *attrmask; __be32 status; + bool parent; int ret; =20 /* Reserve space for attrmask */ @@ -4168,6 +4168,9 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne, s= truct xdr_stream *xdr, ne->ne_file.len =3D namelen; ne->ne_attrs.attrmask.element =3D attrmask; =20 + parent =3D (dentry =3D=3D path.dentry); + path.dentry =3D dentry; + /* FIXME: d_find_alias for inode ? */ if (!path.dentry || !d_inode(path.dentry)) goto noattrs; @@ -4183,15 +4186,20 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne,= struct xdr_stream *xdr, =20 args.change_attr =3D nfsd4_change_attribute(&args.stat); =20 - attrmask[0] =3D dp->dl_child_attrs[0]; - attrmask[1] =3D dp->dl_child_attrs[1]; - attrmask[2] =3D 0; + if (parent) { + attrmask[0] =3D dp->dl_dir_attrs[0]; + attrmask[1] =3D dp->dl_dir_attrs[1]; + } else { + attrmask[0] =3D dp->dl_child_attrs[0]; + attrmask[1] =3D dp->dl_child_attrs[1]; =20 - if (!setup_notify_fhandle(dentry, fi, nf, &args)) - attrmask[0] &=3D ~FATTR4_WORD0_FILEHANDLE; + if (!setup_notify_fhandle(dentry, fi, nf, &args)) + attrmask[0] &=3D ~FATTR4_WORD0_FILEHANDLE; =20 - if (!(args.stat.result_mask & STATX_BTIME)) - attrmask[1] &=3D ~FATTR4_WORD1_TIME_CREATE; + if (!(args.stat.result_mask & STATX_BTIME)) + attrmask[1] &=3D ~FATTR4_WORD1_TIME_CREATE; + } + attrmask[2] =3D 0; =20 ne->ne_attrs.attrmask.count =3D 2; ne->ne_attrs.attr_vals.data =3D (u8 *)xdr->p; @@ -4308,6 +4316,41 @@ u8 *nfsd4_encode_notify_event(struct xdr_stream *xdr= , struct nfsd_notify_event * return NULL; } =20 +/** + * nfsd4_encode_dir_attr_change + * @xdr: stream to which to encode the fattr4 + * @dp: delegation where the event occurred + * @nf: nfsd_file opened on the directory + * + * Encode a dir attr change event. + */ +u8 *nfsd4_encode_dir_attr_change(struct xdr_stream *xdr, struct nfs4_deleg= ation *dp, + struct nfsd_file *nf) +{ + struct dentry *dentry =3D nf->nf_file->f_path.dentry; + struct notify_attr4 na =3D { }; + struct name_snapshot n; + bool ret; + u8 *p =3D NULL; + + if (!(dp->dl_notify_mask & BIT(NOTIFY4_CHANGE_DIR_ATTRS))) + return NULL; + + take_dentry_name_snapshot(&n, dentry); + ret =3D nfsd4_setup_notify_entry4(&na.na_changed_entry, xdr, + dentry, dp, nf, (char *)n.name.name, + n.name.len); + + /* Don't bother with the event if we're not encoding attrs */ + if (ret && na.na_changed_entry.ne_attrs.attr_vals.len) { + p =3D (u8 *)xdr->p; + if (!xdrgen_encode_notify_attr4(xdr, &na)) + p =3D NULL; + } + release_dentry_name_snapshot(&n); + return p; +} + static void svcxdr_init_encode_from_buffer(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p, int bytes) { diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index d276840aca50..cf7f0df68d63 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h @@ -958,6 +958,8 @@ __be32 nfsd4_encode_fattr_to_buf(__be32 **p, int words, u8 *nfsd4_encode_notify_event(struct xdr_stream *xdr, struct nfsd_notify_e= vent *nne, struct nfs4_delegation *dd, struct nfsd_file *nf, u32 *notify_mask); +u8 *nfsd4_encode_dir_attr_change(struct xdr_stream *xdr, struct nfs4_deleg= ation *dp, + struct nfsd_file *nf); extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *, union nfsd4_op_u *u); extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, --=20 2.53.0