Restore mca_btl_self_send() to return 1.

- Force osc/rdma to take the non btl-atomic path for self.

Signed-off-by: Austen Lauria <[email protected]>

Author: awlauria

ompi/mca/osc/rdma/osc_rdma_component.c

@@ -529,6 +529,10 @@ static int allocate_state_single (ompi_osc_rdma_module_t *module, void **base, s
         my_peer->state_handle = module->state_handle;
         my_peer->state_btl_index = my_peer->data_btl_index;
         my_peer->state_endpoint = my_peer->data_endpoint;
+        mca_btl_base_module_t *btl = ompi_osc_rdma_selected_btl (module, my_peer->data_btl_index);
+        if(0 == strcmp(btl->btl_component->btl_version.mca_component_name, "self")) {
+            my_peer->flags |= OMPI_OSC_RDMA_PEER_LOCAL_STATE;
+        }
     }
 
     if (MPI_WIN_FLAVOR_DYNAMIC != module->flavor) {
@@ -789,6 +793,10 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
                 peer->state = (osc_rdma_counter_t) ((uintptr_t) state_region->base + state_base + module->state_size * i);
                 peer->state_endpoint = local_leader->data_endpoint; // data_endpoint initialized in ompi_osc_rdma_new_peer();
                 peer->state_btl_index = local_leader->data_btl_index;
+                mca_btl_base_module_t *btl = ompi_osc_rdma_selected_btl (module, peer->data_btl_index);
+                if(0 == strcmp(btl->btl_component->btl_version.mca_component_name, "self")) {
+                    peer->flags |= OMPI_OSC_RDMA_PEER_LOCAL_STATE;
+                }
             }
 
             if (my_rank == peer_rank) {

ompi/mca/osc/rdma/osc_rdma_lock.h

@@ -86,10 +86,12 @@ static inline int ompi_osc_rdma_btl_fop (ompi_osc_rdma_module_t *module, uint8_t
 
     if (OPAL_SUCCESS != ret) {
         if (OPAL_LIKELY(1 == ret)) {
-            *result = ((int64_t *) pending_op->op_buffer)[0];
             ret = OMPI_SUCCESS;
-            ompi_osc_rdma_atomic_complete (selected_btl, endpoint, pending_op->op_buffer,
-                                           pending_op->op_frag->handle, (void *) pending_op, NULL, OPAL_SUCCESS);
+            if(false == pending_op->op_complete) {
+                *result = ((int64_t *) pending_op->op_buffer)[0];
+                ompi_osc_rdma_atomic_complete (selected_btl, endpoint, pending_op->op_buffer,
+                                               pending_op->op_frag->handle, (void *) pending_op, NULL, OPAL_SUCCESS);
+            }
         } else {
             /* need to release here because ompi_osc_rdma_atomic_complete was not called */
             OBJ_RELEASE(pending_op);
@@ -161,8 +163,10 @@ static inline int ompi_osc_rdma_btl_op (ompi_osc_rdma_module_t *module, uint8_t
         /* need to release here because ompi_osc_rdma_atomic_complete was not called */
         OBJ_RELEASE(pending_op);
         if (OPAL_LIKELY(1 == ret)) {
-            if (cbfunc) {
-                cbfunc (cbdata, cbcontext, OMPI_SUCCESS);
+            if(false == pending_op->op_complete) {
+                if (cbfunc) {
+                    cbfunc (cbdata, cbcontext, OMPI_SUCCESS);
+                }
             }
             ret = OMPI_SUCCESS;
         }

opal/mca/btl/base/btl_base_am_rdma.c

@@ -614,7 +614,7 @@ static int mca_btl_base_am_rdma_respond(mca_btl_base_module_t *btl,
     send_descriptor->des_cbfunc = NULL;
 
     int ret = btl->btl_send(btl, endpoint, send_descriptor, mca_btl_base_rdma_resp_tag());
-    if (OPAL_UNLIKELY(OPAL_SUCCESS != ret)) {
+    if (OPAL_UNLIKELY(ret < 0)) {
         *descriptor = send_descriptor;
     }
     return ret;
@@ -635,7 +635,7 @@ mca_btl_base_am_rmda_rdma_complete(mca_btl_base_module_t *btl,
     operation->is_completed = true;
     int ret = mca_btl_base_am_rdma_respond(operation->btl, operation->endpoint,
                                            &operation->descriptor, NULL, &operation->hdr);
-    if (OPAL_UNLIKELY(OPAL_SUCCESS != ret)) {
+    if (OPAL_UNLIKELY(ret < 0)) {
         BTL_VERBOSE(
             ("could not send a response. queueing the response for later. endpoint=%p, ret=%d",
              endpoint, ret));
@@ -781,7 +781,7 @@ static int mca_btl_base_am_rdma_progress(void)
             int ret = descriptor->btl->btl_send(descriptor->btl, descriptor->endpoint,
                                                 descriptor->descriptor,
                                                 mca_btl_base_rdma_tag(context->type));
-            if (OPAL_SUCCESS == ret) {
+            if (ret <= 1) {
                 opal_list_remove_item(&default_module.queued_initiator_descriptors,
                                       &descriptor->super);
             }
@@ -932,7 +932,7 @@ static void mca_btl_base_am_process_rdma(mca_btl_base_module_t *btl,
         abort();
     }
 
-    if (OPAL_SUCCESS != ret) {
+    if (ret < 0) {
         mca_btl_base_rdma_queue_operation(btl, desc->endpoint, descriptor, 0, hdr, operation);
     }
 }
@@ -995,7 +995,7 @@ static void mca_btl_base_am_process_atomic(mca_btl_base_module_t *btl,
 
     mca_btl_base_descriptor_t *descriptor = NULL;
     int ret = mca_btl_base_am_rdma_respond(btl, desc->endpoint, &descriptor, &atomic_response, hdr);
-    if (OPAL_SUCCESS != ret) {
+    if (ret < 0) {
         mca_btl_base_rdma_queue_operation(btl, desc->endpoint, descriptor, atomic_response, hdr,
                                           NULL);
     }

opal/mca/btl/self/btl_self.c

@@ -218,7 +218,7 @@ static int mca_btl_self_send(struct mca_btl_base_module_t *btl,
     if (btl_ownership) {
         mca_btl_self_free(btl, des);
     }
-    return OPAL_SUCCESS;
+    return 1;
 }
 
 static int mca_btl_self_sendi(struct mca_btl_base_module_t *btl,