[portals4] r2283 committed - Change the definition of the zero length MR support (--enable-zero-mrs...

[port...@googlecode.com]

Revision: 2283
Author: regra...@gmail.com
Date: Tue Oct 14 15:06:04 2014 UTC
Log: Change the definition of the zero length MR support
(--enable-zero-mrs), it is now needed for recent versions of MOFED (2.2 and
greater)

--this was previously designated as Qlogic support (--enable-qlogic), but
it is no longer only for qlogic


https://code.google.com/p/portals4/source/detail?r=2283

Modified:
/trunk/configure.ac
/trunk/src/ib/ptl_mr.c

=======================================
--- /trunk/configure.ac Tue Dec 3 16:31:13 2013 UTC
+++ /trunk/configure.ac Tue Oct 14 15:06:04 2014 UTC
@@ -77,12 +77,12 @@
AS_IF([test "x$enable_register_on_bind" == xyes],
[AC_DEFINE([REGISTER_ON_BIND], [1], [Define that makes XFE memory
registration happen at MDBind time, rather than at data movement time.])])

-AC_ARG_ENABLE([qlogic],
- [AS_HELP_STRING([--enable-qlogic],
- [Use Qlogic InfiniPath Hardware of IB communication. (default: no)])])
-AS_IF([test "x$enable_qlogic" == "xyes"],
- [AC_DEFINE([WITH_QLOGIC], [1], [Define to enable Qlogic])])
-AM_CONDITIONAL(WITH_QLOGIC, test "x$enable_qlogic" == xyes)
+AC_ARG_ENABLE([zeromrs],
+ [AS_HELP_STRING([--enable-zero-mrs],
+ [Enable this when using MOFED V2.2+ or Qlogic InfiniPath Hardware of
IB communication. (default: no)])])
+AS_IF([test "x$enable_zero-mrs" == "xyes"],
+ [AC_DEFINE([WITH_ZERO_MRS], [1], [Define to enable MOFED V2.2 or greater
or Qlogic])])
+AM_CONDITIONAL(WITH_ZERO_MRS, test "x$enable_zero-mrs" == xyes)

AC_ARG_ENABLE([trigmeops],
[AS_HELP_STRING([--enable-me-triggered],
=======================================
--- /trunk/src/ib/ptl_mr.c Thu May 29 19:27:50 2014 UTC
+++ /trunk/src/ib/ptl_mr.c Tue Oct 14 15:06:04 2014 UTC
@@ -164,9 +164,9 @@
err = ENOMEM;
goto err1;
}
-#if WITH_QLOGIC
- //Fix for Qlogic InfiniPath, that does not accept a NULL value for an
ibv_mr_reg
- //REG 2013
+#if WITH_ZERO_MRS
+ //Fix for Qlogic InfiniPath and recent MOFED versions, that does not
accept a NULL value for an ibv_mr_reg
+ //REG 2014
if ((start == NULL) && ((int)length == 0)) {
uint64_t junk_value;
start = &junk_value;
@@ -430,7 +430,7 @@
mr_get(mr);
res = RB_INSERT(the_root, &tree->tree, mr);
//this can happen if using Qlogic
-#if !WITH_QLOGIC
+#if !WITH_ZERO_MRS
assert(res == NULL); /* should never happen */
#endif
}