pool/rdma-core
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 894017 from home:NMoreyChaisemartin:branches:science:HPC

Browse Source 
- Update to rdma-core v35.0
  - Bugfixes on all providers
  - Many improvements on pyverbs
  - Fixes dracut path issues on Tumbleweed
- Refresh patches to latest sources:
  - Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch
  - disable-rdma-interface-renaming.patch

OBS-URL: https://build.opensuse.org/request/show/894017
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=148
This commit is contained in:
Nicolas Morey-Chaisemartin 2021-05-18 10:30:39 +00:00 committed by Git OBS Bridge
parent eafbe33a7c
commit 3e47dac5f1
8 changed files with 41 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch
View File

@ -1,4 +1,4 @@
commit 2f56b7b7737d603c408117b88c60be29019818e4
commit 87b0208768d75fad7f232552408f981f6f5b53b2
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Fri Jan 10 09:07:51 2020 +0100
@ -7,10 +7,10 @@ Date: Fri Jan 10 09:07:51 2020 +0100
This reverts commit 36588f5844af4ef1e5b0d6ad002fa1adf9032653.
diff --git CMakeLists.txt CMakeLists.txt
index 5579b5a187c0..66eb0b2fbc4b 100644
index bee504f9bac3..29b177abb4d3 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -648,6 +648,7 @@ add_subdirectory(librdmacm/man)
@@ -665,6 +665,7 @@ add_subdirectory(librdmacm/man)
# Providers
if (HAVE_COHERENT_DMA)
add_subdirectory(providers/bnxt_re)
@ -19,7 +19,7 @@ index 5579b5a187c0..66eb0b2fbc4b 100644
add_subdirectory(providers/efa)
add_subdirectory(providers/efa/man)
diff --git MAINTAINERS MAINTAINERS
index 948c3a7fb53f..050113e1f60a 100644
index c317f980abe8..8bbd57b61113 100644
--- MAINTAINERS
+++ MAINTAINERS
@@ -51,6 +51,11 @@ M: Devesh Sharma <Devesh.sharma@broadcom.com>
@ -35,7 +35,7 @@ index 948c3a7fb53f..050113e1f60a 100644
M: Steve Wise <swise@opengridcomputing.com>
S: Supported
diff --git README.md README.md
index b649c6f2bc0f..b31d448264e5 100644
index 48113de790cb..61d181756c85 100644
--- README.md
+++ README.md
@@ -15,6 +15,7 @@ under the providers/ directory. Support for the following Kernel RDMA drivers
@ -46,32 +46,6 @@ index b649c6f2bc0f..b31d448264e5 100644
- iw_cxgb4.ko
- hfi1.ko
- hns-roce.ko
diff --git debian/control debian/control
index a423e4f8a4d2..33677170a22a 100644
--- debian/control
+++ debian/control
@@ -91,6 +91,7 @@ Description: User space provider drivers for libibverbs
This package contains the user space verbs drivers:
.
- bnxt_re: Broadcom NetXtreme-E RoCE HCAs
+ - cxgb3: Chelsio T3 iWARP HCAs
- cxgb4: Chelsio T4 iWARP HCAs
- efa: Amazon Elastic Fabric Adapter
- hfi1verbs: Intel Omni-Path HFI
diff --git debian/copyright debian/copyright
index 3bf582b46e06..5c90b2550cf0 100644
--- debian/copyright
+++ debian/copyright
@@ -148,7 +148,8 @@ Files: providers/bnxt_re/*
Copyright: 2015-2017, Broadcom Limited and/or its subsidiaries
License: BSD-2-clause or GPL-2
-Files: providers/cxgb4/*
+Files: providers/cxgb3/*
+ providers/cxgb4/*
Copyright: 2003-2016, Chelsio Communications, Inc.
License: BSD-MIT or GPL-2
diff --git kernel-boot/rdma-description.rules kernel-boot/rdma-description.rules
index 48a7cede9bc8..57bb8f1273cd 100644
--- kernel-boot/rdma-description.rules
@ -97,10 +71,10 @@ index 95eaf7206702..a9b5350aa79c 100644
ENV{ID_NET_DRIVER}=="hns", RUN{builtin}+="kmod load hns_roce"
ENV{ID_NET_DRIVER}=="i40e", RUN{builtin}+="kmod load i40iw"
diff --git libibverbs/verbs.h libibverbs/verbs.h
index da782f2ad2f2..a528b49a4fea 100644
index 7d42095652af..726832e0abe6 100644
--- libibverbs/verbs.h
+++ libibverbs/verbs.h
@@ -2190,6 +2190,7 @@ struct ibv_device **ibv_get_device_list(int *num_devices);
@@ -2204,6 +2204,7 @@ struct ibv_device **ibv_get_device_list(int *num_devices);
struct verbs_devices_ops;
extern const struct verbs_device_ops verbs_provider_bnxt_re;
@ -3090,29 +3064,8 @@ index 000000000000..39a44192e29c
+ break;
+ }
+}
diff --git redhat/rdma-core.spec redhat/rdma-core.spec
index 1bdc4872a233..af0a2e69e3ea 100644
--- redhat/rdma-core.spec
+++ redhat/rdma-core.spec
@@ -147,6 +147,8 @@ Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWAR
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires: %{name}%{?_isa} = %{version}-%{release}
+Provides: libcxgb3 = %{version}-%{release}
+Obsoletes: libcxgb3 < %{version}-%{release}
Provides: libcxgb4 = %{version}-%{release}
Obsoletes: libcxgb4 < %{version}-%{release}
Provides: libefa = %{version}-%{release}
@@ -177,6 +179,7 @@ fast path operations.
Device-specific plug-in ibverbs userspace drivers are included:
+- libcxgb3: Chelsio T3 iWARP HCA
- libcxgb4: Chelsio T4 iWARP HCA
- libefa: Amazon Elastic Fabric Adapter
- libhfi1: Intel Omni-Path HFI
diff --git suse/rdma-core.spec suse/rdma-core.spec
index 63f8699ade18..082515dc11c3 100644
index e5d0950e332b..ff66281047b6 100644
--- suse/rdma-core.spec
+++ suse/rdma-core.spec
@@ -182,6 +182,7 @@ RDMA core development libraries and headers.

2
_service
View File

@ -8,7 +8,7 @@
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<param name="revision">2504c0bab0a807455bfd0e7f516c86a07656e934</param>
<param name="revision">e29a698e99028e9a092bb00c03ee4bfa31ae0cf3</param>
<param name="extract">suse/rdma-core.spec</param>
</service>
<service name="recompress" mode="disabled">

11
disable-rdma-interface-renaming.patch
View File

@ -1,6 +1,6 @@
commit 435ad204d32f9f3b7a72a171e2e6d04a90ba9b6e
commit 1b8594d94f6573e5f359383362ecd97fcbaddc13
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Fri Jan 24 16:01:18 2020 +0100
Date: Tue May 18 11:18:54 2021 +0200
disable rdma interface renaming
@ -9,12 +9,15 @@ Date: Fri Jan 24 16:01:18 2020 +0100
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
diff --git kernel-boot/rdma-persistent-naming.rules kernel-boot/rdma-persistent-naming.rules
index 9b61e1630d56..274d7c87727e 100644
index 6f9c53a53bbb..41d86df10a54 100644
--- kernel-boot/rdma-persistent-naming.rules
+++ kernel-boot/rdma-persistent-naming.rules
@@ -25,4 +25,4 @@
@@ -26,7 +26,7 @@
# Device type = RoCE
# mlx5_0 -> rocex525400c0fe123455
#
-ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK"
+#ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK"
# Example:
# * NAME_FIXED

4
prebuilt-pandoc.tgz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f706683797c1210a19c1937be45e2696e4bfd0c1b83881069c9d7dd255ae0e4
size 91175
oid sha256:aca6830acb3e50b8f9e8643f6f7883fd41d00bd918eeaf6b192edc13e75d6e0b
size 94340

3
rdma-core-33.1.0.2504c0bab0a8.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ea36422773a93931713293d8d2a0a31a764b5b64f41ca8c93d7cb8c9528fe4b
size 1763449

3
rdma-core-35.0.0.e29a698e9902.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed9879696a10de482e1bd48648c5af824b850eeb847d3902d3b458f6c636e921
size 1650154

11
rdma-core.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue May 18 09:21:31 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- Update to rdma-core v35.0
- Bugfixes on all providers
- Many improvements on pyverbs
- Fixes dracut path issues on Tumbleweed
- Refresh patches to latest sources:
- Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch
- disable-rdma-interface-renaming.patch
-------------------------------------------------------------------
Fri Feb 19 08:23:46 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>

13
rdma-core.spec
View File

@ -25,9 +25,9 @@
%define with_pyverbs 0
%endif
%define git_ver .0.2504c0bab0a8
%define git_ver .0.e29a698e9902
Name: rdma-core
Version: 33.1
Version: 35.0
Release: 0
Summary: RDMA core userspace libraries and daemons
License: BSD-2-Clause OR GPL-2.0-only
@ -464,7 +464,7 @@ cd build
cd ..
mkdir -p %{buildroot}/%{_sysconfdir}/rdma
%global dracutlibdir %%{_libexecdir}/dracut/
%global dracutlibdir %%{_prefix}/lib/dracut/
%global sysmodprobedir %%{_sysconfdir}/modprobe.d
mkdir -p %{buildroot}%{_udevrulesdir}
@ -473,14 +473,19 @@ mkdir -p %{buildroot}%{sysmodprobedir}
mkdir -p %{buildroot}%{_unitdir}
# Port type setup for mlx4 dual port cards
install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/50-libmlx4.conf
install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf
sed 's%/usr/libexec%/usr/lib%g' redhat/rdma.mlx4.sys.modprobe > %{buildroot}%{sysmodprobedir}/50-libmlx4.conf
chmod 0644 %{buildroot}%{sysmodprobedir}/50-libmlx4.conf
install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh
# Dracut file for IB support during boot
install -D -m0644 suse/module-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
%if "%{_libexecdir}" != "/usr/libexec"
sed 's-/usr/libexec-%{_libexecdir}-g' -i %{buildroot}%{sysmodprobedir}/50-libmlx4.conf
sed 's-/usr/libexec-%{_libexecdir}-g' -i %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
%endif
# ibacm
cd build
LD_LIBRARY_PATH=./lib bin/ib_acme -D . -O