Skip to content

reexport lock fixes v3

J. Bruce Fields linux-nfs 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest8 patches 18 repliesIn review

Change since v2 from the cover letter

- keep nlmsvc_file_inode a static inline to address build failure identified by the kernel test robot

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8lockd: lockd server-side shouldn't set fl_opsfs/lockd/svclock.c+12 -180 replies
2/8nlm: minor nlm_lookup_file argument changefs/lockd/svc4proc.c fs/lockd/svcproc.c fs/lockd/svcsubs.c +1 more+10 -104 replies
3/8nlm: minor refactoringfs/lockd/svclock.c fs/lockd/svcsubs.c+10 -102 replies
4/8lockd: update nlm_lookup_file reexport commentfs/lockd/svcsubs.c+3 -20 replies
5/8Keep read and write fds with each nlm_filefs/lockd/svc4proc.c fs/lockd/svclock.c fs/lockd/svcproc.c +4 more+114 -438 replies
6/8nfs: don't atempt blocking locks on nfs reexportsfs/nfs/export.c fs/nfsd/nfs4state.c include/linux/exportfs.h+9 -30 replies
7/8lockd: don't attempt blocking locks on nfs reexportsfs/lockd/svclock.c+10 -30 replies
8/8nfs: don't allow reexport reclaimsfs/nfs/file.c fs/nfsd/nfs4state.c fs/nfsd/nfsproc.c +2 more+9 -00 replies

Reviews trailers per patch

None of the 8 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchDaire ByrneAnna Schumaker
SeriesA-b
1/8T-b
2/8
3/8
4/8
5/8
6/8
7/8
8/8

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/8] reexport lock fixes v3

From: "J. Bruce Fields" <[email protected]>

The following fix up some problems that can cause crashes or silently broken lock guarantees in the reexport case.

Note:
- patches 1-5 are server side
- patches 6-7 are client side
- patch 8 affects both

Simplest might be for Trond or Anna to ACK 6-8, if they look OK, and then submit them all through the server. But those three sets of patches are all independent if you'd rather split them up.

Not fixed:
- Attempts to reclaim locks after a reboot of the reexport server will fail. This at least seems like an improvement over the current situation, which is that they'll succeed even in cases where they shouldn't. Complete support for reboot recovery is a bigger job.

- NFSv4.1+ lock nofications don't work. So, clients have to poll as they do with NFSv4.0, which is suboptimal, but correct (and an improvement over the current situation, which is a kernel oops).

So what we have at this point is a suboptimal lock implementation that doesn't support lock recovery.

Another alternative might be to turn off file locking entirely in the re-export case. I'd rather take the incremental improvement and fix the oopses.

Change since v2:
- keep nlmsvc_file_inode a static inline to address build failure identified by the kernel test robot
Changes since v1:
- Use ENOGRACE instead of returning NFS-specific error from vfs lock method.
- Take write opens for write locks in the NLM case (as we always have in the NFSv4 case).
- Don't block NLM threads waiting for blocking locks.

With those changes I'm passing connecthon tests for NFSv3-4.2 reexports of an NFSv4.0 filesystem.

--b.

J. Bruce Fields (8):
lockd: lockd server-side shouldn't set fl_ops
nlm: minor nlm_lookup_file argument change
nlm: minor refactoring
lockd: update nlm_lookup_file reexport comment Keep read and write fds with each nlm_file
nfs: don't atempt blocking locks on nfs reexports
lockd: don't attempt blocking locks on nfs reexports
nfs: don't allow reexport reclaims

 fs/lockd/svc4proc.c         |   6 +-
 fs/lockd/svclock.c          |  80 ++++++++++++++----------
 fs/lockd/svcproc.c          |   6 +-
 fs/lockd/svcsubs.c          | 117 +++++++++++++++++++++++++-----------
 fs/nfs/export.c             |   2 +-
 fs/nfs/file.c               |   3 +
 fs/nfsd/lockd.c             |   8 ++-
 fs/nfsd/nfs4state.c         |  11 +++-
 fs/nfsd/nfsproc.c           |   1 +
 include/linux/errno.h       |   1 +
 include/linux/exportfs.h    |   2 +
 include/linux/fs.h          |   1 +
 include/linux/lockd/bind.h  |   3 +-
 include/linux/lockd/lockd.h |  11 +++-
 14 files changed, 170 insertions(+), 82 deletions(-)
Signature · 1 line
2.31.1