From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A984C454F3; Tue, 25 Jun 2024 18:27:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13809427D7; Tue, 25 Jun 2024 18:27:41 +0200 (CEST) Received: from mail-yb1-f231.google.com (mail-yb1-f231.google.com [209.85.219.231]) by mails.dpdk.org (Postfix) with ESMTP id D3A1E427AC for ; Tue, 25 Jun 2024 18:27:34 +0200 (CEST) Received: by mail-yb1-f231.google.com with SMTP id 3f1490d57ef6-dfef5980a69so5613847276.3 for ; Tue, 25 Jun 2024 09:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1719332854; x=1719937654; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FzDby8PLcJ+WUuJkSniVVOgTdFaFtOdUq2RGZMPRpqI=; b=Y+jwih3uyTObiidmGrp8NMh3oG15j+GVayH9xCsMaDeuHlERXSL24RvNv0rDzKYLuE 09f/A4kheyArKY6uhfTl7RpjRyVld+pN2bysnVgWC3dvGvfVHHexOOk5nUHVKMMCx44S pIMUS6GMmBY/ik+ETtQ+FzMBCr/FJR8s+o+Rs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719332854; x=1719937654; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FzDby8PLcJ+WUuJkSniVVOgTdFaFtOdUq2RGZMPRpqI=; b=keOGH2SNXseMmnx98PGlQtah1FMLDX2d7u73h7L4X57SfhtIeDNG2e04Gn+NZq2tb3 /Eu7oUWtUCK/yX9Gy+BtxAiJdxSPbenFgJmpbZWxBhOaeuu8adGMIY2Xwq++qKiIqjfq TK1mEd3LRRE6EIvOUeVoqjZg8n6oD9rHKFoVIWi+aJq0Flva5MqpZACA7Rhct+aG+1ya lElJQXuXR00MYgBavAMyXPPl5u7HHeN5JUKcVLKybo/dn9yLf4Mp0jJBB/SQNEhjzWNl ebBjlikgN45pDzNBJjX5s7ATPEO9lFU/vyIxWVYJxwTYVzzqirj4NuzzI00CZzwfQzm/ 6inw== X-Gm-Message-State: AOJu0Yxd7Gf5ouy2Yk9EBo5ysjGXy4stk4Q2H5uhUVvrbxE70KGptgpI KDJRs++OU2POX1c2Fm+ZmhtqERrLoY7A4CIiWZsMq1eZoKO1Gsr8NqKJ/TS0jjWcehqGf+UaY9u DTtO9B9xEhCOlD2pvkcYGa/mY6Do9r5fp X-Google-Smtp-Source: AGHT+IHcFlBYERTyMQ57berrykaumYRE7r0M8F2aCmv/OyiNho49G8dGvmha7rGlS68W0PYbW5aMfw3840NR X-Received: by 2002:a25:9f01:0:b0:dfe:388e:2987 with SMTP id 3f1490d57ef6-e030110ae57mr7866367276.64.1719332854164; Tue, 25 Jun 2024 09:27:34 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id 3f1490d57ef6-e02e65e064asm376758276.29.2024.06.25.09.27.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jun 2024 09:27:34 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Received: from iol.unh.edu (unknown [IPv6:2606:4100:3880:1257::1083]) by postal.iol.unh.edu (Postfix) with ESMTP id 51652605C381; Tue, 25 Jun 2024 12:27:33 -0400 (EDT) From: jspewock@iol.unh.edu To: Luca.Vizzarro@arm.com, Honnappa.Nagarahalli@arm.com, juraj.linkes@pantheon.tech, probb@iol.unh.edu, paul.szczepanek@arm.com, yoan.picchi@foss.arm.com, wathsala.vithanage@arm.com, npratte@iol.unh.edu, thomas@monjalon.net Cc: dev@dpdk.org, Jeremy Spewock Subject: [PATCH v5 4/4] dts: add test case that utilizes offload to pmd_buffer_scatter Date: Tue, 25 Jun 2024 12:27:16 -0400 Message-ID: <20240625162716.2053-5-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240625162716.2053-1-jspewock@iol.unh.edu> References: <20240514201436.2496-1-jspewock@iol.unh.edu> <20240625162716.2053-1-jspewock@iol.unh.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Jeremy Spewock Some NICs tested in DPDK allow for the scattering of packets without an offload and others enforce that you enable the scattered_rx offload in testpmd. The current version of the suite for testing support of scattering packets only tests the case where the NIC supports testing without the offload, so an expansion of coverage is needed to cover the second case as well. depends-on: patch-139227 ("dts: skip test cases based on capabilities") Signed-off-by: Jeremy Spewock --- dts/tests/TestSuite_pmd_buffer_scatter.py | 82 ++++++++++++++++------- 1 file changed, 57 insertions(+), 25 deletions(-) diff --git a/dts/tests/TestSuite_pmd_buffer_scatter.py b/dts/tests/TestSuite_pmd_buffer_scatter.py index 645a66b607..0cce9bfc7f 100644 --- a/dts/tests/TestSuite_pmd_buffer_scatter.py +++ b/dts/tests/TestSuite_pmd_buffer_scatter.py @@ -16,14 +16,19 @@ """ import struct +from typing import ClassVar from scapy.layers.inet import IP # type: ignore[import] from scapy.layers.l2 import Ether # type: ignore[import] -from scapy.packet import Raw # type: ignore[import] +from scapy.packet import Packet, Raw # type: ignore[import] from scapy.utils import hexstr # type: ignore[import] -from framework.remote_session.testpmd_shell import TestPmdForwardingModes, TestPmdShell -from framework.test_suite import TestSuite +from framework.remote_session.testpmd_shell import ( + NicCapability, + TestPmdForwardingModes, + TestPmdShell, +) +from framework.test_suite import TestSuite, requires class TestPmdBufferScatter(TestSuite): @@ -48,13 +53,22 @@ class TestPmdBufferScatter(TestSuite): and a single byte of packet data stored in a second buffer alongside the CRC. """ + #: Parameters for testing scatter using testpmd which are universal across all test cases. + base_testpmd_parameters: ClassVar[list[str]] = [ + "--mbcache=200", + "--max-pkt-len=9000", + "--port-topology=paired", + "--tx-offloads=0x00008000", + ] + def set_up_suite(self) -> None: """Set up the test suite. Setup: - Verify that we have at least 2 port links in the current execution - and increase the MTU of both ports on the traffic generator to 9000 - to support larger packet sizes. + Verify that we have at least 2 port links in the current execution and increase the MTU + of both ports on the traffic generator to 9000 to support larger packet sizes. The + traffic generator needs to send and receive packets that are, at most, as large as the + mbuf size of the ports + 5 in each test case, so 9000 should more than suffice. """ self.verify( len(self._port_links) > 1, @@ -64,19 +78,19 @@ def set_up_suite(self) -> None: self.tg_node.main_session.configure_port_mtu(9000, self._tg_port_egress) self.tg_node.main_session.configure_port_mtu(9000, self._tg_port_ingress) - def scatter_pktgen_send_packet(self, pktsize: int) -> str: + def scatter_pktgen_send_packet(self, pktsize: int) -> list[Packet]: """Generate and send a packet to the SUT then capture what is forwarded back. Generate an IP packet of a specific length and send it to the SUT, - then capture the resulting received packet and extract its payload. - The desired length of the packet is met by packing its payload + then capture the resulting received packets and filter them down to the ones that have the + correct layers. The desired length of the packet is met by packing its payload with the letter "X" in hexadecimal. Args: pktsize: Size of the packet to generate and send. Returns: - The payload of the received packet as a string. + The filtered down list of received packets. """ packet = Ether() / IP() / Raw() packet.getlayer(2).load = "" @@ -86,51 +100,69 @@ def scatter_pktgen_send_packet(self, pktsize: int) -> str: for X_in_hex in payload: packet.load += struct.pack("=B", int("%s%s" % (X_in_hex[0], X_in_hex[1]), 16)) received_packets = self.send_packet_and_capture(packet) + # filter down the list to packets that have the appropriate structure + received_packets = list( + filter(lambda p: Ether in p and IP in p and Raw in p, received_packets) + ) self.verify(len(received_packets) > 0, "Did not receive any packets.") - load = hexstr(received_packets[0].getlayer(2), onlyhex=1) - return load + return received_packets - def pmd_scatter(self, mbsize: int) -> None: + def pmd_scatter(self, mbsize: int, extra_testpmd_params: list[str] = []) -> None: """Testpmd support of receiving and sending scattered multi-segment packets. Support for scattered packets is shown by sending 5 packets of differing length where the length of the packet is calculated by taking mbuf-size + an offset. The offsets used in the test are -1, 0, 1, 4, 5 respectively. + Args: + mbsize: Size to set memory buffers to when starting testpmd. + extra_testpmd_params: Additional parameters to add to the base list when starting + testpmd. + Test: - Start testpmd and run functional test with preset mbsize. + Start testpmd and run functional test with preset `mbsize`. """ testpmd_shell = self.sut_node.create_interactive_shell( TestPmdShell, - app_parameters=( - "--mbcache=200 " - f"--mbuf-size={mbsize} " - "--max-pkt-len=9000 " - "--port-topology=paired " - "--tx-offloads=0x00008000" + app_parameters=" ".join( + [*self.base_testpmd_parameters, f"--mbuf-size={mbsize}", *extra_testpmd_params] ), privileged=True, ) with testpmd_shell as testpmd: testpmd.set_forward_mode(TestPmdForwardingModes.mac) + # adjust the MTU of the SUT ports to handle packets at least as large as `mbsize` + 5 + for port_id in range(testpmd.number_of_ports): + testpmd.set_port_mtu(port_id, 9000) testpmd.start() for offset in [-1, 0, 1, 4, 5]: - recv_payload = self.scatter_pktgen_send_packet(mbsize + offset) - self._logger.debug( - f"Payload of scattered packet after forwarding: \n{recv_payload}" - ) + recv_packets = self.scatter_pktgen_send_packet(mbsize + offset) + self._logger.debug(f"Relevant captured packets: \n{recv_packets}") + self.verify( - ("58 " * 8).strip() in recv_payload, + any( + " ".join(["58"] * 8) in hexstr(pakt.getlayer(2), onlyhex=1) + for pakt in recv_packets + ), "Payload of scattered packet did not match expected payload with offset " f"{offset}.", ) + testpmd.stop() + # reset the MTU of the SUT ports + for port_id in range(testpmd.number_of_ports): + testpmd.set_port_mtu(port_id, 1500) + @requires(NicCapability.scattered_rx) def test_scatter_mbuf_2048(self) -> None: """Run the :meth:`pmd_scatter` test with `mbsize` set to 2048.""" self.pmd_scatter(mbsize=2048) + def test_scatter_mbuf_2048_with_offload(self) -> None: + """Run the :meth:`pmd_scatter` test with `mbsize` set to 2048 and rx_scatter offload.""" + self.pmd_scatter(mbsize=2048, extra_testpmd_params=["--enable-scatter"]) + def tear_down_suite(self) -> None: """Tear down the test suite. -- 2.45.2