fix(infra): Octeon - fix for multicore performance

Number of default rx queues should be same as number of worker cores.

Change-Id: I1763dd326f8617c0f72b5a6a16da00f959e05cb2
Signed-off-by: Kishor Dhanawade <[email protected]>

diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index 7021d7f..dc93992 100644 (file)
--- a/resources/libraries/python/VppConfigGenerator.py
+++ b/resources/libraries/python/VppConfigGenerator.py
@@ -727,7 +727,7 @@ class VppConfigGenerator:
             path = ["dsa", f"dev {device}"]
             self.add_config_item(self._nodeconfig, "", path)
 
-    def add_octeon_dev(self, *devices):
+    def add_octeon_dev(self, *devices, num_default_rx_queues=1):
         """Add OCTEON PCI device configuration.
 
         :param devices: PCI device(s) (format xxxx:xx:xx.x)
@@ -744,6 +744,9 @@ class VppConfigGenerator:
                 if num_rx_queues and num_tx_queues:
                     self.add_octeon_dev_default_rxq(device, num_rx_queues)
                     self.add_octeon_dev_default_txq(device, num_tx_queues)
+                else:
+                    self.add_octeon_dev_default_rxq(device, \
+                            num_default_rx_queues)
 
     def add_octeon_dev_default_rxq(self, device, value):
         """Add OCTEON dev default rxq configuration.

diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index 929ff16..b225be5 100644 (file)
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -145,11 +145,13 @@
 | | [Arguments] | ${dut}
 | | Run Keyword If | ${nic_vfs}
 | | ... | ${dut}.Add OCTEON Dev | @{${dut}_prevf_pci}
+| | ... | num_default_rx_queues=${rxq_count_int}
 | | Run Keyword If | not ${nic_vfs}
 | | ... | Bind PCI Devices To Specific Driver | ${nodes['${dut}']} | vfio-pci
 | | ... | @{${dut}_pf_pci}
 | | Run Keyword If | not ${nic_vfs}
 | | ... | ${dut}.Add OCTEON Dev | @{${dut}_pf_pci}
+| | ... | num_default_rx_queues=${rxq_count_int}
 
 | Pre-initialize layer vfio-pci for dpdk_plugin.so
 | | [Documentation]