Skip to contentSkip to conversation

IB/ipoib: correct tx lockup patch

PATCH In review Mike Marciniszyn 3 participants 4 messages Feb 26, 2013 – Mar 18, 2013 2 messages not in the archive InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 IB/ipoib: correct tx lockup patch

Commit f0dc117 ("IPoIB: Fix TX queue lockup with mixed UD/CM traffic") attempts to solve an issue were unprocessed UD send cq completions can deadlock the netdev.

The patch doesn't fully resolve the issue because if more than half the tx_outstanding's were UD and all of the destinations are RC reachable, arming the CQ doesn't solve the issue.

This patch uses the IB_CQ_REPORT_MISSED_EVENTS on the
ib_req_notify_cq(). If the rc is above 0, the UD send cq
completion callback is called directly to re-arm the send completion timer.

This issue is seen in very large parallel filesystem deployments and has been show to correct the issue.

---
 drivers/infiniband/ulp/ipoib/ipoib_cm.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/ulp/ipoib/ipoib_cm.c +6 -2
index 67b0c1d..1ef880d 100644
@@ -758,9 +758,13 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_
 		if (++priv->tx_outstanding == ipoib_sendq_size) {
 			ipoib_dbg(priv, "TX ring 0x%x full, stopping kernel net queue\n",
 				  tx->qp->qp_num);
-			if (ib_req_notify_cq(priv->send_cq, IB_CQ_NEXT_COMP))
-				ipoib_warn(priv, "request notify on send CQ failed\n");
 			netif_stop_queue(dev);
+			rc = ib_req_notify_cq(priv->send_cq,
+				IB_CQ_NEXT_COMP | IB_CQ_REPORT_MISSED_EVENTS);
+			if (rc < 0)
+				ipoib_warn(priv, "request notify on send CQ failed\n");
+			else if (rc)
+				ipoib_send_comp_handler(priv->send_cq, dev);
 		}
 	}
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20130226154627.3775.35111.stgit-K+u1se/DcYrLESAwzcoQNrvm/[email protected]

A message that is not in the archive (sent off-list or not yet received): CAL1RGDUZVybRbrVyFVqRomWXYtGZOAgOT7+GT5Pn-ZDv0k3AYQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org