From 11cb0f24a51cc971db13ce12578c1f6ff4932281 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Wed, 15 May 2019 12:24:22 -0600 Subject: [PATCH] btl/uct: check for support before disabling UCX memory hooks Signed-off-by: Nathan Hjelm (cherry picked from commit 3e1dd362411f1da5564d3402f65e9b3b74f50759) --- opal/mca/btl/uct/btl_uct_component.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/opal/mca/btl/uct/btl_uct_component.c b/opal/mca/btl/uct/btl_uct_component.c index c8bc9e9377..f968cb9c31 100644 --- 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); }