Skip to contentSkip to conversation

nfsd changes for 5.8

GIT PULL Merged J. Bruce Fields 3 participants 6 messages Jun 11, 2020 – Jun 20, 2020

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

Please pull nfsd changes for 5.8 from:

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

Highlights:

- Keep nfsd clients from unnecessarily breaking their own delegations:
Note this requires a small kthreadd addition, discussed at:
https://lore.kernel.org/r/[email protected]
The result is Tejun Heo's suggestion, and he was OK with this going through my tree.
- Patch nfsd/clients/ to display filenames, and to fix byte-order when displaying stateid's.
- fix a module loading/unloading bug, from Neil Brown.
- A big series from Chuck Lever with RPC/RDMA and tracing improvements, and lay some groundwork for RPC-over-TLS.

Note Stephen Rothwell spotted two conflicts in linux-next. Both should be straightforward:

	include/trace/events/sunrpc.h
		https://lore.kernel.org/r/[email protected]
	net/sunrpc/svcsock.c
		https://lore.kernel.org/r/[email protected]

----------------------------------------------------------------
Achilles Gaikwad (1):
nfsd4: add filename to states output

Chen Zhou (1):
sunrpc: use kmemdup_nul() in gssp_stringify()

Chuck Lever (32):
SUNRPC: Move xpt_mutex into socket xpo_sendto methods
svcrdma: Clean up the tracing for rw_ctx_init errors
svcrdma: Clean up handling of get_rw_ctx errors
svcrdma: Trace page overruns when constructing RDMA Reads
svcrdma: trace undersized Write chunks
svcrdma: Fix backchannel return code
svcrdma: Remove backchannel dprintk call sites
svcrdma: Rename tracepoints that record header decoding errors
svcrdma: Remove the SVCRDMA_DEBUG macro
svcrdma: Displayed remote IP address should match stored address
svcrdma: Add tracepoints to report ->xpo_accept failures
SUNRPC: Remove kernel memory address from svc_xprt tracepoints
SUNRPC: Tracepoint to record errors in svc_xpo_create()
SUNRPC: Trace a few more generic svc_xprt events
SUNRPC: Remove "#include <trace/events/skb.h>"
SUNRPC: Add more svcsock tracepoints
SUNRPC: Replace dprintk call sites in TCP state change callouts
SUNRPC: Trace server-side rpcbind registration events
SUNRPC: Rename svc_sock::sk_reclen
SUNRPC: Restructure svc_tcp_recv_record()
SUNRPC: Replace dprintk() call sites in TCP receive path
SUNRPC: Refactor recvfrom path dealing with incomplete TCP receives
SUNRPC: Clean up svc_release_skb() functions
SUNRPC: Refactor svc_recvfrom()
SUNRPC: Restructure svc_udp_recvfrom()
SUNRPC: svc_show_status() macro should have enum definitions
NFSD: Add tracepoints to NFSD's duplicate reply cache
NFSD: Add tracepoints to the NFSD state management code
NFSD: Add tracepoints for monitoring NFSD callbacks
SUNRPC: Clean up request deferral tracepoints
NFSD: Squash an annoying compiler warning
NFSD: Fix improperly-formatted Doxygen comments

J. Bruce Fields (8):
nfsd4: common stateid-printing code
nfsd4: stid display should preserve on-the-wire byte order
nfsd: handle repeated BIND_CONN_TO_SESSION
kthread: save thread function
nfsd: clients don't need to break their own delegations
Merge branch 'nfsd-5.8' of git://linux-nfs.org/~cel/cel-2.6 into for-5.8-incoming
nfsd4: make drc_slab global, not per-net
nfsd: safer handling of corrupted c_type

Ma Feng (1):
nfsd: Fix old-style function definition

NeilBrown (3):
sunrpc: check that domain table is empty at module unload.
sunrpc: svcauth_gss_register_pseudoflavor must reject duplicate registrations.
sunrpc: clean up properly in gss_mech_unregister()

Xiongfeng Wang (1):
sunrpc: add missing newline when printing parameter 'pool_mode' by sysfs

Xiyu Yang (2):
nfsd: Fix svc_xprt refcnt leak when setup callback client failed
SUNRPC: Remove unreachable error condition in rpcb_getport_async()

YueHaibing (1):
sunrpc: Remove unused function ip_map_update

 Documentation/filesystems/locking.rst      |   2 +
 fs/locks.c                                 |   3 +
 fs/nfsd/cache.h                            |   2 +
 fs/nfsd/netns.h                            |   1 -
 fs/nfsd/nfs4callback.c                     |  39 +--
 fs/nfsd/nfs4proc.c                         |   9 +-
 fs/nfsd/nfs4state.c                        | 166 ++++++++----
 fs/nfsd/nfscache.c                         |  89 +++---
 fs/nfsd/nfsctl.c                           |  32 ++-
 fs/nfsd/nfsd.h                             |   2 +
 fs/nfsd/nfssvc.c                           |   6 +
 fs/nfsd/state.h                            |   7 -
 fs/nfsd/trace.h                            | 345 ++++++++++++++++++++++++
 include/linux/fs.h                         |   1 +
 include/linux/kthread.h                    |   1 +
 include/linux/sunrpc/gss_api.h             |   1 +
 include/linux/sunrpc/svc.h                 |   2 +
 include/linux/sunrpc/svc_rdma.h            |   6 +-
 include/linux/sunrpc/svc_xprt.h            |   6 +
 include/linux/sunrpc/svcauth_gss.h         |   3 +-
 include/linux/sunrpc/svcsock.h             |   6 +-
 include/trace/events/rpcrdma.h             | 142 ++++++++--
 include/trace/events/sunrpc.h              | 419 +++++++++++++++++++++++++++--
 kernel/kthread.c                           |  17 ++
 net/sunrpc/auth_gss/gss_mech_switch.c      |  12 +-
 net/sunrpc/auth_gss/gss_rpc_upcall.c       |   2 +-
 net/sunrpc/auth_gss/svcauth_gss.c          |  18 +-
 net/sunrpc/rpcb_clnt.c                     |   6 -
 net/sunrpc/sunrpc.h                        |   1 +
 net/sunrpc/sunrpc_syms.c                   |   2 +
 net/sunrpc/svc.c                           |  29 +-
 net/sunrpc/svc_xprt.c                      |  53 ++--
 net/sunrpc/svcauth.c                       |  25 ++
 net/sunrpc/svcauth_unix.c                  |   9 -
 net/sunrpc/svcsock.c                       | 407 ++++++++++++++--------------
 net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 121 +++------
 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c    |  21 +-
 net/sunrpc/xprtrdma/svc_rdma_rw.c          |  92 ++++---
 net/sunrpc/xprtrdma/svc_rdma_sendto.c      |  10 +-
 net/sunrpc/xprtrdma/svc_rdma_transport.c   |  55 ++--
 net/sunrpc/xprtsock.c                      |  12 +-
 41 files changed, 1527 insertions(+), 655 deletions(-)
#1 lore raw
Quoted 2 lines · J. Bruce Fields

Please pull nfsd changes for 5.8 from:

I'm not entirely sure why, but gmail hates you and marked this as spam.

I (obviously) caught it despite that, but thought I'd mention it. I assume it's lack of DKIM for fieldses.org.

Or maybe you run some side MLM business peddling essential oils that I'm not aware of but google dislikes? You do you.

Linus

#2 lore raw
Quoted 4 lines · Linus Torvalds

I'm not entirely sure why, but gmail hates you and marked this as spam.

I (obviously) caught it despite that, but thought I'd mention it. I assume it's lack of DKIM for fieldses.org.

Twenty years ago running my own mail service sounded like a fun idea.

Nowadays it's just this thing that means that, every now and then, I have to drop everything and go learn about some random bit of annoying tech, just so I can get on with my work or talk to my friends. Then I'll promptly forget it, until years later it breaks, and I have to go relearn it all from scratch.

Anyway, googling DKIM....

Quoted 2 lines

Or maybe you run some side MLM business peddling essential oils that I'm not aware of but google dislikes? You do you.

Hey, as long as they think I'm a spammer anyway, maybe I should just go with it.

--b.

merge bot Merged
#5 lore raw
In reply to J. Bruce Fields
The pull request you sent on Thu, 11 Jun 2020 11:57:43 -0400:

The pull request you sent on Thu, 11 Jun 2020 11:57:43 -0400:

Quoted 1 line

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

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

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
#3 lore raw
In reply to J. Bruce Fields
Quoted 8 lines · J. Bruce Fields
Quoted 4 lines · Linus Torvalds

I'm not entirely sure why, but gmail hates you and marked this as spam.

I (obviously) caught it despite that, but thought I'd mention it. I assume it's lack of DKIM for fieldses.org.

Twenty years ago running my own mail service sounded like a fun idea.

Quoted 7 lines

Nowadays it's just this thing that means that, every now and then, I have to drop everything and go learn about some random bit of annoying tech, just so I can get on with my work or talk to my friends. Then I'll promptly forget it, until years later it breaks, and I have to go relearn it all from scratch.

Anyway, googling DKIM....

By the way, I think the real problem might have been Spamhaus SBLCSS listing my Linode server's IPv6 address. I followed the suggestion at:

	https://www.spamhaus.org/faq/section/Spamhaus%20CSS#426

and requested a new /64 from Linode, added an IP from the new /64 to my main interface, and updated AAAA and reverse DNS records.

I also set up DKIM (mainly following instructions from README.fedora in the opendkim package). Reading up a little more suggested DMARC is a bad idea for my case.

Anyway, hopefully things are better now.

--b.

#4 lore raw
Quoted 2 lines · J. Bruce Fields

Anyway, hopefully things are better now.

This email certainly looked fine. You had

    DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; ...

with the proper headers ("From" shows up twice in your DKIM signature list, and maybe you could add the message-id to the DKIM-protected headers, but whatever), and google clearly liked the end result too:

       dkim=pass [email protected] header.s=default header.b=z+wyI4pO;

(and you already had the SPF records previously, and that continues to pass too).

So from what I can tell, you're now doing everything you can to look like a good modern non-spam email sender, and hopefully together with having the Linode addresses cleared from Spamhaus there would be no reason for gmail to ever hate you again.

In fact, you look better than most people. DKIM still isn't as common as it perhaps should be.

Knock wood.

Linus