From 285b3ef3a9250ced5dc009ec3fb33b40443e0958 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 30 Apr 2019 13:03:11 +0400 Subject: [dpdk] Get back to shared memory model The per port model potentially requires an increase in memory resource requirements (which is limited by labs) to support the same number of ports and configuration as the shared port model. Set linux:network:openvswitch:per_port_memory explicitly to true to enable per port mempools support for DPDK devices. Change-Id: I130885afc50e7a047f8835113d370840827ad718 Signed-off-by: Michael Polenchuk (cherry picked from commit 90480f70cf3d287e82830a1df157a0066807a3c9) --- .../0004-dpdk-Enable-per-port-memory-model.patch | 25 ---------------------- .../0004-dpdk-Handle-per-port-memory-model.patch | 25 ++++++++++++++++++++++ mcp/reclass/classes/system | 2 +- mcp/scripts/pharos | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch create mode 100644 mcp/patches/salt-formula-linux/0004-dpdk-Handle-per-port-memory-model.patch diff --git a/mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch b/mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch deleted file mode 100644 index 4a35a8a79..000000000 --- a/mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch +++ /dev/null @@ -1,25 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2019 Mirantis Inc., Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Michael Polenchuk -Date: Mon, 1 Apr 2019 13:09:37 +0400 -Subject: [PATCH] [dpdk] Enable per port memory model - - -diff --git a/linux/network/dpdk.sls b/linux/network/dpdk.sls -index 786f7c8..48c00f5 100644 ---- a/linux/network/dpdk.sls -+++ b/linux/network/dpdk.sls -@@ -49,6 +49,7 @@ linux_network_dpdk_ovs_service: - - unless: 'ovs-vsctl get Open_vSwitch . other_config | grep "dpdk-init=\"true\""' - - {%- set ovs_options = [ -+ 'per-port-memory="true"', - "pmd-cpu-mask=\""+network.openvswitch.pmd_cpu_mask+"\"", - "dpdk-socket-mem=\""+network.openvswitch.dpdk_socket_mem+"\"", - "dpdk-lcore-mask=\""+network.openvswitch.dpdk_lcore_mask+"\"", diff --git a/mcp/patches/salt-formula-linux/0004-dpdk-Handle-per-port-memory-model.patch b/mcp/patches/salt-formula-linux/0004-dpdk-Handle-per-port-memory-model.patch new file mode 100644 index 000000000..b54650007 --- /dev/null +++ b/mcp/patches/salt-formula-linux/0004-dpdk-Handle-per-port-memory-model.patch @@ -0,0 +1,25 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2019 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Michael Polenchuk +Date: Tue, 30 Apr 2019 12:59:54 +0400 +Subject: [PATCH] [dpdk] Handle per port memory model + + +diff --git a/linux/network/dpdk.sls b/linux/network/dpdk.sls +index 786f7c8..c6f3020 100644 +--- a/linux/network/dpdk.sls ++++ b/linux/network/dpdk.sls +@@ -49,6 +49,7 @@ linux_network_dpdk_ovs_service: + - unless: 'ovs-vsctl get Open_vSwitch . other_config | grep "dpdk-init=\"true\""' + + {%- set ovs_options = [ ++ 'per-port-memory="'+network.openvswitch.per_port_memory|d('false')+'"', + "pmd-cpu-mask=\""+network.openvswitch.pmd_cpu_mask+"\"", + "dpdk-socket-mem=\""+network.openvswitch.dpdk_socket_mem+"\"", + "dpdk-lcore-mask=\""+network.openvswitch.dpdk_lcore_mask+"\"", diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index 39baa623d..6176bde8f 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 39baa623d525cd9a7eaedb5661e6b6730f0311b5 +Subproject commit 6176bde8f5a5e3b723149830242ada46c5126e3b diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos index 4fd183a33..fed789498 160000 --- a/mcp/scripts/pharos +++ b/mcp/scripts/pharos @@ -1 +1 @@ -Subproject commit 4fd183a336dd1047f0468ae2699860c67116c2b0 +Subproject commit fed789498ee2d7b4a910c881331013d30ef623b3 -- cgit 1.2.3-korg