From b6b593d63086aca02783acf0f50076766e5c9cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Batista=20Fernandes?= Date: Fri, 17 Jun 2022 17:17:57 -0300 Subject: [PATCH] Pull request #10473 from jotabf/patch-2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit osc/rdma: removed deadlock in find dynamic region Signed-off-by: João Batista Fernandes (cherry picked from commit 9779b99e9a5885bc4c716dec65a48a07fbc1309c) --- ompi/mca/osc/rdma/osc_rdma_dynamic.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ompi/mca/osc/rdma/osc_rdma_dynamic.c b/ompi/mca/osc/rdma/osc_rdma_dynamic.c index b839a0e362f..718a75b742a 100644 --- a/ompi/mca/osc/rdma/osc_rdma_dynamic.c +++ b/ompi/mca/osc/rdma/osc_rdma_dynamic.c @@ -466,12 +466,9 @@ int ompi_osc_rdma_find_dynamic_region (ompi_osc_rdma_module_t *module, ompi_osc_ " (len %lu)", base, base + len, (unsigned long) len); OPAL_THREAD_LOCK(&module->lock); - // Make sure region isn't being touched. - ompi_osc_rdma_lock_acquire_exclusive (module, peer, offsetof (ompi_osc_rdma_state_t, regions_lock)); if (!ompi_osc_rdma_peer_local_state (peer)) { ret = ompi_osc_rdma_refresh_dynamic_region (module, dy_peer); if (OMPI_SUCCESS != ret) { - ompi_osc_rdma_lock_release_exclusive (module, peer, offsetof (ompi_osc_rdma_state_t, regions_lock)); return ret; } @@ -488,7 +485,6 @@ int ompi_osc_rdma_find_dynamic_region (ompi_osc_rdma_module_t *module, ompi_osc_ ret = OMPI_ERR_RMA_RANGE; } OPAL_THREAD_UNLOCK(&module->lock); - ompi_osc_rdma_lock_release_exclusive (module, peer, offsetof (ompi_osc_rdma_state_t, regions_lock)); /* round a matching region */ return ret;