X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fconf%2Fstartup.conf;h=b0d0c86641f1fb678ef1107f4b53ba6cde5c1eff;hb=refs%2Fchanges%2F27%2F26527%2F3;hp=66b0c226303584cb0f32068cff207dd169434033;hpb=ec11b13a21b2becc1d1bd746a04624d17b26583f;p=vpp.git

diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
index 66b0c226303..b0d0c86641f 100644
--- a/src/vpp/conf/startup.conf
+++ b/src/vpp/conf/startup.conf
@@ -69,6 +69,17 @@ cpu {
 	# scheduler-priority 50
 }
 
+# buffers {
+	## Increase number of buffers allocated, needed only in scenarios with
+	## large number of interfaces and worker threads. Value is per numa node.
+	## Default is 16384 (8192 if running unpriviledged)
+	# buffers-per-numa 128000
+
+	## Size of buffer data area
+	## Default is 2048
+	# default data-size 2048
+# }
+
 # dpdk {
 	## Change default settings for all interfaces
 	# dev default {
@@ -89,27 +100,36 @@ cpu {
 		## VLAN strip offload mode for interface
 		## Default is off
 		# vlan-strip-offload on
+
+		## TCP Segment Offload
+		## Default is off
+		## To enable TSO, 'enable-tcp-udp-checksum' must be set
+		# tso on
+
+		## Devargs
+                ## device specific init args
+                ## Default is NULL
+		# devargs safe-mode-support=1,pipeline-mode-support=1
 	# }
 
 	## Whitelist specific interface by specifying PCI address
 	# dev 0000:02:00.0
 
+	## Blacklist specific device type by specifying PCI vendor:device
+        ## Whitelist entries take precedence
+	# blacklist 8086:10fb
+
+	## Set interface name
+	# dev 0000:02:00.1 {
+	#	name eth0
+	# }
+
 	## 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
 	# }
 
-	## Specify bonded interface and its slaves via PCI addresses
-	##
-	## Bonded interface in XOR load balance mode (mode 2) with L3 and L4 headers
-	# vdev eth_bond0,mode=2,slave=0000:02:00.0,slave=0000:03:00.0,xmit_policy=l34
-	# vdev eth_bond1,mode=2,slave=0000:02:00.1,slave=0000:03:00.1,xmit_policy=l34
-	##
-	## Bonded interface in Active-Back up mode (mode 1)
-	# vdev eth_bond0,mode=1,slave=0000:02:00.0,slave=0000:03:00.0
-	# vdev eth_bond1,mode=1,slave=0000:02:00.1,slave=0000:03:00.1
-
 	## Change UIO driver used by VPP, Options are: igb_uio, vfio-pci,
 	## uio_pci_generic or auto (default)
 	# uio-driver vfio-pci
@@ -118,11 +138,6 @@ cpu {
 	## 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 16384
-	# 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
@@ -130,12 +145,16 @@ cpu {
 	## Disables UDP / TCP TX checksum offload. Typically needed for use
 	## faster vector PMDs (together with no-multi-seg)
 	# no-tx-checksum-offload
+
+	## Enable UDP / TCP TX checksum offload
+	## This is the reversed option of 'no-tx-checksum-offload'
+	# enable-tcp-udp-checksum
 # }
 
 
 # plugins {
 	## Adjusting the plugin path depending on where the VPP plugins are
-	#	path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins
+	#	path /ws/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins
 
 	## Disable all plugins by default and then selectively enable specific plugins
 	# plugin default { disable }
@@ -147,5 +166,11 @@ cpu {
 	# plugin acl_plugin.so { disable }
 # }
 
-	## Alternate syntax to choose plugin path
-	# plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins
+## Statistics Segment
+# statseg {
+    # socket-name <filename>, name of the stats segment socket
+    #     defaults to /run/vpp/stats.sock
+    # size <nnn>[KMG], size of the stats segment, defaults to 32mb
+    # per-node-counters on | off, defaults to none
+    # update-interval <f64-seconds>, sets the segment scrape / update interval
+# }