| Date | Tue, 15 Feb 2011 16:12:52 -0800 | From | Greg KH <> | Subject | [115/272] RDMA/cxgb4: Dont re-init wait object in init/fini paths |
| |
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
From: Steve Wise <swise@opengridcomputing.com>
commit db8b10167126d72829653690f57b9c7ca53c4d54 upstream.
Re-initializing the wait object in rdma_init()/rdma_fini() causes a timing window which can lead to a deadlock during close. Once this deadlock hits, all RDMA activity over the T4 device will be stuck.
There's no need to re-init the wait object, so remove it.
Signed-off-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Roland Dreier <rolandd@cisco.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/infiniband/hw/cxgb4/qp.c | 2 -- 1 file changed, 2 deletions(-)
--- a/drivers/infiniband/hw/cxgb4/qp.c +++ b/drivers/infiniband/hw/cxgb4/qp.c @@ -1029,7 +1029,6 @@ static int rdma_fini(struct c4iw_dev *rh wqe->cookie = (unsigned long) &ep->com.wr_wait; wqe->u.fini.type = FW_RI_TYPE_FINI; - c4iw_init_wr_wait(&ep->com.wr_wait); ret = c4iw_ofld_send(&rhp->rdev, skb); if (ret) goto out; @@ -1125,7 +1124,6 @@ static int rdma_init(struct c4iw_dev *rh if (qhp->attr.mpa_attr.initiator) build_rtr_msg(qhp->attr.mpa_attr.p2p_type, &wqe->u.init); - c4iw_init_wr_wait(&qhp->ep->com.wr_wait); ret = c4iw_ofld_send(&rhp->rdev, skb); if (ret) goto out;
|