> On Mar 15, 2022, at 12:20 PM, trondmy@xxxxxxxxxx wrote: > > From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > > When allocating memory, it should be safe to always use GFP_KERNEL, > since both swap tasks and asynchronous tasks will regulate the > allocation mode through the struct task flags. Is a similar change necessary in xprt_rdma_allocate() ? > Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > --- > net/sunrpc/sched.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c > index 7c8f87ebdbc0..c62fcacf7366 100644 > --- a/net/sunrpc/sched.c > +++ b/net/sunrpc/sched.c > @@ -1030,16 +1030,12 @@ int rpc_malloc(struct rpc_task *task) > struct rpc_rqst *rqst = task->tk_rqstp; > size_t size = rqst->rq_callsize + rqst->rq_rcvsize; > struct rpc_buffer *buf; > - gfp_t gfp = GFP_KERNEL; > - > - if (RPC_IS_ASYNC(task)) > - gfp = GFP_NOWAIT | __GFP_NOWARN; > > size += sizeof(struct rpc_buffer); > if (size <= RPC_BUFFER_MAXSIZE) > - buf = mempool_alloc(rpc_buffer_mempool, gfp); > + buf = mempool_alloc(rpc_buffer_mempool, GFP_KERNEL); > else > - buf = kmalloc(size, gfp); > + buf = kmalloc(size, GFP_KERNEL); > > if (!buf) > return -ENOMEM; > -- > 2.35.1 > -- Chuck Lever
