From 26014e4ef4d97a8c9c977e949b2d19d220387c77 Mon Sep 17 00:00:00 2001 From: Ajaykumar Hotchandani Date: Tue, 10 May 2016 15:43:48 -0700 Subject: [PATCH] OFED: indicate consistent vendor error vendor error print should be consistent across protocols to avoid any confusion. Currently, it's decimal at some places and hex at some places. This patch corrects that. Orabug: 22381117 Suggested-by: Santosh Shilimkar Signed-off-by: Ajaykumar Hotchandani Reviewed-by: Santosh Shilimkar Acked-by: Wengang Wang --- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 6 +++--- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 4 ++-- drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- drivers/infiniband/ulp/isert/ib_isert.c | 2 +- drivers/infiniband/ulp/sdp/sdp_rx.c | 2 +- drivers/infiniband/ulp/xsigo/xve/xve_cm.c | 4 ++-- drivers/infiniband/ulp/xsigo/xve/xve_ib.c | 4 ++-- net/rds/ib_recv.c | 2 +- net/rds/ib_send.c | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index e59d4ce87dda..d4341b8b247d 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -633,7 +633,7 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) if (unlikely(wc->status != IB_WC_SUCCESS)) { ipoib_dbg(priv, "cm recv error " - "(status=%d, wrid=%d vend_err %x)\n", + "(status=%d, wrid=%d vend_err 0x%x)\n", wc->status, wr_id, wc->vendor_err); ++dev->stats.rx_dropped; if (has_srq) @@ -913,11 +913,11 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc) /*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 " - "(status=%d, wrid=%d vend_err %x)\n", + "(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 " - "(status=%d, wrid=%d vend_err %x)\n", + "(status=%d, wrid=%d vend_err 0x%x)\n", __func__, wc->status, wr_id, wc->vendor_err); spin_lock_irqsave(&priv->lock, flags); diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index 8f28dbda80db..1da39f666107 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -195,7 +195,7 @@ 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", + "(status=%d, wrid=%d vend_err 0x%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); @@ -405,7 +405,7 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc) 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", + "(status=%d, wrid=%d vend_err 0x%x)\n", wc->status, wr_id, wc->vendor_err); qp_work = kzalloc(sizeof(*qp_work), GFP_ATOMIC); if (!qp_work) { diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c index 762ae4e9ced1..aedb8b1226f4 100644 --- a/drivers/infiniband/ulp/iser/iser_verbs.c +++ b/drivers/infiniband/ulp/iser/iser_verbs.c @@ -1174,7 +1174,7 @@ static void iser_handle_wc(struct ib_wc *wc) } } else { if (wc->status != IB_WC_WR_FLUSH_ERR) - iser_err("wr id %llx status %d vend_err %x\n", + iser_err("wr id %llx status %d vend_err 0x%x\n", wc->wr_id, wc->status, wc->vendor_err); else iser_dbg("flush error: wr id %llx\n", wc->wr_id); diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index 575a072d765f..9fc2ffbccfa2 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c @@ -2108,7 +2108,7 @@ isert_handle_wc(struct ib_wc *wc) } } else { if (wc->status != IB_WC_WR_FLUSH_ERR) - isert_err("wr id %llx status %d vend_err %x\n", + isert_err("wr id %llx status %d vend_err 0x%x\n", wc->wr_id, wc->status, wc->vendor_err); else isert_dbg("flush error: wr id %llx\n", wc->wr_id); diff --git a/drivers/infiniband/ulp/sdp/sdp_rx.c b/drivers/infiniband/ulp/sdp/sdp_rx.c index 89d0ea42d94f..fa56a098ce23 100644 --- a/drivers/infiniband/ulp/sdp/sdp_rx.c +++ b/drivers/infiniband/ulp/sdp/sdp_rx.c @@ -637,7 +637,7 @@ static struct sk_buff *sdp_process_rx_wc(struct sdp_sock *ssk, if (unlikely(wc->status)) { if (ssk->qp_active) { sdp_dbg(sk, "Recv completion with error. " - "Status %d, vendor: %d\n", + "Status %d, vendor: 0x%x\n", wc->status, wc->vendor_err); sdp_reset(sk); ssk->qp_active = 0; diff --git a/drivers/infiniband/ulp/xsigo/xve/xve_cm.c b/drivers/infiniband/ulp/xsigo/xve/xve_cm.c index b6a6d1c0e328..5d2cc4d689f2 100644 --- a/drivers/infiniband/ulp/xsigo/xve/xve_cm.c +++ b/drivers/infiniband/ulp/xsigo/xve/xve_cm.c @@ -541,7 +541,7 @@ void xve_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc) if (!test_bit(XVE_DELETING, &priv->state)) { pr_err("%s: cm recv error", priv->xve_name); pr_err("(status=%d, wrid=%d", wc->status, wr_id); - pr_err("vend_err %x)\n", wc->vendor_err); + pr_err("vend_err 0x%x)\n", wc->vendor_err); } INC_RX_DROP_STATS(priv, dev); goto repost; @@ -754,7 +754,7 @@ void xve_cm_handle_tx_wc(struct net_device *dev, if (wc->status != IB_WC_SUCCESS && wc->status != IB_WC_WR_FLUSH_ERR) { pr_err("%s: failed cm send event ", priv->xve_name); - pr_err("(status=%d, wrid=%d vend_err %x)\n", + pr_err("(status=%d, wrid=%d vend_err 0x%x)\n", wc->status, wr_id, wc->vendor_err); xve_cm_destroy_tx_deferred(tx); } diff --git a/drivers/infiniband/ulp/xsigo/xve/xve_ib.c b/drivers/infiniband/ulp/xsigo/xve/xve_ib.c index 04de9a1aa7b3..ff2268685bb9 100644 --- a/drivers/infiniband/ulp/xsigo/xve/xve_ib.c +++ b/drivers/infiniband/ulp/xsigo/xve/xve_ib.c @@ -319,7 +319,7 @@ xve_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) { xve_warn(priv, "failed recv event "); - xve_warn(priv, "(status=%d, wrid=%d vend_err %x)\n", + xve_warn(priv, "(status=%d, wrid=%d vend_err 0x%x)\n", wc->status, wr_id, wc->vendor_err); } xve_ud_dma_unmap_rx(priv, priv->rx_ring[wr_id].mapping); @@ -525,7 +525,7 @@ static void xve_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) { xve_warn(priv, "failed send event "); - xve_warn(priv, "(status=%d, wrid=%d vend_err %x)\n", + xve_warn(priv, "(status=%d, wrid=%d vend_err 0x%x)\n", wc->status, wr_id, wc->vendor_err); } } diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c index 819b27c7ee56..085691e26e75 100644 --- a/net/rds/ib_recv.c +++ b/net/rds/ib_recv.c @@ -1347,7 +1347,7 @@ void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic, conn->c_drop_source = DR_IB_RECV_COMP_ERR; rds_ib_conn_error(conn, "recv completion " "<%pI4,%pI4,%d> had status %u " - "vendor_err %u, disconnecting and " + "vendor_err 0x%x, disconnecting and " "reconnecting\n", &conn->c_laddr, &conn->c_faddr, diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c index 8f19eb4a93f2..384669373635 100644 --- a/net/rds/ib_send.c +++ b/net/rds/ib_send.c @@ -344,7 +344,7 @@ void rds_ib_send_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc) conn->c_drop_source = DR_IB_SEND_COMP_ERR; rds_ib_conn_error(conn, "send completion <%u.%u.%u.%u,%u.%u.%u.%u,%d> status " - "%u vendor_err %u, disconnecting and reconnecting\n", + "%u vendor_err 0x%x, disconnecting and reconnecting\n", NIPQUAD(conn->c_laddr), NIPQUAD(conn->c_faddr), conn->c_tos, wc->status, wc->vendor_err); -- 2.50.1