History

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

Pull nfsd updates from Chuck Lever: - filehandle signing to defend against filehandle-guessing attacks (Benjamin Coddington) The server now appends a SipHash-2-4 MAC to each filehandle when the new "sign_fh" export option is enabled. NFSD then verifies filehandles received from clients against the expected MAC; mismatches return NFS error STALE - convert the entire NLMv4 server-side XDR layer from hand-written C to xdrgen-generated code, spanning roughly thirty patches (Chuck Lever) XDR functions are generally boilerplate code and are easy to get wrong. The goals of this conversion are improved memory safety, lower maintenance burden, and groundwork for eventual Rust code generation for these functions. - improve pNFS block/SCSI layout robustness with two related changes (Dai Ngo) SCSI persistent reservation fencing is now tracked per client and per device via an xarray, to avoid both redundant preempt operations on devices already fenced and a potential NFSD deadlock when all nfsd threads are waiting for a layout return. - scalability and infrastructure improvements Sincere thanks to all contributors, reviewers, testers, and bug reporters who participated in the v7.1 NFSD development cycle. * tag 'nfsd-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (83 commits) NFSD: Docs: clean up pnfs server timeout docs nfsd: fix comment typo in nfsxdr nfsd: fix comment typo in nfs3xdr NFSD: convert callback RPC program to per-net namespace NFSD: use per-operation statidx for callback procedures svcrdma: Use contiguous pages for RDMA Read sink buffers SUNRPC: Add svc_rqst_page_release() helper SUNRPC: xdr.h: fix all kernel-doc warnings svcrdma: Factor out WR chain linking into helper svcrdma: Add Write chunk WRs to the RPC's Send WR chain svcrdma: Clean up use of rdma->sc_pd->device svcrdma: Clean up use of rdma->sc_pd->device in Receive paths svcrdma: Add fair queuing for Send Queue access SUNRPC: Optimize rq_respages allocation in svc_alloc_arg SUNRPC: Track consumed rq_pages entries svcrdma: preserve rq_next_page in svc_rdma_save_io_pages SUNRPC: Handle NULL entries in svc_rqst_release_pages SUNRPC: Allocate a separate Reply page array SUNRPC: Tighten bounds checking in svc_rqst_replace_page NFSD: Sign filehandles ...

Linus Torvalds committed 6 months ago

Commit 36d179f2 parents c1f49de d644a6978 files · +4421 −1724Browse files

Showing the changes to include/uapi/linux (2 of 78 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/nfsd/export.h +2 −2
  2. include/uapi/linux/nfsd_netlink.h +1 −0
include/uapi/linux/nfsd/export.h+2−2
@@ -34,7 +34,7 @@ · 33 unmodified lines
34#define NFSEXP_GATHERED_WRITES 0x002034#define NFSEXP_GATHERED_WRITES 0x0020
35#define NFSEXP_NOREADDIRPLUS 0x004035#define NFSEXP_NOREADDIRPLUS 0x0040
36#define NFSEXP_SECURITY_LABEL 0x008036#define NFSEXP_SECURITY_LABEL 0x0080
37/* 0x100 currently unused */37#define NFSEXP_SIGN_FH 0x0100
38#define NFSEXP_NOHIDE 0x020038#define NFSEXP_NOHIDE 0x0200
39#define NFSEXP_NOSUBTREECHECK 0x040039#define NFSEXP_NOSUBTREECHECK 0x0400
40#define NFSEXP_NOAUTHNLM 0x0800 /* Don't authenticate NLM requests - just trust */40#define NFSEXP_NOAUTHNLM 0x0800 /* Don't authenticate NLM requests - just trust */
@@ -55,7 +55,7 @@ · 14 unmodified lines
55#define NFSEXP_PNFS 0x2000055#define NFSEXP_PNFS 0x20000
56 56
57/* All flags that we claim to support. (Note we don't support NOACL.) */57/* All flags that we claim to support. (Note we don't support NOACL.) */
58#define NFSEXP_ALLFLAGS 0x3FEFF58#define NFSEXP_ALLFLAGS 0x3FFFF
59 59
60/* The flags that may vary depending on security flavor: */60/* The flags that may vary depending on security flavor: */
61#define NFSEXP_SECINFO_FLAGS (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \61#define NFSEXP_SECINFO_FLAGS (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
include/uapi/linux/nfsd_netlink.h+1−0
@@ -36,6 +36,7 @@ enum { · 35 unmodified lines
36 NFSD_A_SERVER_LEASETIME,36 NFSD_A_SERVER_LEASETIME,
37 NFSD_A_SERVER_SCOPE,37 NFSD_A_SERVER_SCOPE,
38 NFSD_A_SERVER_MIN_THREADS,38 NFSD_A_SERVER_MIN_THREADS,
39 NFSD_A_SERVER_FH_KEY,
39 40
40 __NFSD_A_SERVER_MAX,41 __NFSD_A_SERVER_MAX,
41 NFSD_A_SERVER_MAX = (__NFSD_A_SERVER_MAX - 1)42 NFSD_A_SERVER_MAX = (__NFSD_A_SERVER_MAX - 1)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t