Merge pull request open-mpi#1832 from hjelmn/r2_rdma

hjelmn · web-flow · commit 2640271c26b7 · 2016-06-30T10:05:23.000-06:00
bml/r2: be more restrictive on rdma endpoints
diff --git a/ompi/mca/bml/r2/bml_r2.c b/ompi/mca/bml/r2/bml_r2.c
@@ -267,8 +267,9 @@ static int mca_bml_r2_endpoint_add_btl (struct ompi_proc_t *proc, mca_bml_base_e
         }
     }
 
-    /* always add rdma endpoints */
-    if ((btl_flags & MCA_BTL_FLAGS_RDMA) &&
+    /* always add rdma endpoints if they support full rdma */
+    if ((btl_in_use && (btl_flags & MCA_BTL_FLAGS_RDMA) ||
+         (btl_flags & (MCA_BTL_FLAGS_RDMA | MCA_BTL_FLAGS_ATOMIC_FOPS)) == (MCA_BTL_FLAGS_RDMA | MCA_BTL_FLAGS_ATOMIC_FOPS)) &&
         !((proc->super.proc_arch != ompi_proc_local_proc->super.proc_arch) &&
           (0 == (btl->btl_flags & MCA_BTL_FLAGS_HETEROGENEOUS_RDMA)))) {
         mca_bml_base_btl_t *bml_btl_rdma = mca_bml_base_btl_array_insert(&bml_endpoint->btl_rdma);

Original file line number	Diff line number	Diff line change
`@@ -267,8 +267,9 @@ static int mca_bml_r2_endpoint_add_btl (struct ompi_proc_t *proc, mca_bml_base_e`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
`270`		`- /* always add rdma endpoints */`
`271`		`- if ((btl_flags & MCA_BTL_FLAGS_RDMA) &&`
	`270`	`+ /* always add rdma endpoints if they support full rdma */`
	`271`	`+ if ((btl_in_use && (btl_flags & MCA_BTL_FLAGS_RDMA) \|\|`
	`272`	`+ (btl_flags & (MCA_BTL_FLAGS_RDMA \| MCA_BTL_FLAGS_ATOMIC_FOPS)) == (MCA_BTL_FLAGS_RDMA \| MCA_BTL_FLAGS_ATOMIC_FOPS)) &&`
`272`	`273`	`!((proc->super.proc_arch != ompi_proc_local_proc->super.proc_arch) &&`
`273`	`274`	`(0 == (btl->btl_flags & MCA_BTL_FLAGS_HETEROGENEOUS_RDMA)))) {`
`274`	`275`	`mca_bml_base_btl_t *bml_btl_rdma = mca_bml_base_btl_array_insert(&bml_endpoint->btl_rdma);`