Merge pull request #5971 from devreal/ompi-rdma-preinit-fixbarrier

hjelmn · web-flow · commit 049bfb6c3cf6 · 2018-10-25T09:45:36.000-06:00
Fix regression in RDMA shared memory registration
diff --git a/ompi/mca/osc/rdma/osc_rdma_component.c b/ompi/mca/osc/rdma/osc_rdma_component.c
@@ -653,6 +653,9 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
             }
         }
 
+        /* barrier to make sure memory is registered */
+        shared_comm->c_coll->coll_barrier(shared_comm, shared_comm->c_coll->coll_barrier_module);
+
         if (MPI_WIN_FLAVOR_CREATE == module->flavor) {
             ret = ompi_osc_rdma_initialize_region (module, base, size);
             if (OMPI_SUCCESS != ret) {

Original file line number	Diff line number	Diff line change
`@@ -653,6 +653,9 @@ static int allocate_state_shared (ompi_osc_rdma_module_t module, void *base, s`
`653`	`653`	`}`
`654`	`654`	`}`
`655`	`655`
	`656`	`+ /* barrier to make sure memory is registered */`
	`657`	`+ shared_comm->c_coll->coll_barrier(shared_comm, shared_comm->c_coll->coll_barrier_module);`
	`658`	`+`
`656`	`659`	`if (MPI_WIN_FLAVOR_CREATE == module->flavor) {`
`657`	`660`	`ret = ompi_osc_rdma_initialize_region (module, base, size);`
`658`	`661`	`if (OMPI_SUCCESS != ret) {`