From c3a6272a7036bfd8c4d4eb105d35aff7507a103d Mon Sep 17 00:00:00 2001 From: Alex Mikheev Date: Thu, 23 Feb 2017 14:21:16 +0200 Subject: [PATCH] ompi: pml ucx: fix race when ompi request is released Signed-off-by: Alex Mikheev --- ompi/mca/pml/ucx/pml_ucx.c | 2 +- ompi/mca/pml/ucx/pml_ucx_request.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ompi/mca/pml/ucx/pml_ucx.c b/ompi/mca/pml/ucx/pml_ucx.c index 59cc043362d..e45855d17b5 100644 --- a/ompi/mca/pml/ucx/pml_ucx.c +++ b/ompi/mca/pml/ucx/pml_ucx.c @@ -326,7 +326,7 @@ static void mca_pml_ucx_waitall(void **reqs, size_t *count_p) PML_UCX_ERROR("disconnect request failed: %s", ucs_status_string(status)); } - ucp_request_release(reqs[i]); + ucp_request_free(reqs[i]); reqs[i] = NULL; } diff --git a/ompi/mca/pml/ucx/pml_ucx_request.c b/ompi/mca/pml/ucx/pml_ucx_request.c index 5fb0d3fc1b8..84dfe8e1d74 100644 --- a/ompi/mca/pml/ucx/pml_ucx_request.c +++ b/ompi/mca/pml/ucx/pml_ucx_request.c @@ -21,7 +21,7 @@ static int mca_pml_ucx_request_free(ompi_request_t **rptr) *rptr = MPI_REQUEST_NULL; mca_pml_ucx_request_reset(req); - ucp_request_release(req); + ucp_request_free(req); return OMPI_SUCCESS; } @@ -75,7 +75,7 @@ void mca_pml_ucx_persistent_request_complete(mca_pml_ucx_persistent_request_t *p ompi_request_complete(&preq->ompi, true); mca_pml_ucx_persistent_request_detach(preq, tmp_req); mca_pml_ucx_request_reset(tmp_req); - ucp_request_release(tmp_req); + ucp_request_free(tmp_req); } static inline void mca_pml_ucx_preq_completion(ompi_request_t *tmp_req) @@ -154,7 +154,7 @@ static int mca_pml_ucx_persistent_request_free(ompi_request_t **rptr) preq->ompi.req_state = OMPI_REQUEST_INVALID; if (tmp_req != NULL) { mca_pml_ucx_persistent_request_detach(preq, tmp_req); - ucp_request_release(tmp_req); + ucp_request_free(tmp_req); } PML_UCX_FREELIST_RETURN(&ompi_pml_ucx.persistent_reqs, &preq->ompi.super); *rptr = MPI_REQUEST_NULL;