Merge pull request #6696 from gpaulsen/topic/v4.0.x/btl_uct_from_6668

hppritcha · web-flow · commit 76f01b9b8ec8 · 2019-06-03T12:15:40.000-07:00
btl/uct: check for support before disabling UCX memory hooks
diff --git a/opal/mca/btl/uct/btl_uct_component.c b/opal/mca/btl/uct/btl_uct_component.c
@@ -17,6 +17,7 @@
  * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * Copyright (c) 2018      Triad National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2019      Google, LLC. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -127,7 +128,10 @@ static int mca_btl_uct_component_open(void)
         mca_btl_uct_component.num_contexts_per_module = MCA_BTL_UCT_MAX_WORKERS;
     }
 
-    if (mca_btl_uct_component.disable_ucx_memory_hooks) {
+    if (mca_btl_uct_component.disable_ucx_memory_hooks &&
+        ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) ==
+        ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) &
+         opal_mem_hooks_support_level()))) {
         ucm_set_external_event(UCM_EVENT_VM_UNMAPPED);
         opal_mem_hooks_register_release(mca_btl_uct_mem_release_cb, NULL);
     }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.`
`18`	`18`	`* Copyright (c) 2018 Triad National Security, LLC. All rights`
`19`	`19`	`* reserved.`
	`20`	`+ * Copyright (c) 2019 Google, LLC. All rights reserved.`
`20`	`21`	`* $COPYRIGHT$`
`21`	`22`	`*`
`22`	`23`	`* Additional copyrights may follow`
`@@ -127,7 +128,10 @@ static int mca_btl_uct_component_open(void)`
`127`	`128`	`mca_btl_uct_component.num_contexts_per_module = MCA_BTL_UCT_MAX_WORKERS;`
`128`	`129`	`}`
`129`	`130`
`130`		`- if (mca_btl_uct_component.disable_ucx_memory_hooks) {`
	`131`	`+ if (mca_btl_uct_component.disable_ucx_memory_hooks &&`
	`132`	`+ ((OPAL_MEMORY_FREE_SUPPORT \| OPAL_MEMORY_MUNMAP_SUPPORT) ==`
	`133`	`+ ((OPAL_MEMORY_FREE_SUPPORT \| OPAL_MEMORY_MUNMAP_SUPPORT) &`
	`134`	`+ opal_mem_hooks_support_level()))) {`
`131`	`135`	`ucm_set_external_event(UCM_EVENT_VM_UNMAPPED);`
`132`	`136`	`opal_mem_hooks_register_release(mca_btl_uct_mem_release_cb, NULL);`
`133`	`137`	`}`