Browse Source

Merge "enable vhost numa support"

Zuul 8 months ago
parent
commit
da3261e0e8
2 changed files with 9 additions and 0 deletions
  1. 8
    0
      devstack/libs/ovs-dpdk
  2. 1
    0
      devstack/settings

+ 8
- 0
devstack/libs/ovs-dpdk View File

@@ -384,6 +384,13 @@ function build_ovs_dpdk(){
384 384
         OVS_DPDK_BUILD_SHARED_LIB='n'
385 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 394
     local enable_igb_uio='n'
388 395
     if [ "$OVS_INTERFACE_DRIVER" == "igb_uio" ]; then
389 396
         enable_igb_uio='y'
@@ -392,6 +399,7 @@ function build_ovs_dpdk(){
392 399
     sed "s/CONFIG_RTE_BUILD_COMBINE_LIBS=n/CONFIG_RTE_BUILD_COMBINE_LIBS=y/" -i ${OVS_DPDK_DIR}/build/.config
393 400
     sed "s/CONFIG_RTE_MAX_MEMSEG=.*$/CONFIG_RTE_MAX_MEMSEG=${OVS_DPDK_MEM_SEGMENTS}/" -i ${OVS_DPDK_DIR}/build/.config
394 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 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 404
     sed "s/CONFIG_RTE_LIBRTE_KNI=.*$/CONFIG_RTE_LIBRTE_KNI=n/" -i ${OVS_DPDK_DIR}/build/.config
397 405
     sed "s/CONFIG_RTE_KNI_KMOD=.*$/CONFIG_RTE_KNI_KMOD=n/" -i ${OVS_DPDK_DIR}/build/.config

+ 1
- 0
devstack/settings View File

@@ -15,6 +15,7 @@ OVS_DPDK_MEM_SEGMENTS=${OVS_DPDK_MEM_SEGMENTS:-256}
15 15
 OVS_DPDK_RTE_LIBRTE_VHOST=${OVS_DPDK_RTE_LIBRTE_VHOST:-True}
16 16
 OVS_DPDK_VHOST_USER_DEBUG=${OVS_DPDK_VHOST_USER_DEBUG:-False}
17 17
 OVS_DPDK_BUILD_SHARED_LIB=${OVS_DPDK_BUILD_SHARED_LIB:-False}
18
+OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA=${OVS_DPDK_CONFIG_RTE_LIBRTE_VHOST_NUMA:-True}
18 19
 
19 20
 # ovs constants
20 21
 OVS_DB_CONF_DIR=/etc/openvswitch

Loading…
Cancel
Save