SUNRPC: Set memalloc_nofs_save() on all rpciod/xprtiod jobs

Set memalloc_nofs_save() on all the rpciod/xprtiod jobs so that we
ensure memory allocations for asynchronous rpc calls don't ever end
up recursing back to the NFS layer for memory reclaim.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 7754aa3e434f..f5d7dcd9e8d9 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -50,6 +50,7 @@
 #include <linux/bvec.h>
 #include <linux/highmem.h>
 #include <linux/uio.h>
+#include <linux/sched/mm.h>
 
 #include <trace/events/sunrpc.h>
 
@@ -680,7 +681,10 @@ static void xs_stream_data_receive_workfn(struct work_struct *work)
 {
         struct sock_xprt *transport =
                 container_of(work, struct sock_xprt, recv_worker);
+        unsigned int pflags = memalloc_nofs_save();
+
         xs_stream_data_receive(transport);
+        memalloc_nofs_restore(pflags);
 }
 
 static void
@@ -1378,7 +1382,10 @@ static void xs_udp_data_receive_workfn(struct work_struct *work)
 {
         struct sock_xprt *transport =
                 container_of(work, struct sock_xprt, recv_worker);
+        unsigned int pflags = memalloc_nofs_save();
+
         xs_udp_data_receive(transport);
+        memalloc_nofs_restore(pflags);
 }
 
 /**
@@ -1869,7 +1876,6 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
                 sk->sk_write_space = xs_udp_write_space;
                 sock_set_flag(sk, SOCK_FASYNC);
                 sk->sk_error_report = xs_error_report;
-                sk->sk_allocation = GFP_NOIO;
 
                 xprt_clear_connected(xprt);
 
@@ -2057,7 +2063,6 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
                 sk->sk_data_ready = xs_data_ready;
                 sk->sk_write_space = xs_udp_write_space;
                 sock_set_flag(sk, SOCK_FASYNC);
-                sk->sk_allocation = GFP_NOIO;
 
                 xprt_set_connected(xprt);
 
@@ -2220,7 +2225,6 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
                 sk->sk_write_space = xs_tcp_write_space;
                 sock_set_flag(sk, SOCK_FASYNC);
                 sk->sk_error_report = xs_error_report;
-                sk->sk_allocation = GFP_NOIO;
 
                 /* socket options */
                 sock_reset_flag(sk, SOCK_LINGER);