Pull nfsd updates from Chuck Lever: - CB_NOTIFY support for NFSD's NFSv4.1 directory delegations The server used to recall a delegation as soon as the directory changed. NFSD now watches delegated directories through fsnotify and reports adds, removes, renames, and directory attribute changes, carrying the filehandle and attributes of the affected entry, so clients can keep their caches. Some of the NOTIFY4 flags come from RFC 8881bis (Jeff Layton) - Continued netlink work A new server-stats-get operation reports what /proc/net/rpc/nfsd publishes, plus NFSv4 callback counts, and SUNRPC now keeps its per-procedure call counts per network namespace, so a container sees its own numbers. nfsstat reads all of this over netlink, with a procfs fallback for older kernels (Jeff Layton) - Remove SUNRPC service thread pool mode selection Per node is the right choice on any host we run today, so the auto, global, and percpu modes have been removed. A single-node host still gets one pool. A multi-NUMA host now gets a pool per node. sunrpc.pool_mode accepts the old names but no longer selects anything. - Bug fixes, clean-ups, and small optimizations: - async COPY offload rework (Jeff Layton) - more use-after-free fixes in the NFSv4 state revocation paths - percpu counter contention removed from the reply cache and IO accounting - a long list of hardening fixes (Chris Mason) Sincere thanks to all contributors, reviewers, testers, and bug reporters who participated in the v7.3 NFSD development cycle. * tag 'nfsd-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (182 commits) nfsd: export NFSv4 callback op stats via netlink nfsd: count NFSv4 callback operations per netns sunrpc: remove unused svc_version vs_count field nfsd: implement server-stats-get netlink handler sunrpc: use per-net counts in svc_seq_show() sunrpc: add per-netns per-procedure call counts to svc_stat NFSD: Document reply_cache_stats ABI NFSD: Eliminate percpu counter contention in IO byte accounting NFSD: Eliminate percpu counter contention in reply cache statistics NFSD: Eliminate percpu counter contention in DRC memory accounting NFSD: Fix off-by-one in DRC bucket pruning limit NFSD: Relocate NFSv4 "supported attributes" to new header NFSD: Relocate nfsd4_set_netaddr() NFSD: Relocate nfsd_user_namespace() NFSD: Move struct readdir_cd NFSD: Move the export.h include from nfsd.h to auth.c NFSD: Remove '#include "nfsd.h"' from fs/nfsd/cache.h NFSD: include "netns.h" NFSD: Explicitly include "stats.h" NFSD: Make "stats.h" self-contained ...
Showing the changes to include/uapi/linux (2 of 117 files). Show all
Unified · Split
| @@ -17,11 +17,9 @@ · 16 unmodified lines | |||
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | 18 | ||
| 19 | #define NFS4_BITMAP_SIZE 3 | 19 | #define NFS4_BITMAP_SIZE 3 |
| 20 | #define NFS4_VERIFIER_SIZE 8 | ||
| 21 | #define NFS4_STATEID_SEQID_SIZE 4 | 20 | #define NFS4_STATEID_SEQID_SIZE 4 |
| 22 | #define NFS4_STATEID_OTHER_SIZE 12 | 21 | #define NFS4_STATEID_OTHER_SIZE 12 |
| 23 | #define NFS4_STATEID_SIZE (NFS4_STATEID_SEQID_SIZE + NFS4_STATEID_OTHER_SIZE) | 22 | #define NFS4_STATEID_SIZE (NFS4_STATEID_SEQID_SIZE + NFS4_STATEID_OTHER_SIZE) |
| 24 | #define NFS4_FHSIZE 128 | ||
| 25 | #define NFS4_MAXPATHLEN PATH_MAX | 23 | #define NFS4_MAXPATHLEN PATH_MAX |
| 26 | #define NFS4_MAXNAMLEN NAME_MAX | 24 | #define NFS4_MAXNAMLEN NAME_MAX |
| 27 | #define NFS4_OPAQUE_LIMIT 1024 | 25 | #define NFS4_OPAQUE_LIMIT 1024 |
| @@ -225,6 +225,41 @@ enum { · 224 unmodified lines | |||
| 225 | NFSD_A_UNLOCK_EXPORT_MAX = (__NFSD_A_UNLOCK_EXPORT_MAX - 1) | 225 | NFSD_A_UNLOCK_EXPORT_MAX = (__NFSD_A_UNLOCK_EXPORT_MAX - 1) |
| 226 | }; | 226 | }; |
| 227 | 227 | ||
| 228 | enum { | ||
| 229 | NFSD_A_SERVER_PROC_ENTRY_OP = 1, | ||
| 230 | NFSD_A_SERVER_PROC_ENTRY_COUNT, | ||
| 231 | NFSD_A_SERVER_PROC_ENTRY_PAD, | ||
| 232 | |||
| 233 | __NFSD_A_SERVER_PROC_ENTRY_MAX, | ||
| 234 | NFSD_A_SERVER_PROC_ENTRY_MAX = (__NFSD_A_SERVER_PROC_ENTRY_MAX - 1) | ||
| 235 | }; | ||
| 236 | |||
| 237 | enum { | ||
| 238 | NFSD_A_SERVER_STATS_RC_HITS = 1, | ||
| 239 | NFSD_A_SERVER_STATS_RC_MISSES, | ||
| 240 | NFSD_A_SERVER_STATS_RC_NOCACHE, | ||
| 241 | NFSD_A_SERVER_STATS_PAD, | ||
| 242 | NFSD_A_SERVER_STATS_FH_STALE, | ||
| 243 | NFSD_A_SERVER_STATS_IO_READ, | ||
| 244 | NFSD_A_SERVER_STATS_IO_WRITE, | ||
| 245 | NFSD_A_SERVER_STATS_NETCNT, | ||
| 246 | NFSD_A_SERVER_STATS_NETUDPCNT, | ||
| 247 | NFSD_A_SERVER_STATS_NETTCPCNT, | ||
| 248 | NFSD_A_SERVER_STATS_NETTCPCONN, | ||
| 249 | NFSD_A_SERVER_STATS_RPCCNT, | ||
| 250 | NFSD_A_SERVER_STATS_RPCBADFMT, | ||
| 251 | NFSD_A_SERVER_STATS_RPCBADAUTH, | ||
| 252 | NFSD_A_SERVER_STATS_RPCBADCLNT, | ||
| 253 | NFSD_A_SERVER_STATS_PROC2_OPS, | ||
| 254 | NFSD_A_SERVER_STATS_PROC3_OPS, | ||
| 255 | NFSD_A_SERVER_STATS_PROC4_OPS, | ||
| 256 | NFSD_A_SERVER_STATS_PROC4OPS_OPS, | ||
| 257 | NFSD_A_SERVER_STATS_PROC4CB_OPS, | ||
| 258 | |||
| 259 | __NFSD_A_SERVER_STATS_MAX, | ||
| 260 | NFSD_A_SERVER_STATS_MAX = (__NFSD_A_SERVER_STATS_MAX - 1) | ||
| 261 | }; | ||
| 262 | |||
| 228 | enum { | 263 | enum { |
| 229 | NFSD_CMD_RPC_STATUS_GET = 1, | 264 | NFSD_CMD_RPC_STATUS_GET = 1, |
| 230 | NFSD_CMD_THREADS_SET, | 265 | NFSD_CMD_THREADS_SET, |
| @@ -244,6 +279,7 @@ enum { · 13 unmodified lines | |||
| 244 | NFSD_CMD_UNLOCK_IP, | 279 | NFSD_CMD_UNLOCK_IP, |
| 245 | NFSD_CMD_UNLOCK_FILESYSTEM, | 280 | NFSD_CMD_UNLOCK_FILESYSTEM, |
| 246 | NFSD_CMD_UNLOCK_EXPORT, | 281 | NFSD_CMD_UNLOCK_EXPORT, |
| 282 | NFSD_CMD_SERVER_STATS_GET, | ||
| 247 | 283 | ||
| 248 | __NFSD_CMD_MAX, | 284 | __NFSD_CMD_MAX, |
| 249 | NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1) | 285 | NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1) |