ofi: Improve memory monitor detection

Test for the features needed to support injecting a memory
monitor in Libfabric, rather than testing for a Libfabric
version.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>
(cherry picked from commit 947b3fe)

Author: bwbarrett

config/opal_check_ofi.m4

@@ -126,19 +126,26 @@ AC_DEFUN([_OPAL_CHECK_OFI],[
     CPPFLAGS="$CPPFLAGS $opal_ofi_CPPFLAGS"
 
     AS_IF([test $opal_ofi_happy = yes],
-          [AC_CHECK_MEMBER([struct fi_info.nic],
+          [AC_CHECK_HEADERS([rdma/fi_ext.h])
+
+           AC_CHECK_MEMBER([struct fi_info.nic],
                            [opal_check_fi_info_pci=1],
                            [opal_check_fi_info_pci=0],
-                           [[#include <rdma/fabric.h>]])])
+                           [[#include <rdma/fabric.h>]])
+
+           AC_DEFINE_UNQUOTED([OPAL_OFI_PCI_DATA_AVAILABLE],
+                              [$opal_check_fi_info_pci],
+                              [check if pci data is available in ofi])
 
-    AC_DEFINE_UNQUOTED([OPAL_OFI_PCI_DATA_AVAILABLE],
-                       [$opal_check_fi_info_pci],
-                       [check if pci data is available in ofi])
+           AC_CHECK_DECLS([PMIX_PACKAGE_RANK],
+                          [],
+                          [],
+                          [#include <pmix.h>])
 
-    AC_CHECK_DECLS([PMIX_PACKAGE_RANK],
-                   [],
-                   [],
-                   [#include <pmix.h>])
+           AC_CHECK_TYPES([struct fi_ops_mem_monitor], [], [],
+                          [#ifdef HAVE_RDMA_FI_EXT_H
+#include <rdma/fi_ext.h>
+#endif])])
 
     CPPFLAGS=$opal_check_ofi_save_CPPFLAGS
     LDFLAGS=$opal_check_ofi_save_LDFLAGS
@@ -157,18 +164,6 @@ AC_DEFUN([_OPAL_CHECK_OFI],[
                  [AC_MSG_WARN([OFI libfabric support requested (via --with-ofi or --with-libfabric), but not found.])
                   AC_MSG_ERROR([Cannot continue.])])
            ])
-    opal_ofi_import_monitor=no
-    AS_IF([test $opal_ofi_happy = "yes"],
-          [OPAL_CHECK_OFI_VERSION_GE([1,14],
-                                     [opal_ofi_import_monitor=yes],
-                                     [opal_ofi_import_monitor=no])])
-
-
-if test "$opal_ofi_import_monitor" = "yes"; then
-    AC_DEFINE_UNQUOTED([OPAL_OFI_IMPORT_MONITOR_SUPPORT],1,
-                       [Whether libfabric supports monitor import])
-fi
-
 ])dnl
 
 

opal/mca/common/ofi/common_ofi.c

@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <rdma/fabric.h>
-#if OPAL_OFI_IMPORT_MONITOR_SUPPORT
+#ifdef HAVE_RDMA_FI_EXT_H
 #include <rdma/fi_ext.h>
 #endif
 
@@ -45,7 +45,7 @@ static opal_mutex_t opal_common_ofi_mutex = OPAL_MUTEX_STATIC_INIT;
 static bool opal_common_ofi_initialized = false;
 static int opal_common_ofi_init_ref_cnt = 0;
 
-#if OPAL_OFI_IMPORT_MONITOR_SUPPORT
+#ifdef HAVE_STRUCT_FI_OPS_MEM_MONITOR
 
 static int opal_common_ofi_monitor_start(struct fid_mem_monitor *monitor)
 {
@@ -88,7 +88,7 @@ static void opal_common_ofi_mem_release_cb(void *buf, size_t length,
     opal_common_ofi_monitor->import_ops->notify(opal_common_ofi_monitor,
                                                 buf, length);
 }
-#endif /* OPAL_OFI_IMPORT_MONITOR_SUPPORT */
+#endif /* HAVE_STRUCT_FI_OPS_MEM_MONITOR */
 
 int opal_common_ofi_init(void)
 {
@@ -98,7 +98,7 @@ int opal_common_ofi_init(void)
     if (opal_common_ofi_initialized) {
         return OPAL_SUCCESS;
     }
-#if OPAL_OFI_IMPORT_MONITOR_SUPPORT
+#ifdef HAVE_STRUCT_FI_OPS_MEM_MONITOR
 
     mca_base_framework_open(&opal_memory_base_framework, 0);
     if ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT)