diff --git a/openucx.changes b/openucx.changes index 4e21d0b..a6d45c8 100644 --- a/openucx.changes +++ b/openucx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 13 08:42:05 UTC 2022 - Nicolas Morey-Chaisemartin + +- Fix UCM bistro support on non s390x archs +- Add ucm-fix-UCX_MEM_MALLOC_RELOC.patch to disable malloc relocations by default (bsc#1194369) + ------------------------------------------------------------------- Thu Sep 23 07:35:57 UTC 2021 - Nicolas Morey-Chaisemartin diff --git a/openucx.spec b/openucx.spec index fabf416..661f206 100644 --- a/openucx.spec +++ b/openucx.spec @@ -1,7 +1,7 @@ # # spec file for package openucx # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ URL: http://openucx.org/ Source: https://github.com/openucx/ucx/releases/download/v%version/ucx-%version.tar.gz Source1: baselibs.conf Patch1: openucx-s390x-support.patch +Patch2: ucm-fix-UCX_MEM_MALLOC_RELOC.patch BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1.10 BuildRequires: binutils-devel @@ -133,7 +134,10 @@ hardware. %prep %setup -qn ucx-%version +%ifarch s390x %patch1 +%endif +%patch2 %build autoreconf -fi diff --git a/ucm-fix-UCX_MEM_MALLOC_RELOC.patch b/ucm-fix-UCX_MEM_MALLOC_RELOC.patch new file mode 100644 index 0000000..90f16af --- /dev/null +++ b/ucm-fix-UCX_MEM_MALLOC_RELOC.patch @@ -0,0 +1,23 @@ +commit 57ca2c53bcef6de7ca33767cedab120afd9a7601 +Author: Nicolas Morey-Chaisemartin +Date: Thu Jan 13 12:00:19 2022 +0100 + + ucm: fix UCX_MEM_MALLOC_RELOC + + Should be disabled by default but is enabled by the parser default value + + Signed-off-by: Nicolas Morey-Chaisemartin + +diff --git src/ucs/config/ucm_opts.c src/ucs/config/ucm_opts.c +index 89cccc487231..b13360980793 100644 +--- src/ucs/config/ucm_opts.c ++++ src/ucs/config/ucm_opts.c +@@ -62,7 +62,7 @@ static ucs_config_field_t ucm_global_config_table[] = { + ucs_offsetof(ucm_global_config_t, enable_malloc_hooks), + UCS_CONFIG_TYPE_BOOL}, + +- {"MALLOC_RELOC", "yes", ++ {"MALLOC_RELOC", "no", + "Enable installing malloc symbols in the relocation table.\n" + "This is unsafe and off by default, because sometimes glibc\n" + "calls malloc/free without going through the relocation table,\n"