Update to upstream release v51.0

Resolves: RHEL-24081, RHEL-22907, RHEL-22908, RHEL-22906

Signed-off-by: Kamal Heib <kheib@redhat.com>
This commit is contained in:
Kamal Heib 2024-04-17 11:15:11 -04:00
parent 3c0ec0b366
commit 1918297a42
5 changed files with 6 additions and 88 deletions

1
.gitignore vendored
View File

@ -24,3 +24,4 @@
/rdma-core-46.0.tar.gz
/rdma-core-48.0.tar.gz
/rdma-core-50.0.tar.gz
/rdma-core-51.0.tar.gz

View File

@ -1,35 +0,0 @@
From 4d0e1a40d8662cf0e2b00ef944ddf6dcef27f7f2 Mon Sep 17 00:00:00 2001
From: Kamal Heib <kheib@redhat.com>
Date: Fri, 8 Mar 2024 21:46:56 -0500
Subject: [PATCH] pyverbs: Fix build failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix the following error:
rdma-core-50.0/pyverbs/dmabuf_alloc.c: In function drm_open:
rdma-core-50.0/pyverbs/dmabuf_alloc.c:122:28: error: assignment to int (*)(struct drm *, uint64_t, uint32_t *, int) {aka int (*)(struct drm *, long long unsigned int, unsigned int *, int)} from incompatible pointer type int (*)(struct drm *, size_t, uint32_t *, int) {aka int (*)(struct drm *, unsigned int, unsigned int *, int)} [-Wincompatible-pointer-types]
122 | drm->alloc = amdgpu_alloc;
Signed-off-by: Kamal Heib <kheib@redhat.com>
---
pyverbs/dmabuf_alloc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyverbs/dmabuf_alloc.c b/pyverbs/dmabuf_alloc.c
index e3ea0a44f3d5..68f25928a1b7 100644
--- a/pyverbs/dmabuf_alloc.c
+++ b/pyverbs/dmabuf_alloc.c
@@ -43,7 +43,7 @@ static int i915_alloc(struct drm *drm, uint64_t size, uint32_t *handle, int gtt)
return 0;
}
-static int amdgpu_alloc(struct drm *drm, size_t size, uint32_t *handle, int gtt)
+static int amdgpu_alloc(struct drm *drm, uint64_t size, uint32_t *handle, int gtt)
{
union drm_amdgpu_gem_create gem_create = {{}};
int err;
--
2.44.0

View File

@ -1,42 +0,0 @@
From 1c63f25b55ca4f5317e1c85b548469bbc747e147 Mon Sep 17 00:00:00 2001
From: "Goldman, Adam" <adam.goldman@intel.com>
Date: Tue, 4 Feb 2020 08:55:20 -0500
Subject: [PATCH] kernel-boot: Do not perform device rename on OPA devices
PSM2 will not run with recent rdma-core releases. Several tools and
libraries like PSM2, require the hfi1 name to be present.
Recent rdma-core releases added a new feature to rename kernel devices,
but the default configuration will not work with hfi1 fabrics.
Related opa-psm2 github issue:
https://github.com/intel/opa-psm2/issues/43
Fixes: 5b4099d47be3 ("kernel-boot: Perform device rename to make stable names")
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Goldman, Adam <adam.goldman@intel.com>
---
kernel-boot/rdma-persistent-naming.rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel-boot/rdma-persistent-naming.rules b/kernel-boot/rdma-persistent-naming.rules
index 6f9c53a5..3ce34ea9 100644
--- a/kernel-boot/rdma-persistent-naming.rules
+++ b/kernel-boot/rdma-persistent-naming.rules
@@ -26,10 +26,10 @@
# Device type = RoCE
# mlx5_0 -> rocex525400c0fe123455
#
-ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK"
+ACTION=="add", SUBSYSTEM=="infiniband", KERNEL!="hfi1*", PROGRAM="rdma_rename %k NAME_FALLBACK"
# Example:
# * NAME_FIXED
# fixed name for specific board_id
#
-#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"
\ No newline at end of file
+#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"
--
2.30.1

View File

@ -1,5 +1,5 @@
Name: rdma-core
Version: 50.0
Version: 51.0
Release: %autorelease
Summary: RDMA core userspace libraries and daemons
@ -10,8 +10,6 @@ Summary: RDMA core userspace libraries and daemons
License: GPLv2 or BSD
Url: https://github.com/linux-rdma/rdma-core
Source: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz
Patch0001: 0001-pyverbs-Fix-build-failure.patch
Patch9998: 9998-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch
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}
@ -282,17 +280,10 @@ easy, object-oriented access to IB verbs.
%prep
%setup -q
%if 0%{?fedora}
%patch 9998 -p1
%endif
%if 0%{?rhel}
%patch 9999 -p1
%endif
%if %{with_pyverbs}
%patch 0001 -p1
%endif
%build
# New RPM defines _rundir, usually as /run
@ -453,6 +444,7 @@ fi
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/efadv*
%{_mandir}/man3/hnsdv*
%{_mandir}/man3/ibv_*
%{_mandir}/man3/rdma*
%{_mandir}/man3/umad*
@ -462,6 +454,7 @@ fi
%{_mandir}/man3/mlx5dv*
%{_mandir}/man3/mlx4dv*
%{_mandir}/man7/efadv*
%{_mandir}/man7/hnsdv*
%{_mandir}/man7/manadv*
%{_mandir}/man7/mlx5dv*
%{_mandir}/man7/mlx4dv*
@ -580,6 +573,7 @@ fi
%dir %{_sysconfdir}/libibverbs.d
%dir %{_libdir}/libibverbs
%{_libdir}/libefa.so.*
%{_libdir}/libhns.so.*
%{_libdir}/libibverbs*.so.*
%{_libdir}/libibverbs/*.so
%{_libdir}/libmana.so.*

View File

@ -1 +1 @@
SHA512 (rdma-core-50.0.tar.gz) = 0d341300dde2a8756ab0e80bf8d316627c997e85661d50b51897aa03e1b7326f4ca7a6f24e370354779482a2d9455e58dbb07e6292ed8b511e7f195e4e2d1850
SHA512 (rdma-core-51.0.tar.gz) = 25b92f4cf98172c00bdfc166666307be39fbdbc061e91c290fee9e932829df799e864019273cfd1f6118968bdfb3361b467d414f062b5bd7a269246c5857671d