[openib-general] [PATCH] [kdapl CM] Add more debug on connection destruction

[Hal Rosenstock]

[kdapl CM] Add more debug on connection destruction
Also, make naming of retry defines consistent

Signed-off-by: Hal Rosenstock <halr at voltaire.com>

Index: dapl_openib_cm.c
===================================================================
--- dapl_openib_cm.c	(revision 2507)
+++ dapl_openib_cm.c	(working copy)
@@ -42,7 +42,7 @@
 #define DAPL_IB_RNR_RETRY_COUNT     6
 #define DAPL_IB_CM_RESPONSE_TIMEOUT 20      /* 4 sec */
 #define DAPL_IB_MAX_CM_RETRIES      4
-#define DAPL_IB_MAX_AT_RETRY        3
+#define DAPL_IB_MAX_AT_RETRIES      3
 
 /* Should these be queried ? */
 #define DAPL_IB_TARGET_MAX      4 /* responder resources (max_qp_ous_rd_atom) */
@@ -65,6 +65,9 @@
 	spin_unlock_irqrestore(&conn->lock, flags);
 
 	if (!in_callback) {
+		dapl_dbg_log(DAPL_DBG_TYPE_CM,
+			     "  >>> dapl_destroy_cm_id: conn %p CM ID %p\n",
+			     conn, conn->cm_id);
 		ib_destroy_cm_id(conn->cm_id);
 		if (conn->ep)
 			conn->ep->cm_handle = NULL;
@@ -297,7 +300,7 @@
 	if (rec_num <= 0) {
 		printk(KERN_ERR "dapl_path_comp_handler: path resolution "
 		       "failed %d retry %d!!!\n", rec_num, conn->retries + 1);
-		if (++conn->retries > DAPL_IB_MAX_AT_RETRY) {
+		if (++conn->retries > DAPL_IB_MAX_AT_RETRIES) {
 			printk(KERN_ERR "dapl_path_comp_handler: ep_ptr 0x%p\n",
 			       conn->ep);
 			event = DAT_CONNECTION_EVENT_UNREACHABLE;
@@ -346,7 +349,7 @@
 	if (rec_num <= 0) {
 		printk(KERN_ERR "dapl_rt_comp_handler: rec num %d retry %d\n",
 		       rec_num, conn->retries + 1);
-		if (++conn->retries > DAPL_IB_MAX_AT_RETRY) {
+		if (++conn->retries > DAPL_IB_MAX_AT_RETRIES) {
 			event = DAT_CONNECTION_EVENT_UNREACHABLE;
 			goto error;
 		}
@@ -580,6 +583,9 @@
 	struct dapl_ia *ia_ptr;
 	int      ib_status;
 
+	dapl_dbg_log(DAPL_DBG_TYPE_CM,
+		     "  >>> dapl_ib_reinit_ep: EP %p\n", ep_ptr);
+
 	ia_ptr = ep_ptr->header.owner_ia;
 
 	/*
@@ -671,6 +677,10 @@
  */
 u32 dapl_ib_remove_conn_listener(struct dapl_ia *ia_ptr, struct dapl_sp *sp_ptr)
 {
+        dapl_dbg_log(DAPL_DBG_TYPE_CM,
+		     "  >>> dapl_ib_remove_conn_listener: SP %p conn %p\n",
+		     sp_ptr, sp_ptr->cm_srvc_handle);
+
 	/*
 	 * This will hang if called from CM thread context...
 	 * Move back to using WQ...