diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/python/DpdkUtil.py | 28 | ||||
| -rw-r--r-- | resources/libraries/robot/performance.robot | 16 |
2 files changed, 25 insertions, 19 deletions
diff --git a/resources/libraries/python/DpdkUtil.py b/resources/libraries/python/DpdkUtil.py index e7727c1101..a81251c97b 100644 --- a/resources/libraries/python/DpdkUtil.py +++ b/resources/libraries/python/DpdkUtil.py @@ -19,6 +19,7 @@ from resources.libraries.python.ssh import SSH, exec_cmd_no_error class DpdkUtil(object): """Utilities for DPDK.""" + #pylint: disable=too-many-locals @staticmethod def dpdk_testpmd_start(node, **args): """Start DPDK testpmd app on VM node. @@ -32,6 +33,8 @@ class DpdkUtil(object): # Set the hexadecimal bitmask of the cores to run on. eal_coremask = '-c {} '.format(args['eal_coremask'])\ if args.get('eal_coremask', '') else '' + # Set master core. + eal_master_core = '--master-lcore 0 ' # Set the number of memory channels to use. eal_mem_channels = '-n {} '.format(args['eal_mem_channels'])\ if args.get('eal_mem_channels', '') else '' @@ -47,15 +50,21 @@ 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=2048 ' + pmd_txd = '--txd=256 ' # Set the number of descriptors in the RX rings to N. - pmd_rxd = '--rxd=2048 ' + pmd_rxd = '--rxd=256 ' + # Set the number of queues in the TX to N. + pmd_txq = '--txq=1 ' + # Set the number of queues in the RX to N. + pmd_rxq = '--rxq=1 ' # Set the hexadecimal bitmask of TX queue flags. pmd_txqflags = '--txqflags=0xf00 ' # Set the number of mbufs to be allocated in the mbuf pools. - pmd_total_num_mbufs = '--total-num-mbufs=65536 ' + pmd_total_num_mbufs = '--total-num-mbufs={} '.format(\ + args['pmd_num_mbufs']) if args.get('pmd_num_mbufs', '') else '' # Set the hexadecimal bitmask of the ports for forwarding. - pmd_portmask = '--portmask=0x3 ' + pmd_portmask = '--portmask={} '.format(args['pmd_portmask'])\ + if args.get('pmd_portmask', '') else '' # Disable hardware VLAN. pmd_disable_hw_vlan = '--disable-hw-vlan '\ if args.get('pmd_disable_hw_vlan', '') else '' @@ -67,17 +76,13 @@ class DpdkUtil(object): if args.get('pmd_eth_peer_0', '') else '' pmd_eth_peer_1 = '--eth-peer={} '.format(args['pmd_eth_peer_1'])\ if args.get('pmd_eth_peer_1', '') else '' - # Set the hexadecimal bitmask of the cores running forwarding. Master - # lcore=0 is reserved, so highest bit is set to 0. - pmd_coremask = '--coremask={} '.format(\ - hex(int(args['eal_coremask'], 0) & 0xFFFE))\ - if args.get('eal_coremask', '') else '' # Set the number of forwarding cores based on coremask. pmd_nb_cores = '--nb-cores={} '.format(\ - bin(int(args['eal_coremask'], 0) & 0xFFFE).count('1'))\ + bin(int(args['eal_coremask'], 0)).count('1')-1)\ if args.get('eal_coremask', '') else '' eal_options = '-v '\ + eal_coremask\ + + eal_master_core\ + eal_mem_channels\ + eal_socket_mem\ + eal_driver @@ -86,6 +91,8 @@ class DpdkUtil(object): + pmd_burst\ + pmd_txd\ + pmd_rxd\ + + pmd_txq\ + + pmd_rxq\ + pmd_txqflags\ + pmd_total_num_mbufs\ + pmd_portmask\ @@ -93,7 +100,6 @@ class DpdkUtil(object): + pmd_disable_rss\ + pmd_eth_peer_0\ + pmd_eth_peer_1\ - + pmd_coremask\ + pmd_nb_cores ssh = SSH() ssh.connect(node) diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot index 0aefdef1d7..c33905bc9a 100644 --- a/resources/libraries/robot/performance.robot +++ b/resources/libraries/robot/performance.robot @@ -1277,9 +1277,9 @@ | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting | | ... | DPDK testpmd. Qemu Guest is using 3 cores pinned to physical cores 5, | | ... | 6, 7 and 2048M. Testpmd is using 3 cores (1 main core and 2 cores -| | ... | dedicated to io) socket-mem=1024, mem-channel=4, txq/rxq=2048, -| | ... | burst=64, disable-hw-vlan, total-num-mbufs, driver -| | ... | usr/lib/librte_pmd_virtio.so. +| | ... | dedicated to io) mem-channel=4, txq/rxq=256, burst=64, +| | ... | disable-hw-vlan, disable-rss, driver usr/lib/librte_pmd_virtio.so +| | ... | and fwd mode is io. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node to start guest VM on. Type: dictionary @@ -1305,9 +1305,9 @@ | | Run keyword | ${vm_name}.Qemu Set Affinity | 5 | 6 | 7 | | Dpdk Testpmd Start | ${vm} | eal_coremask=0x7 | | ... | eal_mem_channels=4 -| | ... | eal_socket_mem=1024 | | ... | pmd_fwd_mode=io | | ... | pmd_disable_hw_vlan=${True} +| | ... | pmd_disable_rss=${True} | | Return From Keyword | ${vm} | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup @@ -1315,9 +1315,9 @@ | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting | | ... | DPDK testpmd. Qemu Guest is using 3 cores pinned to physical cores 5, | | ... | 6, 7 and 2048M. Testpmd is using 3 cores (1 main core and 2 cores -| | ... | dedicated to io) socket-mem=1024, mem-channel=4, txq/rxq=2048, -| | ... | burst=64, disable-hw-vlan, total-num-mbufs=65K, driver -| | ... | usr/lib/librte_pmd_virtio.so and fwd mode is mac rewrite. +| | ... | dedicated to io) mem-channel=4, txq/rxq=256, burst=64, +| | ... | disable-hw-vlan, disable-rss, driver usr/lib/librte_pmd_virtio.so +| | ... | and fwd mode is mac rewrite. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node to start guest VM on. Type: dictionary @@ -1348,11 +1348,11 @@ | | Run keyword | ${vm_name}.Qemu Set Affinity | 5 | 6 | 7 | | Dpdk Testpmd Start | ${vm} | eal_coremask=0x7 | | ... | eal_mem_channels=4 -| | ... | eal_socket_mem=1024 | | ... | pmd_fwd_mode=mac | | ... | pmd_eth_peer_0=0,${eth0_mac} | | ... | pmd_eth_peer_1=1,${eth1_mac} | | ... | pmd_disable_hw_vlan=${True} +| | ... | pmd_disable_rss=${True} | | Return From Keyword | ${vm} | Guest VM with Linux Bridge connected via vhost-user is setup |