[dts] [PATCH for-next 0/3] add support for Mellanox's nics

[dts] [PATCH for-next 0/3] add support for Mellanox's nics

[Ali Alnubani]

This patchset adds support to run nic_single_core_perf test on
ConnectX-5 EX, ConnectX-4 LX 25G, and ConnectX-4 LX 40G.

Please note that this series is applied on top of
Patrick's "Fixes and modifications for T-Rex integration and nic_single_core_perf"
patchset: http://dpdk.org/ml/archives/dts/2018-March/003736.html.

Ali Alnubani (3):
  framework/project_dpdk: pass modprobe if driver is mlx5_core
  nics/net_device: add a function to get nic speed
  nic_single_core_perf: add support for Mellanox's nics

 conf/nic_single_core_perf.cfg           |  3 +++
 framework/project_dpdk.py               |  5 ++++-
 nics/net_device.py                      | 13 +++++++++++++
 tests/TestSuite_nic_single_core_perf.py | 25 ++++++++++++++++++++++++-
 4 files changed, 44 insertions(+), 2 deletions(-)

-- 
2.7.4

[dts] [PATCH 1/3] framework/project_dpdk: pass modprobe if driver is mlx5_core

[Ali Alnubani]

Module probing mlx5_core is not needed with MLNX_OFED
installed.

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
 framework/project_dpdk.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index 40c862a..618cd57 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -112,7 +112,10 @@ class DPDKdut(Dut):
             self.send_expect("modprobe uio_pci_generic", "#", 70)
             out = self.send_expect("lsmod | grep uio_pci_generic", "#")
             assert ("uio_pci_generic" in out), "Failed to setup uio_pci_generic"
- 
+
+        elif drivername == "mlx5_core":
+            pass
+
         else:
             self.send_expect("modprobe uio", "#", 70)
             out = self.send_expect("lsmod | grep igb_uio", "#")
-- 
2.7.4

[dts] [PATCH 2/3] nics/net_device: add a function to get nic speed

[Ali Alnubani]

Needed to differentiate between nics with same
device identifier, but with different speeds.

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
 nics/net_device.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nics/net_device.py b/nics/net_device.py
index 4861145..037956e 100644
--- a/nics/net_device.py
+++ b/nics/net_device.py
@@ -539,6 +539,19 @@ class NetDevice(object):
         """
         return self.crb.get_pci_dev_id(self.domain_id, self.bus_id, self.devfun_id)
 
+    def get_nic_speed(self):
+        """
+        Get the speed of specified pci device.
+        """
+        command = ('cat /sys/bus/pci/devices/%s\:%s\:%s/net/*/speed' % ( \
+                self.domain_id, self.bus_id, self.devfun_id))
+        try:
+            nic_speed = self.__send_expect(command, '# ')
+        except Exception as e:
+            print 'Failed to get the speed of the pci device [%s:%s:%s]: %s' \
+                    % (self.domain_id, self.bus_id, self.devfun_id, e)
+        return self.__send_expect(command, '# ')
+
     @nic_has_driver
     def get_sriov_vfs_pci(self):
         """
-- 
2.7.4

[dts] [PATCH 3/3] nic_single_core_perf: add support for Mellanox's nics

[Ali Alnubani]

1. Add support in the test for ConnectX-5 EX, ConnectX-4 LX 25G
and ConnectX-4 LX 40G.
2. Also add the expected performance in the test's configuration
file.

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
 conf/nic_single_core_perf.cfg           |  3 +++
 tests/TestSuite_nic_single_core_perf.py | 25 ++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/conf/nic_single_core_perf.cfg b/conf/nic_single_core_perf.cfg
index 4c470db..03cd6c3 100644
--- a/conf/nic_single_core_perf.cfg
+++ b/conf/nic_single_core_perf.cfg
@@ -8,3 +8,6 @@
 
 throughput_nnt = {64: {128: 53.435, 512: 53.699, 2048: 42.798}}
 throughput_fvl25g = {64: {512: 43.777, 2048: 43.651}}
+throughput_cx5 = {64: {128: 42.161, 256: 56.651, 512: 47.091, 2048: 40.104}}
+throughput_cx4lx25g = {64: {128: 28.178, 256: 34.581, 512: 30.528, 2048: 26.004}}
+throughput_cx4lx40g = {64: {128: 31.635, 256: 32.473, 512: 30.72, 2048: 26.94}}
diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py
index bff763c..460bcda 100644
--- a/tests/TestSuite_nic_single_core_perf.py
+++ b/tests/TestSuite_nic_single_core_perf.py
@@ -55,6 +55,9 @@ class TestNicSingleCorePerf(TestCase):
         self.headers_size = HEADER_SIZE['eth'] + HEADER_SIZE['ip'] + HEADER_SIZE['tcp']
         self.ixgbe_descriptors = [128, 512, 2048]
         self.i40e_descriptors = [512, 2048]
+        self.cx5_descriptors = [128, 256, 512, 2048]
+        self.cx4lx25g_descriptors = [128, 256, 512, 2048]
+        self.cx4lx40g_descriptors = [128, 256, 512, 2048]
 
         # traffic duraion in second
         self.trafficDuration = 60
@@ -62,6 +65,9 @@ class TestNicSingleCorePerf(TestCase):
         #load the expected throughput for required nic
         self.expected_throughput_nnt = self.get_suite_cfg()["throughput_nnt"]
         self.expected_throughput_fvl25g = self.get_suite_cfg()["throughput_fvl25g"]
+        self.expected_throughput_cx5 = self.get_suite_cfg()["throughput_cx5"]
+        self.expected_throughput_cx4lx25g = self.get_suite_cfg()["throughput_cx4lx25g"]
+        self.expected_throughput_cx4lx40g = self.get_suite_cfg()["throughput_cx4lx40g"]
 
         # The acdepted gap between expected throughput and actual throughput, 1 Mpps
         self.gap = 1
@@ -94,6 +100,14 @@ class TestNicSingleCorePerf(TestCase):
             self.descriptors = self.ixgbe_descriptors
         elif self.nic in ["fortville_25g"]:
             self.descriptors = self.i40e_descriptors
+        elif self.nic in ["ConnectX5_MT4121"]:
+            self.descriptors = self.cx5_descriptors
+        elif self.nic in ["ConnectX4_LX_MT4117"]:
+            nic_speed = self.dut.ports_info[0]['port'].get_nic_speed()
+            if "25000" in nic_speed:
+                self.descriptors = self.cx4lx25g_descriptors
+            else:
+                self.descriptors = self.cx4lx40g_descriptors
         else:
             raise Exception("Not required NIC")
 
@@ -102,7 +116,8 @@ class TestNicSingleCorePerf(TestCase):
         Run nic single core performance 
         """
         self.verify(len(self.dut_ports) == 2 or len(self.dut_ports) == 4, "Require 2 or 4 ports to test")
-        self.verify(self.nic in ['niantic','fortville_25g'], "Not required NIC ")
+        self.verify(self.nic in ['niantic', 'fortville_25g', \
+                'ConnectX5_MT4121', 'ConnectX4_LX_MT4117'], "Not required NIC ")
         if len(self.dut_ports) == 2:
             self.perf_test(2)   
         elif len(self.dut_ports) == 4:
@@ -173,6 +188,14 @@ class TestNicSingleCorePerf(TestCase):
                     ret_data[header[4]] = str(self.expected_throughput_nnt[frame_size][descriptor]) + " Mpps"
                 elif self.nic == "fortville_25g":
                     ret_data[header[4]] = str(self.expected_throughput_fvl25g[frame_size][descriptor]) + " Mpps"
+                elif self.nic == "ConnectX5_MT4121":
+                    ret_data[header[4]] = str(self.expected_throughput_cx5[frame_size][descriptor]) + " Mpps"
+                elif self.nic == "ConnectX4_LX_MT4117":
+                    nic_speed = self.dut.ports_info[0]['port'].get_nic_speed()
+                    if "25000" in nic_speed:
+                        ret_data[header[4]] = str(self.expected_throughput_cx4lx25g[frame_size][descriptor]) + " Mpps"
+                    else:
+                        ret_data[header[4]] = str(self.expected_throughput_cx4lx40g[frame_size][descriptor]) + " Mpps"
                 ret_datas[descriptor] = deepcopy(ret_data)
                 self.test_result[frame_size] = deepcopy(ret_datas)
         
-- 
2.7.4