Update rdma-core to v39.0 (#2221)

SPECS/rdma-core/0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch

@@ -1,33 +1,17 @@
-From d9a376151c8a0d30ea814704e844f3aa3359d984 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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kernel-boot/rdma-persistent-naming.rules b/kernel-boot/rdma-persistent-naming.rules
-index 9b61e1630d56..95d6851fb97a 100644
---- a/kernel-boot/rdma-persistent-naming.rules
-+++ b/kernel-boot/rdma-persistent-naming.rules
-@@ -25,4 +25,4 @@
+diff -Naur rdma-core-36.3-a/kernel-boot/rdma-persistent-naming.rules rdma-core-36.3-b/kernel-boot/rdma-persistent-naming.rules
+--- rdma-core-36.3-a/kernel-boot/rdma-persistent-naming.rules	2022-01-07 00:54:18.000000000 -0800
++++ rdma-core-36.3-b/kernel-boot/rdma-persistent-naming.rules	2022-02-03 15:10:26.763415015 -0800
+@@ -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"
--- 
-2.24.1
+ 
+ # 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"

SPECS/rdma-core/rdma-core.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "rdma-core-31.0.tar.gz": "51ae9a3ab81cd6834436813fafc310c8b7007feae9d09a53fdd5c169e648d50b"
+  "rdma-core-39.0.tar.gz": "f6eaf0de9fe386e234e00a18a553f591143f50e03342c9fdd703fa8747bf2378"
  }
 }

SPECS/rdma-core/rdma-core.spec

@@ -1,7 +1,7 @@
 Summary:        RDMA core userspace libraries and daemons
 Name:           rdma-core
-Version:        31.0
-Release:        3%{?dist}
+Version:        39.0
+Release:        1%{?dist}
 URL:            https://github.com/linux-rdma/rdma-core
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -281,14 +281,9 @@ mkdir -p %{buildroot}%{_udevrulesdir}
 mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma
 mkdir -p %{buildroot}%{sysmodprobedir}
 install -D -m0644 redhat/rdma.conf %{buildroot}/%{_sysconfdir}/rdma/rdma.conf
-install -D -m0644 redhat/rdma.sriov-vfs %{buildroot}/%{_sysconfdir}/rdma/sriov-vfs
 install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf
-install -D -m0644 redhat/rdma.service %{buildroot}%{_unitdir}/rdma.service
 install -D -m0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
-install -D -m0644 redhat/rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules
 install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf
-install -D -m0755 redhat/rdma.kernel-init %{buildroot}%{_libexecdir}/rdma-init-kernel
-install -D -m0755 redhat/rdma.sriov-init %{buildroot}%{_libexecdir}/rdma-set-sriov-vf
 install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh
 
 # ibacm
@@ -351,14 +346,12 @@ fi
 %config(noreplace) %{_sysconfdir}/rdma/modules/rdma.conf
 %config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf
 %config(noreplace) %{_sysconfdir}/rdma/rdma.conf
-%config(noreplace) %{_sysconfdir}/rdma/sriov-vfs
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %dir %{_sysconfdir}/modprobe.d
 %config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf
 %{_unitdir}/rdma-hw.target
 %{_unitdir}/rdma-load-modules@.service
-%{_unitdir}/rdma.service
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
 %dir %{dracutlibdir}/modules.d/05rdma
@@ -371,11 +364,8 @@ fi
 %{_udevrulesdir}/90-rdma-hw-modules.rules
 %{_udevrulesdir}/90-rdma-ulp-modules.rules
 %{_udevrulesdir}/90-rdma-umad.rules
-%{_udevrulesdir}/98-rdma.rules
 %dir %{sysmodprobedir}
 %{sysmodprobedir}/libmlx4.conf
-%{_libexecdir}/rdma-init-kernel
-%{_libexecdir}/rdma-set-sriov-vf
 %{_libexecdir}/mlx4-setup.sh
 %{_libexecdir}/truescale-serdes.cmds
 %{_sbindir}/rdma-ndd
@@ -613,6 +603,10 @@ fi
 %{_docdir}/%{name}/tests/*.py
 
 %changelog
+* Mon Feb 14 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 39.0-1
+- Update to version 39.0.
+- Modified patch to apply to new version.
+
 * Wed Oct 20 2021 Thomas Crain <thcrain@microsoft.com> - 31.0-3
 - Use python3-docutils dependency instead of python-docutils
 

cgmanifest.json

@@ -25484,8 +25484,8 @@
         "type": "other",
         "other": {
           "name": "rdma-core",
-          "version": "31.0",
-          "downloadUrl": "https://github.com/linux-rdma/rdma-core/releases/download/v31.0/rdma-core-31.0.tar.gz"
+          "version": "39.0",
+          "downloadUrl": "https://github.com/linux-rdma/rdma-core/releases/download/v39.0/rdma-core-39.0.tar.gz"
         }
       }
     },