Skip to contentSkip to conversation

nfsd changes for 5.4

GIT PULL Merged J. Bruce Fields 3 participants 5 messages Sep 27, 2019 – Sep 28, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Please pull nfsd changes from:

git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.4

--b.

----------------------------------------------------------------
Highlights:

- add a new knfsd file cache, so that we don't have to open and close on each (NFSv2/v3) READ or WRITE. This can speed up read and write in some cases. It also replaces our readahead cache.
- Prevent silent data loss on write errors, by treating write errors like server reboots for the purposes of write caching, thus forcing clients to resend their writes.
- Tweak the code that allocates sessions to be more forgiving, so that NFSv4.1 mounts are less likely to hang when a server already has a lot of clients.
- Eliminate an arbitrary limit on NFSv4 ACL sizes; they should now be limited only by the backend filesystem and the maximum RPC size.
- Allow the server to enforce use of the correct kerberos credentials when a client reclaims state after a reboot.

And some miscellaneous smaller bugfixes and cleanup.

----------------------------------------------------------------
Dave Wysochanski (1):
SUNRPC: Track writers of the 'channel' file to improve cache_listeners_exist

 include/linux/sunrpc/cache.h |  6 +++---
 net/sunrpc/cache.c           | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)
#1 lore raw
Quoted 4 lines · J. Bruce Fields

Please pull nfsd changes from:

git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.4

Hmm. I styarted to pull, but then realized that the description doesn't match the content at all.

You say:

Quoted 18 lines

Highlights:

- add a new knfsd file cache, so that we don't have to open and close on each (NFSv2/v3) READ or WRITE. This can speed up read and write in some cases. It also replaces our readahead cache.
- Prevent silent data loss on write errors, by treating write errors like server reboots for the purposes of write caching, thus forcing clients to resend their writes.
- Tweak the code that allocates sessions to be more forgiving, so that NFSv4.1 mounts are less likely to hang when a server already has a lot of clients.
- Eliminate an arbitrary limit on NFSv4 ACL sizes; they should now be limited only by the backend filesystem and the maximum RPC size.
- Allow the server to enforce use of the correct kerberos credentials when a client reclaims state after a reboot.

Quoted 1 line

And some miscellaneous smaller bugfixes and cleanup.

But then the actual code is just one single small commit:

Quoted 2 lines

Dave Wysochanski (1):
SUNRPC: Track writers of the 'channel' file to improve cache_listeners_exist

which doesn't actually match any of the things your description says should be there.

So I undid my pull - either the description is completely wrong, or you tagged the wrong commit.

Please double-check,

Linus

#2 lore raw
Quoted 4 lines · Linus Torvalds

But then the actual code is just one single small commit:

Quoted 2 lines

Dave Wysochanski (1):
SUNRPC: Track writers of the 'channel' file to improve cache_listeners_exist

And that's also all that was in the diffstat in my pull message, but I somehow didn't notice. I must be tired....

Quoted 5 lines

which doesn't actually match any of the things your description says should be there.

So I undid my pull - either the description is completely wrong, or you tagged the wrong commit.

Yes, the latter. I've redone the tag; the pull request should have been for:

git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.4

----------------------------------------------------------------
Highlights:

- add a new knfsd file cache, so that we don't have to open and close on each (NFSv2/v3) READ or WRITE. This can speed up read and write in some cases. It also replaces our readahead cache.
- Prevent silent data loss on write errors, by treating write errors like server reboots for the purposes of write caching, thus forcing clients to resend their writes.
- Tweak the code that allocates sessions to be more forgiving, so that NFSv4.1 mounts are less likely to hang when a server already has a lot of clients.
- Eliminate an arbitrary limit on NFSv4 ACL sizes; they should now be limited only by the backend filesystem and the maximum RPC size.
- Allow the server to enforce use of the correct kerberos credentials when a client reclaims state after a reboot.

And some miscellaneous smaller bugfixes and cleanup.

----------------------------------------------------------------
Chuck Lever (2):
svcrdma: Remove svc_rdma_wq
svcrdma: Use llist for managing cache of recv_ctxts

Colin Ian King (1):
sunrpc: clean up indentation issue

Dave Wysochanski (1):
SUNRPC: Track writers of the 'channel' file to improve cache_listeners_exist

J. Bruce Fields (4):
Merge nfsd bugfixes
nfsd: Remove unnecessary NULL checks Deprecate nfsd fault injection
nfsd: eliminate an unnecessary acl size limit

Jeff Layton (12):
sunrpc: add a new cache_detail operation for when a cache is flushed
locks: create a new notifier chain for lease attempts
nfsd: add a new struct file caching facility to nfsd
nfsd: hook up nfsd_write to the new nfsd_file cache
nfsd: hook up nfsd_read to the nfsd_file cache
nfsd: hook nfsd_commit up to the nfsd_file cache
nfsd: convert nfs4_file->fi_fds array to use nfsd_files
nfsd: convert fi_deleg_file and ls_file fields to nfsd_file
nfsd: hook up nfs4_preprocess_stateid_op to the nfsd_file cache
nfsd: have nfsd_test_lock use the nfsd_file cache
nfsd: rip out the raparms cache
nfsd: close cached files prior to a REMOVE or RENAME that would replace target

NeilBrown (2):
nfsd: handle drc over-allocation gracefully.
nfsd: degraded slot-count more gracefully as allocation nears exhaustion.

Scott Mayhew (2):
nfsd: add a "GetVersion" upcall for nfsdcld
nfsd: add support for upcall version 2

Trond Myklebust (9):
notify: export symbols for use by the knfsd file cache
vfs: Export flush_delayed_fput for use by knfsd.
nfsd: Fix up some unused variable warnings
nfsd: Fix the documentation for svcxdr_tmpalloc()
nfsd: nfsd_file cache entries should be per net namespace
nfsd: Support the server resetting the boot verifier
nfsd: Don't garbage collect files that might contain write errors
nfsd: Reset the boot verifier on all write I/O errors
nfsd: fix nfs read eof detection

YueHaibing (2):
nfsd: remove duplicated include from filecache.c
nfsd: Make nfsd_reset_boot_verifier_locked static

 fs/file_table.c                          |   1 +
 fs/locks.c                               |  62 ++
 fs/nfsd/Kconfig                          |   3 +-
 fs/nfsd/Makefile                         |   3 +-
 fs/nfsd/acl.h                            |   8 -
 fs/nfsd/blocklayout.c                    |   3 +-
 fs/nfsd/export.c                         |  13 +
 fs/nfsd/filecache.c                      | 934 +++++++++++++++++++++++++++++++
 fs/nfsd/filecache.h                      |  61 ++
 fs/nfsd/netns.h                          |   4 +
 fs/nfsd/nfs3proc.c                       |   9 +-
 fs/nfsd/nfs3xdr.c                        |  13 +-
 fs/nfsd/nfs4callback.c                   |  35 +-
 fs/nfsd/nfs4layouts.c                    |  12 +-
 fs/nfsd/nfs4proc.c                       |  97 ++--
 fs/nfsd/nfs4recover.c                    | 388 ++++++++++---
 fs/nfsd/nfs4state.c                      | 239 ++++----
 fs/nfsd/nfs4xdr.c                        |  56 +-
 fs/nfsd/nfsctl.c                         |   1 +
 fs/nfsd/nfsproc.c                        |   4 +-
 fs/nfsd/nfssvc.c                         |  48 +-
 fs/nfsd/state.h                          |  13 +-
 fs/nfsd/trace.h                          | 140 +++++
 fs/nfsd/vfs.c                            | 351 +++++-------
 fs/nfsd/vfs.h                            |  37 +-
 fs/nfsd/xdr3.h                           |   2 +-
 fs/nfsd/xdr4.h                           |  19 +-
 fs/notify/fsnotify.h                     |   2 -
 fs/notify/group.c                        |   2 +
 fs/notify/mark.c                         |   6 +
 include/linux/fs.h                       |   5 +
 include/linux/fsnotify_backend.h         |   2 +
 include/linux/sunrpc/cache.h             |   7 +-
 include/linux/sunrpc/svc_rdma.h          |   6 +-
 include/uapi/linux/nfsd/cld.h            |  41 +-
 net/sunrpc/cache.c                       |  15 +-
 net/sunrpc/svc.c                         |   4 +-
 net/sunrpc/xprtrdma/svc_rdma.c           |   7 -
 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c  |  24 +-
 net/sunrpc/xprtrdma/svc_rdma_transport.c |   6 +-
 40 files changed, 2083 insertions(+), 600 deletions(-)
 create mode 100644 fs/nfsd/filecache.c
 create mode 100644 fs/nfsd/filecache.h
merge bot Merged
#4 lore raw
In reply to J. Bruce Fields
The pull request you sent on Fri, 27 Sep 2019 16:08:38 -0400:

The pull request you sent on Fri, 27 Sep 2019 16:08:38 -0400:

Quoted 1 line

git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.4

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4f375483559c94ec7c58fa3499e28e327d1ef911

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
merge bot Merged
#3 lore raw
In reply to J. Bruce Fields
The pull request you sent on Fri, 27 Sep 2019 19:55:54 -0400:

The pull request you sent on Fri, 27 Sep 2019 19:55:54 -0400:

Quoted 1 line

git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.4

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/298fb76a5583900a155d387efaf37a8b39e5dea2

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker