Upgrade mellanox drivers to 4.7-3.2.9.0 to support CentOS 8.1

3 modules are upgraded: mlnx-ofa_kernel, rdma-core and libibverbs.
driver sign method is updated to align with 4.18 kernel.

Story: 2007308
Task: 38804
Task: 38805
Task: 38806
Depends-On: https://review.opendev.org/710920
Change-Id: Ib04667fee9958938181d9d3fb3163cc11b2a1944
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>

centos_tarball-dl.lst

@@ -42,7 +42,7 @@ libtpms-0.6.0-4f0d59d.tar.gz#libtpms-0.6.0#https://github.com/stefanberger/libtp
 lldpd-0.9.0.tar.gz#lldpd-0.9.0#https://media.luffy.cx/files/lldpd/lldpd-0.9.0.tar.gz#http##
 lua-1fce39c6397056db645718b8f5821571d97869a4.tar.gz#lua#https://api.github.com/repos/ceph/lua/tarball/1fce39c6397056db645718b8f5821571d97869a4#https##
 !mariadb-10.1.28.tar.gz#mariadb-10.1.28#https://github.com/MariaDB/server/archive/mariadb-10.1.28.tar.gz#http_script##post-dl-script/mariadb.sh
-!MLNX_OFED_SRC-4.5-1.0.1.0.tgz#MLNX_OFED_SRC-4.5-1.0.1.0#http://content.mellanox.com/ofed/MLNX_OFED-4.5-1.0.1.0/MLNX_OFED_SRC-4.5-1.0.1.0.tgz#http_script##post-dl-script/MLNX_OFEDqat1.7.sh
+!MLNX_OFED_SRC-4.7-3.2.9.0.tgz#MLNX_OFED_SRC-4.7-3.2.9.0#http://content.mellanox.com/ofed/MLNX_OFED-4.7-3.2.9.0/MLNX_OFED_SRC-4.7-3.2.9.0.tgz#http_script##post-dl-script/MLNX_OFED.sh
 opae-intel-fpga-driver-2.0.1.tar.gz#opae-intel-fpga-driver-2.0.1#https://github.com/OPAE/opae-sdk/releases/download/1.3.6-4/opae-intel-fpga-driver-2.0.1.tar.gz#http##
 openvswitch-2.11.0.tar.gz#openvswitch-2.11.0#https://github.com/openvswitch/ovs/archive/v2.11.0.tar.gz#http##
 puppet-boolean-22b726dd78b0a60a224cc7054aebbf28e9306f62.tar.gz#puppet-boolean#https://github.com/voxpupuli/puppet-boolean/tarball/22b726dd78b0a60a224cc7054aebbf28e9306f62#http##

kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch

@@ -1,8 +1,7 @@
-From 6152dc85e1b94ec93a3378f4f77b3b33907aac35 Mon Sep 17 00:00:00 2001
+From 0d5ddc8227336beccae3f02c4b30386b09a41a0b Mon Sep 17 00:00:00 2001
-Message-Id: <6152dc85e1b94ec93a3378f4f77b3b33907aac35.1579886617.git.Jim.Somerville@windriver.com>
 From: Jim Somerville <Jim.Somerville@windriver.com>
 Date: Mon, 20 Jan 2020 11:40:06 -0500
-Subject: [PATCH 1/1] Support TiS system
+Subject: [PATCH] Support TiS system
 
 This patch added the following to support TiS system:
 - Support package versioning for TiS format
@@ -18,12 +17,13 @@ Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
 Signed-off-by: Kam Nasim <kam.nasim@windriver.com>
 Signed-off-by: eric zhang <eric.zhang@windriver.com>
 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
+Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
 ---
  SPECS/mlnx-ofa_kernel.spec | 51 +++++++++++++++++++++++++++++++---------------
  1 file changed, 35 insertions(+), 16 deletions(-)
 
 diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec
-index 85af93f..6e77d09 100644
+index b123e82..44a31ef 100644
 --- a/SPECS/mlnx-ofa_kernel.spec
 +++ b/SPECS/mlnx-ofa_kernel.spec
 @@ -27,8 +27,14 @@
@@ -42,9 +42,9 @@ index 85af93f..6e77d09 100644
  %global WITH_SYSTEMD %(if ( test -d "%{_unitdir}" > /dev/null); then echo -n '1'; else echo -n '0'; fi)
  
  %{!?configure_options: %global configure_options --with-core-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-mlx4-mod --with-mlx4_en-mod --with-mlx5-mod --with-mlxfw-mod --with-ipoib-mod}
-@@ -41,12 +47,11 @@
+@@ -43,12 +49,11 @@
- %global BLUENIX %(if (grep -qiE "Bluenix" /etc/issue /etc/*release* 2>/dev/null); then echo -n '1'; else echo -n '0'; fi)
+ # Force python3 on RHEL8 and OL8:
- %global XENSERVER65 %(if (grep -qiE "XenServer.*6\.5" /etc/issue /etc/*release* 2>/dev/null); then echo -n '1'; else echo -n '0'; fi)
+ %global PYTHON3 %(if test `grep -E '^(ID="(rhel|ol|centos)"|VERSION="8)' /etc/os-release 2>/dev/null | wc -l` -eq 2; then echo -n '1'; else echo -n '0'; fi)
  
 -%{!?KVERSION: %global KVERSION %(uname -r)}
 +%{!?KVERSION: %global KVERSION %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')}
@@ -57,7 +57,7 @@ index 85af93f..6e77d09 100644
  # Select packages to build
  
  # Kernel module packages to be included into kernel-ib
-@@ -63,7 +68,9 @@
+@@ -64,7 +69,9 @@
  
  %{!?KERNEL_SOURCES: %global KERNEL_SOURCES /lib/modules/%{KVERSION}/source}
  
@@ -65,10 +65,10 @@ index 85af93f..6e77d09 100644
 +
 +%define _basename mlnx-ofa_kernel
 +%define _name %{_basename}%{?bt_ext}
- %{!?_version: %global _version 4.5}
+ %{!?_version: %global _version 4.7}
- %{!?_release: %global _release OFED.4.5.1.0.1.1.gb4fdfac}
+ %{!?_release: %global _release OFED.4.7.3.2.9.1.g457f064}
  %global _kmp_rel %{_release}%{?_kmp_build_num}%{?_dist}
-@@ -75,11 +82,17 @@
+@@ -82,11 +89,17 @@
  Summary: Infiniband HCA Driver
  Name: %{_name}
  Version: %{_version}
@@ -88,7 +88,7 @@ index 85af93f..6e77d09 100644
  BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/OFED}
  Vendor: Mellanox Technologies
  Obsoletes: kernel-ib
-@@ -135,7 +148,6 @@ EOF)
+@@ -142,7 +155,6 @@ EOF)
  %global kernel_release() %{KVERSION}
  %global flavors_to_build default
  %package -n %{non_kmp_pname}
@@ -96,7 +96,7 @@ index 85af93f..6e77d09 100644
  Requires: coreutils
  Requires: pciutils
  Requires: grep
-@@ -162,7 +174,7 @@ Obsoletes: mlnx-en-doc
+@@ -169,7 +181,7 @@ Obsoletes: mlnx-en-doc
  Obsoletes: mlnx-en-debuginfo
  Obsoletes: mlnx-en-sources
  Version: %{_version}
@@ -105,7 +105,7 @@ index 85af93f..6e77d09 100644
  Summary: Infiniband Driver and ULPs kernel modules
  Group: System Environment/Libraries
  %description -n %{non_kmp_pname}
-@@ -174,7 +186,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
+@@ -181,7 +193,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
  %package -n %{devel_pname}
  Version: %{_version}
  # build KMP rpms?
@@ -114,7 +114,7 @@ index 85af93f..6e77d09 100644
  Obsoletes: kernel-ib-devel
  Obsoletes: compat-rdma-devel
  Obsoletes: kernel-ib
-@@ -212,13 +224,12 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
+@@ -219,13 +231,12 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
  	else \
  		echo -n '0'; fi)
  
@@ -129,7 +129,7 @@ index 85af93f..6e77d09 100644
  %global buildsubdir %{_name}-%{version}
  # Disgusting hack alert! We need to ensure we sign modules *after* all
  # invocations of strip occur, which is in __debug_install_post if
-@@ -231,7 +242,6 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
+@@ -238,7 +249,6 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
    %{__modsign_install_post} \
  %{nil}
  
@@ -137,7 +137,7 @@ index 85af93f..6e77d09 100644
  #
  %if "%{_vendor}" == "suse"
  %debug_package
-@@ -262,12 +272,17 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
+@@ -269,7 +279,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o
  %{!?install_mod_dir: %global install_mod_dir updates}
  
  %prep
@@ -146,6 +146,8 @@ index 85af93f..6e77d09 100644
  set -- *
  mkdir source
  mv "$@" source/
+@@ -278,6 +288,11 @@ sed -s -i -e '1s|python\>|python3|' `grep -rl '^#!.*python' source/ofed_scripts`
+ %endif
  mkdir obj
  
 +%patch01 -p1
@@ -156,7 +158,7 @@ index 85af93f..6e77d09 100644
  %build
  export EXTRA_CFLAGS='-DVERSION=\"%version\"'
  export INSTALL_MOD_DIR=%{install_mod_dir}
-@@ -282,7 +297,6 @@ for flavor in %flavors_to_build; do
+@@ -293,7 +308,6 @@ for flavor in %flavors_to_build; do
  	find compat -type f -exec touch -t 200012201010 '{}' \; || true
  	./configure --build-dummy-mods --prefix=%{_prefix} --kernel-version $KVERSION --kernel-sources $KSRC --modules-dir $LIB_MOD_DIR $CONF_OPTIONS %{?_smp_mflags}
  	make %{?_smp_mflags} kernel
@@ -164,7 +166,7 @@ index 85af93f..6e77d09 100644
  	cd -
  done
  
-@@ -291,9 +305,11 @@ touch ofed-files
+@@ -302,9 +316,11 @@ touch ofed-files
  export RECORD_PY_FILES=1
  export INSTALL_MOD_PATH=%{buildroot}
  export INSTALL_MOD_DIR=%{install_mod_dir}
@@ -172,12 +174,12 @@ index 85af93f..6e77d09 100644
 +export NAME=%{_basename}
  export VERSION=%{version}
  export PREFIX=%{_prefix}
-+export MODULE_SIGN_PRIV_KEY=/usr/src/kernels/%{KVERSION}/signing_key.priv
++export MODULE_SIGN_PRIV_KEY=/usr/src/kernels/%{KVERSION}/signing_key.pem
 +export MODULE_SIGN_PUB_KEY=/usr/src/kernels/%{KVERSION}/signing_key.x509
+ %{mlnx_python_env}
  for flavor in %flavors_to_build; do 
  	export KSRC=%{kernel_source $flavor}
- 	export KVERSION=%{kernel_release $KSRC}
+@@ -355,6 +371,8 @@ echo "override ${mod_name} * weak-updates/%{_name}${mod_path}" >> %{buildroot}%{
-@@ -343,6 +359,8 @@ echo "override ${mod_name} * weak-updates/%{_name}${mod_path}" >> %{buildroot}%{
  echo "override ${mod_name} * extra/%{_name}${mod_path}" >> %{buildroot}%{_sysconfdir}/depmod.d/zz01-%{_name}-${mod_name}.conf
  done
  %endif
@@ -186,7 +188,7 @@ index 85af93f..6e77d09 100644
  %endif
  
  # copy sources
-@@ -686,6 +704,7 @@ fi
+@@ -701,6 +719,7 @@ fi
  %config(noreplace) %{_sysconfdir}/depmod.d/zz01-%{_name}-*.conf
  %endif
  %endif
@@ -195,5 +197,5 @@ index 85af93f..6e77d09 100644
  
  %files -n %{devel_pname}
 -- 
-1.8.3.1
+2.7.4
 

kernel/kernel-modules/mlnx-ofa_kernel/centos/srpm_path

@@ -1 +1 @@
-repo:stx/downloads/mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm
+repo:stx/downloads/mlnx-ofa_kernel-4.7-OFED.4.7.3.2.9.1.g457f064.src.rpm

networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch

@@ -1,26 +1,27 @@
-From 929b465ceb0710134a562ab593c2a1e4a2ce5df7 Mon Sep 17 00:00:00 2001
+From bfa58d25ad24537cc798ad207f7e5458cf53877f Mon Sep 17 00:00:00 2001
 From: eric zhang <eric.zhang@windriver.com>
 Date: Fri, 5 Jan 2018 21:05:50 -0500
-Subject: [PATCH 1/3] upversion with release num
+Subject: [PATCH 2/3] upversion with release num
 
 Signed-off-by: eric zhang <eric.zhang@windriver.com>
+Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
 ---
  SPECS/libibverbs.spec | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec
-index e55433c..74cb4d2 100644
+index 519e421..4faf18c 100644
 --- a/SPECS/libibverbs.spec
 +++ b/SPECS/libibverbs.spec
 @@ -12,7 +12,7 @@
  
  Name: libibverbs
  Version: 41mlnx1
--Release: OFED.4.5.0.1.0.45101
+-Release: OFED.4.7.0.0.2.47329
-+Release: OFED.4.5.0.1.0.45101%{?_tis_dist}.%{tis_patch_ver}
++Release: OFED.4.7.0.0.2.47329%{?_tis_dist}.%{tis_patch_ver}
  Summary: A library for direct userspace use of RDMA (InfiniBand/iWARP) hardware
  
  Group: System Environment/Libraries
 -- 
-1.8.3.1
+2.7.4
 

networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch

@@ -1,7 +1,7 @@
-From 0b4a6feba98f0e0bfc3db007463cd43a43797d45 Mon Sep 17 00:00:00 2001
+From 0c0ad51a359b9751910a3229f988ddf37bc489b0 Mon Sep 17 00:00:00 2001
 From: Dahir Osman <dahir.osman@windriver.com>
 Date: Tue, 14 Jun 2016 14:55:39 -0400
-Subject: [PATCH] Add build dependency
+Subject: [PATCH 1/3] Add build dependency
 
 To fix package complaining that libnl is not available
 ---
@@ -9,7 +9,7 @@ To fix package complaining that libnl is not available
  1 file changed, 1 insertion(+)
 
 diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec
-index 4fc96d1..864c31c 100644
+index 9b4e0cd..519e421 100644
 --- a/SPECS/libibverbs.spec
 +++ b/SPECS/libibverbs.spec
 @@ -22,6 +22,7 @@ Source: http://openfabrics.org/downloads/verbs/libibverbs-%{version}.tar.gz
@@ -21,5 +21,5 @@ index 4fc96d1..864c31c 100644
  BuildRequires: valgrind-devel
  %endif
 -- 
-1.8.3.1
+2.7.4
 

networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch

@@ -1,17 +1,17 @@
-From e78c78816e4e07f7c1ba8bd415195efb0cd27563 Mon Sep 17 00:00:00 2001
+From f6393c8e666fc5e7e58a6f7dbef8e521dc9fc205 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Fri, 18 Nov 2016 13:53:47 -0500
-Subject: [PATCH 1/1] libibverbs: fix build failures due to unwanted sgid bit
+Subject: [PATCH 3/3] libibverbs: fix build failures due to unwanted sgid bit
 
 ---
  SPECS/libibverbs.spec | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec
-index b8913c6..1e7b1eb 100644
+index 4faf18c..83940de 100644
 --- a/SPECS/libibverbs.spec
 +++ b/SPECS/libibverbs.spec
-@@ -107,6 +107,7 @@ rm -rf $RPM_BUILD_ROOT
+@@ -111,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT
  %if %{_with_valgrind}
  %{_libdir}/mlnx_ofed/valgrind/lib*.so
  %endif
@@ -20,5 +20,5 @@ index b8913c6..1e7b1eb 100644
  %{_mandir}/man3/*
  %{_mandir}/man7/*
 -- 
-1.8.3.1
+2.7.4
 

networking/mellanox/libibverbs/centos/srpm_path

@@ -1 +1 @@
-repo:stx/downloads/libibverbs-41mlnx1-OFED.4.5.0.1.0.45101.src.rpm
+repo:stx/downloads/libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm

networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch

@@ -2,17 +2,20 @@ From 70c67a459f94f65e33e6eaf5ca2120dd2dc8de78 Mon Sep 17 00:00:00 2001
 Message-Id: <70c67a459f94f65e33e6eaf5ca2120dd2dc8de78.1527783193.git.Jim.Somerville@windriver.com>
 From: eric zhang <eric.zhang@windriver.com>
 Date: Wed, 14 Mar 2018 14:56:21 -0400
-Subject: [PATCH 1/1] Add build dependencies and package versioning for TiS
+Subject: [PATCH] Add build dependencies and package versioning for TiS format
- format
+
+Force disable python3 to avoid random build failure due to go to
+python3 path.
 
 Signed-off-by: eric zhang <eric.zhang@windriver.com>
 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
+Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
 ---
- SPECS/rdma-core.spec | 12 ++++++++++--
+ SPECS/rdma-core.spec | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 2 deletions(-)
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec
-index 7f9cd5b..6d81a28 100644
+index 1f8af03..bd0e7a5 100644
 --- a/SPECS/rdma-core.spec
 +++ b/SPECS/rdma-core.spec
 @@ -1,3 +1,9 @@
@@ -23,28 +26,38 @@ index 7f9cd5b..6d81a28 100644
 +%endif
 +
  %{!?cmake: %global cmake cmake}
- %{!?_udevrulesdir: %global _udevrulesdir /etc/udev/rules.d}
+ %{!?make_jobs: %global make_jobs make VERBOSE=1 %{?_smp_mflags}}
- 
+ %{!?cmake_install: %global cmake_install DESTDIR=%{buildroot} make install}
-@@ -8,7 +14,7 @@
+@@ -15,7 +21,7 @@
  
  Name: rdma-core
- Version: 45mlnx1
+ Version: 47mlnx1
--Release: 1%{?dist}.45101
+-Release: 1%{?dist}.47329
-+Release: 1.45101%{?_tis_dist}.%{tis_patch_ver}
++Release: 1.47329%{?_tis_dist}.%{tis_patch_ver}
  Summary: RDMA core userspace libraries and daemons
  Group: System Environment/Libraries
  
-@@ -26,7 +32,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+@@ -62,6 +68,9 @@ BuildRequires: python
- BuildRequires: binutils
+ %if 0%{?fedora} >= 21
- BuildRequires: gcc
+ BuildRequires: perl-generators
- BuildRequires: python
+ %endif
--
 +BuildRequires: cmake
 +BuildRequires: libnl3-devel
 +BuildRequires: mlnx-ofa_kernel%{?bt_ext}-devel
+ 
+ Requires: dracut, kmod, systemd
  # Red Hat/Fedora previously shipped redhat/ as a stand-alone
- # package called 'rdma', which we're supplanting here.
+@@ -351,10 +360,6 @@ easy, object-oriented access to IB verbs.
- Provides: rdma = %{version}-%{release}
+          -DENABLE_STATIC=1 \
+ %endif
+          %{EXTRA_CMAKE_FLAGS} \
+-%if %{defined __python3}
+-         -DPYTHON_EXECUTABLE:PATH=%{__python3} \
+-         -DCMAKE_INSTALL_PYTHON_ARCH_LIB:PATH=%{python3_sitearch} \
+-%endif
+ %if %{with_pyverbs}
+          -DNO_PYVERBS=0
+ %else
 -- 
-1.8.3.1
+2.7.4
 

networking/mellanox/rdma-core/centos/srpm_path

@@ -1 +1 @@
-repo:stx/downloads/rdma-core-45mlnx1-1.45101.src.rpm
+repo:stx/downloads/rdma-core-47mlnx1-1.47329.src.rpm