Skip to content

Removed deadlock in find dynamic region #10473

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
devreal merged 1 commit into from
Jun 23, 2022
Merged

Removed deadlock in find dynamic region #10473

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
4 changes: 0 additions & 4 deletions ompi/mca/osc/rdma/osc_rdma_dynamic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,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));
Copy link
Contributor

@awlauria awlauria Jun 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's an OPAL_THREAD_LOCK() acquired on line 470 above..should that get released here?

Technically outside the scope of this PR, but something @gpaulsen and I noticed.

Copy link
Contributor

@devreal devreal Jun 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, this should be fixed in this PR as well (while we're at it)

return ret;
}

Expand All @@ -490,7 +487,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;
Expand Down