ipoib: supress the retry related completion errors

IPoIB doesn't support transport/rnr retry schemes as per
RFC so those errors are expected. No need to flood the
log files with them.

It was tempting make it as upstream(debug mode only) but
since we have this erros in Oracle IB stack for while,
leaving rest of them to be logged.

Orabug: 24663803, 22347191

Tested-by: Michael Nowak <michael.nowak@oracle.com>
Tested-by: Rafael Alejandro Peralez <rafael.peralez@oracle.com>
Tested-by: Liwen Huang <liwen.huang@oracle.com>
Tested-by: Hong Liu <hong.x.liu@oracle.com>
Reviewed-by: Mukesh Kacker <mukesh.kacker@oracle.com>
Reported-by: Rajiv Raja <rajiv.raja@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 1888f2c07830382d6e63910762136fcec1d1fe96..7cecea9c1a5a596128b2897d6db66ca72227c85c 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -918,13 +918,16 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
            wc->status != IB_WC_WR_FLUSH_ERR) {
                struct ipoib_neigh *neigh;
 
-               /*IB_WC_RNR_RETRY_EXC_ERR error is part of the life cycle, so don't make waves.*/
-               if (IB_WC_RNR_RETRY_EXC_ERR != wc->status)
-                       ipoib_warn(priv, "%s: failed cm send event "
+               /* IB_WC[_RNR]_RETRY_EXC_ERR error is part of the life cycle,
+                * so don't make waves.
+                */
+               if (IB_WC_RNR_RETRY_EXC_ERR == wc->status ||
+                   IB_WC_RETRY_EXC_ERR == wc->status)
+                       ipoib_dbg(priv, "%s: failed cm send event "
                                   "(status=%d, wrid=%d vend_err 0x%x)\n",
                                   __func__, wc->status, wr_id, wc->vendor_err);
                else
-                       ipoib_dbg(priv, "%s: failed cm send event "
+                       ipoib_warn(priv, "%s: failed cm send event "
                                   "(status=%d, wrid=%d vend_err 0x%x)\n",
                                   __func__, wc->status, wr_id, wc->vendor_err);