From ec56d7af3115e119c5fb965bd2017504ead03dcd Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Mon, 25 Feb 2013 14:04:18 +0200 Subject: [PATCH] ib/core: change error prints in cm module to debug prints. commit acd10b49 added prints to the cm module. These, however, should really be debug prints, to be activated when it is necessary to track down some cm problem. To activate the debug mechanism, you need to do the following: 1. mount the debug fs (do this once) mount -t debugfs none /sys/kernel/debug/ 2. activate debug output for ib_cm: echo -n "module ib_cm +p" > /sys/kernel/debug/dynamic_debug/control 3. To de-activate debug output when you are done, do the following echo -n "module ib_cm -p" > /sys/kernel/debug/dynamic_debug/control You will see the debug output in dmesg. This change was suggested by Moni Shoua (monis@mellanox.com) Signed-off-by: Jack Morgenstein (Ported from Mellanox OFED 2.4) Signed-off-by: Mukesh Kacker --- drivers/infiniband/core/cm.c | 47 +++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index d52ab8e847ca..8947def09b1c 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -57,6 +57,11 @@ MODULE_AUTHOR("Sean Hefty"); MODULE_DESCRIPTION("InfiniBand CM"); MODULE_LICENSE("Dual BSD/GPL"); +#ifdef pr_fmt +#undef pr_fmt +#endif +#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ + static void cm_add_one(struct ib_device *device); static void cm_remove_one(struct ib_device *device); @@ -1654,7 +1659,7 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id, spin_lock_irqsave(&cm_id_priv->lock, flags); if (cm_id->state != IB_CM_REQ_RCVD && cm_id->state != IB_CM_MRA_REQ_SENT) { - pr_err("%s: cm_id->state: %d\n", __func__, cm_id->state); + pr_debug("cm_id->state: %d\n", cm_id->state); ret = -EINVAL; goto out; } @@ -1721,7 +1726,7 @@ int ib_send_cm_rtu(struct ib_cm_id *cm_id, spin_lock_irqsave(&cm_id_priv->lock, flags); if (cm_id->state != IB_CM_REP_RCVD && cm_id->state != IB_CM_MRA_REP_SENT) { - pr_err("%s: cm_id->state: %d\n", __func__, cm_id->state); + pr_debug("cm_id->state: %d\n", cm_id->state); ret = -EINVAL; goto error; } @@ -1826,7 +1831,7 @@ static int cm_rep_handler(struct cm_work *work) cm_id_priv = cm_acquire_id(rep_msg->remote_comm_id, 0); if (!cm_id_priv) { cm_dup_rep_handler(work); - pr_err("%s: no cm_id_priv\n", __func__); + pr_debug("no cm_id_priv\n"); return -EINVAL; } @@ -1840,7 +1845,7 @@ static int cm_rep_handler(struct cm_work *work) default: spin_unlock_irq(&cm_id_priv->lock); ret = -EINVAL; - pr_err("%s: cm_id_priv->id.state: %d \n", __func__, cm_id_priv->id.state); + pr_debug("cm_id_priv->id.state: %d\n", cm_id_priv->id.state); goto error; } @@ -1854,7 +1859,7 @@ static int cm_rep_handler(struct cm_work *work) spin_unlock(&cm.lock); spin_unlock_irq(&cm_id_priv->lock); ret = -EINVAL; - pr_err("%s: Failed to insert remote id \n", __func__); + pr_debug("Failed to insert remote id\n"); goto error; } /* Check for a stale connection. */ @@ -1868,7 +1873,7 @@ static int cm_rep_handler(struct cm_work *work) IB_CM_REJ_STALE_CONN, CM_MSG_RESPONSE_REP, NULL, 0); ret = -EINVAL; - pr_err("%s: Stale connection.\n", __func__); + pr_debug("Stale connection.\n"); goto error; } spin_unlock(&cm.lock); @@ -2009,7 +2014,7 @@ int ib_send_cm_dreq(struct ib_cm_id *cm_id, cm_id_priv = container_of(cm_id, struct cm_id_private, id); spin_lock_irqsave(&cm_id_priv->lock, flags); if (cm_id->state != IB_CM_ESTABLISHED) { - pr_err("%s: cm_id->state: %d \n", __func__, cm_id->state); + pr_debug("cm_id->state: %d\n", cm_id->state); ret = -EINVAL; goto out; } @@ -2079,8 +2084,7 @@ int ib_send_cm_drep(struct ib_cm_id *cm_id, if (cm_id->state != IB_CM_DREQ_RCVD) { spin_unlock_irqrestore(&cm_id_priv->lock, flags); kfree(data); - pr_err("%s: cm_id->state(%d) != IB_CM_DREQ_RCVD\n", - __func__, cm_id->state); + pr_debug("cm_id->state(%d) != IB_CM_DREQ_RCVD\n", cm_id->state); return -EINVAL; } @@ -2146,7 +2150,7 @@ static int cm_dreq_handler(struct cm_work *work) atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. counter[CM_DREQ_COUNTER]); cm_issue_drep(work->port, work->mad_recv_wc); - pr_err("%s: no cm_id_priv\n", __func__); + pr_debug("no cm_id_priv\n"); return -EINVAL; } @@ -2187,7 +2191,7 @@ static int cm_dreq_handler(struct cm_work *work) counter[CM_DREQ_COUNTER]); goto unlock; default: - pr_err("%s: cm_id_priv->id.state: %d\n", __func__, cm_id_priv->id.state); + pr_debug("cm_id_priv->id.state: %d\n", cm_id_priv->id.state); goto unlock; } cm_id_priv->id.state = IB_CM_DREQ_RCVD; @@ -2291,7 +2295,7 @@ int ib_send_cm_rej(struct ib_cm_id *cm_id, cm_enter_timewait(cm_id_priv); break; default: - pr_err("%s: cm_id->state: 0x%x\n", __func__, cm_id->state); + pr_debug("cm_id->state: 0x%x\n", cm_id->state); ret = -EINVAL; goto out; } @@ -2402,8 +2406,7 @@ static int cm_rej_handler(struct cm_work *work) /* fall through */ default: spin_unlock_irq(&cm_id_priv->lock); - pr_err("%s: cm_id_priv->id.state: 0x%x\n", - __func__, cm_id_priv->id.state); + pr_debug("cm_id_priv->id.state: 0x%x\n", cm_id_priv->id.state); ret = -EINVAL; goto out; } @@ -2466,7 +2469,7 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id, break; } default: - pr_err("%s: cm_id_priv->id.state: 0x%x\n", __func__, cm_id_priv->id.state); + pr_debug("cm_id_priv->id.state: 0x%x\n", cm_id_priv->id.state); ret = -EINVAL; goto error1; } @@ -2568,7 +2571,7 @@ static int cm_mra_handler(struct cm_work *work) counter[CM_MRA_COUNTER]); /* fall through */ default: - pr_err("%s: cm_id_priv->id.state: 0x%x\n", __func__, cm_id_priv->id.state); + pr_debug("cm_id_priv->id.state: 0x%x\n", cm_id_priv->id.state); goto out; } @@ -3306,7 +3309,7 @@ static void cm_work_handler(struct work_struct *_work) ret = cm_timewait_handler(work); break; default: - pr_err("%s: work->cm_event.event: 0x%x\n", __func__, work->cm_event.event); + pr_debug("work->cm_event.event: 0x%x\n", work->cm_event.event); ret = -EINVAL; break; } @@ -3337,7 +3340,7 @@ static int cm_establish(struct ib_cm_id *cm_id) ret = -EISCONN; break; default: - pr_err("%s: cm_id->state: 0x%x\n", __func__, cm_id->state); + pr_debug("cm_id->state: 0x%x\n", cm_id->state); ret = -EINVAL; break; } @@ -3500,7 +3503,7 @@ static int cm_init_qp_init_attr(struct cm_id_private *cm_id_priv, ret = 0; break; default: - pr_err("%s: cm_id_priv->id.state: 0x%x\n", __func__, cm_id_priv->id.state); + pr_debug("cm_id_priv->id.state: 0x%x\n", cm_id_priv->id.state); ret = -EINVAL; break; } @@ -3574,7 +3577,7 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv, ret = 0; break; default: - pr_err("%s: cm_id_priv->id.state: 0x%x\n", __func__, cm_id_priv->id.state); + pr_debug("cm_id_priv->id.state: 0x%x\n", cm_id_priv->id.state); ret = -EINVAL; break; } @@ -3634,7 +3637,7 @@ static int cm_init_qp_rts_attr(struct cm_id_private *cm_id_priv, ret = 0; break; default: - pr_err("%s: cm_id_priv->id.state: 0x%x\n", __func__, cm_id_priv->id.state); + pr_debug("cm_id_priv->id.state: 0x%x\n", cm_id_priv->id.state); ret = -EINVAL; break; } @@ -3661,7 +3664,7 @@ int ib_cm_init_qp_attr(struct ib_cm_id *cm_id, ret = cm_init_qp_rts_attr(cm_id_priv, qp_attr, qp_attr_mask); break; default: - pr_err("%s: qp_attr->qp_state: 0x%x\n", __func__, qp_attr->qp_state); + pr_debug("qp_attr->qp_state: 0x%x\n", qp_attr->qp_state); ret = -EINVAL; break; } -- 2.50.1