Merge tag 'nfsd-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

3dc7c001 · Linus Torvalds <[email protected]> · 2026-06-18 09:14:15 -07:00

Pull nfsd updates from Chuck Lever:
 "Jeff Layton wired up netlink upcalls for the auth.unix.ip and
  auth.unix.gid caches in SunRPC and the svc_export and nfsd.fh caches
  in NFSD. The new kernel-user API is more extensible and lays the
  groundwork for retiring the old pipe interface.

  The default NFS r/w block size rises to 4MB on hosts with at least
  16GB of RAM, reducing per-RPC overhead on fast networks. Smaller
  machines keep their previously computed default, and the value remains
  tunable through /proc/fs/nfsd/max_block_size.

  Chuck Lever converted the server's RPCSEC GSS Kerberos code to the
  kernel's shared crypto/krb5 library. The conversion retires and
  removes SunRPC's bespoke implementation of Kerberos v5, but keeps
  RPCSEC GSS-API.

  Continuing the xdrgen migration that converted the NLMv4 server XDR
  layer in v7.1, Chuck Lever converted the NLM version 3 server-side XDR
  layer from hand-written C to xdrgen-generated code. As with the NLMv4
  conversion in v7.1, the goals are improved memory safety, lower
  maintenance burden, and groundwork for generation of Rust code for
  this layer instead of C.

  Chuck Lever fixed an issue where lingering NFSv4 state pins a mounted
  file system after it is unexported. A new netlink-based mechanism can
  now release NLM locks and NFSv4 state by client address, by
  filesystem, and by export. Now an administrator can quiesce an export
  cleanly before unmounting it.

  The remaining patches are bug fixes, clean-ups, and minor
  optimizations, including a batch of memory-leak and use-after-free
  fixes in the ACL, lockd, and TLS handshake paths, many of them
  reported by Chris Mason. Sincere thanks to all contributors,
  reviewers, testers, and bug reporters who participated in the v7.2
  NFSD development cycle"

* tag 'nfsd-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (106 commits)
  svcrdma: wake sq waiters when the transport closes
  nfsd: reset write verifier on deferred writeback errors
  nfsd: avoid leaking pre-allocated openowner on unconfirmed retry race
  sunrpc: wait for in-flight TLS handshake callback when cancel loses race
  sunrpc: pin svc_xprt across the asynchronous TLS handshake callback
  nfsd: fix posix_acl leak on SETACL decode failure
  nfsd: fix posix_acl leak and ignored error in nfsd4_create_file
  nfsd: check get_user() return when reading princhashlen
  nfsd: fix inverted cp_ttl check in async copy reaper
  nfsd: fix dead ACL conflict guard in nfsd4_create
  NFSD: Fix SECINFO_NO_NAME decode error cleanup
  sunrpc: harden rq_procinfo lifecycle to prevent double-free
  SUNRPC: Return an error from xdr_buf_to_bvec() on overflow
  SUNRPC: Bound-check xdr_buf_to_bvec() stores before writing
  nfsd: release layout stid on setlease failure
  lockd: Avoid hashing uninitialized bytes in nlm4svc_lookup_file()
  lockd: Plug nlm_file refcount leak on cached nlm_do_fopen() failure
  lockd: Plug nlm_file leak when nlm_do_fopen() fails
  Revert "NFSD: Defer sub-object cleanup in export put callbacks"
  Revert "svcrdma: Use contiguous pages for RDMA Read sink buffers"
  ...

Commit: 3dc7c001169d112b3e514cacff6c93091c57af9a
Parents: 6edc2007 · e5248a74

Merge commit. Changes below are compared with the first parent: 6edc2007.

Changes

79 files changed · +6146 −5776

File	Status	Add	Del	Content
.mailmap	modified	+3	−3	View file
Documentation/netlink/specs/nfsd.yaml	modified	+290	−0	View file
Documentation/netlink/specs/sunrpc_cache.yaml	added	+149	−0	View file
Documentation/sunrpc/xdr/nlm3.x	added	+168	−0	View file
MAINTAINERS	modified	+4	−4	View file
fs/lockd/Makefile	modified	+15	−4	View file
fs/lockd/clnt4xdr.c	modified	+21	−21	View file
fs/lockd/clntlock.c	modified	+1	−1	View file
fs/lockd/clntproc.c	modified	+7	−7	View file
fs/lockd/clntxdr.c	modified	+22	−22	View file
fs/lockd/host.c	modified	+2	−2	View file
fs/lockd/lockd.h	modified	+48	−17	View file
fs/lockd/mon.c	modified	+1	−1	View file
fs/lockd/nlm3xdr_gen.c	added	+714	−0	View file
fs/lockd/nlm3xdr_gen.h	added	+32	−0	View file
fs/lockd/share.h	modified	+2	−2	View file
fs/lockd/svc4proc.c	modified	+38	−34	View file
fs/lockd/svclock.c	modified	+19	−19	View file
fs/lockd/svcproc.c	modified	+1168	−558	View file
fs/lockd/svcshare.c	modified	+4	−4	View file
fs/lockd/svcsubs.c	modified	+5	−4	View file
fs/lockd/svcxdr.h	deleted	+0	−142	View before deletion
fs/lockd/trace.h	modified	+8	−8	View file
fs/lockd/xdr.c	deleted	+0	−354	View before deletion
fs/lockd/xdr.h	modified	+9	−30	View file
fs/nfs/dns_resolve.c	modified	+1	−1	View file
fs/nfsd/export.c	modified	+717	−60	View file
fs/nfsd/export.h	modified	+2	−5	View file
fs/nfsd/filecache.c	modified	+46	−0	View file
fs/nfsd/filecache.h	modified	+1	−0	View file
fs/nfsd/netlink.c	modified	+129	−0	View file
fs/nfsd/netlink.h	modified	+21	−0	View file
fs/nfsd/nfs2acl.c	modified	+12	−5	View file
fs/nfsd/nfs3acl.c	modified	+12	−5	View file
fs/nfsd/nfs4idmap.c	modified	+2	−2	View file
fs/nfsd/nfs4layouts.c	modified	+7	−7	View file
fs/nfsd/nfs4proc.c	modified	+11	−8	View file
fs/nfsd/nfs4recover.c	modified	+2	−1	View file
fs/nfsd/nfs4state.c	modified	+193	−74	View file
fs/nfsd/nfs4xdr.c	modified	+2	−1	View file
fs/nfsd/nfsctl.c	modified	+205	−8	View file
fs/nfsd/nfsd.h	modified	+3	−19	View file
fs/nfsd/state.h	modified	+6	−0	View file
fs/nfsd/trace.h	modified	+26	−6	View file
fs/nfsd/vfs.c	modified	+10	−2	View file
include/linux/sunrpc/cache.h	modified	+13	−2	View file
include/linux/sunrpc/gss_krb5.h	modified	+0	−105	View file
include/linux/sunrpc/svc_rdma.h	modified	+4	−3	View file
include/linux/sunrpc/xdr.h	modified	+17	−3	View file
include/linux/sunrpc/xdrgen/nlm3.h	added	+210	−0	View file
include/uapi/linux/nfsd_netlink.h	modified	+156	−0	View file
include/uapi/linux/sunrpc_netlink.h	added	+84	−0	View file
net/sunrpc/.kunitconfig	deleted	+0	−29	View before deletion
net/sunrpc/Kconfig	modified	+1	−55	View file
net/sunrpc/Makefile	modified	+1	−1	View file
net/sunrpc/auth_gss/Makefile	modified	+1	−3	View file
net/sunrpc/auth_gss/gss_krb5_crypto.c	modified	+180	−814	View file
net/sunrpc/auth_gss/gss_krb5_internal.h	modified	+19	−142	View file
net/sunrpc/auth_gss/gss_krb5_keys.c	deleted	+0	−546	View before deletion
net/sunrpc/auth_gss/gss_krb5_mech.c	modified	+85	−348	View file
net/sunrpc/auth_gss/gss_krb5_seal.c	modified	+33	−14	View file
net/sunrpc/auth_gss/gss_krb5_test.c	deleted	+0	−1868	View before deletion
net/sunrpc/auth_gss/gss_krb5_unseal.c	modified	+23	−13	View file
net/sunrpc/auth_gss/gss_krb5_wrap.c	modified	+6	−7	View file
net/sunrpc/auth_gss/svcauth_gss.c	modified	+1	−1	View file
net/sunrpc/cache.c	modified	+117	−10	View file
net/sunrpc/netlink.c	added	+97	−0	View file
net/sunrpc/netlink.h	added	+35	−0	View file
net/sunrpc/sunrpc_syms.c	modified	+10	−0	View file
net/sunrpc/svc.c	modified	+10	−0	View file
net/sunrpc/svc_xprt.c	modified	+40	−6	View file
net/sunrpc/svcauth_unix.c	modified	+514	−2	View file
net/sunrpc/svcsock.c	modified	+22	−2	View file
net/sunrpc/xdr.c	modified	+213	−76	View file
net/sunrpc/xprtrdma/svc_rdma.c	modified	+1	−17	View file
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	modified	+11	−2	View file
net/sunrpc/xprtrdma/svc_rdma_rw.c	modified	+4	−236	View file
net/sunrpc/xprtrdma/svc_rdma_sendto.c	modified	+70	−27	View file
net/sunrpc/xprtrdma/svc_rdma_transport.c	modified	+30	−3	View file

Only the first 600 diff lines are shown. Download the complete patch.

.mailmap

View file

diff --git a/.mailmap b/.mailmap
index 34b9b51..33b0339 100644
--- a/.mailmap
+++ b/.mailmap
@@ -202,9 +202,9 @@ Christophe Ricard <[email protected]>
 Christopher Obbard <[email protected]> <[email protected]>
 Christoph Hellwig <[email protected]>
 Christoph Manszewski <[email protected]> <[email protected]>
-Chuck Lever <[email protected]> <[email protected]>
-Chuck Lever <[email protected]> <[email protected]>
-Chuck Lever <[email protected]> <[email protected]>
+Chuck Lever <[email protected]> <[email protected]>
+Chuck Lever <[email protected]> <[email protected]>
+Chuck Lever <[email protected]> <[email protected]>
 Claudiu Beznea <[email protected]> <[email protected]>
 Colin Ian King <[email protected]> <[email protected]>
 Corey Minyard <[email protected]>

Documentation/netlink/specs/nfsd.yaml

View file

diff --git a/Documentation/netlink/specs/nfsd.yaml b/Documentation/netlink/specs/nfsd.yaml
index 8ab43c8..8f36fad 100644
--- a/Documentation/netlink/specs/nfsd.yaml
+++ b/Documentation/netlink/specs/nfsd.yaml
@@ -6,8 +6,52 @@ uapi-header: linux/nfsd_netlink.h
 
 doc: NFSD configuration over generic netlink.
 
+definitions:
+  -
+    type: flags
+    name: cache-type
+    entries: [svc_export, expkey]
+  -
+    type: flags
+    name: export-flags
+    doc: These flags are ordered to match the NFSEXP_* flags in include/linux/nfsd/export.h
+    entries:
+      - readonly
+      - insecure-port
+      - rootsquash
+      - allsquash
+      - async
+      - gathered-writes
+      - noreaddirplus
+      - security-label
+      - sign-fh
+      - nohide
+      - nosubtreecheck
+      - noauthnlm
+      - msnfs
+      - fsid
+      - crossmount
+      - noacl
+      - v4root
+      - pnfs
+  -
+    type: flags
+    name: xprtsec-mode
+    doc: These flags are ordered to match the NFSEXP_XPRTSEC_* flags in include/linux/nfsd/export.h
+    entries:
+      - none
+      - tls
+      - mtls
+
 attribute-sets:
   -
+    name: cache-notify
+    attributes:
+      -
+        name: cache-type
+        type: u32
+        enum: cache-type
+  -
     name: rpc-status
     attributes:
       -
@@ -132,6 +176,160 @@ attribute-sets:
       -
         name: npools
         type: u32
+  -
+    name: fslocation
+    attributes:
+      -
+        name: host
+        type: string
+      -
+        name: path
+        type: string
+  -
+    name: fslocations
+    attributes:
+      -
+        name: location
+        type: nest
+        nested-attributes: fslocation
+        multi-attr: true
+  -
+    name: auth-flavor
+    attributes:
+      -
+        name: pseudoflavor
+        type: u32
+      -
+        name: flags
+        type: u32
+        enum: export-flags
+        enum-as-flags: true
+  -
+    name: svc-export
+    attributes:
+      -
+        name: seqno
+        type: u64
+      -
+        name: client
+        type: string
+      -
+        name: path
+        type: string
+      -
+        name: negative
+        type: flag
+      -
+        name: expiry
+        type: u64
+      -
+        name: anon-uid
+        type: u32
+      -
+        name: anon-gid
+        type: u32
+      -
+        name: fslocations
+        type: nest
+        nested-attributes: fslocations
+      -
+        name: uuid
+        type: binary
+      -
+        name: secinfo
+        type: nest
+        nested-attributes: auth-flavor
+        multi-attr: true
+      -
+        name: xprtsec
+        type: u32
+        enum: xprtsec-mode
+        multi-attr: true
+      -
+        name: flags
+        type: u32
+        enum: export-flags
+        enum-as-flags: true
+      -
+        name: fsid
+        type: s32
+  -
+    name: svc-export-reqs
+    attributes:
+      -
+        name: requests
+        type: nest
+        nested-attributes: svc-export
+        multi-attr: true
+  -
+    name: expkey
+    attributes:
+      -
+        name: seqno
+        type: u64
+      -
+        name: client
+        type: string
+      -
+        name: fsidtype
+        type: u8
+      -
+        name: fsid
+        type: binary
+      -
+        name: negative
+        type: flag
+      -
+        name: expiry
+        type: u64
+      -
+        name: path
+        type: string
+  -
+    name: expkey-reqs
+    attributes:
+      -
+        name: requests
+        type: nest
+        nested-attributes: expkey
+        multi-attr: true
+  -
+    name: cache-flush
+    attributes:
+      -
+        name: mask
+        type: u32
+        enum: cache-type
+        enum-as-flags: true
+  -
+    name: unlock-ip
+    attributes:
+      -
+        name: address
+        type: binary
+        doc: struct sockaddr_in or struct sockaddr_in6.
+        checks:
+          min-len: 16
+  -
+    name: unlock-filesystem
+    attributes:
+      -
+        name: path
+        type: string
+        doc: Filesystem path whose state should be released.
+  -
+    name: unlock-export
+    attributes:
+      -
+        name: path
+        type: string
+        doc: >-
+          Export path whose NFSv4 state should be revoked.
+          All state (opens, locks, delegations, layouts) acquired
+          through any export of this path is revoked, regardless
+          of which client holds the state. Intended for use after
+          all clients have been unexported from a given path,
+          enabling the underlying filesystem to be unmounted.
 
 operations:
   list:
@@ -233,3 +431,95 @@ operations:
           attributes:
             - mode
             - npools
+    -
+      name: cache-notify
+      doc: Notification that there are cache requests that need servicing
+      attribute-set: cache-notify
+      mcgrp: exportd
+      event:
+        attributes:
+          - cache-type
+    -
+      name: svc-export-get-reqs
+      doc: Dump all pending svc_export requests
+      attribute-set: svc-export-reqs
+      flags: [admin-perm]
+      dump:
+          reply:
+            attributes:
+              - requests
+    -
+      name: svc-export-set-reqs
+      doc: Respond to one or more svc_export requests
+      attribute-set: svc-export-reqs
+      flags: [admin-perm]
+      do:
+          request:
+            attributes:
+              - requests
+    -
+      name: expkey-get-reqs
+      doc: Dump all pending expkey requests
+      attribute-set: expkey-reqs
+      flags: [admin-perm]
+      dump:
+          reply:
+            attributes:
+              - requests
+    -
+      name: expkey-set-reqs
+      doc: Respond to one or more expkey requests
+      attribute-set: expkey-reqs
+      flags: [admin-perm]
+      do:
+          request:
+            attributes:
+              - requests
+    -
+      name: cache-flush
+      doc: Flush nfsd caches (svc_export and/or expkey)
+      attribute-set: cache-flush
+      flags: [admin-perm]
+      do:
+        request:
+          attributes:
+            - mask
+    -
+      name: unlock-ip
+      doc: release NLM locks held by an IP address
+      attribute-set: unlock-ip
+      flags: [admin-perm]
+      do:
+        request:
+          attributes:
+            - address
+    -
+      name: unlock-filesystem
+      doc: revoke NFS state under a filesystem path
+      attribute-set: unlock-filesystem
+      flags: [admin-perm]
+      do:
+        request:
+          attributes:
+            - path
+    -
+      name: unlock-export
+      doc: >-
+        Revoke NFSv4 state acquired through exports of a given path.
+        Unlike unlock-filesystem, which operates at superblock granularity,
+        this command targets only state associated with a specific export
+        path. Userspace (exportfs -u) sends this after removing the last
+        client for a path so the underlying filesystem can be unmounted.
+      attribute-set: unlock-export
+      flags: [admin-perm]
+      do:
+        request:
+          attributes:
+            - path
+
+mcast-groups:
+  list:
+    -
+      name: none
+    -
+      name: exportd

Documentation/netlink/specs/sunrpc_cache.yaml

View file

diff --git a/Documentation/netlink/specs/sunrpc_cache.yaml b/Documentation/netlink/specs/sunrpc_cache.yaml
new file mode 100644
index 0000000..f22ff22
--- /dev/null
+++ b/Documentation/netlink/specs/sunrpc_cache.yaml
@@ -0,0 +1,149 @@
+# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
+---
+name: sunrpc
+protocol: genetlink
+uapi-header: linux/sunrpc_netlink.h
+
+doc: SUNRPC cache upcall support over generic netlink.
+
+definitions:
+  -
+    type: flags
+    name: cache-type
+    entries: [ip_map, unix_gid]
+
+attribute-sets:
+  -
+    name: cache-notify
+    attributes:
+      -
+        name: cache-type
+        type: u32
+        enum: cache-type
+  -
+    name: ip-map
+    attributes:
+      -
+        name: seqno
+        type: u64
+      -
+        name: class
+        type: string
+      -
+        name: addr
+        type: string
+      -
+        name: domain
+        type: string
+      -
+        name: negative
+        type: flag
+      -
+        name: expiry
+        type: u64
+  -
+    name: ip-map-reqs
+    attributes:
+      -
+        name: requests
+        type: nest
+        nested-attributes: ip-map
+        multi-attr: true
+  -
+    name: unix-gid
+    attributes:
+      -
+        name: seqno
+        type: u64
+      -
+        name: uid
+        type: u32
+      -
+        name: gids
+        type: u32
+        multi-attr: true
+      -
+        name: negative
+        type: flag
+      -
+        name: expiry
+        type: u64
+  -
+    name: unix-gid-reqs
+    attributes:
+      -
+        name: requests
+        type: nest
+        nested-attributes: unix-gid
+        multi-attr: true
+  -
+    name: cache-flush
+    attributes:
+      -
+        name: mask
+        type: u32
+        enum: cache-type
+        enum-as-flags: true
+
+operations:
+  list:
+    -
+      name: cache-notify
+      doc: Notification that there are cache requests that need servicing
+      attribute-set: cache-notify
+      mcgrp: exportd
+      event:
+        attributes:
+          - cache-type
+    -
+      name: ip-map-get-reqs
+      doc: Dump all pending ip_map requests
+      attribute-set: ip-map-reqs
+      flags: [admin-perm]
+      dump:
+          reply:
+            attributes:
+              - requests
+    -
+      name: ip-map-set-reqs
+      doc: Respond to one or more ip_map requests
+      attribute-set: ip-map-reqs
+      flags: [admin-perm]
+      do:
+          request:
+            attributes:
+              - requests
+    -
+      name: unix-gid-get-reqs
+      doc: Dump all pending unix_gid requests
+      attribute-set: unix-gid-reqs
+      flags: [admin-perm]
+      dump:
+          reply:
+            attributes:
+              - requests
+    -
+      name: unix-gid-set-reqs
+      doc: Respond to one or more unix_gid requests
+      attribute-set: unix-gid-reqs
+      flags: [admin-perm]
+      do:
+          request:
+            attributes:
+              - requests
+    -
+      name: cache-flush
+      doc: Flush sunrpc caches (ip_map and/or unix_gid)
+      attribute-set: cache-flush
+      flags: [admin-perm]
+      do:
+        request:
+          attributes:
+            - mask
+
+mcast-groups:
+  list:
+    -
+      name: none
+    -
+      name: exportd

Documentation/sunrpc/xdr/nlm3.x

View file

diff --git a/Documentation/sunrpc/xdr/nlm3.x b/Documentation/sunrpc/xdr/nlm3.x
new file mode 100644
index 0000000..b2e704f
--- /dev/null
+++ b/Documentation/sunrpc/xdr/nlm3.x
@@ -0,0 +1,168 @@
+/*
+ * This file was extracted by hand from
+ * https://pubs.opengroup.org/onlinepubs/9629799/chap10.htm#tagcjh_11_03
+ */
+
+/*
+ * The NLMv3 protocol
+ */
+
+pragma header nlm3;
+
+const LM_MAXSTRLEN = 1024;
+
+const LM_MAXNAMELEN = 1025;
+
+const MAXNETOBJ_SZ = 1024;
+
+typedef opaque netobj<MAXNETOBJ_SZ>;
+
+enum nlm_stats {
+	LCK_GRANTED = 0,
+	LCK_DENIED = 1,
+	LCK_DENIED_NOLOCKS = 2,
+	LCK_BLOCKED = 3,
+	LCK_DENIED_GRACE_PERIOD = 4
+};
+
+pragma big_endian nlm_stats;
+
+struct nlm_stat {
+	nlm_stats	stat;
+};
+
+struct nlm_res {
+	netobj		cookie;
+	nlm_stat	stat;
+};
+
+struct nlm_holder {
+	bool		exclusive;
+	int		uppid;
+	netobj		oh;
+	unsigned int	l_offset;
+	unsigned int	l_len;
+};
+
+union nlm_testrply switch (nlm_stats stat) {
+	case LCK_DENIED:
+		nlm_holder	holder;
+	default:
+		void;
+};
+
+struct nlm_testres {
+	netobj		cookie;
+	nlm_testrply	test_stat;
+};
+
+struct nlm_lock {
+	string		caller_name<LM_MAXSTRLEN>;
+	netobj		fh;
+	netobj		oh;
+	int		uppid;
+	unsigned int	l_offset;
+	unsigned int	l_len;
+};
+
+struct nlm_lockargs {
+	netobj		cookie;
+	bool		block;
+	bool		exclusive;
+	nlm_lock	alock;
+	bool		reclaim;
+	int		state;
+};
+
+struct nlm_cancargs {
+	netobj		cookie;
+	bool		block;
+	bool		exclusive;
+	nlm_lock	alock;
+};
+
+struct nlm_testargs {
+	netobj		cookie;
+	bool		exclusive;
+	nlm_lock	alock;
+};
+
+struct nlm_unlockargs {
+	netobj		cookie;
+	nlm_lock	alock;
+};
+
+enum fsh_mode {
+	fsm_DN = 0,
+	fsm_DR = 1,
+	fsm_DW = 2,
+	fsm_DRW = 3
+};
+
+enum fsh_access {
+	fsa_NONE = 0,
+	fsa_R = 1,
+	fsa_W = 2,
+	fsa_RW = 3
+};
+