summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-17 09:41:49 +0000
committerGerrit Code Review <review@openstack.org>2018-08-17 09:41:49 +0000
commitda3261e0e867e9f581c6c4458363bd11047eb9aa (patch)
tree406cce0e8316732ebc8e74e02e55f1b3cf1d820e
parentda24dca68d87b4580fd40b5a944b152eef900740 (diff)
parent8c1aa86354d805edeb3f16297df06e958309f42e (diff)
Merge "enable vhost numa support"
-rw-r--r--devstack/libs/ovs-dpdk8
-rw-r--r--devstack/settings1
2 files changed, 9 insertions, 0 deletions
diff --git a/devstack/libs/ovs-dpdk b/devstack/libs/ovs-dpdk
index 6de56c3..ef3db63 100644
--- a/devstack/libs/ovs-dpdk
+++ b/devstack/libs/ovs-dpdk
@@ -384,6 +384,13 @@ function build_ovs_dpdk(){
384 OVS_DPDK_BUILD_SHARED_LIB='n' 384 OVS_DPDK_BUILD_SHARED_LIB='n'
385 fi 385 fi
386 386
387 OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA=$(trueorfalse True OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA)
388 if [ "$OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA" == "True" ]; then
389 OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA='y'
390 else
391 OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA='n'
392 fi
393
387 local enable_igb_uio='n' 394 local enable_igb_uio='n'
388 if [ "$OVS_INTERFACE_DRIVER" == "igb_uio" ]; then 395 if [ "$OVS_INTERFACE_DRIVER" == "igb_uio" ]; then
389 enable_igb_uio='y' 396 enable_igb_uio='y'
@@ -392,6 +399,7 @@ function build_ovs_dpdk(){
392 sed "s/CONFIG_RTE_BUILD_COMBINE_LIBS=n/CONFIG_RTE_BUILD_COMBINE_LIBS=y/" -i ${OVS_DPDK_DIR}/build/.config 399 sed "s/CONFIG_RTE_BUILD_COMBINE_LIBS=n/CONFIG_RTE_BUILD_COMBINE_LIBS=y/" -i ${OVS_DPDK_DIR}/build/.config
393 sed "s/CONFIG_RTE_MAX_MEMSEG=.*$/CONFIG_RTE_MAX_MEMSEG=${OVS_DPDK_MEM_SEGMENTS}/" -i ${OVS_DPDK_DIR}/build/.config 400 sed "s/CONFIG_RTE_MAX_MEMSEG=.*$/CONFIG_RTE_MAX_MEMSEG=${OVS_DPDK_MEM_SEGMENTS}/" -i ${OVS_DPDK_DIR}/build/.config
394 sed "s/CONFIG_RTE_LIBRTE_VHOST=.*$/CONFIG_RTE_LIBRTE_VHOST=${OVS_DPDK_RTE_LIBRTE_VHOST}/" -i ${OVS_DPDK_DIR}/build/.config 401 sed "s/CONFIG_RTE_LIBRTE_VHOST=.*$/CONFIG_RTE_LIBRTE_VHOST=${OVS_DPDK_RTE_LIBRTE_VHOST}/" -i ${OVS_DPDK_DIR}/build/.config
402 sed "s/CONFIG_RTE_LIBRTE_VHOST_NUMA=.*$/CONFIG_RTE_LIBRTE_VHOST_NUMA=${OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA}/" -i ${OVS_DPDK_DIR}/build/.config
395 sed "s/CONFIG_RTE_LIBRTE_VHOST_DEBUG=.*$/CONFIG_RTE_LIBRTE_VHOST_DEBUG=${OVS_DPDK_VHOST_USER_DEBUG}/" -i ${OVS_DPDK_DIR}/build/.config 403 sed "s/CONFIG_RTE_LIBRTE_VHOST_DEBUG=.*$/CONFIG_RTE_LIBRTE_VHOST_DEBUG=${OVS_DPDK_VHOST_USER_DEBUG}/" -i ${OVS_DPDK_DIR}/build/.config
396 sed "s/CONFIG_RTE_LIBRTE_KNI=.*$/CONFIG_RTE_LIBRTE_KNI=n/" -i ${OVS_DPDK_DIR}/build/.config 404 sed "s/CONFIG_RTE_LIBRTE_KNI=.*$/CONFIG_RTE_LIBRTE_KNI=n/" -i ${OVS_DPDK_DIR}/build/.config
397 sed "s/CONFIG_RTE_KNI_KMOD=.*$/CONFIG_RTE_KNI_KMOD=n/" -i ${OVS_DPDK_DIR}/build/.config 405 sed "s/CONFIG_RTE_KNI_KMOD=.*$/CONFIG_RTE_KNI_KMOD=n/" -i ${OVS_DPDK_DIR}/build/.config
diff --git a/devstack/settings b/devstack/settings
index 865daf1..cf2ff3b 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -15,6 +15,7 @@ OVS_DPDK_MEM_SEGMENTS=${OVS_DPDK_MEM_SEGMENTS:-256}
15OVS_DPDK_RTE_LIBRTE_VHOST=${OVS_DPDK_RTE_LIBRTE_VHOST:-True} 15OVS_DPDK_RTE_LIBRTE_VHOST=${OVS_DPDK_RTE_LIBRTE_VHOST:-True}
16OVS_DPDK_VHOST_USER_DEBUG=${OVS_DPDK_VHOST_USER_DEBUG:-False} 16OVS_DPDK_VHOST_USER_DEBUG=${OVS_DPDK_VHOST_USER_DEBUG:-False}
17OVS_DPDK_BUILD_SHARED_LIB=${OVS_DPDK_BUILD_SHARED_LIB:-False} 17OVS_DPDK_BUILD_SHARED_LIB=${OVS_DPDK_BUILD_SHARED_LIB:-False}
18OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA=${OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA:-True}
18 19
19# ovs constants 20# ovs constants
20OVS_DB_CONF_DIR=/etc/openvswitch 21OVS_DB_CONF_DIR=/etc/openvswitch