From 997cf361075305a7ccec5471c7d6cb3713464b24 Mon Sep 17 00:00:00 2001 From: Jiping Ma Date: Wed, 24 Apr 2024 23:15:39 -0400 Subject: [PATCH] kernel-modules: re-enable mlnx-ofa_kernel This commit re-enables mlnx-ofa_kernel OOT drivers and disables the in-tree bnxt_en/bnxt_re and mlnx-ofa_kernel drivers because we decide to select the OOT drivers for bnxt_en/bnxt_re and mlnx-ofa_kernel based on Melanox/Broadcom's suggestion. We also upgrade the driver version recommended by Nvidia. Upgrade the mlnx-ofa_kernel to the version 23.10.2.1.3.1 from 5.9, also upgrade the rdma-core to the version 2307mlnx47 from 59mlnx44. This commit also corrects one small patch naming issue, deletes 'i' in the patch name. The new versions are: mlnx-ofa_kernel-23.10.tgz rdma-core-2307mlnx47.tar.gz Verification: - Build package success for rdma-core, mlnx-ofa_kernel. - Install onto a StarlingX system with All-in-One lab with network adapters Mellanox's OFED. The network adapters of controllers are Mellanox Technologies MT27800 Family [ConnectX-5]. - The physical function interfaces are up and pass packets for rt and std. - create vfs, ensure that the interface can come up and pass packets. - RDMA/Infiniband over Ethernet functionalities of the Mellanox adapters were successfully tested using the Linux RDMA community's perftest package. Story: 2011056 Task: 49876 Change-Id: I0f88125f1332451127947763088c193fc9342405 Signed-off-by: Jiping Ma (cherry picked from commit 4653f78aa3ffdb6825fac24754dce5f54ac8ae5b) Signed-off-by: Jiping Ma --- debian_iso_image.inc | 4 +-- debian_pkg_dirs | 2 +- debian_pkg_dirs_rt | 2 +- .../mlnx-ofa_kernel/debian/meta_data.yaml | 8 +++--- .../0001-Enable-mlx5-onboard-udev-name.patch | 27 ++++++++++-------- kernel-rt/debian/source/config | 28 ++++++++----------- kernel-std/debian/source/config | 28 +++++++------------ ...thon3-dev-to-depends-list-for-build.patch} | 12 ++++---- .../rdma-core/debian/deb_patches/series | 2 +- .../mellanox/rdma-core/debian/meta_data.yaml | 8 +++--- 10 files changed, 56 insertions(+), 65 deletions(-) rename userspace/mellanox/rdma-core/debian/deb_patches/{0001-rdma-core-add-python3-dev-to-depends-list-for-buildi.patch => 0001-rdma-core-add-python3-dev-to-depends-list-for-build.patch} (77%) diff --git a/debian_iso_image.inc b/debian_iso_image.inc index 09a8448d..f0c7edd5 100644 --- a/debian_iso_image.inc +++ b/debian_iso_image.inc @@ -52,8 +52,8 @@ linux-libc-dev linux-perf #mlnx-ofa_kernel -#mlnx-ofed-kernel-modules -#mlnx-ofed-kernel-modules-rt +mlnx-ofed-kernel-modules +mlnx-ofed-kernel-modules-rt #mlnx-ofed-kernel-utils #qat20 diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 790e2471..833df0c3 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -6,7 +6,7 @@ kernel-modules/intel-ice kernel-modules/intel-igb_uio kernel-modules/intel-opae-fpga kernel-modules/intel-qv -#kernel-modules/mlnx-ofa_kernel +kernel-modules/mlnx-ofa_kernel kernel-modules/qat kernel-modules/octeon_ep userspace/broadcom/libbnxt_re diff --git a/debian_pkg_dirs_rt b/debian_pkg_dirs_rt index cd4a2792..c8d100f6 100644 --- a/debian_pkg_dirs_rt +++ b/debian_pkg_dirs_rt @@ -6,6 +6,6 @@ kernel-modules/intel-ice kernel-modules/intel-igb_uio kernel-modules/intel-opae-fpga kernel-modules/intel-qv -#kernel-modules/mlnx-ofa_kernel +kernel-modules/mlnx-ofa_kernel kernel-modules/qat kernel-modules/octeon_ep diff --git a/kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml b/kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml index 9d860212..8b63835a 100644 --- a/kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml +++ b/kernel-modules/mlnx-ofa_kernel/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- -debver: 5.9 +debver: 23.10@ debname: mlnx-ofed-kernel dl_path: - name: mlnx-ofa-kernel-5.9.tgz + name: mlnx-ofa-kernel-23.10.tgz url: "https://linux.mellanox.com/public/repo/mlnx_ofed/\ - 5.9-0.5.6.0/SRPMS/mlnx-ofa_kernel-5.9.tgz" - sha256sum: c25965b336b58116ee8f4ddaf3c858564b00214ab12164a347f2d27d32d79df5 + 23.10-2.1.3.1/SRPMS/mlnx-ofa_kernel-23.10.tgz" + sha256sum: 9d0082bd7379098f750d0127c623ed0a29629bb149944f213d43429eea7d9519 revision: dist: $STX_DIST GITREVCOUNT: diff --git a/kernel-modules/mlnx-ofa_kernel/debian/patches/0001-Enable-mlx5-onboard-udev-name.patch b/kernel-modules/mlnx-ofa_kernel/debian/patches/0001-Enable-mlx5-onboard-udev-name.patch index aa098fe4..0c9498ed 100644 --- a/kernel-modules/mlnx-ofa_kernel/debian/patches/0001-Enable-mlx5-onboard-udev-name.patch +++ b/kernel-modules/mlnx-ofa_kernel/debian/patches/0001-Enable-mlx5-onboard-udev-name.patch @@ -1,4 +1,4 @@ -From 74ecb6be9dd81ff6a3c28d2d8f9e557cb76009c3 Mon Sep 17 00:00:00 2001 +From c6a43833d3b9bf97049e373d20a6eb7daff91c36 Mon Sep 17 00:00:00 2001 From: Steven Webster Date: Thu, 11 Aug 2022 12:32:48 -0400 Subject: [PATCH] Enable mlx5 onboard udev name @@ -18,16 +18,18 @@ slot/path name, and then being overridden by the Mellanox specific 82-net-setup-link.rules. Signed-off-by: Steven Webster +[jm: Adapted the patch for context change] +Signed-off-by: Jiping Ma --- - source/ofed_scripts/vf-net-link-name.sh | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) + ofed_scripts/vf-net-link-name.sh | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ofed_scripts/vf-net-link-name.sh b/ofed_scripts/vf-net-link-name.sh -index 65d8a7b..3bf87cc 100755 +index e22ae76..1134629 100755 --- a/ofed_scripts/vf-net-link-name.sh +++ b/ofed_scripts/vf-net-link-name.sh -@@ -68,7 +68,9 @@ if [ "$ID_NET_DRIVER" == "mlx5e_rep" ]; then - fi +@@ -93,7 +93,9 @@ function test_if_pf() { + } if [ "$skip" == "0" ]; then - if [ -n "$ID_NET_NAME_SLOT" ]; then @@ -37,7 +39,7 @@ index 65d8a7b..3bf87cc 100755 NAME="${ID_NET_NAME_SLOT%%np[[:digit:]]}" elif [ -n "$ID_NET_NAME_PATH" ]; then NAME="${ID_NET_NAME_PATH%%np[[:digit:]]}" -@@ -176,9 +178,12 @@ for cnt in {1..2}; do +@@ -226,11 +228,14 @@ for cnt in {1..2}; do continue fi @@ -46,12 +48,15 @@ index 65d8a7b..3bf87cc 100755 if [ -z "$parent_path" ]; then - parent_path=`get_pci_name $pci ID_NET_NAME_PATH` + parent_path=`get_pci_name $pci ID_NET_NAME_SLOT` -+ if [ -z "$parent_path" ]; then + if [ -z "$parent_path" ]; then +- continue + parent_path=`get_pci_name $pci ID_NET_NAME_PATH` -+ fi ++ if [ -z "$parent_path" ]; then ++ continue ++ fi + fi fi echo "NAME=${parent_path}_$PORT" - exit -- -2.29.2 +2.43.0 diff --git a/kernel-rt/debian/source/config b/kernel-rt/debian/source/config index 590ed23b..c8472aa0 100644 --- a/kernel-rt/debian/source/config +++ b/kernel-rt/debian/source/config @@ -2444,11 +2444,11 @@ CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y # CONFIG_SYSTEMPORT is not set -CONFIG_BNXT=m -CONFIG_BNXT_SRIOV=y -CONFIG_BNXT_FLOWER_OFFLOAD=y -CONFIG_BNXT_DCB=y -CONFIG_BNXT_HWMON=y +# CONFIG_BNXT is not set +# CONFIG_BNXT_SRIOV is not set +# CONFIG_BNXT_FLOWER_OFFLOAD is not set +# CONFIG_BNXT_DCB is not set +# CONFIG_BNXT_HWMON is not set CONFIG_NET_VENDOR_BROCADE=y # CONFIG_BNA is not set CONFIG_NET_VENDOR_CADENCE=y @@ -2513,10 +2513,8 @@ CONFIG_ICE=m CONFIG_IGC=m # CONFIG_JME is not set # CONFIG_NET_VENDOR_MARVELL is not set -CONFIG_NET_VENDOR_MELLANOX=m +# CONFIG_NET_VENDOR_MELLANOX is not set CONFIG_NET_VENDOR_MICREL=y -CONFIG_MLX5_CORE=m -CONFIG_MLXFW=m # CONFIG_KS8842 is not set # CONFIG_KS8851 is not set # CONFIG_KS8851_MLL is not set @@ -4431,24 +4429,20 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_AUDIO=m # CONFIG_ACCESSIBILITY is not set CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_ADDR_TRANS=m +# CONFIG_INFINIBAND_USER_MAD is not set +# CONFIG_INFINIBAND_USER_ACCESS is not set +# CONFIG_INFINIBAND_ADDR_TRANS is not set CONFIG_INFINIBAND_VIRT_DMA=y # CONFIG_INFINIBAND_MTHCA is not set # CONFIG_MLX4_INFINIBAND is not set -CONFIG_MLX5_INFINIBAND=m # CONFIG_INFINIBAND_OCRDMA is not set # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set -CONFIG_INFINIBAND_BNXT_RE=m -CONFIG_INFINIBAND_EFA=m -CONFIG_INFINIBAND_IRDMA=m -# CONFIG_INFINIBAND_HFI1 is not set +# CONFIG_INFINIBAND_BNXT_RE is not set # CONFIG_INFINIBAND_QEDR is not set # CONFIG_INFINIBAND_RDMAVT is not set # CONFIG_RDMA_RXE is not set # CONFIG_RDMA_SIW is not set -CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB is not set # CONFIG_INFINIBAND_OPA_VNIC is not set CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y diff --git a/kernel-std/debian/source/config b/kernel-std/debian/source/config index b34a82e5..5e095284 100644 --- a/kernel-std/debian/source/config +++ b/kernel-std/debian/source/config @@ -2453,11 +2453,11 @@ CONFIG_TIGON3_HWMON=y CONFIG_BNX2X=m CONFIG_BNX2X_SRIOV=y # CONFIG_SYSTEMPORT is not set -CONFIG_BNXT=m -CONFIG_BNXT_SRIOV=y -CONFIG_BNXT_FLOWER_OFFLOAD=y -CONFIG_BNXT_DCB=y -CONFIG_BNXT_HWMON=y +# CONFIG_BNXT is not set +# CONFIG_BNXT_SRIOV is not set +# CONFIG_BNXT_FLOWER_OFFLOAD is not set +# CONFIG_BNXT_DCB is not set +# CONFIG_BNXT_HWMON is not set CONFIG_NET_VENDOR_BROCADE=y # CONFIG_BNA is not set CONFIG_NET_VENDOR_CADENCE=y @@ -2602,9 +2602,6 @@ CONFIG_PHYLIB=y CONFIG_SWPHY=y CONFIG_LED_TRIGGER_PHY=y CONFIG_FIXED_PHY=y -CONFIG_NET_VENDOR_MELLANOX=m -CONFIG_MLX5_CORE=m -CONFIG_MLXFW=m # # MII PHY device drivers @@ -4420,24 +4417,20 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_AUDIO=m # CONFIG_ACCESSIBILITY is not set CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_ADDR_TRANS=m +# CONFIG_INFINIBAND_USER_MAD is not set +# CONFIG_INFINIBAND_USER_ACCESS is not set +# CONFIG_INFINIBAND_ADDR_TRANS is not set CONFIG_INFINIBAND_VIRT_DMA=y # CONFIG_INFINIBAND_MTHCA is not set # CONFIG_MLX4_INFINIBAND is not set -CONFIG_MLX5_INFINIBAND=m # CONFIG_INFINIBAND_OCRDMA is not set # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set -CONFIG_INFINIBAND_BNXT_RE=m -CONFIG_INFINIBAND_EFA=m -CONFIG_INFINIBAND_IRDMA=m -# CONFIG_INFINIBAND_HFI1 is not set +# CONFIG_INFINIBAND_BNXT_RE is not set # CONFIG_INFINIBAND_QEDR is not set # CONFIG_INFINIBAND_RDMAVT is not set # CONFIG_RDMA_RXE is not set # CONFIG_RDMA_SIW is not set -CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB is not set # CONFIG_INFINIBAND_OPA_VNIC is not set CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y @@ -5578,7 +5571,6 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set # CONFIG_SUNRPC_DEBUG is not set diff --git a/userspace/mellanox/rdma-core/debian/deb_patches/0001-rdma-core-add-python3-dev-to-depends-list-for-buildi.patch b/userspace/mellanox/rdma-core/debian/deb_patches/0001-rdma-core-add-python3-dev-to-depends-list-for-build.patch similarity index 77% rename from userspace/mellanox/rdma-core/debian/deb_patches/0001-rdma-core-add-python3-dev-to-depends-list-for-buildi.patch rename to userspace/mellanox/rdma-core/debian/deb_patches/0001-rdma-core-add-python3-dev-to-depends-list-for-build.patch index c1cdb63b..7a44c452 100644 --- a/userspace/mellanox/rdma-core/debian/deb_patches/0001-rdma-core-add-python3-dev-to-depends-list-for-buildi.patch +++ b/userspace/mellanox/rdma-core/debian/deb_patches/0001-rdma-core-add-python3-dev-to-depends-list-for-build.patch @@ -1,4 +1,4 @@ -From c0985ef490736b661df11395c1fc5c00cde88ad5 Mon Sep 17 00:00:00 2001 +From 0ef40a6c28d2538a558f215e32db3e3a1ef5819b Mon Sep 17 00:00:00 2001 From: Li Zhou Date: Thu, 16 Sep 2021 07:42:24 +0000 Subject: [PATCH] rdma-core: add python3-dev to depends list for building error @@ -13,17 +13,17 @@ Signed-off-by: Li Zhou 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control -index 40c5bcd..2011c5a 100644 +index bf945b4..fba039d 100644 --- a/debian/control +++ b/debian/control -@@ -7,6 +7,7 @@ Section: net +@@ -6,6 +6,7 @@ Section: net Priority: optional Build-Depends: cmake (>= 2.8.11), cython3 (>= 0.25) | python, + python3-dev, - debhelper (>= 9), - debhelper (>= 9.20160709) | dh-systemd, + debhelper (>= 10), dh-python, + dpkg-dev (>= 1.17), -- -2.17.1 +2.43.0 diff --git a/userspace/mellanox/rdma-core/debian/deb_patches/series b/userspace/mellanox/rdma-core/debian/deb_patches/series index e06a9a5b..67c3d925 100644 --- a/userspace/mellanox/rdma-core/debian/deb_patches/series +++ b/userspace/mellanox/rdma-core/debian/deb_patches/series @@ -1 +1 @@ -0001-rdma-core-add-python3-dev-to-depends-list-for-buildi.patch +0001-rdma-core-add-python3-dev-to-depends-list-for-build.patch diff --git a/userspace/mellanox/rdma-core/debian/meta_data.yaml b/userspace/mellanox/rdma-core/debian/meta_data.yaml index a44552f5..368f167d 100644 --- a/userspace/mellanox/rdma-core/debian/meta_data.yaml +++ b/userspace/mellanox/rdma-core/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- -debver: 59mlnx44 +debver: 2307mlnx47 debname: rdma-core dl_path: - name: rdma-core-59mlnx44.tgz + name: rdma-core-2307mlnx47.tar.gz url: "https://linux.mellanox.com/public/repo/mlnx_ofed/\ - 5.9-0.5.6.0/SRPMS/rdma-core-59mlnx44.tgz" - sha256sum: 49e8d5b95e35679ce01ad143ac39b23f01cc2499ec68d2a1556e349244f3fd95 + 23.10-2.1.3.1/SRPMS/rdma-core-2307mlnx47.tar.gz" + sha256sum: 1697f06f491e0f004620004be7fa937d3f22603b5a5705dc4cba8fe706c0356b revision: dist: $STX_DIST GITREVCOUNT: