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 0FEED4541F; Thu, 13 Jun 2024 20:16:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0D29427DA; Thu, 13 Jun 2024 20:15:56 +0200 (CEST) Received: from mail-io1-f103.google.com (mail-io1-f103.google.com [209.85.166.103]) by mails.dpdk.org (Postfix) with ESMTP id 6F764427D2 for ; Thu, 13 Jun 2024 20:15:53 +0200 (CEST) Received: by mail-io1-f103.google.com with SMTP id ca18e2360f4ac-7eba486df76so46567939f.0 for ; Thu, 13 Jun 2024 11:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1718302553; x=1718907353; 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=NeTldC4siRoVk7rZWm+npftl6M9/8F9jB3FO5a7MUKI=; b=aoCiTHR9entncCM5hPj6rhLc7qQ9vWnDN3dNDJ8gLyWUdvC1brZkyXmHHDYSYUeboM rHNPHYJCM894Y8pUlKYHFyNtlLpugLiG9Ek7EwqoAJEK9VhJLCu3f8lgHb9Gj0gjsUXm NDIqXWXkQcZ6rgv+uwccDjgZAFaWilMb+G7e0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718302553; x=1718907353; 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=NeTldC4siRoVk7rZWm+npftl6M9/8F9jB3FO5a7MUKI=; b=uROK9xzuAX22pN+0kvPm26TJD1XRCRcHNVc0f2vQfUbERTG7x6fZLBLCJJbiSzNN97 7kMu+Nk6GyyhgbCEbdv772WleNbAjVWVwBGvbbgS80IEZG1c/5Tizd6RCHZXJAI9Ghag qj9vuMo67nwO5z1udn0THe/TyhzAeDRDkECU71B2nTanOkDNiWxYOGyujt2OwnlO+yL+ WXlnyalYyHuE3sllBtu16xarQK00sa1+BVeCkpKN1c9/MCHn6yIq2bD+ov7wrM++fSGJ M02Akpgs1X0VScHLCcupOl+5XL1xU+lOD5HNvt15iZyZc6wiwcX/0Co6mEyjt2F8cyDb 8UzA== X-Gm-Message-State: AOJu0YxYYWTk5okge7vaoSqPzAOyCA5wFV0QTKjrSm7Q0s1aAC8el+Xb 1nGyKrq/l1h7UQsMgn6mNGOi+uzRQxUf/7VBU6kaGeTso8qDr6UBPjgJRPslB/pMFORBHIJjTzf u2XKup6lZ6Ol6qB+z81ARHy2sDmM2WKOQ X-Google-Smtp-Source: AGHT+IG2cpJqUkyGdWIdAyivkqkeyu6X0NMmqg6qL3HM/p2VDnuRZEuFnNniQw3Zh3vwClSsttH/6DpUe845 X-Received: by 2002:a05:6602:640a:b0:7eb:7995:e488 with SMTP id ca18e2360f4ac-7ebea3dbefcmr62828039f.6.1718302552682; Thu, 13 Jun 2024 11:15:52 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id ca18e2360f4ac-7ebdbaf11b6sm5813639f.30.2024.06.13.11.15.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2024 11:15:52 -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 85266605C380; Thu, 13 Jun 2024 14:15:51 -0400 (EDT) From: jspewock@iol.unh.edu To: juraj.linkes@pantheon.tech, probb@iol.unh.edu, yoan.picchi@foss.arm.com, npratte@iol.unh.edu, Honnappa.Nagarahalli@arm.com, wathsala.vithanage@arm.com, paul.szczepanek@arm.com, Luca.Vizzarro@arm.com, thomas@monjalon.net Cc: dev@dpdk.org, Jeremy Spewock Subject: [PATCH v4 4/4] dts: add test case that utilizes offload to pmd_buffer_scatter Date: Thu, 13 Jun 2024 14:15:10 -0400 Message-ID: <20240613181510.30135-5-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240613181510.30135-1-jspewock@iol.unh.edu> References: <20240514201436.2496-1-jspewock@iol.unh.edu> <20240613181510.30135-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 | 75 ++++++++++++++++------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/dts/tests/TestSuite_pmd_buffer_scatter.py b/dts/tests/TestSuite_pmd_buffer_scatter.py index 645a66b607..f7bdd4fbcf 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,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 received packets. """ packet = Ether() / IP() / Raw() packet.getlayer(2).load = "" @@ -86,51 +99,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 + 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.1