From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 55C42A045E for ; Fri, 31 May 2019 12:09:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4518E1B945; Fri, 31 May 2019 12:09:25 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 6CBEA2C60 for ; Fri, 31 May 2019 12:09:23 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 May 2019 03:09:22 -0700 X-ExtLoop1: 1 Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga004.jf.intel.com with ESMTP; 31 May 2019 03:09:22 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 31 May 2019 03:09:21 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 31 May 2019 03:09:21 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.134]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.120]) with mapi id 14.03.0415.000; Fri, 31 May 2019 18:09:20 +0800 From: "Zhu, WenhuiX" To: "Zhu, ShuaiX" , "dts@dpdk.org" CC: "Zhu, ShuaiX" Thread-Topic: [dts] [PATCH V1] tests/tso:Optimize-the-verification-result. Thread-Index: AQHVF5jHJcpifCyxzU+pG7i7791xrqaFAn4w Date: Fri, 31 May 2019 10:09:19 +0000 Message-ID: References: <1559297528-124202-1-git-send-email-shuaix.zhu@intel.com> In-Reply-To: <1559297528-124202-1-git-send-email-shuaix.zhu@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1] tests/tso:Optimize-the-verification-result. 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" Tested-by: Zhu, WenhuiX -----Original Message----- From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhu,shuai Sent: Friday, May 31, 2019 6:12 PM To: dts@dpdk.org Cc: Zhu, ShuaiX Subject: [dts] [PATCH V1] tests/tso:Optimize-the-verification-result. Modify the verification result of the case. Signed-off-by: zhu,shuai --- tests/TestSuite_tso.py | 126 +++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 62 deletions(-) diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py index 5e0dbd5.= .e560386 100644 --- a/tests/TestSuite_tso.py +++ b/tests/TestSuite_tso.py @@ -36,7 +36,7 @@ DPDK Test suite. Tests for TSO. =20 """ - +import os import utils import time import re @@ -62,7 +62,7 @@ class TestTSO(TestCase): self.portMask =3D utils.create_mask([self.dut_ports[0], self.dut_p= orts[1]]) self.ports_socket =3D self.dut.get_numa_id(self.dut_ports[0]) =20 - self.frame_sizes =3D [128, 1458] + self.loading_sizes =3D [800, 801] self.rxfreet_values =3D [0, 8, 16, 32, 64, 128] =20 self.test_cycles =3D [{'cores': '1S/1C/2T', 'Mpps': {}, 'pct': {}}= ] @@ -83,6 +83,16 @@ class TestTSO(TestCase): """ pass =20 + def load_module(self): + """ + Load vxlan or nvgre module to scapy. + """ + cwd =3D os.getcwd() + dir_module =3D cwd + r'/' + 'dep' + self.tester.scapy_append('sys.path.append("%s")' % dir_module) + self.tester.scapy_append("from vxlan import Vxlan") + self.tester.scapy_append('from nvgre import NVGRE') + def tcpdump_start_sniffing(self, ifaces=3D[]): """ Starts tcpdump in the background to sniff the tester interface whe= re @@ -93,7 +103,8 @@ class TestTSO(TestCase): =20 for iface in ifaces: command =3D ('tcpdump -w tcpdump_{0}.pcap -i {0} 2>tcpdump_{0}= .out &').format(iface) - self.tester.send_expect('rm -f tcpdump_{0}.pcap', '#').format(= iface) + del_cmd =3D ('rm -f tcpdump_{0}.pcap').format(iface) + self.tester.send_expect(del_cmd, '#') self.tester.send_expect(command, '#') =20 def tcpdump_stop_sniff(self): @@ -137,7 +148,6 @@ class TestTSO(TestCase): self.verify(cores is not None, "Insufficient cores for speed testi= ng") self.coreMask =3D utils.create_mask(cores) =20 - padding =3D self.frame_sizes[0] - self.headers_size =20 self.tester.send_expect("ethtool -K %s rx off tx off tso off gso o= ff gro off lro off" % tx_interface, "# ") self.tester.send_expect("ip l set %s up" % tx_interface, "# ") @@ = -163,34 +173,28 @@ class TestTSO(TestCase): self.dut.send_expect("tso set 800 %d" % self.dut_ports[1], "testpm= d> ", 120) self.dut.send_expect("set fwd csum", "testpmd> ", 120) self.dut.send_expect("port start all", "testpmd> ", 120) + self.dut.send_expect("set promisc all off", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ") =20 self.tester.scapy_foreground() time.sleep(5) =20 - # IPv4 tcp test - - self.tcpdump_start_sniffing([tx_interface, rx_interface]) - self.tester.scapy_append('sendp([Ether(dst=3D"%s",src=3D"52:00:00:= 00:00:00")/IP(src=3D"192.168.1.1",dst=3D"192.168.1.2")/TCP(sport=3D1021,dpo= rt=3D1021)/("X"*%s)], iface=3D"%s")' % (mac, padding, tx_interface)) - out =3D self.tester.scapy_execute() - out =3D self.dut.send_expect("show port stats all", "testpmd> ", 1= 20) - print out - self.tcpdump_stop_sniff() - rx_stats =3D self.number_of_packets(rx_interface) - if (rx_stats =3D=3D 2): - self.verify(1, "Pass") - - # IPv6 tcp test - - self.tcpdump_start_sniffing([tx_interface, rx_interface]) - self.tester.scapy_append('sendp([Ether(dst=3D"%s", src=3D"52:00:00= :00:00:00")/IPv6(src=3D"FE80:0:0:0:200:1FF:FE00:200", dst=3D"3555:5555:6666= :6666:7777:7777:8888:8888")/TCP(sport=3D1021,dport=3D1021)/("X"*%s)], iface= =3D"%s")' % (mac, padding, tx_interface)) - out =3D self.tester.scapy_execute() - out =3D self.dut.send_expect("show port stats all", "testpmd> ", 1= 20) - print out - self.tcpdump_stop_sniff() - rx_stats =3D self.number_of_packets(rx_interface) - if (rx_stats =3D=3D 2): - self.verify(1, "Pass") + for loading_size in self.loading_sizes: + # IPv4 tcp test + self.tcpdump_start_sniffing([tx_interface, rx_interface]) + self.tester.scapy_append('sendp([Ether(dst=3D"%s",src=3D"52:00= :00:00:00:00")/IP(src=3D"192.168.1.1",dst=3D"192.168.1.2")/TCP(sport=3D1021= ,dport=3D1021)/("X"*%s)], iface=3D"%s")' % (mac, loading_size, tx_interface= )) + # IPv6 tcp test + self.tester.scapy_append('sendp([Ether(dst=3D"%s", src=3D"52:0= 0:00:00:00:00")/IPv6(src=3D"FE80:0:0:0:200:1FF:FE00:200", dst=3D"3555:5555:= 6666:6666:7777:7777:8888:8888")/TCP(sport=3D1021,dport=3D1021)/("X"*%s)], i= face=3D"%s")' % (mac, loading_size, tx_interface)) + out =3D self.tester.scapy_execute() + out =3D self.dut.send_expect("show port stats all", "testpmd> = ", 120) + print out + self.tcpdump_stop_sniff() + rx_stats =3D self.number_of_packets(rx_interface) + tx_stats =3D self.number_of_packets(tx_interface) + if (loading_size <=3D 800): + self.verify(rx_stats =3D=3D tx_stats, "RX or TX packet num= ber not correct") + else: + self.verify(rx_stats =3D=3D tx_stats * 2, "RX or TX packet= =20 + number not correct") =20 def test_tso_tunneling(self): """ @@ -205,8 +209,6 @@ class TestTSO(TestCase): self.verify(cores is not None, "Insufficient cores for speed testi= ng") self.coreMask =3D utils.create_mask(cores) =20 - padding =3D self.frame_sizes[0] - self.headers_size - self.tester.send_expect("ethtool -K %s rx off tx off tso off gso o= ff gro off lro off" % tx_interface, "# ") self.tester.send_expect("ip l set %s up" % tx_interface, "# ") =20 @@ -228,35 +230,34 @@ class TestTSO(TestCase): self.dut.send_expect("csum set outer-ip hw %d" % self.dut_ports[1]= , "testpmd> ", 120) self.dut.send_expect("csum parse-tunnel on %d" % self.dut_ports[1]= , "testpmd> ", 120) =20 - self.dut.send_expect("tso set 800 %d" % self.dut_ports[1], "testpm= d> ", 120) + self.dut.send_expect("tunnel_tso set 800 %d" % self.dut_ports[1], = "testpmd> ", 120) + self.dut.send_expect("rx_vxlan_port add 4789 0", "testpmd> ",=20 + 120) self.dut.send_expect("set fwd csum", "testpmd> ", 120) self.dut.send_expect("port start all", "testpmd> ", 120) + self.dut.send_expect("set promisc all off", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ") =20 self.tester.scapy_foreground() time.sleep(5) =20 - # Vxlan test - self.tcpdump_start_sniffing([tx_interface, rx_interface]) - self.tester.scapy_append('sendp([Ether(dst=3D"%s",src=3D"52:00:00:= 00:00:00")/IP(src=3D"192.168.1.1",dst=3D"192.168.1.2")/UDP(sport=3D"1021",d= port=3D"4789")/VXLAN()/Ether(dst=3D%s,src=3D"52:00:00:00:00:00")/IP(src=3D"= 192.168.1.1",dst=3D"192.168.1.2")/TCP(sport=3D"1021",dport=3D"1021")/("X"*%= s)], iface=3D"%s")' % (mac, mac, padding, tx_interface)) - out =3D self.tester.scapy_execute() - out =3D self.dut.send_expect("show port stats all", "testpmd> ", 1= 20) - print out - self.tcpdump_stop_sniff() - rx_stats =3D self.number_of_packets(rx_interface) - if (rx_stats =3D=3D 2): - self.verify(1, "Pass") - - # Nvgre test - self.tcpdump_start_sniffing([tx_interface, rx_interface]) - self.tester.scapy_append('sendp([Ether(dst=3D"%s",src=3D"52:00:00:= 00:00:00")/IP(src=3D"192.168.1.1",dst=3D"192.168.1.2",proto=3D47)/NVGRE()/E= ther(dst=3D%s,src=3D"52:00:00:00:00:00")/IP(src=3D"192.168.1.1",dst=3D"192.= 168.1.2")/TCP(sport=3D"1021",dport=3D"1021")/("X"*%s)], iface=3D"%s")' % (m= ac, mac, padding, tx_interface)) - out =3D self.tester.scapy_execute() - out =3D self.dut.send_expect("show port stats all", "testpmd> ", 1= 20) - print out - self.tcpdump_stop_sniff() - rx_stats =3D self.number_of_packets(rx_interface) - if (rx_stats =3D=3D 2): - self.verify(1, "Pass") + for loading_size in self.loading_sizes: + # Vxlan test + self.tcpdump_start_sniffing([tx_interface, rx_interface]) + self.load_module() + =20 + self.tester.scapy_append('sendp([Ether(dst=3D"%s",src=3D"52:00:00:00:00:0= 0 + ")/IP(src=3D"192.168.1.1",dst=3D"192.168.1.2")/UDP(sport=3D1021,dport=3D4= 789)/ + Vxlan()/Ether(dst=3D"%s",src=3D"52:00:00:00:00:00")/IP(src=3D"192.168.1.1= ",d + st=3D"192.168.1.2")/TCP(sport=3D1021,dport=3D1021)/("X"*%s)], iface=3D"%s= ")' %=20 + (mac, mac, loading_size, tx_interface)) + + # Nvgre test + self.tester.scapy_append('sendp([Ether(dst=3D"%s",src=3D"52:00= :00:00:00:00")/IP(src=3D"192.168.1.1",dst=3D"192.168.1.2",proto=3D47)/NVGRE= ()/Ether(dst=3D"%s",src=3D"52:00:00:00:00:00")/IP(src=3D"192.168.1.1",dst= =3D"192.168.1.2")/TCP(sport=3D1021,dport=3D1021)/("X"*%s)], iface=3D"%s")' = % (mac, mac, loading_size, tx_interface)) + out =3D self.tester.scapy_execute() + out =3D self.dut.send_expect("show port stats all", "testpmd> = ", 120) + print out + self.tcpdump_stop_sniff() + rx_stats =3D self.number_of_packets(rx_interface) + tx_stats =3D self.number_of_packets(tx_interface) + if (loading_size <=3D 800): + self.verify(rx_stats =3D=3D tx_stats, "RX or TX packet num= ber not correct") + else: + self.verify(rx_stats =3D=3D tx_stats * 2, "RX or TX packet= =20 + number not correct") =20 def test_perf_TSO_2ports(self): """ @@ -301,15 +302,15 @@ class TestTSO(TestCase): self.dut.send_expect("set fwd csum", "testpmd> ", 120) self.dut.send_expect("port start all", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ") - for frame_size in self.frame_sizes: + for loading_size in self.loading_sizes: + frame_size =3D loading_size + self.headers_size wirespeed =3D self.wirespeed(self.nic, frame_size, 2) =20 # create pcap file self.logger.info("Running with frame size %d " % frame_siz= e) - payload_size =3D frame_size - self.headers_size for _port in range(2): mac =3D self.dut.get_mac_address(self.dut_ports[_port]) - self.tester.scapy_append('wrpcap("dst%d.pcap", [Ether(dst= =3D"%s",src=3D"52:00:00:00:00:01")/IP(src=3D"192.168.1.1",dst=3D"192.168.1.= 2")/TCP(sport=3D1021,dport=3D1021)/("X"*%d)])' % (_port, mac, payload_size)= ) + self.tester.scapy_append('wrpcap("dst%d.pcap",=20 + [Ether(dst=3D"%s",src=3D"52:00:00:00:00:01")/IP(src=3D"192.168.1.1",dst= =3D"192 + .168.1.2")/TCP(sport=3D1021,dport=3D1021)/("X"*%d)])' % (_port, mac,=20 + loading_size)) tgen_input.append((self.tester.get_local_port(self.dut_ports[_po= rt]), self.tester.get_local_port(self.dut_ports[1-_po= rt]), "dst%d.pcap") % _port) self.tester.scapy_execute() @@ -318,29 +319,30 @@ class Te= stTSO(TestCase): _, pps =3D self.tester.traffic_generator_throughput(tgen_i= nput) =20 pps /=3D 1000000.0 - test_cycle['Mpps'][frame_size] =3D pps - test_cycle['pct'][frame_size] =3D pps * 100 / wirespeed + test_cycle['Mpps'][loading_size] =3D pps + test_cycle['pct'][loading_size] =3D pps * 100 / wirespeed =20 self.dut.send_expect("stop", "testpmd> ") self.dut.send_expect("quit", "# ", 30) time.sleep(5) =20 for n in range(len(self.test_cycles)): - for frame_size in self.frame_sizes: + for loading_size in self.loading_sizes: self.verify(self.test_cycles[n]['Mpps'][ - frame_size] > 0, "No traffic detected") + loading_size] > 0, "No traffic detected") =20 # Print results self.result_table_create(self.table_header) - for frame_size in self.frame_sizes: - table_row =3D [frame_size] + for loading_size in self.loading_sizes: + table_row =3D [loading_size] for test_cycle in self.test_cycles: - table_row.append(test_cycle['Mpps'][frame_size]) - table_row.append(test_cycle['pct'][frame_size]) + table_row.append(test_cycle['Mpps'][loading_size]) + table_row.append(test_cycle['pct'][loading_size]) =20 self.result_table_add(table_row) =20 self.result_table_print() + def tear_down(self): """ Run after each test case. -- 2.17.2