Skip to content

osc/rdma: fix osc_rdma_get_remote_segment() length parameter #3600

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

Merged
merged 1 commit into from
Jun 1, 2017
Merged

osc/rdma: fix osc_rdma_get_remote_segment() length parameter #3600

Show file tree
Hide file tree
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
16 changes: 12 additions & 4 deletions ompi/mca/osc/rdma/osc_rdma_accumulate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,7 @@ int ompi_osc_rdma_compare_and_swap (const void *origin_addr, const void *compare
mca_btl_base_registration_handle_t *target_handle;
ompi_osc_rdma_sync_t *sync;
uint64_t target_address;
ptrdiff_t true_lb, true_extent;
int ret;

OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "cswap: 0x%lx, 0x%lx, 0x%lx, %s, %d, %d, %s",
Expand All @@ -978,7 +979,12 @@ int ompi_osc_rdma_compare_and_swap (const void *origin_addr, const void *compare
return OMPI_ERR_RMA_SYNC;
}

ret = osc_rdma_get_remote_segment (module, peer, target_disp, dt->super.size, &target_address, &target_handle);
ret = ompi_datatype_get_true_extent(dt, &true_lb, &true_extent);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
return ret;
}

ret = osc_rdma_get_remote_segment (module, peer, target_disp, true_lb+true_extent, &target_address, &target_handle);
if (OPAL_UNLIKELY(OPAL_SUCCESS != ret)) {
return ret;
}
Expand Down Expand Up @@ -1015,7 +1021,7 @@ int ompi_osc_rdma_rget_accumulate_internal (ompi_osc_rdma_sync_t *sync, const vo
ompi_osc_rdma_module_t *module = sync->module;
mca_btl_base_registration_handle_t *target_handle;
uint64_t target_address;
ptrdiff_t lb, origin_extent, target_extent;
ptrdiff_t lb, origin_extent, target_span;
int ret;

/* short-circuit case. note that origin_count may be 0 if op is MPI_NO_OP */
Expand All @@ -1027,9 +1033,11 @@ int ompi_osc_rdma_rget_accumulate_internal (ompi_osc_rdma_sync_t *sync, const vo
return OMPI_SUCCESS;
}

(void) ompi_datatype_get_extent (target_datatype, &lb, &target_extent);
target_span = opal_datatype_span(&target_datatype->super, target_count, &lb);

ret = osc_rdma_get_remote_segment (module, peer, target_disp, target_extent * target_count, &target_address, &target_handle);
// a buffer defined by (buf, count, dt)
// will have data starting at buf+offset and ending len bytes later:
ret = osc_rdma_get_remote_segment (module, peer, target_disp, target_span+lb, &target_address, &target_handle);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
return ret;
}
Expand Down
7 changes: 6 additions & 1 deletion ompi/mca/osc/rdma/osc_rdma_comm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,7 @@ static inline int ompi_osc_rdma_get_w_req (ompi_osc_rdma_sync_t *sync, void *ori
ompi_osc_rdma_module_t *module = sync->module;
mca_btl_base_registration_handle_t *source_handle;
uint64_t source_address;
ptrdiff_t source_span, source_lb;
int ret;

/* short-circuit case */
Expand All @@ -836,7 +837,11 @@ static inline int ompi_osc_rdma_get_w_req (ompi_osc_rdma_sync_t *sync, void *ori
return OMPI_SUCCESS;
}

ret = osc_rdma_get_remote_segment (module, peer, source_disp, source_datatype->super.size * source_count,
// a buffer defined by (buf, count, dt)
// will have data starting at buf+offset and ending len bytes later:
source_span = opal_datatype_span(&source_datatype->super, source_count, &source_lb);

ret = osc_rdma_get_remote_segment (module, peer, source_disp, source_span+source_lb,
&source_address, &source_handle);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
return ret;
Expand Down