From 8d3f999220e01e67dad19670b487eb3a0747bf41 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 3 Mar 2023 19:29:20 +0100 Subject: [PATCH] - updated to 43.0, introduced erdma driver --- rdma-core-cxgb3.patch | 8 +++---- rdma-core-kernel-abi.patch | 10 ++++----- rdma-core.spec | 45 ++++++++++++++++++++++++++++++++++---- 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/rdma-core-cxgb3.patch b/rdma-core-cxgb3.patch index e734959..7b63055 100644 --- a/rdma-core-cxgb3.patch +++ b/rdma-core-cxgb3.patch @@ -55,10 +55,10 @@ diff --git a/README.md b/README.md index 451ff7fcb..a96351933 100644 --- a/README.md +++ b/README.md -@@ -15,7 +15,6 @@ under the providers/ directory. Support for the following Kernel RDMA drivers - is included: +@@ -16,7 +16,6 @@ is included: - efa.ko + - erdma.ko - - iw_cxgb3.ko - iw_cxgb4.ko - hfi1.ko @@ -91,14 +91,14 @@ diff --git a/libibverbs/verbs.h b/libibverbs/verbs.h index c411722b1..12a33a99a 100644 --- a/libibverbs/verbs.h +++ b/libibverbs/verbs.h -@@ -2144,7 +2144,6 @@ struct ibv_device **ibv_get_device_list(int *num_devices); +@@ -2210,7 +2210,6 @@ struct ibv_device **ibv_get_device_list( struct verbs_devices_ops; extern const struct verbs_device_ops verbs_provider_bnxt_re; -extern const struct verbs_device_ops verbs_provider_cxgb3; extern const struct verbs_device_ops verbs_provider_cxgb4; extern const struct verbs_device_ops verbs_provider_efa; - extern const struct verbs_device_ops verbs_provider_hfi1verbs; + extern const struct verbs_device_ops verbs_provider_erdma; diff --git a/providers/cxgb3/CMakeLists.txt b/providers/cxgb3/CMakeLists.txt deleted file mode 100644 index a578105e7..000000000 diff --git a/rdma-core-kernel-abi.patch b/rdma-core-kernel-abi.patch index 5f8917a..16a9329 100644 --- a/rdma-core-kernel-abi.patch +++ b/rdma-core-kernel-abi.patch @@ -31,8 +31,8 @@ index 50bc77e6a..2d0766dd1 100644 - rdma/cxgb3-abi.h rdma/cxgb4-abi.h rdma/efa-abi.h - rdma/hns-abi.h -@@ -15,7 +14,6 @@ publish_internal_headers(rdma + rdma/erdma-abi.h +@@ -16,7 +15,6 @@ publish_internal_headers(rdma rdma/mlx5_user_ioctl_cmds.h rdma/mlx5_user_ioctl_verbs.h rdma/mthca-abi.h @@ -40,15 +40,15 @@ index 50bc77e6a..2d0766dd1 100644 rdma/ocrdma-abi.h rdma/qedr-abi.h rdma/rdma_netlink.h -@@ -59,7 +58,6 @@ endfunction() +@@ -66,7 +64,6 @@ endfunction() # Transform the kernel ABIs used by the providers rdma_kernel_provider_abi( rdma/bnxt_re-abi.h - rdma/cxgb3-abi.h rdma/cxgb4-abi.h rdma/efa-abi.h - rdma/hns-abi.h -@@ -68,7 +66,6 @@ rdma_kernel_provider_abi( + rdma/erdma-abi.h +@@ -76,7 +73,6 @@ rdma_kernel_provider_abi( rdma/mlx4-abi.h rdma/mlx5-abi.h rdma/mthca-abi.h diff --git a/rdma-core.spec b/rdma-core.spec index 70dc0c8..f685fa6 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -7,13 +7,13 @@ Summary: RDMA Core Userspace Libraries and Daemons Summary(pl.UTF-8): RDMA Core - biblioteki i demony przestrzeni użytkownika Name: rdma-core -Version: 42.1 +Version: 43.0 Release: 1 License: BSD or GPL v2 Group: Applications/System #Source0Download: https://github.com/linux-rdma/rdma-core/releases Source0: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: c60ef0fbdb7b1773dc71998bcf4ae3c0 +# Source0-md5: 3785fd2b35cd41043ab53226fc112d41 Source1: libibverbs.pc.in Source2: librdmacm.pc.in Patch0: %{name}-static.patch @@ -342,6 +342,33 @@ application. Statyczna wersja sterownika efa, którą można wbudować bezpośrednio w aplikację. +%package -n libibverbs-driver-erdma +Summary: Userspace driver for Alibaba Elastic RDMA (iWarp) adapters +Summary(pl.UTF-8): Sterownik przestrzeni użytkownika dla kart Alibaba Elastic RDMA (iWarp) +Group: Libraries +Requires: libibverbs = %{version}-%{release} + +%description -n libibverbs-driver-erdma +Userspace driver for Alibaba Elastic RDMA (iWarp) adapters. + +%description -n libibverbs-driver-erdma -l pl.UTF-8 +Sterownik przestrzeni użytkownika dla kart Alibaba Elastic RDMA +(iWarp). + +%package -n libibverbs-driver-erdma-static +Summary: Static version of erdma driver +Summary(pl.UTF-8): Statyczna wersja sterownika erdma +Group: Development/Libraries +Requires: libibverbs-static = %{version}-%{release} + +%description -n libibverbs-driver-erdma-static +Static version of erdma driver, which may be linked directly into +application. + +%description -n libibverbs-driver-erdma-static -l pl.UTF-8 +Statyczna wersja sterownika erdma, którą można wbudować bezpośrednio w +aplikację. + %package -n libibverbs-driver-hfi1verbs Summary: Userspace driver for Intel OPA Gen1 adapters Summary(pl.UTF-8): Sterownik przestrzeni użytkownika dla kart Intel OPA Gen1 @@ -1160,7 +1187,7 @@ rm -rf $RPM_BUILD_ROOT %files -n rdma-boot %defattr(644,root,root,755) -%doc Documentation/udev.md +%doc Documentation/udev.md build/kernel-boot/persistent-ipoib.rules.in %dir %{_sysconfdir}/rdma %dir %{_sysconfdir}/rdma/modules %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rdma/modules/infiniband.conf @@ -1176,7 +1203,6 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rules.d/90-rdma-hw-modules.rules /lib/udev/rules.d/90-rdma-ulp-modules.rules /lib/udev/rules.d/90-rdma-umad.rules -%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/70-persistent-ipoib.rules %files -n rdma-ndd %defattr(644,root,root,755) @@ -1283,6 +1309,17 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libefa.a %endif +%files -n libibverbs-driver-erdma +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libibverbs/liberdma-%{ibv_abi}.so +%{_sysconfdir}/libibverbs.d/erdma.driver + +%if %{with static_libs} +%files -n libibverbs-driver-erdma-static +%defattr(644,root,root,755) +%{_libdir}/liberdma-%{ibv_abi}.a +%endif + %files -n libibverbs-driver-hfi1verbs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libibverbs/libhfi1verbs-%{ibv_abi}.so -- 2.44.0