Skip to content

v3.1.x: coll-portals4: retry PtlMEUnlink() if PTL_IN_USE #5522

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
Aug 7, 2018
Merged

v3.1.x: coll-portals4: retry PtlMEUnlink() if PTL_IN_USE #5522

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
29 changes: 26 additions & 3 deletions ompi/mca/coll/portals4/coll_portals4_allreduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,38 @@ allreduce_kary_tree_top(const void *sendbuf, void *recvbuf, int count,
static int
allreduce_kary_tree_bottom(ompi_coll_portals4_request_t *request)
{
int ret;

if (request->u.allreduce.is_optim) {
PtlAtomicSync();

if (request->u.allreduce.child_nb) {
PtlCTFree(request->u.allreduce.ack_ct_h);
ret = PtlCTFree(request->u.allreduce.ack_ct_h);
if (PTL_OK != ret) {
opal_output_verbose(1, ompi_coll_base_framework.framework_output,
"%s:%d: PtlCTFree failed: %d\n",
__FILE__, __LINE__, ret);
return OMPI_ERROR;
}
}

PtlMEUnlink(request->u.allreduce.data_me_h);
PtlCTFree(request->u.allreduce.trig_ct_h);
do {
ret = PtlMEUnlink(request->u.allreduce.data_me_h);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) {
opal_output_verbose(1, ompi_coll_base_framework.framework_output,
"%s:%d: PtlMEUnlink failed: %d\n",
__FILE__, __LINE__, ret);
return OMPI_ERROR;
}

ret = PtlCTFree(request->u.allreduce.trig_ct_h);
if (PTL_OK != ret) {
opal_output_verbose(1, ompi_coll_base_framework.framework_output,
"%s:%d: PtlCTFree failed: %d\n",
__FILE__, __LINE__, ret);
return OMPI_ERROR;
}
}

return (OMPI_SUCCESS);
Expand Down
4 changes: 3 additions & 1 deletion ompi/mca/coll/portals4/coll_portals4_barrier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,9 @@ barrier_hypercube_bottom(ompi_coll_portals4_request_t *request)
int ret;

/* cleanup */
ret = PtlMEUnlink(request->u.barrier.data_me_h);
do {
ret = PtlMEUnlink(request->u.barrier.data_me_h);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) {
opal_output_verbose(1, ompi_coll_base_framework.framework_output,
"%s:%d: PtlMEUnlink failed: %d\n",
Expand Down
8 changes: 6 additions & 2 deletions ompi/mca/coll/portals4/coll_portals4_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,19 @@ portals4_close(void)
mca_coll_portals4_component.data_md_h = PTL_INVALID_HANDLE;

if (!PtlHandleIsEqual(mca_coll_portals4_component.finish_me_h, PTL_INVALID_HANDLE)) {
ret = PtlMEUnlink(mca_coll_portals4_component.finish_me_h);
do {
ret = PtlMEUnlink(mca_coll_portals4_component.finish_me_h);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) {
opal_output_verbose(1, ompi_coll_base_framework.framework_output,
"%s:%d: PtlMEUnlink failed: %d\n",
__FILE__, __LINE__, ret);
}
}
if (!PtlHandleIsEqual(mca_coll_portals4_component.unex_me_h, PTL_INVALID_HANDLE)) {
ret = PtlMEUnlink(mca_coll_portals4_component.unex_me_h);
do {
ret = PtlMEUnlink(mca_coll_portals4_component.unex_me_h);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) {
opal_output_verbose(1, ompi_coll_base_framework.framework_output,
"%s:%d: PtlMEUnlink failed: %d\n",
Expand Down
8 changes: 6 additions & 2 deletions ompi/mca/coll/portals4/coll_portals4_gather.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,9 @@ cleanup_gather_handles(ompi_coll_portals4_request_t *request)
/**********************************/
/* Cleanup Gather Handles */
/**********************************/
ret = PtlMEUnlink(request->u.gather.gather_meh);
do {
ret = PtlMEUnlink(request->u.gather.gather_meh);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }

ret = PtlCTFree(request->u.gather.gather_cth);
Expand All @@ -484,7 +486,9 @@ cleanup_sync_handles(ompi_coll_portals4_request_t *request)
/**********************************/
/* Cleanup Sync Handles */
/**********************************/
ret = PtlMEUnlink(request->u.gather.sync_meh);
do {
ret = PtlMEUnlink(request->u.gather.sync_meh);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }

ret = PtlCTFree(request->u.gather.sync_cth);
Expand Down
20 changes: 17 additions & 3 deletions ompi/mca/coll/portals4/coll_portals4_reduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,24 +340,38 @@ reduce_kary_tree_top(const void *sendbuf, void *recvbuf, int count,
static int
reduce_kary_tree_bottom(ompi_coll_portals4_request_t *request)
{
int ret, line;

if (request->u.reduce.is_optim) {
PtlAtomicSync();

if (request->u.reduce.use_ack_ct_h) {
PtlCTFree(request->u.reduce.ack_ct_h);
ret = PtlCTFree(request->u.reduce.ack_ct_h);
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }
}

if (request->u.reduce.child_nb) {
PtlMEUnlink(request->u.reduce.data_me_h);
do {
ret = PtlMEUnlink(request->u.reduce.data_me_h);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }
}

PtlCTFree(request->u.reduce.trig_ct_h);
ret = PtlCTFree(request->u.reduce.trig_ct_h);
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }

if (request->u.reduce.free_buffer) {
free(request->u.reduce.free_buffer);
}
}
return (OMPI_SUCCESS);

err_hdlr:
opal_output(ompi_coll_base_framework.framework_output,
"%s:%4d:%4d\tError occurred ret=%d",
__FILE__, __LINE__, line, ret);

return ret;
}


Expand Down
20 changes: 4 additions & 16 deletions ompi/mca/coll/portals4/coll_portals4_scatter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,8 @@ cleanup_scatter_handles(ompi_coll_portals4_request_t *request)
/**********************************/
do {
ret = PtlMEUnlink(request->u.scatter.scatter_meh);
if (PTL_IN_USE == ret) {
opal_output(ompi_coll_base_framework.framework_output,
"%s:%4d: scatter_meh still in use (ret=%d, rank %2d)",
__FILE__, __LINE__, ret, request->u.scatter.my_rank);
continue;
}
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }
} while (ret == PTL_IN_USE);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }

ret = PtlCTFree(request->u.scatter.scatter_cth);
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }
Expand Down Expand Up @@ -292,14 +286,8 @@ cleanup_sync_handles(ompi_coll_portals4_request_t *request)
/**********************************/
do {
ret = PtlMEUnlink(request->u.scatter.sync_meh);
if (PTL_IN_USE == ret) {
opal_output(ompi_coll_base_framework.framework_output,
"%s:%4d: sync_meh still in use (ret=%d, rank %2d)",
__FILE__, __LINE__, ret, request->u.scatter.my_rank);
continue;
}
if (PTL_OK != ret) { ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }
} while (ret == PTL_IN_USE);
} while (PTL_IN_USE == ret);
if (PTL_OK != ret) { ptl_ret = ret; ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }

ret = PtlCTFree(request->u.scatter.sync_cth);
if (PTL_OK != ret) { ptl_ret = ret; ret = OMPI_ERROR; line = __LINE__; goto err_hdlr; }
Expand Down