From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9FD11A2E1B for ; Thu, 5 Sep 2019 10:03:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8ACF61EDE2; Thu, 5 Sep 2019 10:03:25 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 6EA321EDB1 for ; Thu, 5 Sep 2019 10:03:24 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Sep 2019 01:03:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,469,1559545200"; d="scan'208";a="266943601" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by orsmga001.jf.intel.com with ESMTP; 05 Sep 2019 01:03:22 -0700 From: zhuwenhui To: dts@dpdk.org Cc: zhuwenhui Date: Thu, 5 Sep 2019 16:07:55 +0800 Message-Id: <1567670875-149095-1-git-send-email-wenhuix.zhu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] tests/dpdk_gso_lib:Put the same case to suite X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Due to the different topology of cases in virtio_user_as_exceptional_path. Put the same case as the dpdk_gso_lib topology into dpdk_gso_lib Signed-off-by: zhuwenhui --- tests/TestSuite_dpdk_gso_lib.py | 103 +++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/tests/TestSuite_dpdk_gso_lib.py b/tests/TestSuite_dpdk_gso_lib.py index 68d09cb..fd50ba5 100644 --- a/tests/TestSuite_dpdk_gso_lib.py +++ b/tests/TestSuite_dpdk_gso_lib.py @@ -207,6 +207,14 @@ class TestDPDKGsoLib(TestCase): "ip netns exec ns1 ifconfig gre100 1.1.1.1/24 up", "#") + def config_kernel_nic_host_for_exception_path(self): + self.dut.send_expect("ip netns del ns1", "#") + self.dut.send_expect("ip netns add ns1", "#") + self.dut.send_expect("ip link set %s netns ns1" % self.nic_in_kernel, "#") + self.dut.send_expect("ip netns exec ns1 ifconfig %s 1.1.1.8 up" % self.nic_in_kernel, "#") + self.dut.send_expect("ip netns exec ns1 ethtool -K %s gro on" % self.nic_in_kernel, "#") + self.dut.send_expect("ip netns exec ns1 ethtool -K %s tso on" % self.nic_in_kernel, "#") + def prepare_dpdk(self): # Changhe the testpmd checksum fwd code for mac change self.dut.send_expect( @@ -282,18 +290,59 @@ class TestDPDKGsoLib(TestCase): print iperfdata self.verify(iperfdata, 'There no data about this case') self.result_table_create(['Data', 'Unit']) - results_row = ['GSO'] + if self.type_row == "exception_path": + results_row = ['exception path'] + else: + results_row = ['GSO'] results_row.append(iperfdata[-1]) self.result_table_add(results_row) self.result_table_print() self.output_result = "Iperf throughput is %s" % iperfdata[-1] self.logger.info(self.output_result) + def launch_testpmd_exception_path(self): + self.testcmd = self.target + "/app/testpmd -c %s -n %d --socket-mem %s --legacy-mem" \ + + " --vdev=virtio_user0,mac=%s,path=/dev/vhost-net,queue_size=1024 -- -i" \ + + " --rxd=1024 --txd=1024" + self.cores = self.dut.get_core_list("1S/2C/1T", socket=self.socket) + self.coremask = utils.create_mask(self.cores) + self.testcmd_start = self.testcmd % (self.coremask, self.memory_channel, + self.socket_mem, self.virtio_mac1) + self.vhost_user = self.dut.new_session(suite="user") + self.vhost_user.send_expect("modprobe vhost-net", "#", 120) + self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120) + self.vhost_user.send_expect("set fwd csum", "testpmd> ", 120) + self.vhost_user.send_expect("stop", "testpmd> ", 120) + self.vhost_user.send_expect("port stop 0", "testpmd> ", 120) + self.vhost_user.send_expect("port stop 1", "testpmd> ", 120) + self.vhost_user.send_expect("port config 0 tx_offload tcp_cksum on", "testpmd> ", 120) + self.vhost_user.send_expect("port config 0 tx_offload ipv4_cksum on", "testpmd> ", 120) + self.vhost_user.send_expect("csum set ip sw 1", "testpmd> ", 120) + self.vhost_user.send_expect("csum set tcp hw 1", "testpmd> ", 120) + self.vhost_user.send_expect("csum set ip hw 0", "testpmd> ", 120) + self.vhost_user.send_expect("csum set tcp hw 0", "testpmd> ", 120) + self.vhost_user.send_expect("tso set 1448 0", "testpmd> ", 120) + self.vhost_user.send_expect("port start 0", "testpmd> ", 120) + self.vhost_user.send_expect("port start 1", "testpmd> ", 120) + self.vhost_user.send_expect("start", "testpmd> ", 120) + + def testpmd_reset(self): + self.vhost_user.send_expect("stop", "testpmd> ", 120) + self.vhost_user.send_expect("port stop 1", "testpmd> ", 120) + self.vhost_user.send_expect("csum set ip sw 1", "testpmd> ", 120) + self.vhost_user.send_expect("port start 1", "testpmd> ", 120) + self.vhost_user.send_expect("start", "testpmd> ", 120) + + def prepare_tap_device(self): + self.dut.send_expect("ifconfig tap0 up", "#") + self.dut.send_expect("ifconfig tap0 1.1.1.2", "#") + def test_vhost_gso_dpdk_tcp(self): """ DPDK GSO test with tcp traffic """ # Config the NIC which will be assigned to another namespace + self.type_row = "gso" self.config_kernel_nic_host() self.launch_testpmd_gso_on(0) self.start_vm(0) @@ -323,6 +372,7 @@ class TestDPDKGsoLib(TestCase): DPDK GSO test with udp traffic """ # Config the NIC which will be assigned to another namespace + self.type_row = "gso" self.config_kernel_nic_host() self.launch_testpmd_gso_on(1) self.start_vm(0) @@ -352,6 +402,7 @@ class TestDPDKGsoLib(TestCase): self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") def test_vhost_tso_dpdk(self): + self.type_row = "gso" self.config_kernel_nic_host() self.launch_testpmd_gso_on(3) self.start_vm(0) @@ -387,6 +438,7 @@ class TestDPDKGsoLib(TestCase): self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") def test_kernel_gso_dpdk(self): + self.type_row = "gso" self.config_kernel_nic_host() self.launch_testpmd_gso_on(4) self.start_vm(1) @@ -423,6 +475,7 @@ class TestDPDKGsoLib(TestCase): self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") def test_no_gso_dpdk(self): + self.type_row = "gso" self.config_kernel_nic_host() self.launch_testpmd_gso_on(4) self.start_vm(1) @@ -461,6 +514,7 @@ class TestDPDKGsoLib(TestCase): """ Test Performance with GSO for VXLAN traffic """ + self.type_row = "gso" self.config_kernel_nic_host_for_vxlan() self.launch_testpmd_gso_on(2) self.start_vm(2) @@ -493,6 +547,7 @@ class TestDPDKGsoLib(TestCase): """ Test Performance with GSO for GRE traffic """ + self.type_row = "gso" self.config_kernel_nic_host_for_gre() self.launch_testpmd_gso_on(2) self.start_vm(2) @@ -520,6 +575,52 @@ class TestDPDKGsoLib(TestCase): self.quit_testpmd() self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") + def test_vhost_exception_path_TAP_original(self): + self.type_row = "exception_path" + self.config_kernel_nic_host_for_exception_path() + self.launch_testpmd_exception_path() + self.dut.get_session_output(timeout=2) + time.sleep(5) + # Get the virtio-net device name + self.prepare_tap_device() + self.testpmd_reset() + self.dut.send_expect('ip netns exec ns1 iperf -s -i 1', '', 10) + self.iperf = self.dut.new_session(suite="iperf") + self.iperf.send_expect('rm /root/iperf_client.log', '#', 10) + self.iperf.send_expect('iperf -c 1.1.1.8 -i 1 -t 10 > /root/iperf_client.log &', '', 180) + time.sleep(30) + self.dut.send_expect('^C', '#', 10) + self.iperf_result_verify(self.iperf) + self.logger.info("TAP->virtio-user->Kernel_NIC %s " % (self.output_result)) + self.iperf.send_expect('rm /root/iperf_client.log', '#', 10) + self.vhost_user.send_expect("quit", "#", 120) + self.dut.close_session(self.vhost_user) + self.dut.send_expect("ip netns del ns1", "#") + self.dut.close_session(self.iperf) + + def test_vhost_exception_path_NIC_original(self): + self.type_row = "exception_path" + self.config_kernel_nic_host_for_exception_path() + self.launch_testpmd_exception_path() + time.sleep(5) + self.dut.get_session_output(timeout=2) + self.prepare_tap_device() + self.testpmd_reset() + self.iperf = self.dut.new_session(suite="iperf") + self.dut.send_expect('rm /root/iperf_client.log', '#', 10) + self.iperf.send_expect('iperf -s -i 1', '', 180) + self.dut.send_expect('ip netns exec ns1 iperf -c 1.1.1.2 -i 1 -t 10 > /root/iperf_client.log &', '', 10) + time.sleep(30) + self.iperf.send_expect('^C', '#', 10) + self.iperf_result_verify(self.dut) + self.dut.get_session_output(timeout=2) + self.logger.info("Kernel_NIC<-virtio-user<-TAP %s " % (self.output_result)) + self.dut.send_expect('rm /root/iperf_client.log', '#', 10) + self.vhost_user.send_expect("quit", "#", 120) + self.dut.close_session(self.vhost_user) + self.dut.send_expect("ip netns del ns1", "#") + self.dut.close_session(self.iperf) + def tear_down(self): """ Run after each test case. -- 2.17.2