xprtrdma: Memory allocation should be allowed to fail during connect

An attempt to establish a connection can always fail and then be
retried. GFP_KERNEL allocation is not necessary here.

Like MR allocation, establishing a connection is always done in a
worker thread. The new GFP flags align with the flags that would
be returned by rpc_task_gfp_mask() in this case.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 4a7b87e..7ca58cb 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -372,7 +372,7 @@ static int rpcrdma_ep_create(struct rpcrdma_xprt *r_xprt)
        struct rpcrdma_ep *ep;
        int rc;
 
-       ep = kzalloc(sizeof(*ep), GFP_KERNEL);
+       ep = kzalloc(sizeof(*ep), XPRTRDMA_GFP_FLAGS);
        if (!ep)
                return -ENOTCONN;
        ep->re_xprt = &r_xprt->rx_xprt;
@@ -605,7 +605,7 @@ static struct rpcrdma_sendctx *rpcrdma_sendctx_create(struct rpcrdma_ep *ep)
        struct rpcrdma_sendctx *sc;
 
        sc = kzalloc(struct_size(sc, sc_sges, ep->re_attr.cap.max_send_sge),
-                    GFP_KERNEL);
+                    XPRTRDMA_GFP_FLAGS);
        if (!sc)
                return NULL;
 
@@ -628,7 +628,7 @@ static int rpcrdma_sendctxs_create(struct rpcrdma_xprt *r_xprt)
         * Sends are posted.
         */
        i = r_xprt->rx_ep->re_max_requests + RPCRDMA_MAX_BC_REQUESTS;
-       buf->rb_sc_ctxs = kcalloc(i, sizeof(sc), GFP_KERNEL);
+       buf->rb_sc_ctxs = kcalloc(i, sizeof(sc), XPRTRDMA_GFP_FLAGS);
        if (!buf->rb_sc_ctxs)
                return -ENOMEM;