From c0061038f0dda5f1cfb7341820b12f5cff056097 Mon Sep 17 00:00:00 2001 From: Martin Klozik <martinx.klozik@intel.com> Date: Wed, 12 Oct 2016 15:35:13 +0100 Subject: testpmd: Simplify GUEST's testpmd configuration Testpmd has a lot of parameters and vsperf was able to modify only a few of them through dedicated GUEST's specific configuration options. Old configuration options were replaced by one generic GUEST_TESTPMD_PARAMS, which allows to modify any of existing testpmd parameters. Detection of testpmd execution was changed to be independent on TXQ flags setting. Documentation was modified to reflect GUEST_TESTPMD change. Also doc formatting was fixed at several places. JIRA: VSPERF-380 Change-Id: Ie0bf290320f3b22ef6be6b55ed553235bbcb4aff Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Bill Michalowski <bmichalo@redhat.com> Reviewed-by: Antonio Fischetti <antonio.fischetti@intel.com> --- conf/04_vnf.conf | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'conf') diff --git a/conf/04_vnf.conf b/conf/04_vnf.conf index e3a4824b..e996ecce 100644 --- a/conf/04_vnf.conf +++ b/conf/04_vnf.conf @@ -90,12 +90,6 @@ GUEST_TIMEOUT = [180] GUEST_BOOT_DRIVE_TYPE = ['scsi'] GUEST_SHARED_DRIVE_TYPE = ['scsi'] -# packet forwarding mode supported by testpmd; Please see DPDK documentation -# for comprehensive list of modes supported by your version. -# e.g. io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho|... -# Note: Option "mac_retry" has been changed to "mac retry" since DPDK v16.07 -GUEST_TESTPMD_FWD_MODE = 'csum' - # guest loopback application method; supported options are: # 'testpmd' - testpmd from dpdk will be built and used # 'l2fwd' - l2fwd module provided by Huawei will be built and used @@ -189,19 +183,16 @@ GUEST_BRIDGE_IP = ['#IP(1.1.1.5)/16'] # Guest TESTPMD configuration # ############################ +# set of configuration parameters, which will be passed to the testpmd +# executed inside the guest +# Note: Testpmd must be executed in interactive mode. It means, that +# VSPERF won't work correctly if '-i' will be removed. +GUEST_TESTPMD_PARAMS = ['-c 0x3 -n 4 --socket-mem 512 -- ' + '--burst=64 -i --txqflags=0xf00 ' + '--disable-hw-vlan'] + # packet forwarding mode supported by testpmd; Please see DPDK documentation # for comprehensive list of modes supported by your version. # e.g. io|mac|mac_retry|macswap|flowgen|rxonly|txonly|csum|icmpecho|... # Note: Option "mac_retry" has been changed to "mac retry" since DPDK v16.07 GUEST_TESTPMD_FWD_MODE = ['csum'] - -# Set the CPU mask for testpmd loopback. To bind to specific guest CPUs use -l -# GUEST_TESTPMD_CPU_MASK = ['-l 0,1'] -GUEST_TESTPMD_CPU_MASK = ['-c 0x3'] - -# Testpmd multi-core config. Leave at 0's for disabled. Will not enable unless -# GUEST_NIC_QUEUES are > 0. For bi directional traffic NB_CORES must be equal -# to (RXQ + TXQ). -GUEST_TESTPMD_NB_CORES = [0] -GUEST_TESTPMD_TXQ = [0] -GUEST_TESTPMD_RXQ = [0] -- cgit