This is a note to let you know that I've just added the patch titled

    RDMA/cxgb4: Don't re-init wait object in init/fini paths

to the 2.6.37-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     rdma-cxgb4-don-t-re-init-wait-object-in-init-fini-paths.patch
and it can be found in the queue-2.6.37 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From db8b10167126d72829653690f57b9c7ca53c4d54 Mon Sep 17 00:00:00 2001
From: Steve Wise <[email protected]>
Date: Mon, 10 Jan 2011 17:41:43 -0800
Subject: RDMA/cxgb4: Don't re-init wait object in init/fini paths

From: Steve Wise <[email protected]>

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 <[email protected]>
Signed-off-by: Roland Dreier <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 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;


Patches currently in stable-queue which might be from 
[email protected] are

queue-2.6.37/rdma-cxgb4-don-t-re-init-wait-object-in-init-fini-paths.patch
queue-2.6.37/rdma-cxgb4-limit-maxburst-eq-context-field-to-256b.patch
queue-2.6.37/rdma-cxgb4-set-the-correct-device-physical-function-for-iwarp-connections.patch

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to