Skip to content

osc/rdma: ensure bml add_procs has been called for all local procs #8452

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
hppritcha merged 1 commit into from
Feb 8, 2021
Merged

osc/rdma: ensure bml add_procs has been called for all local procs #8452

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
33 changes: 32 additions & 1 deletion ompi/mca/osc/rdma/osc_rdma_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2020 Google, LLC. All rights reserved.
* Copyright (c) 2020-2021 Google, LLC. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -799,6 +799,34 @@ static int ompi_osc_rdma_query_mtls (void)
return -1;
}

/**
* @brief ensure that all local procs are added to the bml
*
* The sm btl requires that all local procs be added to work correctly. If pml/ob1
* was not selected then we can't rely on this property. Since osc/rdma may use
* btl/sm we need to ensure that btl/sm is set up correctly. This function will
* only (potentially) call add_procs on local procs.
*/
static void ompi_osc_rdma_ensure_local_add_procs (void)
{
size_t nprocs;
ompi_proc_t** procs = ompi_proc_get_allocated (&nprocs);
if (NULL == procs) {
/* weird, this should have caused MPI_Init to fail */
return;
}

for (size_t proc_index = 0 ; proc_index < nprocs ; ++proc_index) {
ompi_proc_t *proc = procs[proc_index];
if (OPAL_PROC_ON_LOCAL_NODE(proc->super.proc_flags)) {
/* this will cause add_proc to get called if it has not already been called */
(void) mca_bml_base_get_endpoint (proc);
}
}

free(procs);
}

static int ompi_osc_rdma_query_btls (ompi_communicator_t *comm, struct mca_btl_base_module_t **btl)
{
struct mca_btl_base_module_t **possible_btls = NULL;
Expand Down Expand Up @@ -843,6 +871,9 @@ static int ompi_osc_rdma_query_btls (ompi_communicator_t *comm, struct mca_btl_b
return OMPI_SUCCESS;
}

/* if osc/rdma gets selected we need to ensure that all local procs have been added */
ompi_osc_rdma_ensure_local_add_procs ();

for (int rank = 0 ; rank < comm_size ; ++rank) {
ompi_proc_t *proc = ompi_comm_peer_lookup (comm, rank);
mca_bml_base_endpoint_t *endpoint;
Expand Down