@@ -1,6 +1,31 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2022 Intel Corporation
#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Intel Corporation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
DPDK Test suite.
@@ -43,9 +68,9 @@ class TestDPDKGROLibCbdma(TestCase):
)
self.path = self.dut.apps_name["test-pmd"]
self.testpmd_name = self.path.split("/")[-1]
- cores_list = self.dut.get_core_list(config="all", socket=self.ports_socket)
- self.vhost_list = cores_list[0:3]
- self.qemu_cpupin = cores_list[3:4][0]
+ self.cores_list = self.dut.get_core_list(config="all", socket=self.ports_socket)
+ self.vhost_core_list = self.cores_list[0:3]
+ self.qemu_cpupin = self.cores_list[3:4][0]
# Set the params for VM
self.virtio_ip1 = "1.1.1.2"
@@ -175,6 +200,7 @@ class TestDPDKGROLibCbdma(TestCase):
raise Exception("Set up VM ENV failed")
except Exception as e:
print((utils.RED("Failure for %s" % str(e))))
+ self.vm1_dut.restore_interfaces()
def iperf_result_verify(self, run_info):
"""
@@ -202,33 +228,49 @@ class TestDPDKGROLibCbdma(TestCase):
iperfdata_kb = float(tmp_value)
return iperfdata_kb
- def check_dut_perf_top_info(self, check_string):
- self.dut.send_expect("perf top", "# ")
+ def get_and_verify_func_name_of_perf_top(self, func_name_list):
+ self.dut.send_expect("rm -fr perf_top.log", "# ", 120)
+ self.dut.send_expect("perf top > perf_top.log", "", 120)
+ time.sleep(10)
+ self.dut.send_expect("^C", "#")
+ out = self.dut.send_expect("cat perf_top.log", "# ", 120)
+ self.logger.info(out)
+ for func_name in func_name_list:
+ self.verify(
+ func_name in out,
+ "the func_name {} is not in the perf top output".format(func_name),
+ )
def test_vhost_gro_tcp_ipv4_with_cbdma_enable(self):
"""
- Test Case1: DPDK GRO test with two queues and two CBDMA channels using tcp/ipv4 traffic
+ Test Case1: DPDK GRO test with two queues and cbdma channels using tcp/ipv4 traffic
"""
self.config_kernel_nic_host()
self.get_cbdma_ports_info_and_bind_to_dpdk(cbdma_num=2)
- lcore_dma = "[lcore{}@{},lcore{}@{},lcore{}@{}]".format(
- self.vhost_list[1],
- self.cbdma_list[0],
- self.vhost_list[1],
- self.cbdma_list[1],
- self.vhost_list[2],
- self.cbdma_list[1],
+ lcore_dma = (
+ "lcore%s@%s,"
+ "lcore%s@%s,"
+ "lcore%s@%s,"
+ % (
+ self.vhost_core_list[1],
+ self.cbdma_list[0],
+ self.vhost_core_list[1],
+ self.cbdma_list[1],
+ self.vhost_core_list[2],
+ self.cbdma_list[1],
+ )
)
param = (
- "--txd=1024 --rxd=1024 --txq=2 --rxq=2 --nb-cores=2 --lcore-dma={}".format(
- lcore_dma
- )
+ "--txd=1024 --rxd=1024 --txq=2 --rxq=2 --nb-cores=2 --lcore-dma=[%s]"
+ % lcore_dma
+ )
+ eal_param = (
+ "--vdev 'net_vhost0,iface=vhost-net,queues=2,dmas=[txq0;txq1;rxq0;rxq1]'"
)
- eal_param = "--vdev 'net_vhost0,iface=vhost-net,queues=2,dmas=[txq0;txq1]'"
ports = self.cbdma_list
ports.append(self.pci)
self.vhost_pmd.start_testpmd(
- cores=self.vhost_list,
+ cores=self.vhost_core_list,
ports=ports,
prefix="vhost",
eal_param=eal_param,
@@ -253,8 +295,9 @@ class TestDPDKGROLibCbdma(TestCase):
"",
180,
)
+ self.func_name_list = ["virtio_dev_rx_async", "virtio_dev_tx_async"]
+ self.get_and_verify_func_name_of_perf_top(self.func_name_list)
time.sleep(30)
- print(out)
perfdata = self.iperf_result_verify("GRO lib")
print(("the GRO lib %s " % (self.output_result)))
self.quit_testpmd()