xprtrdma: Free the pd if ib_query_qp() fails

If ib_query_qp() fails or the memory registration mode isn't
supported, don't leak the PD. An orphaned IB/core resource will
cause IB module removal to hang.

Fixes: bd7ed1d13304 ("RPC/RDMA: check selected memory registration ...")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index c61bb61c4d13..aa012a393448 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -614,7 +614,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
         if (rc) {
                 dprintk("RPC:       %s: ib_query_device failed %d\n",
                         __func__, rc);
-                goto out2;
+                goto out3;
         }
 
         if (devattr.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY) {
@@ -672,14 +672,14 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
                                 "phys register failed with %lX\n",
                                 __func__, PTR_ERR(ia->ri_bind_mem));
                         rc = -ENOMEM;
-                        goto out2;
+                        goto out3;
                 }
                 break;
         default:
                 printk(KERN_ERR "RPC: Unsupported memory "
                                 "registration mode: %d\n", memreg);
                 rc = -ENOMEM;
-                goto out2;
+                goto out3;
         }
         dprintk("RPC:       %s: memory registration strategy is %d\n",
                 __func__, memreg);
@@ -689,6 +689,10 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
 
         rwlock_init(&ia->ri_qplock);
         return 0;
+
+out3:
+        ib_dealloc_pd(ia->ri_pd);
+        ia->ri_pd = NULL;
 out2:
         rdma_destroy_id(ia->ri_id);
         ia->ri_id = NULL;