From 922b99e05f6e07f27b67ecf13fb1d7228a0cfa4a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 11 Nov 2022 08:10:16 -0700 Subject: [PATCH] Add upstream patch to fix openmpi hang on koji builders (bz#2141137) --- 8227.patch | 27 +++++++++++++++++++++++++++ libfabric.spec | 8 +++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 8227.patch diff --git a/8227.patch b/8227.patch new file mode 100644 index 0000000..765b14e --- /dev/null +++ b/8227.patch @@ -0,0 +1,27 @@ +From b50b4df7e93988caff0574c6f62e99ab561b1f36 Mon Sep 17 00:00:00 2001 +From: Nicolas Morey-Chaisemartin +Date: Tue, 8 Nov 2022 12:40:43 +0100 +Subject: [PATCH] prov/net: fix error path in xnet_enable_rdm + +If xnet_listen fails (happens 100% of the time on a system with no +network interface but lo), the progress lock is not released which +causes a deadlock when fi_close is called later on the endpoint. + +Signed-off-by: Nicolas Morey-Chaisemartin +--- + prov/net/src/xnet_rdm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/prov/net/src/xnet_rdm.c b/prov/net/src/xnet_rdm.c +index 77a236b519..b5f77f068b 100644 +--- a/prov/net/src/xnet_rdm.c ++++ b/prov/net/src/xnet_rdm.c +@@ -711,7 +711,7 @@ static int xnet_enable_rdm(struct xnet_rdm *rdm) + + ret = xnet_listen(rdm->pep, progress); + if (ret) +- return ret; ++ goto unlock; + + /* TODO: Move updating the src_addr to pep_listen(). */ + len = sizeof(rdm->addr); diff --git a/libfabric.spec b/libfabric.spec index 44b143d..51e4f64 100644 --- a/libfabric.spec +++ b/libfabric.spec @@ -7,12 +7,15 @@ Name: libfabric Version: 1.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Fabric Interfaces License: BSD or GPLv2 URL: https://github.com/ofiwg/libfabric Source0: https://github.com/ofiwg/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +# Upstream patch to fix deadlock with no network +# https://github.com/ofiwg/libfabric/pull/8227 +Patch0: https://patch-diff.githubusercontent.com/raw/ofiwg/libfabric/pull/8227.patch %if %{__remake_config} BuildRequires: automake @@ -99,6 +102,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Fri Nov 11 2022 Orion Poplawski - 1.16.1-2 +- Add upstream patch to fix openmpi hang on koji builders (bz#2141137) + * Tue Oct 11 2022 Orion Poplawski - 1.16.1-1 - Update to 1.16.1