Merge pull request #9733 from awlauria/sm_sc_v5.0.x

v5.0.x: SMSC support.

Author: gpaulsen

opal/mca/btl/sm/Makefile.am

@@ -13,7 +13,7 @@
 # Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2017      IBM Corporation.  All rights reserved.
-# Copyright (c) 2020      Google, LLC. All rights reserved.
+# Copyright (c) 2020-2021 Google, LLC. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -38,10 +38,6 @@ libmca_btl_sm_la_sources = \
     btl_sm_fbox.h \
     btl_sm_get.c \
     btl_sm_put.c \
-    btl_sm_xpmem.c \
-    btl_sm_xpmem.h \
-    btl_sm_knem.c \
-    btl_sm_knem.h \
     btl_sm_types.h \
     btl_sm_virtual.h
 

opal/mca/btl/sm/btl_sm.h

@@ -61,9 +61,6 @@
 
 #include "opal/mca/pmix/pmix-internal.h"
 
-#include "btl_sm_knem.h"
-#include "btl_sm_xpmem.h"
-
 BEGIN_C_DECLS
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
@@ -121,32 +118,12 @@ int mca_btl_sm_sendi(struct mca_btl_base_module_t *btl, struct mca_btl_base_endp
  * @param endpoint (IN)    BTL addressing information
  * @param descriptor (IN)  Description of the data to be transferred
  */
-#if OPAL_BTL_SM_HAVE_XPMEM
-int mca_btl_sm_put_xpmem(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint,
-                         void *local_address, uint64_t remote_address,
-                         mca_btl_base_registration_handle_t *local_handle,
-                         mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
-                         int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext,
-                         void *cbdata);
-#endif
-
-#if OPAL_BTL_SM_HAVE_CMA
-int mca_btl_sm_put_cma(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint,
-                       void *local_address, uint64_t remote_address,
-                       mca_btl_base_registration_handle_t *local_handle,
-                       mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
-                       int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext,
-                       void *cbdata);
-#endif
-
-#if OPAL_BTL_SM_HAVE_KNEM
-int mca_btl_sm_put_knem(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint,
-                        void *local_address, uint64_t remote_address,
-                        mca_btl_base_registration_handle_t *local_handle,
-                        mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
-                        int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext,
-                        void *cbdata);
-#endif
+int mca_btl_sm_put(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint,
+                   void *local_address, uint64_t remote_address,
+                   mca_btl_base_registration_handle_t *local_handle,
+                   mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
+                   int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext,
+                   void *cbdata);
 
 /**
  * Initiate an synchronous get.
@@ -155,34 +132,12 @@ int mca_btl_sm_put_knem(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *end
  * @param endpoint (IN)    BTL addressing information
  * @param descriptor (IN)  Description of the data to be transferred
  */
-#if OPAL_BTL_SM_HAVE_XPMEM
-int mca_btl_sm_get_xpmem(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint,
-                         void *local_address, uint64_t remote_address,
-                         mca_btl_base_registration_handle_t *local_handle,
-                         mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
-                         int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext,
-                         void *cbdata);
-#endif
-
-#if OPAL_BTL_SM_HAVE_CMA
-int mca_btl_sm_get_cma(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint,
-                       void *local_address, uint64_t remote_address,
-                       mca_btl_base_registration_handle_t *local_handle,
-                       mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
-                       int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext,
-                       void *cbdata);
-#endif
-
-#if OPAL_BTL_SM_HAVE_KNEM
-int mca_btl_sm_get_knem(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint,
-                        void *local_address, uint64_t remote_address,
-                        mca_btl_base_registration_handle_t *local_handle,
-                        mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
-                        int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext,
-                        void *cbdata);
-#endif
-
-ino_t mca_btl_sm_get_user_ns_id(void);
+int mca_btl_sm_get(mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint,
+                   void *local_address, uint64_t remote_address,
+                   mca_btl_base_registration_handle_t *local_handle,
+                   mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
+                   int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext,
+                   void *cbdata);
 
 /**
  * Allocate a segment.