Hi Linus- The following changes since commit 6ee1d745b7c9fd573fba142a2efdad76a9f1cb04: Linux 5.11-rc5 (2021-01-24 16:47:14 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git/ tags/nfsd-5.12 for you to fetch changes up to 428a23d2bf0ca8fd4d364a464c3e468f0e81671e: nfsd: skip some unnecessary stats in the v4 case (2021-01-30 11:47:21 -0500) ---------------------------------------------------------------- Highlights: - Update NFSv2 and NFSv3 XDR decoding functions - Further improve support for re-exporting NFS mounts - Convert NFSD stats to per-CPU counters - Add batch Receive posting to the server's RPC/RDMA transport ---------------------------------------------------------------- Amir Goldstein (3): nfsd: remove unused stats counters nfsd: protect concurrent access to nfsd stats counters nfsd: report per-export stats Chuck Lever (50): SUNRPC: Make trace_svc_process() display the RPC procedure symbolically SUNRPC: Display RPC procedure names instead of proc numbers SUNRPC: Move definition of XDR_UNIT NFSD: Update GETATTR3args decoder to use struct xdr_stream NFSD: Update ACCESS3arg decoder to use struct xdr_stream NFSD: Update READ3arg decoder to use struct xdr_stream NFSD: Update WRITE3arg decoder to use struct xdr_stream NFSD: Update READLINK3arg decoder to use struct xdr_stream NFSD: Fix returned READDIR offset cookie NFSD: Add helper to set up the pages where the dirlist is encoded NFSD: Update READDIR3args decoders to use struct xdr_stream NFSD: Update COMMIT3arg decoder to use struct xdr_stream NFSD: Update the NFSv3 DIROPargs decoder to use struct xdr_stream NFSD: Update the RENAME3args decoder to use struct xdr_stream NFSD: Update the LINK3args decoder to use struct xdr_stream NFSD: Update the SETATTR3args decoder to use struct xdr_stream NFSD: Update the CREATE3args decoder to use struct xdr_stream NFSD: Update the MKDIR3args decoder to use struct xdr_stream NFSD: Update the SYMLINK3args decoder to use struct xdr_stream NFSD: Update the MKNOD3args decoder to use struct xdr_stream NFSD: Update the NFSv2 GETATTR argument decoder to use struct xdr_stream NFSD: Update the NFSv2 READ argument decoder to use struct xdr_stream NFSD: Update the NFSv2 WRITE argument decoder to use struct xdr_stream NFSD: Update the NFSv2 READLINK argument decoder to use struct xdr_stream NFSD: Add helper to set up the pages where the dirlist is encoded NFSD: Update the NFSv2 READDIR argument decoder to use struct xdr_stream NFSD: Update NFSv2 diropargs decoding to use struct xdr_stream NFSD: Update the NFSv2 RENAME argument decoder to use struct xdr_stream NFSD: Update the NFSv2 LINK argument decoder to use struct xdr_stream NFSD: Update the NFSv2 SETATTR argument decoder to use struct xdr_stream NFSD: Update the NFSv2 CREATE argument decoder to use struct xdr_stream NFSD: Update the NFSv2 SYMLINK argument decoder to use struct xdr_stream NFSD: Remove argument length checking in nfsd_dispatch() NFSD: Update the NFSv2 GETACL argument decoder to use struct xdr_stream NFSD: Add an xdr_stream-based decoder for NFSv2/3 ACLs NFSD: Update the NFSv2 SETACL argument decoder to use struct xdr_stream NFSD: Update the NFSv2 ACL GETATTR argument decoder to use struct xdr_stream NFSD: Update the NFSv2 ACL ACCESS argument decoder to use struct xdr_stream NFSD: Clean up after updating NFSv2 ACL decoders NFSD: Update the NFSv3 GETACL argument decoder to use struct xdr_stream NFSD: Update the NFSv2 SETACL argument decoder to use struct xdr_stream NFSD: Clean up after updating NFSv3 ACL decoders svcrdma: Refactor svc_rdma_init() and svc_rdma_clean_up() svcrdma: Convert rdma_stat_recv to a per-CPU counter svcrdma: Convert rdma_stat_sq_starve to a per-CPU counter svcrdma: Restore read and write stats svcrdma: Deprecate stat variables that are no longer used svcrdma: Reduce Receive doorbell rate svcrdma: DMA-sync the receive buffer in svc_rdma_recvfrom() SUNRPC: Correct a comment Dai Ngo (1): NFSv4_2: SSC helper should use its own config. J. Bruce Fields (11): nfsd4: simplify process_lookup1 nfsd: simplify process_lock nfsd: simplify nfsd_renew nfsd: rename lookup_clientid->set_client nfsd: refactor set_client nfsd: find_cpntf_state cleanup nfsd: remove unused set_client argument nfsd: simplify nfsd4_check_open_reclaim nfsd: cstate->session->se_client -> cstate->clp nfs: use change attribute for NFS re-exports nfsd: skip some unnecessary stats in the v4 case fs/Kconfig | 4 + fs/lockd/svc4proc.c | 24 ++++ fs/lockd/svcproc.c | 24 ++++ fs/nfs/callback_xdr.c | 2 + fs/nfs/export.c | 18 +++ fs/nfs/nfs4file.c | 4 + fs/nfs/super.c | 12 ++ fs/nfs_common/Makefile | 2 +- fs/nfs_common/nfs_ssc.c | 2 - fs/nfs_common/nfsacl.c | 52 +++++++++ fs/nfsd/Kconfig | 1 + fs/nfsd/export.c | 68 +++++++++-- fs/nfsd/export.h | 15 +++ fs/nfsd/netns.h | 23 ++-- fs/nfsd/nfs2acl.c | 67 +++++------ fs/nfsd/nfs3acl.c | 45 ++++---- fs/nfsd/nfs3proc.c | 93 ++++++++++++---- fs/nfsd/nfs3xdr.c | 588 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- fs/nfsd/nfs4proc.c | 12 +- fs/nfsd/nfs4state.c | 124 +++++++++------------ fs/nfsd/nfscache.c | 52 ++++++--- fs/nfsd/nfsctl.c | 8 +- fs/nfsd/nfsd.h | 2 +- fs/nfsd/nfsfh.c | 4 +- fs/nfsd/nfsfh.h | 5 +- fs/nfsd/nfsproc.c | 92 +++++++++------ fs/nfsd/nfssvc.c | 34 ------ fs/nfsd/nfsxdr.c | 348 ++++++++++++++++++++++++++------------------------------- fs/nfsd/state.h | 3 +- fs/nfsd/stats.c | 118 +++++++++++++------- fs/nfsd/stats.h | 98 ++++++++++++---- fs/nfsd/vfs.c | 4 +- fs/nfsd/xdr.h | 12 +- fs/nfsd/xdr3.h | 20 +--- include/linux/exportfs.h | 1 + include/linux/nfsacl.h | 3 + include/linux/sunrpc/msg_prot.h | 3 - include/linux/sunrpc/svc.h | 1 + include/linux/sunrpc/svc_rdma.h | 15 +-- include/linux/sunrpc/xdr.h | 13 ++- include/trace/events/sunrpc.h | 15 ++- include/uapi/linux/nfs3.h | 6 + net/sunrpc/svc.c | 2 +- net/sunrpc/xprtrdma/svc_rdma.c | 196 ++++++++++++++++++++------------ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 91 +++++++-------- net/sunrpc/xprtrdma/svc_rdma_rw.c | 3 + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 +- 47 files changed, 1386 insertions(+), 945 deletions(-) -- Chuck Lever
