diff --git a/1000-CMakeLists-enable-erdma-provider.patch b/1000-CMakeLists-enable-erdma-provider.patch new file mode 100644 index 0000000000000000000000000000000000000000..e4c9c50f39f244b84edefaa5da4cc99cb1ede92e --- /dev/null +++ b/1000-CMakeLists-enable-erdma-provider.patch @@ -0,0 +1,29 @@ +From 6d10c60de8bc0b3a26c4f4a179d87be5cbae9a8b Mon Sep 17 00:00:00 2001 +From: Cheng Xu +Date: Fri, 19 Apr 2024 10:59:11 +0800 +Subject: [PATCH] CMakeLists: enable erdma provider + +RHEL upstream disables erdma provider, which is unexpected. Enable +it first, and then fix upstream in future. + +Signed-off-by: Cheng Xu +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cfe79bcfa..87c0d0886 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -711,7 +711,7 @@ add_subdirectory(providers/bnxt_re) + add_subdirectory(providers/cxgb4) # NO SPARSE + add_subdirectory(providers/efa) + add_subdirectory(providers/efa/man) +-#add_subdirectory(providers/erdma) ++add_subdirectory(providers/erdma) + add_subdirectory(providers/hns) + add_subdirectory(providers/irdma) + add_subdirectory(providers/mana) +-- +2.31.1 + diff --git a/rdma-core.spec b/rdma-core.spec index ea4a3ff41ad2f53f03872b786bb3cc85fee1902a..b58c530792bd21f75de5f086ff417c5dd8e1b116 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 Name: rdma-core Version: 46.0 Release: 1%{anolis_release}%{?dist}.1 @@ -26,6 +26,8 @@ Patch9999: 9999-udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch # Do not build static libs by default. %define with_static %{?_with_static: 1} %{?!_with_static: 0} +Patch1000: 1000-CMakeLists-enable-erdma-provider.patch + Patch100000: rdma-core-44.0-sw.patch # 32-bit arm is missing required arch-specific memory barriers, ExcludeArch: %{arm} @@ -145,6 +147,8 @@ Provides: libcxgb4 = %{version}-%{release} Obsoletes: libcxgb4 < %{version}-%{release} Provides: libefa = %{version}-%{release} Obsoletes: libefa < %{version}-%{release} +Provides: liberdma = %{version}-%{release} +Obsoletes: liberdma < %{version}-%{release} Provides: libhfi1 = %{version}-%{release} Obsoletes: libhfi1 < %{version}-%{release} Provides: libirdma = %{version}-%{release} @@ -172,6 +176,7 @@ Device-specific plug-in ibverbs userspace drivers are included: - libbxnt_re: Broadcom NetXtreme-E RoCE HCA - libcxgb4: Chelsio T4 iWARP HCA - libefa: Amazon Elastic Fabric Adapter +- liberdma: Alibaba Elastic RDMA (iWarp) Adapter - libhfi1: Intel Omni-Path HFI - libhns: HiSilicon Hip06 SoC - libirdma: Intel Ethernet Connection RDMA @@ -276,6 +281,7 @@ easy, object-oriented access to IB verbs. %if 0%{?rhel} %patch9000 -p1 %patch9999 -p1 +%patch1000 -p1 %endif %patch100000 -p1 @@ -636,6 +642,9 @@ fi %endif %changelog +* Wed Apr 17 2024 Cheng Xu - 46.0-1.0.3.1 +- Add erdma provider support + * Wed Mar 20 2024 wuxiat - 46.0-1.0.2.1 - cherry-pick `add sw Patch #9532175ecea28d05bb1173c2fb3e8ddf05b3e516`.