Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04dc199 authored by Ajaykumar Hotchandani's avatar Ajaykumar Hotchandani Committed by Doug Ledford
Browse files

IB/{ipoib, iser}: Consistent print format of vendor error 



Vendor error print should be consistent across protocols to avoid any
confusion.
This patch corrects that.

Suggested-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: default avatarAjaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
Acked-by: default avatarWengang Wang <wen.gang.wang@oracle.com>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Acked-by: default avatarSagi Grimberg <sagi@grimberg.me>
Acked-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e1ac263f

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+5 −5
Original line number Diff line number Diff line
@@ -594,8 +594,8 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) 
	skb = rx_ring[wr_id].skb;



	if (unlikely(wc->status != IB_WC_SUCCESS)) {

		ipoib_dbg(priv, "cm recv error "

			   "(status=%d, wrid=%d vend_err %x)\n",

		ipoib_dbg(priv,

			  "cm recv error (status=%d, wrid=%d vend_err %#x)\n",

			  wc->status, wr_id, wc->vendor_err);

		++dev->stats.rx_dropped;

		if (has_srq)
@@ -829,11 +829,11 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc) 
		if (wc->status == IB_WC_RNR_RETRY_EXC_ERR ||

		    wc->status == IB_WC_RETRY_EXC_ERR)

			ipoib_dbg(priv,

				  "%s: failed cm send event (status=%d, wrid=%d vend_err 0x%x)\n",

				  "%s: failed cm send event (status=%d, wrid=%d vend_err %#x)\n",

				   __func__, wc->status, wr_id, wc->vendor_err);

		else

			ipoib_warn(priv,

				    "%s: failed cm send event (status=%d, wrid=%d vend_err 0x%x)\n",

				    "%s: failed cm send event (status=%d, wrid=%d vend_err %#x)\n",

				   __func__, wc->status, wr_id, wc->vendor_err);



		spin_lock_irqsave(&priv->lock, flags);

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+4 −4
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) 


	if (unlikely(wc->status != IB_WC_SUCCESS)) {

		if (wc->status != IB_WC_WR_FLUSH_ERR)

			ipoib_warn(priv, "failed recv event "

				   "(status=%d, wrid=%d vend_err %x)\n",

			ipoib_warn(priv,

				   "failed recv event (status=%d, wrid=%d vend_err %#x)\n",

				   wc->status, wr_id, wc->vendor_err);

		ipoib_ud_dma_unmap_rx(priv, priv->rx_ring[wr_id].mapping);

		dev_kfree_skb_any(skb);
@@ -414,8 +414,8 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc) 
	if (wc->status != IB_WC_SUCCESS &&

	    wc->status != IB_WC_WR_FLUSH_ERR) {

		struct ipoib_qp_state_validate *qp_work;

		ipoib_warn(priv, "failed send event "

			   "(status=%d, wrid=%d vend_err %x)\n",

		ipoib_warn(priv,

			   "failed send event (status=%d, wrid=%d vend_err %#x)\n",

			   wc->status, wr_id, wc->vendor_err);

		qp_work = kzalloc(sizeof(*qp_work), GFP_ATOMIC);

		if (!qp_work)

drivers/infiniband/ulp/iser/iser_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ void iser_err_comp(struct ib_wc *wc, const char *type) 
	if (wc->status != IB_WC_WR_FLUSH_ERR) {

		struct iser_conn *iser_conn = to_iser_conn(wc->qp->qp_context);



		iser_err("%s failure: %s (%d) vend_err %x\n", type,

		iser_err("%s failure: %s (%d) vend_err %#x\n", type,

			 ib_wc_status_msg(wc->status), wc->status,

			 wc->vendor_err);