summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-09-13 10:47:35 +0200
committerFlorin Coras <florin.coras@gmail.com>2016-09-13 11:37:55 +0000
commit614480262738dc6de382023a03656e1045d17f04 (patch)
tree3b2b2d0b269f29c5005fd49770efa2a1fef49260
parentff0bf136c08e5369fb6c133cd876c830afebd80c (diff)
Add some help into startup.conf
Change-Id: I84e9d7c3ccd32814c3eebf1cef0a4887c75812a8 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--vnet/vnet/devices/dpdk/init.c2
-rw-r--r--vpp/conf/startup.conf54
2 files changed, 56 insertions, 0 deletions
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c
index 3de33ed1aa9..7b657209ccb 100644
--- a/vnet/vnet/devices/dpdk/init.c
+++ b/vnet/vnet/devices/dpdk/init.c
@@ -1131,6 +1131,8 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
else if (unformat (input, "default"))
;
+ else if (unformat (input, " "))
+ ;
else
{
error = clib_error_return (0, "unknown input `%U'",
diff --git a/vpp/conf/startup.conf b/vpp/conf/startup.conf
index ea6d800910b..7306fa4ec79 100644
--- a/vpp/conf/startup.conf
+++ b/vpp/conf/startup.conf
@@ -12,3 +12,57 @@ api-trace {
api-segment {
gid vpp
}
+
+cpu {
+ ## Set logical CPU core where main thread runs
+ # main-core 1
+
+ ## Set logical CPU core(s) where worker threads are running
+ ## by default there is no worker threads started
+ # corelist-workers 2-3,18-19
+}
+
+dpdk {
+ ## Change default settings for all intefaces
+ # dev default {
+ ## Number of receive queues, enables RSS
+ ## Default is 1
+ # num-rx-queues 3
+
+ ## Number of transmit queues, Default is equal
+ ## to number of worker threads or 1 if no workers treads
+ # num-tx-queues 3
+
+ ## Number of descriptors in transmit and receive rings
+ ## increasing or reducing number can impact performance
+ ## Default is 1024 for both rx and tx
+ # num-rx-desc 512
+ # num-tx-desc 512
+ # }
+
+ ## Whitelist specific interface by specifying PCI address
+ # dev 0000:02:00.0
+
+ ## Whitelist specific interface by specifying PCI address and in
+ ## addition specify custom parameters for this interface
+ # dev 0000:02:00.1 {
+ # num-rx-queues 2
+ # }
+
+ ## Change UIO driver used by VPP, Options are: uio_pci_generic, vfio-pci
+ ## and igb_uio (default)
+ # uio-driver uio_pci_generic
+
+ ## Disable mutli-segment buffers, improves performance but
+ ## disables Jumbo MTU support
+ # no-multi-seg
+
+ ## Increase number of buffers allocated, needed only in scenarios with
+ ## large number of interfaces and worker threads. Value is per CPU socket.
+ ## Default is 32768
+ # num-mbufs 128000
+
+ ## Change hugepages allocation per-socket, needed only if there is need for
+ ## larger number of mbufs. Default is 256M on each detected CPU socket
+ # socket-mem 2048,2048
+}