Commit b1302625 authored by Chuck Lever's avatar Chuck Lever Committed by Zefan Li

xprtrdma: Free the pd if ib_query_qp() fails

commit 5ae711a2 upstream.

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: bd7ed1d1 ("RPC/RDMA: check selected memory registration ...")
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
[lizf: Backported to 3.4: only two goto statements need to be changed]
Signed-off-by: default avatarZefan Li <lizefan@huawei.com>
parent 16d67beb
...@@ -485,7 +485,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) ...@@ -485,7 +485,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
if (rc) { if (rc) {
dprintk("RPC: %s: ib_query_device failed %d\n", dprintk("RPC: %s: ib_query_device failed %d\n",
__func__, rc); __func__, rc);
goto out2; goto out3;
} }
if (devattr.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY) { if (devattr.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY) {
...@@ -587,7 +587,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) ...@@ -587,7 +587,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
printk(KERN_ERR "%s: invalid memory registration mode %d\n", printk(KERN_ERR "%s: invalid memory registration mode %d\n",
__func__, memreg); __func__, memreg);
rc = -EINVAL; rc = -EINVAL;
goto out2; goto out3;
} }
dprintk("RPC: %s: memory registration strategy is %d\n", dprintk("RPC: %s: memory registration strategy is %d\n",
__func__, memreg); __func__, memreg);
...@@ -596,6 +596,10 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) ...@@ -596,6 +596,10 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
ia->ri_memreg_strategy = memreg; ia->ri_memreg_strategy = memreg;
return 0; return 0;
out3:
ib_dealloc_pd(ia->ri_pd);
ia->ri_pd = NULL;
out2: out2:
rdma_destroy_id(ia->ri_id); rdma_destroy_id(ia->ri_id);
ia->ri_id = NULL; ia->ri_id = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment