From: Ke Xu <ke1.xu@intel.com>
To: dts@dpdk.org
Cc: ke1.xu@intel.com, yux.jiang@intel.com, lijuan.tu@intel.com,
qi.fu@intel.com
Subject: [DTS][PATCH V1 2/5] tests/vf_offload: improve TSO validating.
Date: Tue, 7 Feb 2023 11:23:10 +0800 [thread overview]
Message-ID: <20230207032313.404935-3-ke1.xu@intel.com> (raw)
In-Reply-To: <20230207032313.404935-1-ke1.xu@intel.com>
Use segment_validate and tso_validate
methods to do the validate, providing
scalarble interface for futrher cases.
Signed-off-by: Ke Xu <ke1.xu@intel.com>
---
tests/TestSuite_vf_offload.py | 465 +++++++++++++---------------------
1 file changed, 180 insertions(+), 285 deletions(-)
diff --git a/tests/TestSuite_vf_offload.py b/tests/TestSuite_vf_offload.py
index ce1a6f13..bd412100 100644
--- a/tests/TestSuite_vf_offload.py
+++ b/tests/TestSuite_vf_offload.py
@@ -849,6 +849,148 @@ class TestVfOffload(TestCase):
rx_packet_size = [len(p[Raw].load) for p in pkts]
return rx_packet_count, rx_packet_size
+ def segment_validate(
+ self,
+ segment_size,
+ loading_size,
+ packet_count,
+ tx_stats,
+ rx_stats,
+ payload_size_list,
+ ):
+ """
+ Validate the segmentation, checking if the result is segmented
+ as expected.
+ segment_size: segment size,
+ loading_size: tx payload size,
+ packet_count: tx packet count,
+ tx_stats: tx packets count sniffed,
+ rx_stats: rx packets count,
+ payload_size_list: rx packets payload size list,
+ Return a message of validate result.
+ """
+ num_segs = (loading_size + segment_size - 1) // segment_size
+ num_segs_full = loading_size // segment_size
+ if not packet_count == tx_stats:
+ return "Failed: TX packet count is of inconsitent with sniffed TX packet count."
+ elif loading_size <= segment_size and not rx_stats == packet_count:
+ return "Failed: RX packet count is of inconsitent with TX packet count."
+ elif loading_size <= segment_size and not all(
+ [int(payload_size_list[j]) == loading_size for j in range(packet_count)]
+ ):
+ return "Failed: RX packet size is of inconsitent with TX packet size."
+ elif rx_stats != num_segs:
+ return "Failed: RX packet count is of inconsitent with segmented TX packet count."
+ elif not (
+ all(
+ [
+ # i * packet_count + j is the i-th segmentation for j-th packet.
+ payload_size_list[i * packet_count + j] == 800
+ for j in range(packet_count)
+ for i in range(num_segs_full)
+ ]
+ )
+ and all(
+ [
+ # num_segs_full * packet_count + j is the last segmentation for j-th packet.
+ payload_size_list[num_segs_full * packet_count + j]
+ == (loading_size % 800)
+ for j in range(packet_count)
+ ]
+ )
+ ):
+ return (
+ "Failed: RX packet segmentation size incorrect, %s." % payload_size_list
+ )
+ return None
+
+ def tso_validate(
+ self,
+ tx_interface,
+ rx_interface,
+ mac,
+ inet_type,
+ size_and_count,
+ outer_pkts=None,
+ ):
+
+ validate_result = []
+
+ self.tester.scapy_foreground()
+ self.tester.scapy_append("from scapy.contrib.gtp import GTP_U_Header")
+ time.sleep(5)
+
+ if not outer_pkts is None:
+ for key_outer in outer_pkts:
+ for loading_size, packet_count in size_and_count:
+ out = self.vm0_testpmd.execute_cmd(
+ "clear port info all", "testpmd> ", 120
+ )
+ self.tcpdump_start_sniffing([tx_interface, rx_interface])
+ self.tester.scapy_append(
+ (
+ 'sendp([Ether(dst="%s",src="52:00:00:00:00:00")/'
+ + outer_pkts[key_outer]
+ + '/%s(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/Raw(RandString(size=%s))], iface="%s", count=%s)'
+ )
+ % (mac, inet_type, loading_size, tx_interface, packet_count)
+ )
+ out = self.tester.scapy_execute()
+ out = self.vm0_testpmd.execute_cmd("show port stats all")
+ print(out)
+ self.tcpdump_stop_sniff()
+ rx_stats, payload_size_list = self.tcpdump_analyse_sniff(
+ rx_interface
+ )
+ tx_stats, _ = self.tcpdump_analyse_sniff(tx_interface)
+ payload_size_list.sort(reverse=True)
+ self.logger.info(payload_size_list)
+ segment_result = self.segment_validate(
+ 800,
+ loading_size,
+ packet_count,
+ tx_stats,
+ rx_stats,
+ payload_size_list,
+ )
+ if segment_result:
+ validate_result.append(
+ f"Packet: {key_outer}, inet type: {inet_type}, loading size: {loading_size} packet count: {packet_count}: "
+ + segment_result
+ )
+ else:
+ for loading_size, packet_count in size_and_count:
+ out = self.vm0_testpmd.execute_cmd(
+ "clear port info all", "testpmd> ", 120
+ )
+ self.tcpdump_start_sniffing([tx_interface, rx_interface])
+ self.tester.scapy_append(
+ 'sendp([Ether(dst="%s",src="52:00:00:00:00:00")/%s(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/Raw(RandString(size=%s))], iface="%s", count=%s)'
+ % (mac, inet_type, loading_size, tx_interface, packet_count)
+ )
+ out = self.tester.scapy_execute()
+ out = self.vm0_testpmd.execute_cmd("show port stats all")
+ print(out)
+ self.tcpdump_stop_sniff()
+ rx_stats, payload_size_list = self.tcpdump_analyse_sniff(rx_interface)
+ tx_stats, _ = self.tcpdump_analyse_sniff(tx_interface)
+ payload_size_list.sort(reverse=True)
+ self.logger.info(payload_size_list)
+ segment_result = self.segment_validate(
+ 800,
+ loading_size,
+ packet_count,
+ tx_stats,
+ rx_stats,
+ payload_size_list,
+ )
+ if segment_result:
+ validate_result.append(
+ f"Inet type: {inet_type}, loading size: {loading_size} packet count: {packet_count}: "
+ + segment_result
+ )
+ return validate_result
+
def test_tso(self):
"""
TSO IPv4 TCP, IPv6 TCP testing.
@@ -863,7 +1005,7 @@ class TestVfOffload(TestCase):
# Here size_and_count is a list of tuples for the test scopes that
# in a tuple (size, count) means, sending packets for count times
# for TSO with a payload size of size.
- self.size_and_count = [
+ size_and_count = [
(128, 10),
(800, 10),
(801, 10),
@@ -895,162 +1037,30 @@ class TestVfOffload(TestCase):
mac = self.vm0_testpmd.get_port_mac(0)
self.vm0_testpmd.execute_cmd("set verbose 1", "testpmd> ", 120)
- self.vm0_testpmd.execute_cmd("port stop all", "testpmd> ", 120)
- self.vm0_testpmd.execute_cmd(
- "csum set ip hw %d" % self.dut_ports[0], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum set udp hw %d" % self.dut_ports[0], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum set tcp hw %d" % self.dut_ports[0], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum set sctp hw %d" % self.dut_ports[0], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum set outer-ip hw %d" % self.dut_ports[0], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum parse-tunnel on %d" % self.dut_ports[0], "testpmd> ", 120
- )
-
- self.vm0_testpmd.execute_cmd(
- "csum set ip hw %d" % self.dut_ports[1], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum set udp hw %d" % self.dut_ports[1], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum set tcp hw %d" % self.dut_ports[1], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum set sctp hw %d" % self.dut_ports[1], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum set outer-ip hw %d" % self.dut_ports[1], "testpmd> ", 120
- )
- self.vm0_testpmd.execute_cmd(
- "csum parse-tunnel on %d" % self.dut_ports[1], "testpmd> ", 120
- )
-
- self.vm0_testpmd.execute_cmd("tso set 800 %d" % self.vm0_dut_ports[1])
self.vm0_testpmd.execute_cmd("set fwd csum")
- self.vm0_testpmd.execute_cmd("port start all", "testpmd> ", 120)
+ self.tso_enable(self.vm0_dut_ports[0], self.vm_dut_0)
+ self.tso_enable(self.vm0_dut_ports[1], self.vm_dut_0)
self.vm0_testpmd.execute_cmd("set promisc 0 on", "testpmd> ", 120)
self.vm0_testpmd.execute_cmd("set promisc 1 on", "testpmd> ", 120)
self.vm0_testpmd.execute_cmd("start")
+ self.vm0_testpmd.wait_link_status_up(self.vm0_dut_ports[0])
+ self.vm0_testpmd.wait_link_status_up(self.vm0_dut_ports[1])
- self.tester.scapy_foreground()
- time.sleep(5)
-
- for loading_size, packet_count in self.size_and_count:
- # IPv4 tcp test
- out = self.vm0_testpmd.execute_cmd("clear port info all", "testpmd> ", 120)
- self.tcpdump_start_sniffing([tx_interface, rx_interface])
- self.tester.scapy_append(
- 'sendp([Ether(dst="%s",src="52:00:00:00:00:00")/IP(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/Raw(RandString(size=%s))], iface="%s", count=%s)'
- % (mac, loading_size, tx_interface, packet_count)
- )
- out = self.tester.scapy_execute()
- out = self.vm0_testpmd.execute_cmd("show port stats all")
- print(out)
- self.tcpdump_stop_sniff()
- rx_stats, payload_size_list = self.tcpdump_analyse_sniff(rx_interface)
- tx_stats, _ = self.tcpdump_analyse_sniff(tx_interface)
- payload_size_list.sort(reverse=True)
- self.logger.info(payload_size_list)
- if loading_size <= 800:
- self.verify(
- # for all packet_count packets, verifying the packet size equals the size we sent.
- rx_stats == tx_stats
- and all(
- [
- int(payload_size_list[j]) == loading_size
- for j in range(packet_count)
- ]
- ),
- "IPV4 RX or TX packet number not correct",
- )
- else:
- num = loading_size // 800
- for i in range(num):
- self.verify(
- # i * packet_count + j is the i-th segmentation for j-th packet.
- all(
- [
- int(payload_size_list[i * packet_count + j]) == 800
- for j in range(packet_count)
- ]
- ),
- "the packet segmentation incorrect, %s" % payload_size_list,
- )
- if loading_size % 800 != 0:
- self.verify(
- # num * packet_count + j is the last segmentation for j-th packet.
- all(
- [
- int(payload_size_list[num * packet_count + j])
- == loading_size % 800
- for j in range(packet_count)
- ]
- ),
- "the packet segmentation incorrect, %s" % payload_size_list,
- )
-
- for loading_size, packet_count in self.size_and_count:
- # IPv6 tcp test
- out = self.vm0_testpmd.execute_cmd("clear port info all", "testpmd> ", 120)
- self.tcpdump_start_sniffing([tx_interface, rx_interface])
- self.tester.scapy_append(
- 'sendp([Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="FE80:0:0:0:200:1FF:FE00:200", dst="3555:5555:6666:6666:7777:7777:8888:8888")/TCP(sport=1021,dport=1021)/Raw(RandString(size=%s))], iface="%s", count=%s)'
- % (mac, loading_size, tx_interface, packet_count)
- )
- out = self.tester.scapy_execute()
- out = self.vm0_testpmd.execute_cmd("show port stats all")
- print(out)
- self.tcpdump_stop_sniff()
- rx_stats, payload_size_list = self.tcpdump_analyse_sniff(rx_interface)
- tx_stats, _ = self.tcpdump_analyse_sniff(tx_interface)
- payload_size_list.sort(reverse=True)
- self.logger.info(payload_size_list)
- if loading_size <= 800:
- self.verify(
- # for all packet_count packets, verifying the packet size equals the size we sent.
- rx_stats == tx_stats
- and all(
- [
- int(payload_size_list[j]) == loading_size
- for j in range(packet_count)
- ]
- ),
- "IPV6 RX or TX packet number not correct",
- )
- else:
- num = loading_size // 800
- for i in range(num):
- self.verify(
- # i * packet_count + j is the i-th segmentation for j-th packet.
- all(
- [
- int(payload_size_list[i * packet_count + j]) == 800
- for j in range(packet_count)
- ]
- ),
- "the packet segmentation incorrect, %s" % payload_size_list,
- )
- if loading_size % 800 != 0:
- self.verify(
- # num * packet_count + j is the last segmentation for j-th packet.
- all(
- [
- int(payload_size_list[num * packet_count + j])
- == loading_size % 800
- for j in range(packet_count)
- ]
- ),
- "the packet segmentation incorrect, %s" % payload_size_list,
- )
+ validate_result = []
+ validate_result += self.tso_validate(
+ tx_interface=tx_interface,
+ rx_interface=rx_interface,
+ mac=mac,
+ inet_type="IP",
+ size_and_count=size_and_count,
+ )
+ validate_result += self.tso_validate(
+ tx_interface=tx_interface,
+ rx_interface=rx_interface,
+ mac=mac,
+ inet_type="IPv6",
+ size_and_count=size_and_count,
+ )
@check_supported_nic(
["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
@@ -1070,7 +1080,7 @@ class TestVfOffload(TestCase):
# Here size_and_count is a list of tuples for the test scopes that
# in a tuple (size, count) means, sending packets for count times
# for TSO with a payload size of size.
- self.size_and_count = [
+ size_and_count = [
(128, 10),
(800, 10),
(801, 10),
@@ -1130,138 +1140,23 @@ class TestVfOffload(TestCase):
"IPv6/UDP/GTPU": 'IPv6(src = "FE80:0:0:0:200:1FF:FE00:200", dst = "3555:5555:6666:6666:7777:7777:8888:8888") / UDP(dport = 2152) / GTP_U_Header(gtp_type=255, teid=0x123456)',
}
- self.tester.scapy_foreground()
- time.sleep(5)
-
- for key_outer in pkts_outer:
- for loading_size, packet_count in self.size_and_count:
- # IPv4 tcp test
- out = self.vm0_testpmd.execute_cmd(
- "clear port info all", "testpmd> ", 120
- )
- self.tcpdump_start_sniffing([tx_interface, rx_interface])
- if "GTPU" in key_outer:
- self.tester.scapy_append(
- "from scapy.contrib.gtp import GTP_U_Header"
- )
- self.tester.scapy_append(
- (
- 'sendp([Ether(dst="%s",src="52:00:00:00:00:00")/'
- + pkts_outer[key_outer]
- + '/IP(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/Raw(RandString(size=%s))], iface="%s", count=%s)'
- )
- % (mac, loading_size, tx_interface, packet_count)
- )
- out = self.tester.scapy_execute()
- out = self.vm0_testpmd.execute_cmd("show port stats all")
- print(out)
- self.tcpdump_stop_sniff()
- rx_stats, payload_size_list = self.tcpdump_analyse_sniff(rx_interface)
- tx_stats, _ = self.tcpdump_analyse_sniff(tx_interface)
- payload_size_list.sort(reverse=True)
- self.logger.info(payload_size_list)
- if loading_size <= 800:
- self.verify(
- # for all packet_count packets, verifying the packet size equals the size we sent.
- rx_stats == tx_stats
- and all(
- [
- int(payload_size_list[j]) == loading_size
- for j in range(packet_count)
- ]
- ),
- f"{key_outer} tunnel IPV4 RX or TX packet number not correct",
- )
- else:
- num = loading_size // 800
- for i in range(num):
- self.verify(
- # i * packet_count + j is the i-th segmentation for j-th packet.
- all(
- [
- payload_size_list[i * packet_count + j] == 800
- for j in range(packet_count)
- ]
- ),
- "the packet segmentation incorrect, %s" % payload_size_list,
- )
- if loading_size % 800 != 0:
- self.verify(
- # num * packet_count + j is the last segmentation for j-th packet.
- all(
- [
- payload_size_list[num * packet_count + j]
- == loading_size % 800
- for j in range(packet_count)
- ]
- ),
- "the packet segmentation incorrect, %s" % payload_size_list,
- )
-
- for loading_size, packet_count in self.size_and_count:
- # IPv6 tcp test
- out = self.vm0_testpmd.execute_cmd(
- "clear port info all", "testpmd> ", 120
- )
- self.tcpdump_start_sniffing([tx_interface, rx_interface])
- if "GTPU" in key_outer:
- self.tester.scapy_append(
- "from scapy.contrib.gtp import GTP_U_Header"
- )
- self.logger.info([mac, loading_size, tx_interface, packet_count])
- self.tester.scapy_append(
- (
- 'sendp([Ether(dst="%s", src="52:00:00:00:00:00")/'
- + pkts_outer[key_outer]
- + '/IPv6(src="FE80:0:0:0:200:1FF:FE00:200", dst="3555:5555:6666:6666:7777:7777:8888:8888")/TCP(sport=1021,dport=1021)/("X"*%s)], iface="%s", count=%s)'
- )
- % (mac, loading_size, tx_interface, packet_count)
- )
- out = self.tester.scapy_execute()
- out = self.vm0_testpmd.execute_cmd("show port stats all")
- print(out)
- self.tcpdump_stop_sniff()
- rx_stats, payload_size_list = self.tcpdump_analyse_sniff(rx_interface)
- tx_stats, _ = self.tcpdump_analyse_sniff(tx_interface)
- payload_size_list.sort(reverse=True)
- self.logger.info(payload_size_list)
- if loading_size <= 800:
- self.verify(
- # for all packet_count packets, verifying the packet size equals the size we sent.
- rx_stats == tx_stats
- and all(
- [
- payload_size_list[j] == loading_size
- for j in range(packet_count)
- ]
- ),
- f"{key_outer} tunnel IPV6 RX or TX packet number not correct",
- )
- else:
- num = loading_size // 800
- for i in range(num):
- self.verify(
- # i * packet_count + j is the i-th segmentation for j-th packet.
- all(
- [
- payload_size_list[i * packet_count + j] == 800
- for j in range(packet_count)
- ]
- ),
- "the packet segmentation incorrect, %s" % payload_size_list,
- )
- if loading_size % 800 != 0:
- self.verify(
- # num * packet_count + j is the last segmentation for j-th packet.
- all(
- [
- payload_size_list[num * packet_count + j]
- == loading_size % 800
- for j in range(packet_count)
- ]
- ),
- "the packet segmentation incorrect, %s" % payload_size_list,
- )
+ validate_result = []
+ validate_result += self.tso_validate(
+ tx_interface=tx_interface,
+ rx_interface=rx_interface,
+ mac=mac,
+ inet_type="IP",
+ size_and_count=size_and_count,
+ outer_pkts=pkts_outer,
+ )
+ validate_result += self.tso_validate(
+ tx_interface=tx_interface,
+ rx_interface=rx_interface,
+ mac=mac,
+ inet_type="IPv6",
+ size_and_count=size_and_count,
+ outer_pkts=pkts_outer,
+ )
def tear_down(self):
self.vm0_testpmd.execute_cmd("quit", "# ")
--
2.25.1
next prev parent reply other threads:[~2023-02-07 3:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 3:23 [DTS][PATCH V1 0/5] Update vf_offload cases for DPDK-v23.03 validation Ke Xu
2023-02-07 3:23 ` [DTS][PATCH V1 1/5] tests/vf_offload: add VLAN packets to test scope Ke Xu
2023-02-07 3:23 ` Ke Xu [this message]
2023-02-07 3:23 ` [DTS][PATCH V1 3/5] tests/vf_offload: improve vector path validating Ke Xu
2023-02-07 3:23 ` [DTS][PATCH V1 4/5] tests/vf_offload: fix error when no packet captured Ke Xu
2023-02-07 3:23 ` [DTS][PATCH V1 5/5] test_plans/vf_offload: add VLAN packets to test scope and improve vector path validating Ke Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230207032313.404935-3-ke1.xu@intel.com \
--to=ke1.xu@intel.com \
--cc=dts@dpdk.org \
--cc=lijuan.tu@intel.com \
--cc=qi.fu@intel.com \
--cc=yux.jiang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).