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 0735644164; Wed, 5 Jun 2024 23:32:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5822B40E78; Wed, 5 Jun 2024 23:32:38 +0200 (CEST) Received: from mail-ot1-f104.google.com (mail-ot1-f104.google.com [209.85.210.104]) by mails.dpdk.org (Postfix) with ESMTP id 4424640E5A for ; Wed, 5 Jun 2024 23:32:36 +0200 (CEST) Received: by mail-ot1-f104.google.com with SMTP id 46e09a7af769-6f9415b5e8dso173403a34.2 for ; Wed, 05 Jun 2024 14:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1717623155; x=1718227955; 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=shAM4dEf7lIK0xqQ+E0IEDMv9FP5I0g+jpN8W3O2gTQ=; b=JY3o9zkDxeEJyWvpxvmlDz6m6VtFqyheNElOWCpwQCj128CnYZ1nlnkwS7CKPh2P8x 0Zp8gHvPXkOKfDSIdLU3k4oubh9QWQZPEabhkV/VGiip8omFB6Yvb3SX5wFSM+CmLfvj FeX/kvMtbnS/tJjRj+KDNCq4m87KdXc1rbFn8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717623155; x=1718227955; 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=shAM4dEf7lIK0xqQ+E0IEDMv9FP5I0g+jpN8W3O2gTQ=; b=HLgkFRJ3Pza6hmqift8e/nA1kxtFSGktCqzdtZt3QrxUvsN0TTSi+6JYHcjAqWwWhp yAL9sxgGf+2K7nNV6ZGp2KGINwvnYZQGkSF5jViNH1uqYjGl8+y44JCGAgENQAyFMJuh f3dbO9QuA8bNgeWquqh/rmD9aR1o4eg0xKr1+z+uhXU9/6CGhN/NDirA9OI2wCK4dibs gVBqIQbIbluXaIeVF19/tICySWPTIyb/qmpfG6mbnJa8qL6T3f/ef595Y9NmZnElIAph PU7O9XSEpYr/kaPlEpcXLoerSK+2oklBAbAldhqK6KeS4Qai4mgydApKBW20y7yhkwBc VvAQ== X-Gm-Message-State: AOJu0YyaM9gotr3ypgibu3H7lgKaR/WuZbaHNKJjEWiWNGounpr0UXeb sqlo+HR0mArv9fdQ6+oquzatKqJmoYkqlRG+zsPmZdnw+kPUOKjjapl6Xgh3HNh+32dMWyfs2pq oqOb7dI1m/Fk5EWUMDZPVyk2m9/d5ANHzZMgiWGImsVXxNXTJ X-Google-Smtp-Source: AGHT+IH17W3CR54qMyjJtx4v9RXY2x+HDk/aEVnwyTttTqClAtTMaeDdRPpaz6e6h5k7s7xZkTSUcbf9/U69 X-Received: by 2002:a05:6870:6590:b0:24f:bd2e:9c3f with SMTP id 586e51a60fabf-25121d0b763mr4605248fac.11.1717623155510; Wed, 05 Jun 2024 14:32:35 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [2606:4100:3880:1234::84]) by smtp-relay.gmail.com with ESMTPS id 586e51a60fabf-25447d0c007sm4384fac.3.2024.06.05.14.32.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jun 2024 14:32:35 -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 62E23605C380; Wed, 5 Jun 2024 17:32:34 -0400 (EDT) From: jspewock@iol.unh.edu To: Honnappa.Nagarahalli@arm.com, probb@iol.unh.edu, paul.szczepanek@arm.com, juraj.linkes@pantheon.tech, thomas@monjalon.net, wathsala.vithanage@arm.com, npratte@iol.unh.edu, yoan.picchi@foss.arm.com, Luca.Vizzarro@arm.com Cc: dev@dpdk.org, Jeremy Spewock Subject: [PATCH v3 4/4] dts: add test case that utilizes offload to pmd_buffer_scatter Date: Wed, 5 Jun 2024 17:31:48 -0400 Message-ID: <20240605213148.21371-5-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240605213148.21371-1-jspewock@iol.unh.edu> References: <20240514201436.2496-1-jspewock@iol.unh.edu> <20240605213148.21371-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 | 77 ++++++++++++++++------- 1 file changed, 56 insertions(+), 21 deletions(-) diff --git a/dts/tests/TestSuite_pmd_buffer_scatter.py b/dts/tests/TestSuite_pmd_buffer_scatter.py index 41f6090a7e..76eabb51f6 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 Raw, Packet # 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,6 +53,14 @@ 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. @@ -64,19 +77,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 packets. """ packet = Ether() / IP() / Raw() packet.getlayer(2).load = "" @@ -86,12 +99,15 @@ 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, 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 @@ -103,34 +119,53 @@ def pmd_scatter(self, mbsize: int) -> None: """ 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(testpmd_params), privileged=True, ) with testpmd_shell as testpmd: testpmd.set_forward_mode(TestPmdForwardingModes.mac) + # adjust the MTU of the SUT ports + 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) + # This list should only ever contain one element + recv_packets = self.scatter_pktgen_send_packet(mbsize + offset) self._logger.debug( - f"Payload of scattered packet after forwarding: \n{recv_payload}" + 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) + self.pmd_scatter( + mbsize=2048, testpmd_params=[*(self.base_testpmd_parameters), "--mbuf-size=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, + testpmd_params=[ + *(self.base_testpmd_parameters), + "--mbuf-size=2048", + "--enable-scatter", + ], + ) def tear_down_suite(self) -> None: """Tear down the test suite. -- 2.45.1