X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDpdkUtil.py;h=79e72093649f249a6c3a9ded6b803d7ecbc293ab;hp=e7727c11015c8d5e31a0e35a825cdf38f2738d91;hb=c7eb2002bcd007520309feb3e11a26ff847a4e05;hpb=bdc400b3feacd10d8130dedaa7df8df2d2d57feb

diff --git a/resources/libraries/python/DpdkUtil.py b/resources/libraries/python/DpdkUtil.py
index e7727c1101..79e7209364 100644
--- a/resources/libraries/python/DpdkUtil.py
+++ b/resources/libraries/python/DpdkUtil.py
@@ -20,18 +20,19 @@ class DpdkUtil(object):
     """Utilities for DPDK."""
 
     @staticmethod
-    def dpdk_testpmd_start(node, **args):
-        """Start DPDK testpmd app on VM node.
+    def get_eal_options(**args):
+        """Create EAL parameters string.
 
-        :param node: VM Node to start testpmd on.
         :param args: List of testpmd parameters.
-        :type node: dict
-        :type args: list
-        :return: nothing
+        :type args: dict
+        :returns: EAL parameters string.
+        :rtype: str
         """
         # 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 ''
@@ -40,6 +41,23 @@ class DpdkUtil(object):
             if args.get('eal_socket_mem', '') else ''
         # Load an external driver. Multiple -d options are allowed.
         eal_driver = '-d /usr/lib/librte_pmd_virtio.so '
+        eal_options = '-v '\
+            + eal_coremask\
+            + eal_master_core\
+            + eal_mem_channels\
+            + eal_socket_mem\
+            + eal_driver
+        return eal_options
+
+    @staticmethod
+    def get_pmd_options(**args):
+        """Create PMD parameters string.
+
+        :param args: List of testpmd parameters.
+        :type args: dict
+        :returns: PMD parameters string.
+        :rtype: str
+        """
         # Set the forwarding mode: io, mac, mac_retry, mac_swap, flowgen,
         # rxonly, txonly, csum, icmpecho, ieee1588
         pmd_fwd_mode = '--forward-mode={} '.format(args['pmd_fwd_mode'])\
@@ -47,15 +65,25 @@ 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={} '.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=2048 '
+        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={} '.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={} '.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.
-        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,25 +95,17 @@ 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_mem_channels\
-            + eal_socket_mem\
-            + eal_driver
         pmd_options = '-- '\
             + pmd_fwd_mode\
             + pmd_burst\
             + pmd_txd\
             + pmd_rxd\
+            + pmd_txq\
+            + pmd_rxq\
             + pmd_txqflags\
             + pmd_total_num_mbufs\
             + pmd_portmask\
@@ -93,8 +113,22 @@ class DpdkUtil(object):
             + pmd_disable_rss\
             + pmd_eth_peer_0\
             + pmd_eth_peer_1\
-            + pmd_coremask\
             + pmd_nb_cores
+        return pmd_options
+
+    @staticmethod
+    def dpdk_testpmd_start(node, **args):
+        """Start DPDK testpmd app on VM node.
+
+        :param node: VM Node to start testpmd on.
+        :param args: List of testpmd parameters.
+        :type node: dict
+        :type args: dict
+        :return: nothing
+        """
+        eal_options = DpdkUtil.get_eal_options(**args)
+        pmd_options = DpdkUtil.get_pmd_options(**args)
+
         ssh = SSH()
         ssh.connect(node)
         cmd = "/start-testpmd.sh {0} {1}".format(eal_options, pmd_options)