From ec080b35e4b86605253ad103c2634bf515aba8b1 Mon Sep 17 00:00:00 2001 From: Jiping Ma Date: Tue, 22 Feb 2022 18:49:16 -0800 Subject: [PATCH] mlnx-ofa_kernel: Upgrade OFED driver version to 5.5-1.0.3.2 This upgrades the OFED driver related packages to the ones that are included in MLNX_OFED_SRC-5.5-1.0.3.2.tgz. The package can be found here: https://content.mellanox.com/ofed/MLNX_OFED-5.5-1.0.3.2 /MLNX_OFED_SRC-5.5-1.0.3.2.tgz. also removes libibverbs because that is now included in rdma-core package, and adds mlnx-tools package that mlnx-ofa_kernel depends on. The new versions are: mlnx-ofa_kernel-5.5-OFED.5.5.1.0.3.1 rdma-core-55mlnx37-1.55103 mlnx-tools-5.2.0-0.55103 Reason: The NVIDIA Mellanox ConnectX-6 device support is required by Cloud Platform. The required Mellanox drivers must be upgraded to the latest version (5.4+) to support the latest features of this device. Verification: - Build success based on the commit(kernel: Add auxiliary bus support) - Install onto a StarlingX system with two controller and two compute nodes with network adapters Mellanox's OFED. The network adapters of controllers are Mellanox Technologies MT27710 Family [ConnectX-4 Lx], the network adapters of computes are Mellanox Technologies MT27800 Family [ConnectX-5]. - The bootstrap procedure was successful, Check dmesg output to see all mlx5_core driver information are correct. - RDMA/Infiniband over Ethernet functionalities of the Mellanox adapters were successfully tested using the Linux RDMA community's perftest package. Note that we do not test it on the NVIDIA Mellanox ConnectX-6, because the network adapter is not available in our lab yet. We will test it once ConnectX-6 is ready. This work was based on the following commit by Babak Sarashki. https://review.opendev.org/c/starlingx/kernel/+/822660 Story: 2009878 Task: 44610 Depends-On: https://review.opendev.org/c/starlingx/tools/+/831338 Signed-off-by: Jiping Ma Change-Id: Ie2eae9a09b7f5a0a1d01a91cfd0349237b4ccdbf --- centos_extra_downloads.lst | 6 +- centos_pkg_dirs | 2 +- centos_pkg_dirs_rt | 2 +- centos_tarball-dl.lst | 2 +- .../mlnx-ofa_kernel/centos/build_srpm.data | 6 +- ...ile-issues-when-using-kernel-5.10.57.patch | 35 ----- .../meta_patches/Introduce-devtoolset-8.patch | 49 ------- .../centos/meta_patches/PATCH_ORDER | 4 +- ...X-system-and-introduce-devtoolset-8.patch} | 131 ++++++++---------- ...pci_irq-Use-irq_update_affinity_hint.patch | 30 ++-- ...claration-of-function-__is_constexpr.patch | 38 ----- ...ci_irq-Use-irq_update_affinity_hint.patch} | 66 ++++----- .../mlnx-ofa_kernel/centos/srpm_path | 2 +- .../libibverbs/centos/build_srpm.data | 6 - .../meta_patches/Add-build-dependency.patch | 28 ---- .../centos/meta_patches/PATCH_ORDER | 3 - ...ld-failures-due-to-unwanted-sgid-bit.patch | 28 ---- .../upversion-with-release-num.patch | 31 ----- .../mellanox/libibverbs/centos/srpm_path | 1 - .../mlnx-tools/centos/build_srpm.data | 6 + .../0001-Support-STX-system.patch | 35 +++++ .../centos/meta_patches/PATCH_ORDER | 1 + .../mellanox/mlnx-tools/centos/srpm_path | 1 + .../mellanox/rdma-core/centos/build_srpm.data | 6 +- ...encies-and-package-versioning-for-Ti.patch | 67 --------- .../0001-Support-STX-system.patch | 44 ++++++ .../rdma-core/centos/meta_patches/PATCH_ORDER | 2 +- userspace/mellanox/rdma-core/centos/srpm_path | 2 +- 28 files changed, 212 insertions(+), 422 deletions(-) delete mode 100644 kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Fix-compile-issues-when-using-kernel-5.10.57.patch delete mode 100644 kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Introduce-devtoolset-8.patch rename kernel-modules/mlnx-ofa_kernel/centos/meta_patches/{Support-TiS-system.patch => Support-STX-system-and-introduce-devtoolset-8.patch} (57%) delete mode 100644 kernel-modules/mlnx-ofa_kernel/centos/patches/0001-implicit-declaration-of-function-__is_constexpr.patch rename kernel-modules/mlnx-ofa_kernel/centos/patches/{0002-mlx5-pci_irq-Use-irq_update_affinity_hint.patch => 0001-mlx5-pci_irq-Use-irq_update_affinity_hint.patch} (65%) delete mode 100644 userspace/mellanox/libibverbs/centos/build_srpm.data delete mode 100644 userspace/mellanox/libibverbs/centos/meta_patches/Add-build-dependency.patch delete mode 100644 userspace/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER delete mode 100644 userspace/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid-bit.patch delete mode 100644 userspace/mellanox/libibverbs/centos/meta_patches/upversion-with-release-num.patch delete mode 100644 userspace/mellanox/libibverbs/centos/srpm_path create mode 100644 userspace/mellanox/mlnx-tools/centos/build_srpm.data create mode 100644 userspace/mellanox/mlnx-tools/centos/meta_patches/0001-Support-STX-system.patch create mode 100644 userspace/mellanox/mlnx-tools/centos/meta_patches/PATCH_ORDER create mode 100644 userspace/mellanox/mlnx-tools/centos/srpm_path delete mode 100644 userspace/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch create mode 100644 userspace/mellanox/rdma-core/centos/meta_patches/0001-Support-STX-system.patch diff --git a/centos_extra_downloads.lst b/centos_extra_downloads.lst index a6782e34..6f1cab73 100644 --- a/centos_extra_downloads.lst +++ b/centos_extra_downloads.lst @@ -1,5 +1,5 @@ -mlnx-ofa_kernel-5.0-OFED.5.0.2.1.8.1.g5f67178.src.rpm -libibverbs-41mlnx1-OFED.5.0.0.0.9.50218.src.rpm -rdma-core-50mlnx1-1.50218.src.rpm +mlnx-ofa_kernel-5.5-OFED.5.5.1.0.3.1.src.rpm +mlnx-tools-5.2.0-0.55103.src.rpm +rdma-core-55mlnx37-1.55103.src.rpm opae-intel-fpga-driver-2.0.1-10.src.rpm ice_comms-1.3.31.0.zip diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 186cb9c9..e06ddff1 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -6,5 +6,5 @@ kernel-modules/intel-igb_uio kernel-modules/qat17 kernel-modules/intel-opae-fpga kernel-modules/mlnx-ofa_kernel -userspace/mellanox/libibverbs userspace/mellanox/rdma-core +userspace/mellanox/mlnx-tools diff --git a/centos_pkg_dirs_rt b/centos_pkg_dirs_rt index 67095fe4..c344118a 100644 --- a/centos_pkg_dirs_rt +++ b/centos_pkg_dirs_rt @@ -6,5 +6,5 @@ kernel-modules/intel-ice kernel-modules/intel-igb_uio kernel-modules/qat17 kernel-modules/intel-opae-fpga -userspace/mellanox/libibverbs userspace/mellanox/rdma-core +userspace/mellanox/mlnx-tools diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index f49825c2..b2bbbbda 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -7,7 +7,7 @@ ice-1.7.16.tar.gz#ice-1.7.16#https://sourceforge.net/projects/e1000/files/ice%20 ixgbe-5.6.5.tar.gz#ixgbe-5.6.5#https://sourceforge.net/projects/e1000/files/ixgbe%20stable/5.6.5/ixgbe-5.6.5.tar.gz/download#http## ixgbevf-4.6.3.tar.gz#ixgbevf-4.6.3#https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/4.6.3/ixgbevf-4.6.3.tar.gz/download#http## !kernel-rt-4.18.0-147.3.1.rt24.96.el8_1.src.rpm#kernel-rt#https://git.centos.org/rpms/kernel-rt#http_script#327ec52423c67051249291f131ec7f6fff44a828#post-dl-script/kernel-rt.sh -!MLNX_OFED_SRC-5.0-2.1.8.0.tgz#MLNX_OFED_SRC-5.0-2.1.8.0#http://content.mellanox.com/ofed/MLNX_OFED-5.0-2.1.8.0/MLNX_OFED_SRC-5.0-2.1.8.0.tgz#http_script##unused +!MLNX_OFED_SRC-5.5-1.0.3.2.tgz#MLNX_OFED_SRC-5.5-1.0.3.2#https://content.mellanox.com/ofed/MLNX_OFED-5.5-1.0.3.2/MLNX_OFED_SRC-5.5-1.0.3.2.tgz#http_script##unused opae-intel-fpga-driver-2.0.1-8.tar.gz#opae-intel-fpga-driver-2.0.1-8#https://github.com/OPAE/opae-sdk/releases/download/1.3.7-4/opae-intel-fpga-driver-2.0.1-8.tar.gz#http## !qat1.7.l.4.5.0-00034.tar.gz#quickassist#https://01.org/sites/default/files/downloads/qat1.7.l.4.5.0-00034.tar.gz#http_script##post-dl-script/qat1.7.sh !QAT1.7.L.4.14.0-00031.tar.gz#quickassist#https://downloadmirror.intel.com/30178/eng/QAT1.7.L.4.14.0-00031.tar.gz#http_script##unused diff --git a/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data b/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data index 19c67844..f4dbf43b 100644 --- a/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data +++ b/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data @@ -1,8 +1,8 @@ COPY_LIST="$PKG_BASE/files/modules-load.conf" OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt -BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=58597630f681940c2a20cca75dc96c06ae9be15b -BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b -PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b +BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=19ca0df55a7c905dc062008862b7b76b577a2354 +BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=19ca0df55a7c905dc062008862b7b76b577a2354 +PKG_BASE_SRCREV=19ca0df55a7c905dc062008862b7b76b577a2354 TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT BUILD_IS_SLOW=3 diff --git a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Fix-compile-issues-when-using-kernel-5.10.57.patch b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Fix-compile-issues-when-using-kernel-5.10.57.patch deleted file mode 100644 index 06daf9b0..00000000 --- a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Fix-compile-issues-when-using-kernel-5.10.57.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f5e73edb620e7bc8c7122093bc1c1a7880fc9779 Mon Sep 17 00:00:00 2001 -From: Jiping Ma -Date: Mon, 23 Aug 2021 20:25:48 -0700 -Subject: [PATCH] Fix compile issues when using kernel 5.10.57. - -Signed-off-by: Jiping Ma -Signed-off-by: M. Vefa Bicakci ---- - SPECS/mlnx-ofa_kernel.spec | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec -index 98763936e135..0dde85950881 100644 ---- a/SPECS/mlnx-ofa_kernel.spec -+++ b/SPECS/mlnx-ofa_kernel.spec -@@ -109,6 +109,7 @@ Url: http://www.mellanox.com/ - Group: System Environment/Base - Source: %{_basename}-%{_version}.tgz - Source100: modules-load.conf -+Patch01: 0001-implicit-declaration-of-function-__is_constexpr.patch - BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/OFED} - Vendor: Mellanox Technologies - Obsoletes: kernel-ib -@@ -299,6 +300,8 @@ sed -s -i -e '1s|python\>|python3|' `grep -rl '^#!.*python' source/ofed_scripts` - %endif - mkdir obj - -+%patch01 -p1 -+ - %build - %if 0%{?rhel} == 7 - source scl_source enable devtoolset-8 || : --- -2.29.2 - diff --git a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Introduce-devtoolset-8.patch b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Introduce-devtoolset-8.patch deleted file mode 100644 index 7d1393ef..00000000 --- a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Introduce-devtoolset-8.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 546d1eadd21bb1dacdee639d2d198ee8fb6ae579 Mon Sep 17 00:00:00 2001 -From: Jiping Ma -Date: Tue, 20 Apr 2021 21:34:25 -0400 -Subject: [PATCH] Introduce devtoolset-8 - -Signed-off-by: Jiping Ma -Signed-off-by: M. Vefa Bicakci ---- - SPECS/mlnx-ofa_kernel.spec | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec -index e187ff550a56..98763936e135 100644 ---- a/SPECS/mlnx-ofa_kernel.spec -+++ b/SPECS/mlnx-ofa_kernel.spec -@@ -35,6 +35,10 @@ - - %{!?KMP: %global KMP 0} - BuildRequires: kernel%{?bt_ext}-devel, openssl -+BuildRequires: devtoolset-8-build -+BuildRequires: devtoolset-8-binutils -+BuildRequires: devtoolset-8-gcc -+BuildRequires: devtoolset-8-make - %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-mlx5-mod --with-mlxfw-mod --with-ipoib-mod} -@@ -296,6 +300,9 @@ sed -s -i -e '1s|python\>|python3|' `grep -rl '^#!.*python' source/ofed_scripts` - mkdir obj - - %build -+%if 0%{?rhel} == 7 -+source scl_source enable devtoolset-8 || : -+%endif - export EXTRA_CFLAGS='-DVERSION=\"%version\"' - export INSTALL_MOD_DIR=%{install_mod_dir} - export CONF_OPTIONS="%{configure_options}" -@@ -314,6 +321,9 @@ for flavor in %flavors_to_build; do - done - - %install -+%if 0%{?rhel} == 7 -+source scl_source enable devtoolset-8 || : -+%endif - touch ofed-files - export RECORD_PY_FILES=1 - export INSTALL_MOD_PATH=%{buildroot} --- -2.29.2 - diff --git a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER index ae1756f2..775d27b5 100644 --- a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER +++ b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER @@ -1,4 +1,2 @@ -Support-TiS-system.patch -Introduce-devtoolset-8.patch -Fix-compile-issues-when-using-kernel-5.10.57.patch +Support-STX-system-and-introduce-devtoolset-8.patch mlx5-pci_irq-Use-irq_update_affinity_hint.patch diff --git a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Support-TiS-system.patch b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Support-STX-system-and-introduce-devtoolset-8.patch similarity index 57% rename from kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Support-TiS-system.patch rename to kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Support-STX-system-and-introduce-devtoolset-8.patch index baaa23c2..734acfa2 100644 --- a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Support-TiS-system.patch +++ b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/Support-STX-system-and-introduce-devtoolset-8.patch @@ -1,35 +1,39 @@ -From 35822528861b4eaca115a1484284d925db6bb28e Mon Sep 17 00:00:00 2001 +From 24a7530968184bd133432e1f8dfccebef772bc7e Mon Sep 17 00:00:00 2001 From: Jiping Ma -Date: Tue, 20 Apr 2021 21:13:43 -0400 -Subject: [PATCH] Support TiS system +Date: Fri, 28 Jan 2022 23:28:18 -0800 +Subject: [PATCH] Support STX system and introduce devtoolset-8 Signed-off-by: Jiping Ma -Signed-off-by: M. Vefa Bicakci --- - SPECS/mlnx-ofa_kernel.spec | 40 +++++++++++++++++++++++--------------- - 1 file changed, 24 insertions(+), 16 deletions(-) + mlnx-ofa_kernel.spec | 46 ++++++++++++++++++++++++++++++++------------ + 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec -index 254dd4ca974e..e187ff550a56 100644 +index 6a6cde0..3e0d564 100644 --- a/SPECS/mlnx-ofa_kernel.spec +++ b/SPECS/mlnx-ofa_kernel.spec -@@ -27,8 +27,14 @@ +@@ -25,10 +25,19 @@ + # and/or other materials provided with the distribution. + # # - - # KMP is disabled by default --%{!?KMP: %global KMP 0} +%if "%{_tis_build_type}" == "rt" +%define bt_ext -rt +%else +%undefine bt_ext +%endif -+%{!?KMP: %global KMP 0} + # KMP is disabled by default + %{!?KMP: %global KMP 0} +- +BuildRequires: kernel%{?bt_ext}-devel, openssl ++BuildRequires: devtoolset-8-build ++BuildRequires: devtoolset-8-binutils ++BuildRequires: devtoolset-8-gcc ++BuildRequires: devtoolset-8-make %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-mlx5-mod --with-mlxfw-mod --with-ipoib-mod} -@@ -56,12 +62,11 @@ +@@ -43,11 +52,11 @@ %global IS_RHEL_VENDOR "%{_vendor}" == "redhat" || ("%{_vendor}" == "bclinux") || ("%{_vendor}" == "openEuler") @@ -39,27 +43,26 @@ index 254dd4ca974e..e187ff550a56 100644 %global krelver %(echo -n %{KVERSION} | sed -e 's/-/_/g') # take path to kernel sources if provided, otherwise look in default location (for non KMP rpms). -%{!?K_SRC: %global K_SRC /lib/modules/%{KVERSION}/build} -- +%{!?K_SRC: %global K_SRC /usr/src/kernels/%{KVERSION}} + # Select packages to build - # Kernel module packages to be included into kernel-ib -@@ -75,7 +80,8 @@ +@@ -62,7 +71,8 @@ %{!?KERNEL_SOURCES: %global KERNEL_SOURCES /lib/modules/%{KVERSION}/source} -%{!?_name: %global _name mlnx-ofa_kernel} +%define _basename mlnx-ofa_kernel +%define _name %{_basename}%{?bt_ext} - %{!?_version: %global _version 5.3} - %{!?_release: %global _release OFED.5.3.1.0.0.1} + %{!?_version: %global _version 5.5} + %{!?_release: %global _release OFED.5.5.1.0.3.1} %global _kmp_rel %{_release}%{?_kmp_build_num}%{?_dist} -@@ -93,11 +99,12 @@ +@@ -74,11 +84,12 @@ Summary: Infiniband HCA Driver Name: %{_name} Version: %{_version} -Release: %{_release}%{?_dist} -+Release: %{_release}%{?_tis_dist}.%{tis_patch_ver} ++Release: %{_release}%{?_dist}%{?_tis_dist}.%{tis_patch_ver} License: GPLv2 Url: http://www.mellanox.com/ Group: System Environment/Base @@ -69,15 +72,7 @@ index 254dd4ca974e..e187ff550a56 100644 BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/OFED} Vendor: Mellanox Technologies Obsoletes: kernel-ib -@@ -154,7 +161,6 @@ EOF) - %global kernel_release() %{KVERSION} - %global flavors_to_build default - %package -n %{non_kmp_pname} --Requires: %{utils_pname} - Requires: coreutils - Requires: pciutils - Requires: grep -@@ -182,7 +188,7 @@ Obsoletes: mlnx-en-debuginfo +@@ -148,7 +159,7 @@ Obsoletes: mlnx-en-debuginfo Obsoletes: mlnx-en-sources Obsoletes: mlnx-rdma-rxe Version: %{_version} @@ -86,39 +81,16 @@ index 254dd4ca974e..e187ff550a56 100644 Summary: Infiniband Driver and ULPs kernel modules Group: System Environment/Libraries %description -n %{non_kmp_pname} -@@ -194,7 +200,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o - %package -n %{devel_pname} - Version: %{_version} - # build KMP rpms? --Release: %{_release}%{?_dist} -+Release: %{_release}%{?_dist}%{?_tis_dist}.%{tis_patch_ver} +@@ -163,7 +174,7 @@ Version: %{_version} + %if "%{KMP}" == "1" + Release: %{_release}%{?_dist} + %else +-Release: %{_release}.kver.%{krelver} ++Release: %{_release}%{?_tis_dist}.%{tis_patch_ver} + %endif Obsoletes: kernel-ib-devel - Obsoletes: compat-rdma-devel Obsoletes: kernel-ib -@@ -232,13 +238,12 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o - else \ - echo -n '0'; fi) - --%if "%{WITH_MOD_SIGN}" == "1" - # call module sign script - %global __modsign_install_post \ - %{_builddir}/$NAME-$VERSION/source/ofed_scripts/tools/sign-modules %{buildroot}/lib/modules/ %{kernel_source default} || exit 1 \ - %{nil} - --%global __debug_package 1 -+%define debug_package %{nil} - %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 -@@ -251,7 +256,6 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o - %{__modsign_install_post} \ - %{nil} - --%endif # end of setup module sign scripts - # - %if "%{_vendor}" == "suse" - %debug_package -@@ -282,7 +286,7 @@ The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-o +@@ -252,13 +263,16 @@ drivers against it. %{!?install_mod_dir: %global install_mod_dir updates} %prep @@ -127,15 +99,22 @@ index 254dd4ca974e..e187ff550a56 100644 set -- * mkdir source mv "$@" source/ -@@ -306,7 +310,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 -- make build_py_scripts - cd - + mkdir obj + + %build ++%if 0%{?rhel} == 7 ++source scl_source enable devtoolset-8 || : ++%endif + export EXTRA_CFLAGS='-DVERSION=\"%version\"' + export INSTALL_MOD_DIR=%{install_mod_dir} + export CONF_OPTIONS="%{configure_options}" +@@ -277,12 +291,17 @@ for flavor in %flavors_to_build; do done -@@ -315,9 +318,11 @@ touch ofed-files + %install ++%if 0%{?rhel} == 7 ++source scl_source enable devtoolset-8 || : ++%endif export RECORD_PY_FILES=1 export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=%{install_mod_dir} @@ -145,10 +124,10 @@ index 254dd4ca974e..e187ff550a56 100644 export PREFIX=%{_prefix} +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} -@@ -367,6 +372,8 @@ echo "override ${mod_name} * weak-updates/%{_name}${mod_path}" >> %{buildroot}%{ + export KVERSION=%{kernel_release $KSRC} +@@ -327,14 +346,16 @@ 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 @@ -157,7 +136,17 @@ index 254dd4ca974e..e187ff550a56 100644 %endif # copy sources -@@ -696,6 +703,7 @@ fi + mkdir -p %{buildroot}/%{_prefix}/src/ofa_kernel-%{version} + mkdir -p %{buildroot}/%{_prefix}/src/ofa_kernel/%{_arch} +-cp -a %{_builddir}/%{name}-%{version}/source %{buildroot}/%{_prefix}/src/ofa_kernel-%{version}/source ++cp -a %{_builddir}/%{_basename}-%{version}/source %{buildroot}/%{_prefix}/src/ofa_kernel-%{version}/source + ln -s ofa_kernel-%{version}/source %{buildroot}/%{_prefix}/src/mlnx-ofa_kernel-%{version} +-cp -a %{_builddir}/src/%{name}/* %{buildroot}/%{_prefix}/src/ofa_kernel/%{_arch}/%{KVERSION} ++cp -a %{_builddir}/src/%{_basename}/* %{buildroot}/%{_prefix}/src/ofa_kernel/%{_arch}/%{KVERSION} + # Fix path of BACKPORT_INCLUDES + sed -i -e "s@=-I.*backport_includes@=-I/usr/src/ofa_kernel-$VERSION/backport_includes@" %{buildroot}/%{_prefix}/src/ofa_kernel/%{_arch}/%{KVERSION}/configure.mk.kernel || true + rm -rf %{_builddir}/src +@@ -681,6 +702,7 @@ update-alternatives --remove \ %config(noreplace) %{_sysconfdir}/depmod.d/zz01-%{_name}-*.conf %endif %endif @@ -166,5 +155,5 @@ index 254dd4ca974e..e187ff550a56 100644 %files -n %{devel_pname} -- -2.29.2 +2.31.1 diff --git a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/mlx5-pci_irq-Use-irq_update_affinity_hint.patch b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/mlx5-pci_irq-Use-irq_update_affinity_hint.patch index fe4dae3b..88299b20 100644 --- a/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/mlx5-pci_irq-Use-irq_update_affinity_hint.patch +++ b/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/mlx5-pci_irq-Use-irq_update_affinity_hint.patch @@ -1,35 +1,37 @@ -From a2cd8e1c28d9231611e738487ae9e1904942b094 Mon Sep 17 00:00:00 2001 -From: "M. Vefa Bicakci" -Date: Fri, 14 Jan 2022 17:05:36 -0500 +From 839816cfbe2151508e567b1a2244c07a3b592377 Mon Sep 17 00:00:00 2001 +From: Jiping Ma +Date: Sun, 20 Feb 2022 23:32:45 -0800 Subject: [PATCH] mlx5: pci_irq: Use irq_update_affinity_hint (Please see the patch file for a description.) Signed-off-by: M. Vefa Bicakci +Signed-off-by: Jiping Ma --- - SPECS/mlnx-ofa_kernel.spec | 2 ++ - 1 file changed, 2 insertions(+) + mlnx-ofa_kernel.spec | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/SPECS/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel.spec -index 0dde85950881..446edacf92f5 100644 +index 3e0d564..38ae4a5 100644 --- a/SPECS/mlnx-ofa_kernel.spec +++ b/SPECS/mlnx-ofa_kernel.spec -@@ -110,6 +110,7 @@ Group: System Environment/Base +@@ -90,6 +90,7 @@ Url: http://www.mellanox.com/ + Group: System Environment/Base Source: %{_basename}-%{_version}.tgz Source100: modules-load.conf - Patch01: 0001-implicit-declaration-of-function-__is_constexpr.patch -+Patch02: 0002-mlx5-pci_irq-Use-irq_update_affinity_hint.patch ++Patch01: 0001-mlx5-pci_irq-Use-irq_update_affinity_hint.patch BuildRoot: %{?build_root:%{build_root}}%{!?build_root:/var/tmp/OFED} Vendor: Mellanox Technologies Obsoletes: kernel-ib -@@ -301,6 +302,7 @@ sed -s -i -e '1s|python\>|python3|' `grep -rl '^#!.*python' source/ofed_scripts` +@@ -269,6 +270,8 @@ mkdir source + mv "$@" source/ mkdir obj - %patch01 -p1 -+%patch02 -p1 - ++%patch01 -p1 ++ %build %if 0%{?rhel} == 7 + source scl_source enable devtoolset-8 || : -- -2.29.2 +2.31.1 diff --git a/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-implicit-declaration-of-function-__is_constexpr.patch b/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-implicit-declaration-of-function-__is_constexpr.patch deleted file mode 100644 index d997ef4d..00000000 --- a/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-implicit-declaration-of-function-__is_constexpr.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 555ee6e9b3cb4ecb6c6a0a4806a960d564b9f983 Mon Sep 17 00:00:00 2001 -From: Jiping Ma -Date: Mon, 23 Aug 2021 20:11:33 -0700 -Subject: [PATCH] implicit declaration of function '__is_constexpr' - -We get a build error now when we use kernel version 5.10.57 -include/linux/minmax.h:23:4: error: implicit declaration of function '__is_constexpr'; -Because commit 1354ec840899e87259286cc844d4c161ea86fae7 in the yocto kernel changed -the definition of GENMASK_INPUT_CHECK from __builtin_constant_p to __is_constexpr. -so we need add __is_constexpr definition in const.h - -Signed-off-by: Jiping Ma ---- - include/linux/const.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/include/linux/const.h b/include/linux/const.h -index afe88a0..92daf28 100644 ---- a/source/include/linux/const.h -+++ b/source/include/linux/const.h -@@ -7,6 +7,14 @@ - - #include_next - -+/* -+ * This returns a constant expression while determining if an argument is -+ * a constant expression, most importantly without evaluating the argument. -+ * Glory to Martin Uecker -+ */ -+#define __is_constexpr(x) \ -+ (sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8))) -+ - #ifndef UL - #define UL(x) (_UL(x)) - #endif --- -2.31.1 - diff --git a/kernel-modules/mlnx-ofa_kernel/centos/patches/0002-mlx5-pci_irq-Use-irq_update_affinity_hint.patch b/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-mlx5-pci_irq-Use-irq_update_affinity_hint.patch similarity index 65% rename from kernel-modules/mlnx-ofa_kernel/centos/patches/0002-mlx5-pci_irq-Use-irq_update_affinity_hint.patch rename to kernel-modules/mlnx-ofa_kernel/centos/patches/0001-mlx5-pci_irq-Use-irq_update_affinity_hint.patch index 67472546..a457f97a 100644 --- a/kernel-modules/mlnx-ofa_kernel/centos/patches/0002-mlx5-pci_irq-Use-irq_update_affinity_hint.patch +++ b/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-mlx5-pci_irq-Use-irq_update_affinity_hint.patch @@ -1,6 +1,6 @@ -From e5d69db1083481aef4ea64b504c294929c7422d9 Mon Sep 17 00:00:00 2001 -From: "M. Vefa Bicakci" -Date: Fri, 14 Jan 2022 16:26:29 -0500 +From 88b2e22f1006dd802d44c1cdd901220e36ffd3ee Mon Sep 17 00:00:00 2001 +From: Jiping Ma +Date: Wed, 2 Mar 2022 03:44:53 +0000 Subject: [PATCH] mlx5: pci_irq: Use irq_update_affinity_hint This commit applies a patch that modifies the mlx5 driver so that it @@ -15,20 +15,21 @@ by the mlx5 device driver. (Please see the description of the applied patch for more information.) Signed-off-by: M. Vefa Bicakci +Signed-off-by: Jiping Ma --- - ...pci_irq-Use-irq_update_affinity_hint.patch | 60 +++++++++++++++++++ - 1 file changed, 60 insertions(+) + ...pci_irq-Use-irq_update_affinity_hint.patch | 59 +++++++++++++++++++ + 1 file changed, 59 insertions(+) create mode 100644 source/backports/1000-mlx5-pci_irq-Use-irq_update_affinity_hint.patch diff --git a/source/backports/1000-mlx5-pci_irq-Use-irq_update_affinity_hint.patch b/source/backports/1000-mlx5-pci_irq-Use-irq_update_affinity_hint.patch new file mode 100644 -index 000000000000..f1122af264eb +index 0000000..6b3d7bf --- /dev/null +++ b/source/backports/1000-mlx5-pci_irq-Use-irq_update_affinity_hint.patch -@@ -0,0 +1,60 @@ -+From 3884feaf05e9b1003ab83ab76fbfdf9a188c4a19 Mon Sep 17 00:00:00 2001 -+From: "M. Vefa Bicakci" -+Date: Fri, 14 Jan 2022 16:26:29 -0500 +@@ -0,0 +1,59 @@ ++From 73bb521a587baf042d5e79aa2ff4b5e973c64a7b Mon Sep 17 00:00:00 2001 ++From: Jiping Ma ++Date: Tue, 1 Mar 2022 18:42:47 -0800 +Subject: [PATCH] mlx5: pci_irq: Use irq_update_affinity_hint + +The StarlingX kernel was patched to deprecate irq_set_affinity_hint @@ -55,36 +56,35 @@ index 000000000000..f1122af264eb + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7451e9ea8e2055af39afe7ff39a5f68d8ec6b98d + +Signed-off-by: M. Vefa Bicakci ++Signed-off-by: Jiping Ma +--- -+ drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 6 +++--- -+ 1 file changed, 3 insertions(+), 3 deletions(-) ++ drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 4 ++-- ++ 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c -+index 09d0ce8061f3..db7472d10fb6 100644 ++index 06ea6fc..dd97f89 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c -+@@ -237,8 +237,8 @@ static int set_comp_irq_affinity_hint(struct mlx5_core_dev *mdev, int i) -+ cpumask_set_cpu(cpumask_local_spread(i, mdev->priv.numa_node), -+ irq->mask); -+ if (IS_ENABLED(CONFIG_SMP) && -+- irq_set_affinity_hint(irqn, irq->mask)) -+- mlx5_core_warn(mdev, "irq_set_affinity_hint failed, irq 0x%.4x", -++ irq_update_affinity_hint(irqn, irq->mask)) -++ mlx5_core_warn(mdev, "irq_update_affinity_hint failed, irq 0x%.4x", -+ irqn); -+ -+ return 0; -+@@ -261,7 +261,7 @@ static void clear_comp_irq_affinity_hint(struct mlx5_core_dev *mdev, int i) -+ msix = priv->msix_arr; -+ irqn = msix[vecidx].vector; -+ #endif -+- irq_set_affinity_hint(irqn, NULL); -++ irq_update_affinity_hint(irqn, NULL); ++@@ -175,7 +175,7 @@ static void irq_release(struct kref *kref) ++ * before calling it. This is why there is asymmetry with set_rmap ++ * which should be called after alloc_irq but before request_irq. ++ */ ++- irq_set_affinity_hint(irq->irqn, NULL); +++ irq_update_affinity_hint(irq->irqn, NULL); + free_cpumask_var(irq->mask); -+ } -+ ++ free_irq(irq->irqn, &irq->nh); ++ kfree(irq); ++@@ -276,7 +276,7 @@ static struct mlx5_irq *irq_request(struct mlx5_irq_pool *pool, int i, ++ goto err_xa; ++ } ++ affinity_copy(irq, affinity, mlx5_irq_table_get(dev)); ++- irq_set_affinity_hint(irq->irqn, irq->mask); +++ irq_update_affinity_hint(irq->irqn, irq->mask); ++ cpu_get(mlx5_irq_table_get(dev), irq->mask); ++ return irq; ++ err_xa: +-- -+2.29.2 ++2.31.1 + -- 2.29.2 diff --git a/kernel-modules/mlnx-ofa_kernel/centos/srpm_path b/kernel-modules/mlnx-ofa_kernel/centos/srpm_path index a77e0a05..e2b3997f 100644 --- a/kernel-modules/mlnx-ofa_kernel/centos/srpm_path +++ b/kernel-modules/mlnx-ofa_kernel/centos/srpm_path @@ -1 +1 @@ -mirror:Source/mlnx-ofa_kernel-5.3-OFED.5.3.1.0.0.1.src.rpm +repo:stx/downloads/mlnx-ofa_kernel-5.5-OFED.5.5.1.0.3.1.src.rpm diff --git a/userspace/mellanox/libibverbs/centos/build_srpm.data b/userspace/mellanox/libibverbs/centos/build_srpm.data deleted file mode 100644 index aec7b93a..00000000 --- a/userspace/mellanox/libibverbs/centos/build_srpm.data +++ /dev/null @@ -1,6 +0,0 @@ -OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std -OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt -BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=58597630f681940c2a20cca75dc96c06ae9be15b -BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b -PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b -TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT diff --git a/userspace/mellanox/libibverbs/centos/meta_patches/Add-build-dependency.patch b/userspace/mellanox/libibverbs/centos/meta_patches/Add-build-dependency.patch deleted file mode 100644 index 16a28088..00000000 --- a/userspace/mellanox/libibverbs/centos/meta_patches/Add-build-dependency.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 214e3e515699ae332b3345dc5630a276f19324bf Mon Sep 17 00:00:00 2001 -Message-Id: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com> -From: Dahir Osman -Date: Tue, 14 Jun 2016 14:55:39 -0400 -Subject: [PATCH 1/3] Add build dependency - -To fix package complaining that libnl is not available - -Signed-off-by: Jim Somerville ---- - SPECS/libibverbs.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec -index 8b53e51..673516e 100644 ---- a/SPECS/libibverbs.spec -+++ b/SPECS/libibverbs.spec -@@ -22,6 +22,7 @@ Source: http://openfabrics.org/downloads/verbs/libibverbs-%{version}.tar.gz - BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - Requires(post): /sbin/ldconfig - Requires(postun): /sbin/ldconfig -+BuildRequires: libnl-devel - %if %{_with_valgrind} - BuildRequires: valgrind-devel - %endif --- -1.8.3.1 - diff --git a/userspace/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER b/userspace/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index d2266c79..00000000 --- a/userspace/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1,3 +0,0 @@ -Add-build-dependency.patch -upversion-with-release-num.patch -fix-build-failures-due-to-unwanted-sgid-bit.patch diff --git a/userspace/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid-bit.patch b/userspace/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid-bit.patch deleted file mode 100644 index 2e7561ff..00000000 --- a/userspace/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid-bit.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dbac2d4a8d9623550f4d063410837b14ab4e4083 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com> -References: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com> -From: Scott Little -Date: Fri, 18 Nov 2016 13:53:47 -0500 -Subject: [PATCH 3/3] fix build failures due to unwanted sgid bit - -Signed-off-by: Jim Somerville ---- - SPECS/libibverbs.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec -index 1640a8b..d0c6574 100644 ---- a/SPECS/libibverbs.spec -+++ b/SPECS/libibverbs.spec -@@ -111,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT - %if %{_with_valgrind} - %{_libdir}/mlnx_ofed/valgrind/lib*.so - %endif -+%dir %attr(0755,root,root) %{_includedir}/infiniband - %{_includedir}/* - %{_mandir}/man3/* - %{_mandir}/man7/* --- -1.8.3.1 - diff --git a/userspace/mellanox/libibverbs/centos/meta_patches/upversion-with-release-num.patch b/userspace/mellanox/libibverbs/centos/meta_patches/upversion-with-release-num.patch deleted file mode 100644 index 0bad355c..00000000 --- a/userspace/mellanox/libibverbs/centos/meta_patches/upversion-with-release-num.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b5fb1baa8cda84492772493175dd4df2d4b05112 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com> -References: <214e3e515699ae332b3345dc5630a276f19324bf.1594931089.git.Jim.Somerville@windriver.com> -From: eric zhang -Date: Fri, 5 Jan 2018 21:05:50 -0500 -Subject: [PATCH 2/3] upversion with release num - -Signed-off-by: eric zhang -Signed-off-by: Shuicheng Lin -Signed-off-by: Jim Somerville ---- - SPECS/libibverbs.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec -index 673516e..1640a8b 100644 ---- a/SPECS/libibverbs.spec -+++ b/SPECS/libibverbs.spec -@@ -12,7 +12,7 @@ - - Name: libibverbs - Version: 41mlnx1 --Release: OFED.5.0.0.0.9.50218 -+Release: OFED.5.0.0.0.9.50218%{?_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 - diff --git a/userspace/mellanox/libibverbs/centos/srpm_path b/userspace/mellanox/libibverbs/centos/srpm_path deleted file mode 100644 index a9d3fd45..00000000 --- a/userspace/mellanox/libibverbs/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -repo:stx/downloads/libibverbs-41mlnx1-OFED.5.0.0.0.9.50218.src.rpm diff --git a/userspace/mellanox/mlnx-tools/centos/build_srpm.data b/userspace/mellanox/mlnx-tools/centos/build_srpm.data new file mode 100644 index 00000000..42f44216 --- /dev/null +++ b/userspace/mellanox/mlnx-tools/centos/build_srpm.data @@ -0,0 +1,6 @@ +OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std +OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt +BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=19ca0df55a7c905dc062008862b7b76b577a2354 +BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=19ca0df55a7c905dc062008862b7b76b577a2354 +PKG_BASE_SRCREV=19ca0df55a7c905dc062008862b7b76b577a2354 +TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT diff --git a/userspace/mellanox/mlnx-tools/centos/meta_patches/0001-Support-STX-system.patch b/userspace/mellanox/mlnx-tools/centos/meta_patches/0001-Support-STX-system.patch new file mode 100644 index 00000000..3669301e --- /dev/null +++ b/userspace/mellanox/mlnx-tools/centos/meta_patches/0001-Support-STX-system.patch @@ -0,0 +1,35 @@ +From 6c8e7bc564ccf4d2b4160f65b725a1550006ccd6 Mon Sep 17 00:00:00 2001 +From: Jiping Ma +Date: Sat, 29 Jan 2022 01:04:14 -0800 +Subject: [PATCH] Support STX system + +Signed-off-by: Jiping Ma +--- + mlnx-tools.spec | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/SPECS/mlnx-tools.spec b/SPECS//mlnx-tools.spec +index 196721f..6535863 100644 +--- a/SPECS/mlnx-tools.spec ++++ b/SPECS/mlnx-tools.spec +@@ -25,11 +25,16 @@ + # and/or other materials provided with the distribution. + # + # ++%if "%{_tis_build_type}" == "rt" ++%define bt_ext -rt ++%else ++%undefine bt_ext ++%endif + + Summary: Mellanox userland tools and scripts + Name: mlnx-tools + Version: 5.2.0 +-Release: 0%{?_dist}.55103 ++Release: 0.55103%{?_tis_dist}.%{tis_patch_ver} + License: GPLv2 + Url: https://github.com/Mellanox/mlnx-tools + Group: Applications/System +-- +2.31.1 + diff --git a/userspace/mellanox/mlnx-tools/centos/meta_patches/PATCH_ORDER b/userspace/mellanox/mlnx-tools/centos/meta_patches/PATCH_ORDER new file mode 100644 index 00000000..66dcffa2 --- /dev/null +++ b/userspace/mellanox/mlnx-tools/centos/meta_patches/PATCH_ORDER @@ -0,0 +1 @@ +0001-Support-STX-system.patch diff --git a/userspace/mellanox/mlnx-tools/centos/srpm_path b/userspace/mellanox/mlnx-tools/centos/srpm_path new file mode 100644 index 00000000..b5d7e13a --- /dev/null +++ b/userspace/mellanox/mlnx-tools/centos/srpm_path @@ -0,0 +1 @@ +repo:stx/downloads/mlnx-tools-5.2.0-0.55103.src.rpm diff --git a/userspace/mellanox/rdma-core/centos/build_srpm.data b/userspace/mellanox/rdma-core/centos/build_srpm.data index aec7b93a..42f44216 100644 --- a/userspace/mellanox/rdma-core/centos/build_srpm.data +++ b/userspace/mellanox/rdma-core/centos/build_srpm.data @@ -1,6 +1,6 @@ OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt -BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=58597630f681940c2a20cca75dc96c06ae9be15b -BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=58597630f681940c2a20cca75dc96c06ae9be15b -PKG_BASE_SRCREV=58597630f681940c2a20cca75dc96c06ae9be15b +BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=19ca0df55a7c905dc062008862b7b76b577a2354 +BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=19ca0df55a7c905dc062008862b7b76b577a2354 +PKG_BASE_SRCREV=19ca0df55a7c905dc062008862b7b76b577a2354 TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT diff --git a/userspace/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch b/userspace/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch deleted file mode 100644 index f9fe02a5..00000000 --- a/userspace/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 42bd893aeeac109d276f5cd85c24fa7e9944650d Mon Sep 17 00:00:00 2001 -Message-Id: <42bd893aeeac109d276f5cd85c24fa7e9944650d.1594934306.git.Jim.Somerville@windriver.com> -From: eric zhang -Date: Wed, 14 Mar 2018 14:56:21 -0400 -Subject: [PATCH 1/1] Add build dependencies and package versioning for TiS - format - -Force disable python3 to avoid random build failures due to -using python3 path. - -Signed-off-by: eric zhang -Signed-off-by: Jim Somerville -Signed-off-by: Shuicheng Lin ---- - SPECS/rdma-core.spec | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec -index d040b59..b42393f 100644 ---- a/SPECS/rdma-core.spec -+++ b/SPECS/rdma-core.spec -@@ -7,6 +7,12 @@ - %endif - %endif - -+%if "%{_tis_build_type}" == "rt" -+%define bt_ext -rt -+%else -+%undefine bt_ext -+%endif -+ - %{!?cmake: %global cmake cmake} - %{!?make_jobs: %global make_jobs make VERBOSE=1 %{?_smp_mflags}} - %{!?cmake_install: %global cmake_install DESTDIR=%{buildroot} make install} -@@ -35,7 +41,7 @@ - - Name: rdma-core - Version: 50mlnx1 --Release: 1%{?dist}.50218 -+Release: 1.50218%{?_tis_dist}.%{tis_patch_ver} - Summary: RDMA core userspace libraries and daemons - Group: System Environment/Libraries - -@@ -91,6 +97,9 @@ BuildRequires: python3 - BuildRequires: python - %endif - %endif -+BuildRequires: cmake -+BuildRequires: libnl3-devel -+BuildRequires: mlnx-ofa_kernel%{?bt_ext}-devel - - %if %{with build_docs} - %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || %{with_pyverbs} -@@ -397,10 +406,6 @@ easy, object-oriented access to IB verbs. - -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 srp_compat} - -DENABLE_SRP_COMPAT=1 \ - %endif --- -1.8.3.1 - diff --git a/userspace/mellanox/rdma-core/centos/meta_patches/0001-Support-STX-system.patch b/userspace/mellanox/rdma-core/centos/meta_patches/0001-Support-STX-system.patch new file mode 100644 index 00000000..a48271b1 --- /dev/null +++ b/userspace/mellanox/rdma-core/centos/meta_patches/0001-Support-STX-system.patch @@ -0,0 +1,44 @@ +From 3be2d62d2671002aaf14eae0a9759ee99f1d8eae Mon Sep 17 00:00:00 2001 +From: Jiping Ma +Date: Sat, 29 Jan 2022 01:49:48 -0800 +Subject: [PATCH] Support STX system + +Signed-off-by: Jiping Ma +--- + rdma-core.spec | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec +index 7f1a9ee..5b1e337 100644 +--- a/SPECS/rdma-core.spec ++++ b/SPECS/rdma-core.spec +@@ -1,3 +1,9 @@ ++%if "%{_tis_build_type}" == "rt" ++%define bt_ext -rt ++%else ++%undefine bt_ext ++%endif ++ + %{!?cmake: %global cmake cmake} + %{!?make_jobs: %global make_jobs make VERBOSE=1 %{?_smp_mflags}} + %{!?cmake_install: %global cmake_install DESTDIR=%{buildroot} make install} +@@ -27,7 +33,7 @@ + + Name: rdma-core + Version: 55mlnx37 +-Release: 1%{?dist}.55103 ++Release: 1.55103%{?_tis_dist}.%{tis_patch_ver} + Summary: RDMA core userspace libraries and daemons + Group: System Environment/Libraries + +@@ -97,6 +103,7 @@ BuildRequires: python-docutils + BuildRequires: perl-generators + %endif + ++BuildRequires: cmake + # Red Hat/Fedora previously shipped redhat/ as a stand-alone + # package called 'rdma', which we're supplanting here. + Provides: rdma = %{version}-%{release} +-- +2.31.1 + diff --git a/userspace/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER b/userspace/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER index 1b04e9d9..66dcffa2 100644 --- a/userspace/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER +++ b/userspace/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER @@ -1 +1 @@ -0001-Add-build-dependencies-and-package-versioning-for-Ti.patch +0001-Support-STX-system.patch diff --git a/userspace/mellanox/rdma-core/centos/srpm_path b/userspace/mellanox/rdma-core/centos/srpm_path index 6beeb932..ea9b8fa8 100644 --- a/userspace/mellanox/rdma-core/centos/srpm_path +++ b/userspace/mellanox/rdma-core/centos/srpm_path @@ -1 +1 @@ -repo:stx/downloads/rdma-core-50mlnx1-1.50218.src.rpm +repo:stx/downloads/rdma-core-55mlnx37-1.55103.src.rpm