From 94dbeb480de3df3ef750298ae261a8a71feee268 Mon Sep 17 00:00:00 2001 From: Jiping Ma Date: Wed, 2 Mar 2022 19:44:25 -0800 Subject: [PATCH] integ: remove mlx4 from openvswitch The module mlx4 has been dropped in mlnx-ofa_kernel-5.5-OFED.5.5.1.0.3.1. So remove mlx4 from openvswitch after OFED driver upgrade. The infomation can be found in the part "Unsupported Functionalities/Features/NICs" in this link: https://docs.nvidia.com/networking/display/MLNXOFEDv551032/ General+Support where ConnectX-3 and ConnectX-3 Pro adapter card represents use of mlx4. Verification: - Build success. - Install success 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 Teichnologies MT27800 Family [ConnectX-5]. - RDMA/Infiniband over Ethernet functionalities of the Mellanox adapters were successfully tested using the Linux RDMA community's perftest package. - Test ovs-dpdk. It fails with both mlx driver version mlnx-ofa_kernel-5.3-OFED.5.3.1.0.0.1 and mlnx-ofa_kernel-5.5-OFED.5.5.1.0.3.1. The OFED v5.5 is not breaking anything new. Story: 2009878 Task: 44652 Depends-On: https://review.opendev.org/c/starlingx/kernel/+/831461 Signed-off-by: Jiping Ma Change-Id: I5214ef6de1eb7c054e4fc544f113d67652f661fa --- networking/openvswitch/centos/openvswitch.spec | 2 +- networking/openvswitch/files/x86_64-native-linuxapp-gcc-config | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/networking/openvswitch/centos/openvswitch.spec b/networking/openvswitch/centos/openvswitch.spec index fa49f39fa..c5676c7ff 100644 --- a/networking/openvswitch/centos/openvswitch.spec +++ b/networking/openvswitch/centos/openvswitch.spec @@ -324,7 +324,7 @@ cd - make %{?_smp_mflags} \ %if %{with dpdk} %ifarch %{dpdkarches} - LDFLAGS="-libverbs -lmlx4 -lmlx5" + LDFLAGS="-libverbs -lmlx5" %endif %endif diff --git a/networking/openvswitch/files/x86_64-native-linuxapp-gcc-config b/networking/openvswitch/files/x86_64-native-linuxapp-gcc-config index 54f7951df..a3a15e3c1 100644 --- a/networking/openvswitch/files/x86_64-native-linuxapp-gcc-config +++ b/networking/openvswitch/files/x86_64-native-linuxapp-gcc-config @@ -207,10 +207,9 @@ CONFIG_RTE_LIBRTE_FM10K_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE=y CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR=y # Compile burst-oriented Mellanox ConnectX-3 (MLX4) PMD -CONFIG_RTE_LIBRTE_MLX4_PMD=y +CONFIG_RTE_LIBRTE_MLX4_PMD=n CONFIG_RTE_LIBRTE_MLX4_DEBUG=n CONFIG_RTE_LIBRTE_MLX4_DEBUG_BROKEN_VERBS=n -CONFIG_RTE_LIBRTE_MLX4_TX_MP_CACHE=8 # Compile burst-oriented Mellanox ConnectX-4 & ConnectX-5 (MLX5) PMD CONFIG_RTE_LIBRTE_MLX5_PMD=y CONFIG_RTE_LIBRTE_MLX5_DEBUG=n