Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.1.x: RDMA OSC: initialize segment memory before registering the segment #5924

Merged
merged 1 commit into from
Oct 18, 2018
Merged

v3.1.x: RDMA OSC: initialize segment memory before registering the segment #5924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ompi/mca/osc/rdma/osc_rdma_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s

if (size && MPI_WIN_FLAVOR_ALLOCATE == module->flavor) {
*base = (void *)((intptr_t) module->segment_base + my_base_offset);
memset (*base, 0, size);
}

module->rank_array = (ompi_osc_rdma_rank_data_t *) module->segment_base;
Expand All @@ -660,7 +661,12 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
/* initialize my state */
memset (module->state, 0, module->state_size);

/* barrier to make sure all ranks have attached and initialized */
shared_comm->c_coll->coll_barrier(shared_comm, shared_comm->c_coll->coll_barrier_module);

if (0 == local_rank) {
/* unlink the shared memory backing file */
opal_shmem_unlink (&module->seg_ds);
/* just go ahead and register the whole segment */
ret = ompi_osc_rdma_register (module, MCA_BTL_ENDPOINT_ANY, module->segment_base, total_size, MCA_BTL_REG_FLAG_ACCESS_ANY,
&module->state_handle);
Expand All @@ -681,14 +687,6 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
}
}

/* barrier to make sure all ranks have attached */
shared_comm->c_coll->coll_barrier(shared_comm, shared_comm->c_coll->coll_barrier_module);

/* unlink the shared memory backing file */
if (0 == local_rank) {
opal_shmem_unlink (&module->seg_ds);
}

if (MPI_WIN_FLAVOR_ALLOCATE == module->flavor) {
ompi_osc_rdma_region_t *region = (ompi_osc_rdma_region_t *) module->state->regions;
module->state->disp_unit = module->disp_unit;
Expand Down