mpxyd,mcm: increase default CM timers for better oob scaling

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>

diff --git a/dapl/openib_mcm/dapl_ib_util.h b/dapl/openib_mcm/dapl_ib_util.h
index e335c576d9d80d0e59fe0cf1be459d0538e0110a..8cc7d97090053d12e76223dc1e49b5d56e795afe 100644 (file)
--- a/dapl/openib_mcm/dapl_ib_util.h
+++ b/dapl/openib_mcm/dapl_ib_util.h
@@ -36,6 +36,10 @@
 #include "openib_osd.h"
 #include "dapl_ib_common.h"
 
+#define MCM_RETRY_CNT   10
+#define MCM_REP_TIME    4000   /* reply timeout in m_secs */
+#define MCM_RTU_TIME    2000   /* rtu timeout in m_secs */
+
 /* DAPL CM objects MUST include list_entry, ref_count, event for EP linking */
 struct ib_cm_handle
 { 

diff --git a/dapl/openib_mcm/device.c b/dapl/openib_mcm/device.c
index 0001cdadbfbb49b9a48deace49c71fa8b73f65f1..9531aba3068dee3d2ccc31303b64f3dfdf64274b 100644 (file)
--- a/dapl/openib_mcm/device.c
+++ b/dapl/openib_mcm/device.c
@@ -510,9 +510,9 @@ static int mcm_service_create(IN DAPL_HCA *hca)
        dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " mcm_create: \n");
 
        /* setup CM timers and queue sizes */
-       tp->retries = dapl_os_get_env_val("DAPL_UCM_RETRY", DCM_RETRY_CNT);
-       tp->rep_time = dapl_os_get_env_val("DAPL_UCM_REP_TIME", DCM_REP_TIME);
-       tp->rtu_time = dapl_os_get_env_val("DAPL_UCM_RTU_TIME", DCM_RTU_TIME);
+       tp->retries = dapl_os_get_env_val("DAPL_UCM_RETRY", MCM_RETRY_CNT);
+       tp->rep_time = dapl_os_get_env_val("DAPL_UCM_REP_TIME", MCM_REP_TIME);
+       tp->rtu_time = dapl_os_get_env_val("DAPL_UCM_RTU_TIME", MCM_RTU_TIME);
        tp->cm_timer = DAPL_MIN(tp->rep_time,tp->rtu_time);
        tp->qpe = dapl_os_get_env_val("DAPL_UCM_QP_SIZE", DCM_QP_SIZE);
        tp->cqe = dapl_os_get_env_val("DAPL_UCM_CQ_SIZE", DCM_CQ_SIZE);

diff --git a/dapl/svc/mcm.c b/dapl/svc/mcm.c
index 3377e47711d256c59679887dad3c3f30746c7fad..65954e645539b0a477bd945c2668c62504686c5a 100644 (file)
--- a/dapl/svc/mcm.c
+++ b/dapl/svc/mcm.c
@@ -45,8 +45,8 @@ int mcm_signal = 100;
 int mcm_max_rcv = 20;
 int mcm_retry = 10;
 int mcm_disc_retry = 5;
-int mcm_rep_ms = 1600;
-int mcm_rtu_ms = 800;
+int mcm_rep_ms = 4000;
+int mcm_rtu_ms = 2000;
 int mcm_dreq_ms = 1000;
 
 extern int mcm_rx_entries;