p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: bd7ed1d133 ("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>
This commit is contained in:
Chuck Lever 2015-01-21 11:03:19 -05:00 committed by Anna Schumaker
parent afadc468eb
commit 5ae711a246
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/sunrpc/xprtrdma/verbs.c
View File

@ -614,7 +614,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) {
@ -672,14 +672,14 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
"phys register failed with %lX\n", "phys register failed with %lX\n",
__func__, PTR_ERR(ia->ri_bind_mem)); __func__, PTR_ERR(ia->ri_bind_mem));
rc = -ENOMEM; rc = -ENOMEM;
goto out2; goto out3;
} }
break; break;
default: default:
printk(KERN_ERR "RPC: Unsupported memory " printk(KERN_ERR "RPC: Unsupported memory "
"registration mode: %d\n", memreg); "registration mode: %d\n", memreg);
rc = -ENOMEM; rc = -ENOMEM;
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);
@ -689,6 +689,10 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
rwlock_init(&ia->ri_qplock); rwlock_init(&ia->ri_qplock);
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;