Skip to content

osc/pt2pt: Previous locks must complete in order #2593

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

Closed
wants to merge 1 commit into from
Closed

osc/pt2pt: Previous locks must complete in order #2593

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
24 changes: 23 additions & 1 deletion ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,9 @@ static int ompi_osc_pt2pt_lock_internal (int lock_type, int target, int assert,
ompi_osc_pt2pt_module_t *module = GET_MODULE(win);
ompi_osc_pt2pt_sync_t *lock;
int ret = OMPI_SUCCESS;
ompi_osc_pt2pt_sync_t *otherlock = NULL;
int target_key;
void *iter_hash_node = NULL;

/* Check if no_locks is set. TODO: we also need to track whether we are in an
* active target epoch. Fence can make this tricky to track. */
Expand Down Expand Up @@ -345,6 +348,25 @@ static int ompi_osc_pt2pt_lock_internal (int lock_type, int target, int assert,
return OMPI_ERR_RMA_CONFLICT;
}

/* All previously requested locks must be complete before we can start a new
* lock, otherwise we deadlock from mis-ordering of locks.
*/
ret = opal_hash_table_get_first_key_uint32(&module->outstanding_locks,
(uint32_t *) &target_key,
(void **) &otherlock,
&iter_hash_node);
while( OPAL_SUCCESS == ret ) {
if( NULL != otherlock ) {
ompi_osc_pt2pt_sync_wait_expected (otherlock);
}

ret = opal_hash_table_get_next_key_uint32(&module->outstanding_locks,
(uint32_t *) &target_key,
(void **) &otherlock,
iter_hash_node, &iter_hash_node);
}
ret = OPAL_SUCCESS;

++module->passive_target_access_epoch;

ompi_osc_pt2pt_module_lock_insert (module, lock);
Expand Down Expand Up @@ -596,7 +618,7 @@ int ompi_osc_pt2pt_flush_all (struct ompi_win_t *win)
}

ret = opal_hash_table_get_next_key_uint32 (&module->outstanding_locks, (uint32_t *) &target,
(void **) lock, node, &node);
(void **) &lock, node, &node);
if (OPAL_SUCCESS != ret) {
ret = OPAL_SUCCESS;
break;
Expand Down