dapl: cma provider needs to support lower inline send default for iWARP

IB and iWARP work best with different defaults. Add transport check
and set default accordingly. 64 for iWARP, 200 for IB.

DAPL_MAX_INLINE environment variable is still used to override.

Signed-off by: Arlin Davis ardavis@ichips.intel.com

diff --git a/dapl/openib_cma/dapl_ib_util.c b/dapl/openib_cma/dapl_ib_util.c
index 1f411869dc9490a2ad6beef08ccc916e2df4dc8e..41986a349bf1b3d959592869d7dc9d748996f6c8 100755 (executable)
--- a/dapl/openib_cma/dapl_ib_util.c
+++ b/dapl/openib_cma/dapl_ib_util.c
@@ -270,8 +270,15 @@ DAT_RETURN dapls_ib_open_hca(IN IB_HCA_NAME hca_name, IN DAPL_HCA *hca_ptr)
                (unsigned long long)bswap_64(gid->global.interface_id));
 
        /* set inline max with env or default, get local lid and gid 0 */
-       hca_ptr->ib_trans.max_inline_send = 
-               dapl_os_get_env_val("DAPL_MAX_INLINE", INLINE_SEND_DEFAULT);
+        if (hca_ptr->ib_hca_handle->device->transport_type
+                                        == IBV_TRANSPORT_IWARP)
+               hca_ptr->ib_trans.max_inline_send = 
+                       dapl_os_get_env_val("DAPL_MAX_INLINE", 
+                                           INLINE_SEND_IWARP_DEFAULT);
+        else
+               hca_ptr->ib_trans.max_inline_send = 
+                       dapl_os_get_env_val("DAPL_MAX_INLINE", 
+                                           INLINE_SEND_IB_DEFAULT);
 
        /* set CM timer defaults */     
        hca_ptr->ib_trans.max_cm_timeout =

diff --git a/dapl/openib_cma/dapl_ib_util.h b/dapl/openib_cma/dapl_ib_util.h
index 71593fda2764ed111f6b4060550ca14a345c8d31..3368180279c2d9c2f3965c76c6ef861c47db2200 100755 (executable)
--- a/dapl/openib_cma/dapl_ib_util.h
+++ b/dapl/openib_cma/dapl_ib_util.h
@@ -111,7 +111,8 @@ typedef struct _ib_wait_obj_handle
 #define IB_INVALID_HANDLE      NULL
 
 /* inline send rdma threshold */
-#define        INLINE_SEND_DEFAULT     64
+#define        INLINE_SEND_IWARP_DEFAULT       64
+#define        INLINE_SEND_IB_DEFAULT          200
 
 /* CMA private data areas */
 #define CMA_PDATA_HDR          36