Make testpmd txd/rxd/txq/rxq configurable in guest

- Add option to configure vring qsz for testpmd when
  running in guest [make 256 as default]
- Add option to configure number of queues for testpmd when
  running in guest [make 1 as default]

Change-Id: I4ecd24ba4a24d6d212b10cd6d24f5b016fb63fd9
Signed-off-by: pmikus <pmikus@cisco.com>

diff --git a/resources/libraries/python/DpdkUtil.py b/resources/libraries/python/DpdkUtil.py
index 4b00167..3e379b0 100644 (file)
--- a/resources/libraries/python/DpdkUtil.py
+++ b/resources/libraries/python/DpdkUtil.py
@@ -26,7 +26,7 @@ class DpdkUtil(object):
         :param node: VM Node to start testpmd on.
         :param args: List of testpmd parameters.
         :type node: dict
-        :type args: list
+        :type args: dict
         :return: nothing
         """
         # Set the hexadecimal bitmask of the cores to run on.
@@ -49,13 +49,17 @@ class DpdkUtil(object):
         # Set the number of packets per burst to N.
         pmd_burst = '--burst=64 '
         # Set the number of descriptors in the TX rings to N.
-        pmd_txd = '--txd=256 '
+        pmd_txd = '--txd={} '.format(args.get('pmd_txd', '256')) \
+            if args.get('pmd_txd', '256') else ''
         # Set the number of descriptors in the RX rings to N.
-        pmd_rxd = '--rxd=256 '
+        pmd_rxd = '--rxd={} '.format(args.get('pmd_rxd', '256')) \
+            if args.get('pmd_rxd', '256') else ''
         # Set the number of queues in the TX to N.
-        pmd_txq = '--txq=1 '
+        pmd_txq = '--txq={} '.format(args.get('pmd_txq', '1')) \
+            if args.get('pmd_txq', '1') else ''
         # Set the number of queues in the RX to N.
-        pmd_rxq = '--rxq=1 '
+        pmd_rxq = '--rxq={} '.format(args.get('pmd_rxq', '1')) \
+            if args.get('pmd_rxq', '1') else ''
         # Set the hexadecimal bitmask of TX queue flags.
         pmd_txqflags = '--txqflags=0xf00 '
         # Set the number of mbufs to be allocated in the mbuf pools.

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index c275f77..707b266 100644 (file)
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -1697,7 +1697,8 @@
 | | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
 | | Run keyword | ${vm_name}.Qemu Set Scheduler Policy
 | | Dpdk Testpmd Start | ${vm} | eal_coremask=0x1f | eal_mem_channels=4
-| | ... | pmd_fwd_mode=io | pmd_disable_hw_vlan=${True}
+| | ... | pmd_fwd_mode=io | pmd_disable_hw_vlan=${True} | pmd_txd=${256}
+| | ... | pmd_rxd=${256}
 | | Return From Keyword | ${vm}
 
 | '${nr}' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
@@ -1772,7 +1773,8 @@
 | | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
 | | Run keyword | ${vm_name}.Qemu Set Scheduler Policy
 | | Dpdk Testpmd Start | ${vm} | eal_coremask=0x1f | eal_mem_channels=4
-| | ... | pmd_fwd_mode=io | pmd_disable_hw_vlan=${True}
+| | ... | pmd_fwd_mode=io | pmd_disable_hw_vlan=${True} | pmd_txd=${256}
+| | ... | pmd_rxd=${256}
 | | Return From Keyword | ${vm}
 
 | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
@@ -1833,6 +1835,7 @@
 | | Dpdk Testpmd Start | ${vm} | eal_coremask=0x1f
 | | ... | eal_mem_channels=4 | pmd_fwd_mode=mac | pmd_eth_peer_0=0,${eth0_mac}
 | | ... | pmd_eth_peer_1=1,${eth1_mac} | pmd_disable_hw_vlan=${True}
+| | ... | pmd_txd=${256} | pmd_rxd=${256}
 | | Return From Keyword | ${vm}
 
 | '${nr}' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
@@ -1916,6 +1919,7 @@
 | | Dpdk Testpmd Start | ${vm} | eal_coremask=0x1f
 | | ... | eal_mem_channels=4 | pmd_fwd_mode=mac | pmd_eth_peer_0=0,${eth0_mac}
 | | ... | pmd_eth_peer_1=1,${eth1_mac} | pmd_disable_hw_vlan=${True}
+| | ... | pmd_txd=${256} | pmd_rxd=${256}
 | | Return From Keyword | ${vm}
 
 | Guest VM with Linux Bridge connected via vhost-user is setup