> On Feb 6, 2022, at 11:46 PM, NeilBrown <neilb@xxxxxxx> wrote:
>
> rpc tasks can be marked as RPC_TASK_SWAPPER. This causes GFP_MEMALLOC
> to be used for some allocations. This is needed in some cases, but not
> in all where it is currently provided, and in some where it isn't
> provided.
>
> Currently *all* tasks associated with a rpc_client on which swap is
> enabled get the flag and hence some GFP_MEMALLOC support.
>
> GFP_MEMALLOC is provided for ->buf_alloc() but only swap-writes need it.
> However xdr_alloc_bvec does not get GFP_MEMALLOC - though it often does
> need it.
>
> xdr_alloc_bvec is called while the XPRT_LOCK is held. If this blocks,
> then it blocks all other queued tasks. So this allocation needs
> GFP_MEMALLOC for *all* requests, not just writes, when the xprt is used
> for any swap writes.
>
> Similarly, if the transport is not connected, that will block all
> requests including swap writes, so memory allocations should get
> GFP_MEMALLOC if swap writes are possible.
>
> So with this patch:
> 1/ we ONLY set RPC_TASK_SWAPPER for swap writes.
> 2/ __rpc_execute() sets PF_MEMALLOC while handling any task
> with RPC_TASK_SWAPPER set, or when handling any task that
> holds the XPRT_LOCKED lock on an xprt used for swap.
> This removes the need for the RPC_IS_SWAPPER() test
> in ->buf_alloc handlers.
> 3/ xprt_prepare_transmit() sets PF_MEMALLOC after locking
> any task to a swapper xprt. __rpc_execute() will clear it.
> 3/ PF_MEMALLOC is set for all the connect workers.
>
> Signed-off-by: NeilBrown <neilb@xxxxxxx>
Thanks for including xprtrdma in the patch. Those changes
look consistent with the xprtsock hunks.
Reviewed-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> ---
> fs/nfs/write.c | 2 ++
> net/sunrpc/clnt.c | 2 --
> net/sunrpc/sched.c | 20 +++++++++++++++++---
> net/sunrpc/xprt.c | 3 +++
> net/sunrpc/xprtrdma/transport.c | 6 ++++--
> net/sunrpc/xprtsock.c | 8 ++++++++
> 6 files changed, 34 insertions(+), 7 deletions(-)
>
> diff --git a/fs/nfs/write.c b/fs/nfs/write.c
> index 987a187bd39a..9f7176745fef 100644
> --- a/fs/nfs/write.c
> +++ b/fs/nfs/write.c
> @@ -1409,6 +1409,8 @@ static void nfs_initiate_write(struct nfs_pgio_header *hdr,
> {
> int priority = flush_task_priority(how);
>
> + if (IS_SWAPFILE(hdr->inode))
> + task_setup_data->flags |= RPC_TASK_SWAPPER;
> task_setup_data->priority = priority;
> rpc_ops->write_setup(hdr, msg, &task_setup_data->rpc_client);
> trace_nfs_initiate_write(hdr);
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index d1fb7c0c7685..842366a2fc57 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -1085,8 +1085,6 @@ void rpc_task_set_client(struct rpc_task *task, struct rpc_clnt *clnt)
> task->tk_flags |= RPC_TASK_TIMEOUT;
> if (clnt->cl_noretranstimeo)
> task->tk_flags |= RPC_TASK_NO_RETRANS_TIMEOUT;
> - if (atomic_read(&clnt->cl_swapper))
> - task->tk_flags |= RPC_TASK_SWAPPER;
> /* Add to the client's list of all tasks */
> spin_lock(&clnt->cl_lock);
> list_add_tail(&task->tk_task, &clnt->cl_tasks);
> diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
> index 256302bf6557..9020cedb7c95 100644
> --- a/net/sunrpc/sched.c
> +++ b/net/sunrpc/sched.c
> @@ -869,6 +869,15 @@ void rpc_release_calldata(const struct rpc_call_ops *ops, void *calldata)
> ops->rpc_release(calldata);
> }
>
> +static bool xprt_needs_memalloc(struct rpc_xprt *xprt, struct rpc_task *tk)
> +{
> + if (!xprt)
> + return false;
> + if (!atomic_read(&xprt->swapper))
> + return false;
> + return test_bit(XPRT_LOCKED, &xprt->state) && xprt->snd_task == tk;
> +}
> +
> /*
> * This is the RPC `scheduler' (or rather, the finite state machine).
> */
> @@ -877,6 +886,7 @@ static void __rpc_execute(struct rpc_task *task)
> struct rpc_wait_queue *queue;
> int task_is_async = RPC_IS_ASYNC(task);
> int status = 0;
> + unsigned long pflags = current->flags;
>
> WARN_ON_ONCE(RPC_IS_QUEUED(task));
> if (RPC_IS_QUEUED(task))
> @@ -899,6 +909,10 @@ static void __rpc_execute(struct rpc_task *task)
> }
> if (!do_action)
> break;
> + if (RPC_IS_SWAPPER(task) ||
> + xprt_needs_memalloc(task->tk_xprt, task))
> + current->flags |= PF_MEMALLOC;
> +
> trace_rpc_task_run_action(task, do_action);
> do_action(task);
>
> @@ -936,7 +950,7 @@ static void __rpc_execute(struct rpc_task *task)
> rpc_clear_running(task);
> spin_unlock(&queue->lock);
> if (task_is_async)
> - return;
> + goto out;
>
> /* sync task: sleep here */
> trace_rpc_task_sync_sleep(task, task->tk_action);
> @@ -960,6 +974,8 @@ static void __rpc_execute(struct rpc_task *task)
>
> /* Release all resources associated with the task */
> rpc_release_task(task);
> +out:
> + current_restore_flags(pflags, PF_MEMALLOC);
> }
>
> /*
> @@ -1018,8 +1034,6 @@ int rpc_malloc(struct rpc_task *task)
>
> if (RPC_IS_ASYNC(task))
> gfp = GFP_NOWAIT | __GFP_NOWARN;
> - if (RPC_IS_SWAPPER(task))
> - gfp |= __GFP_MEMALLOC;
>
> size += sizeof(struct rpc_buffer);
> if (size <= RPC_BUFFER_MAXSIZE)
> diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
> index a0a2583fe941..0614e7463d4b 100644
> --- a/net/sunrpc/xprt.c
> +++ b/net/sunrpc/xprt.c
> @@ -1492,6 +1492,9 @@ bool xprt_prepare_transmit(struct rpc_task *task)
> return false;
>
> }
> + if (atomic_read(&xprt->swapper))
> + /* This will be clear in __rpc_execute */
> + current->flags |= PF_MEMALLOC;
> return true;
> }
>
> diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
> index 923e4b512ee9..6b7e10e5a141 100644
> --- a/net/sunrpc/xprtrdma/transport.c
> +++ b/net/sunrpc/xprtrdma/transport.c
> @@ -235,8 +235,11 @@ xprt_rdma_connect_worker(struct work_struct *work)
> struct rpcrdma_xprt *r_xprt = container_of(work, struct rpcrdma_xprt,
> rx_connect_worker.work);
> struct rpc_xprt *xprt = &r_xprt->rx_xprt;
> + unsigned int pflags = current->flags;
> int rc;
>
> + if (atomic_read(&xprt->swapper))
> + current->flags |= PF_MEMALLOC;
> rc = rpcrdma_xprt_connect(r_xprt);
> xprt_clear_connecting(xprt);
> if (!rc) {
> @@ -250,6 +253,7 @@ xprt_rdma_connect_worker(struct work_struct *work)
> rpcrdma_xprt_disconnect(r_xprt);
> xprt_unlock_connect(xprt, r_xprt);
> xprt_wake_pending_tasks(xprt, rc);
> + current_restore_flags(pflags, PF_MEMALLOC);
> }
>
> /**
> @@ -572,8 +576,6 @@ xprt_rdma_allocate(struct rpc_task *task)
> flags = RPCRDMA_DEF_GFP;
> if (RPC_IS_ASYNC(task))
> flags = GFP_NOWAIT | __GFP_NOWARN;
> - if (RPC_IS_SWAPPER(task))
> - flags |= __GFP_MEMALLOC;
>
> if (!rpcrdma_check_regbuf(r_xprt, req->rl_sendbuf, rqst->rq_callsize,
> flags))
> diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> index 69b6ee5a5fd1..c461a0ce9531 100644
> --- a/net/sunrpc/xprtsock.c
> +++ b/net/sunrpc/xprtsock.c
> @@ -2047,7 +2047,10 @@ static void xs_udp_setup_socket(struct work_struct *work)
> struct rpc_xprt *xprt = &transport->xprt;
> struct socket *sock;
> int status = -EIO;
> + unsigned int pflags = current->flags;
>
> + if (atomic_read(&xprt->swapper))
> + current->flags |= PF_MEMALLOC;
> sock = xs_create_sock(xprt, transport,
> xs_addr(xprt)->sa_family, SOCK_DGRAM,
> IPPROTO_UDP, false);
> @@ -2067,6 +2070,7 @@ static void xs_udp_setup_socket(struct work_struct *work)
> xprt_clear_connecting(xprt);
> xprt_unlock_connect(xprt, transport);
> xprt_wake_pending_tasks(xprt, status);
> + current_restore_flags(pflags, PF_MEMALLOC);
> }
>
> /**
> @@ -2226,7 +2230,10 @@ static void xs_tcp_setup_socket(struct work_struct *work)
> struct socket *sock = transport->sock;
> struct rpc_xprt *xprt = &transport->xprt;
> int status;
> + unsigned int pflags = current->flags;
>
> + if (atomic_read(&xprt->swapper))
> + current->flags |= PF_MEMALLOC;
> if (!sock) {
> sock = xs_create_sock(xprt, transport,
> xs_addr(xprt)->sa_family, SOCK_STREAM,
> @@ -2291,6 +2298,7 @@ static void xs_tcp_setup_socket(struct work_struct *work)
> xprt_clear_connecting(xprt);
> out_unlock:
> xprt_unlock_connect(xprt, transport);
> + current_restore_flags(pflags, PF_MEMALLOC);
> }
>
> /**
>
>
--
Chuck Lever
