starlingx
/
integ
Code Issues Proposed changes

Merge "Enable Mellanox PMDs in ovs-dpdk build"

This commit is contained in:
Zuul 2018-08-30 14:47:40 +00:00 committed by Gerrit Code Review
parent 0decf3591b 988112868c
commit 1fdf94bedb
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/openvswitch/centos/build_srpm.data
View File

@ -1,3 +1,3 @@
COPY_LIST="files/*"
TIS_PATCH_VER=0
TIS_PATCH_VER=1
BUILD_IS_SLOW=12

45
networking/openvswitch/centos/meta_patches/0007-enable-mlx-pmds.patch Normal file
View File

@ -0,0 +1,45 @@
diff --git a/SOURCES/x86_64-native-linuxapp-gcc-config b/SOURCES/x86_64-native-linuxapp-gcc-config
index f81d420..eab161c 100644
--- a/SOURCES/x86_64-native-linuxapp-gcc-config
+++ b/SOURCES/x86_64-native-linuxapp-gcc-config
@@ -197,12 +197,12 @@ 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=n
+CONFIG_RTE_LIBRTE_MLX4_PMD=y
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=n
+CONFIG_RTE_LIBRTE_MLX5_PMD=y
CONFIG_RTE_LIBRTE_MLX5_DEBUG=n
CONFIG_RTE_LIBRTE_MLX5_TX_MP_CACHE=8
# Compile burst-oriented Broadcom PMD driver
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index 29255d5..f392e95 100644
--- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec
@@ -155,6 +155,7 @@ BuildRequires: libcap-ng libcap-ng-devel
%ifarch %{dpdkarches}
# DPDK driver dependencies
BuildRequires: zlib-devel libpcap-devel numactl-devel
+BuildRequires: rdma-core-devel
Requires: python-pyelftools
# Virtual provide for depending on DPDK-enabled OVS
@@ -356,7 +357,12 @@ cd -
--dpdk \
< rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \
> rhel/usr_lib_systemd_system_ovs-vswitchd.service
-make %{?_smp_mflags}
+make %{?_smp_mflags} \
+%if %{with dpdk}
+%ifarch %{dpdkarches}
+ LDFLAGS="-libverbs -lmlx4 -lmlx5"
+%endif
+%endif
%install
rm -rf $RPM_BUILD_ROOT

1
networking/openvswitch/centos/meta_patches/PATCH_ORDER
View File

@ -4,3 +4,4 @@
0004-add-pmon-conf-files.patch
0005-log-rotation-config.patch
0006-rpm-check-with-condition.patch
0007-enable-mlx-pmds.patch