From patchwork Tue Jul 9 17:53:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Spewock X-Patchwork-Id: 142276 X-Patchwork-Delegate: juraj.linkes@pantheon.tech Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D9D7D455E7; Tue, 9 Jul 2024 19:53:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D7C040ED0; Tue, 9 Jul 2024 19:53:49 +0200 (CEST) Received: from mail-yw1-f225.google.com (mail-yw1-f225.google.com [209.85.128.225]) by mails.dpdk.org (Postfix) with ESMTP id 697844025C for ; Tue, 9 Jul 2024 19:53:47 +0200 (CEST) Received: by mail-yw1-f225.google.com with SMTP id 00721157ae682-64f4fd64773so65090217b3.0 for ; Tue, 09 Jul 2024 10:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1720547627; x=1721152427; 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=v2QATDjKhoO4qffcB03bH4Wb6bNQrBfIl2zqatt5wjE=; b=BjlhymKuzLMJK3POnPQO6PnTWpGlLkw59KwZLxLTR1eQ8RRn7+QufuS1oksxx3l8DE +EvETVoa/6MVkdHv4CjYOsq859GY3UFo6l8/JGtjo0Rf1WQcQLbDbgc9q6Yy34sbrTv4 bSe4vkt4xHbink+MLK2nIiajdR3dlAZctJqkg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720547627; x=1721152427; 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=v2QATDjKhoO4qffcB03bH4Wb6bNQrBfIl2zqatt5wjE=; b=NeRem76AxicJtpMeH+LtLRBM78/6LWbx8F45koRThsxPdSzY+DmeP8FoYRBVRHiIzq cs4M5nQyuucKHIN6KjB15OEq232tBxuFKHuBwTkw2zdb+uIXHmd57MagW1gHv8lDyu8M jjCTGZWMQUePPQ4VnN08dvgAC153Ql4tWmeksg3nnCqyCQV5o9i7li+H31LqFbF7tied Jq9p1Kbmx4H4winq951g9xnplBvfyna09yBbMRGgEwVn2I1F+RTRgJJtTvM1r+KCmsy+ 44Q2o/QoiSVD2a/kJE6XIW/WPOiIY6Mudd4oJdxbUDxdjFmXdIzfKJb8TtP10QKtm5Xk PRbA== X-Gm-Message-State: AOJu0YwcFgP6sKOgR0efb1I/YIqzRFhaZcOdqE7/zXRApi9Yovnyal9Y nOM+QNhdVod1DzBOQDlHq9ppOWt0oZO/WgmUbuHh0R4zrdf0SyNrnIpJsujxziPNwoeLq4jn5iL pXMsKqFDKCJLYSHKLnSIXL1jm8Mso5wDM6KFwBUbKU/oz3Tsf X-Google-Smtp-Source: AGHT+IF6e7+Sc2vS92D8MNUbStfQeQ5WRvp/R2CSVHB3E5OrJbAS9/l8VcbTfBRKcRu1kuiM9IXozbeRMjk5 X-Received: by 2002:a0d:dcc4:0:b0:652:d0a9:87de with SMTP id 00721157ae682-658f09d2b8dmr36973067b3.35.1720547626719; Tue, 09 Jul 2024 10:53:46 -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 00721157ae682-658e4e237d1sm765367b3.39.2024.07.09.10.53.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jul 2024 10:53:46 -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 E9B85605C351; Tue, 9 Jul 2024 13:53:45 -0400 (EDT) From: jspewock@iol.unh.edu To: thomas@monjalon.net, Honnappa.Nagarahalli@arm.com, yoan.picchi@foss.arm.com, paul.szczepanek@arm.com, probb@iol.unh.edu, juraj.linkes@pantheon.tech, Luca.Vizzarro@arm.com, npratte@iol.unh.edu, wathsala.vithanage@arm.com Cc: dev@dpdk.org, Jeremy Spewock Subject: [PATCH v7 1/2] dts: add methods for modifying MTU to testpmd shell Date: Tue, 9 Jul 2024 13:53:40 -0400 Message-ID: <20240709175341.183888-2-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240709175341.183888-1-jspewock@iol.unh.edu> References: <20240514201436.2496-1-jspewock@iol.unh.edu> <20240709175341.183888-1-jspewock@iol.unh.edu> MIME-Version: 1.0 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 There are methods within DTS currently that support updating the MTU of ports on a node, but the methods for doing this in a linux session rely on the ip command and the port being bound to the kernel driver. Since test suites are run while bound to the driver for DPDK, there needs to be a way to modify the value while bound to said driver as well. This is done by using testpmd to modify the MTU. Signed-off-by: Jeremy Spewock --- dts/framework/remote_session/testpmd_shell.py | 131 +++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/dts/framework/remote_session/testpmd_shell.py b/dts/framework/remote_session/testpmd_shell.py index f6783af621..7c9729ba0d 100644 --- a/dts/framework/remote_session/testpmd_shell.py +++ b/dts/framework/remote_session/testpmd_shell.py @@ -22,6 +22,8 @@ from pathlib import PurePath from typing import Callable, ClassVar +from typing_extensions import TypeVarTuple + from framework.exception import InteractiveCommandExecutionError from framework.settings import SETTINGS from framework.utils import StrEnum @@ -82,12 +84,82 @@ class TestPmdForwardingModes(StrEnum): recycle_mbufs = auto() +T = TypeVarTuple("T") # type: ignore[misc] + + +class stop_then_start_port: + """Decorator that stops a port, runs decorated function, then starts the port. + + The function being decorated must be a method defined in :class:`TestPmdShell` that takes a + port ID (as an int) as its first parameter. The port ID will be passed into + :meth:`~TestPmdShell._stop_port` and :meth:`~TestPmdShell._start_port` so that the correct port + is stopped/started. + + Note that, because this decorator is presented through a class to allow for passing arguments + into the decorator, the class must be initialized when decorating functions. This means that, + even when not modifying any arguments, the signature for decorating with this class must be + "@stop_then_start_port()". + + Example usage on testpmd methods:: + + @stop_then_start_port() + def ex1(self, port_id, verify=True) + pass + + @stop_then_start_port(verify=False) + def ex2(self, port_id, verify=True) + pass + + Attributes: + verify: Whether to verify the stopping and starting of the port. + """ + + verify: bool + + def __init__(self, verify: bool = True) -> None: + """Store decorator options. + + Args: + verify: If :data:`True` the stopping/starting of ports will be verified, otherwise they + will it won't. Defaults to :data:`True`. + """ + self.verify = verify + + def __call__( + self, func: Callable[["TestPmdShell", int, *T], None] # type: ignore[valid-type] + ) -> Callable[["TestPmdShell", int, *T], None]: # type: ignore[valid-type] + """Wrap decorated method. + + Args: + func: Decorated method to wrap. + + Returns: + Function that stops a port, runs the decorated method, then starts the port. + """ + + def wrapper(shell: "TestPmdShell", port_id: int, *args, **kwargs) -> None: + """Function that wraps the instance method of :class:`TestPmdShell`. + + Args: + shell: Instance of the shell containing the method to decorate. + port_id: ID of the port to stop/start. + """ + shell._stop_port(port_id, self.verify) + func(shell, port_id, *args, **kwargs) + shell._start_port(port_id, self.verify) + + return wrapper + + class TestPmdShell(InteractiveShell): """Testpmd interactive shell. The testpmd shell users should never use the :meth:`~.interactive_shell.InteractiveShell.send_command` method directly, but rather - call specialized methods. If there isn't one that satisfies a need, it should be added. + call specialized methods. If there isn't one that satisfies a need, it should be added. Methods + of this class can be optionally decorated by :func:`~stop_then_start_port` if their first + parameter is the ID of a port in testpmd. This decorator will stop the port before running the + method and then start it again once the method is finished. Attributes: number_of_ports: The number of ports which were allowed on the command-line when testpmd @@ -227,6 +299,63 @@ def set_forward_mode(self, mode: TestPmdForwardingModes, verify: bool = True): f"Test pmd failed to set fwd mode to {mode.value}" ) + def _stop_port(self, port_id: int, verify: bool = True) -> None: + """Stop port with `port_id` in testpmd. + + Depending on the PMD, the port may need to be stopped before configuration can take place. + This method wraps the command needed to properly stop ports and take their link down. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the port did not + successfully stop. + """ + stop_port_output = self.send_command(f"port stop {port_id}") + if verify and ("Done" not in stop_port_output): + self._logger.debug(f"Failed to stop port {port_id}. Output was:\n{stop_port_output}") + raise InteractiveCommandExecutionError(f"Test pmd failed to stop port {port_id}.") + + def _start_port(self, port_id: int, verify: bool = True) -> None: + """Start port with `port_id` in testpmd. + + Because the port may need to be stopped to make some configuration changes, it naturally + follows that it will need to be started again once those changes have been made. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the port did not come + back up. + """ + start_port_output = self.send_command(f"port start {port_id}") + if verify and ("Done" not in start_port_output): + self._logger.debug(f"Failed to start port {port_id}. Output was:\n{start_port_output}") + raise InteractiveCommandExecutionError(f"Test pmd failed to start port {port_id}.") + + @stop_then_start_port() + def set_port_mtu(self, port_id: int, mtu: int, verify: bool = True) -> None: + """Change the MTU of a port using testpmd. + + Some PMDs require that the port be stopped before changing the MTU, and it does no harm to + stop the port before configuring in cases where it isn't required, so we first stop ports, + then update the MTU, then start the ports again afterwards. + + Args: + port_id: ID of the port to adjust the MTU on. + mtu: Desired value for the MTU to be set to. + verify: If `verify` is :data:`True` then the output will be scanned in an attempt to + verify that the mtu was properly set on the port. Defaults to :data:`True`. + + Raises: + InteractiveCommandExecutionError: If `verify` is :data:`True` and the MTU was not + properly updated on the port matching `port_id`. + """ + set_mtu_output = self.send_command(f"port config mtu {port_id} {mtu}") + if verify and (f"MTU: {mtu}" not in self.send_command(f"show port info {port_id}")): + self._logger.debug( + f"Failed to set mtu to {mtu} on port {port_id}." f" Output was:\n{set_mtu_output}" + ) + raise InteractiveCommandExecutionError( + f"Test pmd failed to update mtu of port {port_id} to {mtu}" + ) + def close(self) -> None: """Overrides :meth:`~.interactive_shell.close`.""" self.send_command("quit", "") From patchwork Tue Jul 9 17:53:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Spewock X-Patchwork-Id: 142277 X-Patchwork-Delegate: juraj.linkes@pantheon.tech Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 59FDE455E7; Tue, 9 Jul 2024 19:54:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67589410FD; Tue, 9 Jul 2024 19:53:52 +0200 (CEST) Received: from mail-oi1-f230.google.com (mail-oi1-f230.google.com [209.85.167.230]) by mails.dpdk.org (Postfix) with ESMTP id B3C72410FD for ; Tue, 9 Jul 2024 19:53:50 +0200 (CEST) Received: by mail-oi1-f230.google.com with SMTP id 5614622812f47-3d9234b77dfso2042749b6e.0 for ; Tue, 09 Jul 2024 10:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1720547629; x=1721152429; 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=R3xWePsfUGrHUUnfy1PNsXqP+yuBGvqTRjG16hKzrjk=; b=OcpIelhjZPGIK9kaISBFSsP6TX1Vw8k33kdKJYo8VlijJ2Kf9dZ/QOZqfM+op+mKlh rnK6hNaJmX+gVlV84wtPauWIOfo8Yb7cmv2H/ZUbF42ar2GyOWG7PPU6A44yYI+BHkD2 OlIwUw1BlON0M0wdEEqJ+JVjiR6v1uyMAdxGQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720547629; x=1721152429; 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=R3xWePsfUGrHUUnfy1PNsXqP+yuBGvqTRjG16hKzrjk=; b=m0F5rbYu2uh2pf44eRocor90H61Kw968I74upU3Rr3QZtHnhCw4oBbjKhCyIeIfeNy T2WLwvd8FnOouV3YKe7GhQSnfZze3i8o9ffnwEyHpU/M+czN1me6yRY5wQXXmuh64pkG f4KS52OokmqrnIGRga6JVfdSVkfrrr0p9Q//m3cg8LSO0dYibsZZWJITqefeKQcG2TFx kuv1if33AxhuhD99Fsh7uarn6w7qne/9f0uZ6MWA1X2my8DOeGjgn+KJ1np/1lVKuPIS sWEZbvTYqbdp0gHLAP7xhUUDjY+Ve/wl9a/IY5rnbpFXRqR3a4e4BRQfxFrWBf26iW5d XmDg== X-Gm-Message-State: AOJu0YwuR6GgzmeXUcBlIqLVVv33RjEz3KqLIB9w+MDnW6bvByoWnV/Y qJjyfmS18uDFORuniSmXPMzBe8JY+wFLUdenJe+lyE/roOrHHR3pyEdrFCQ4uyW+QlbCNFLWByJ zqbuvWScw8ClJdP8ROc2pGREQdDruW1lrKFGHxFZS98ppMjq+ X-Google-Smtp-Source: AGHT+IE+jP9O37GGmRwevrMt5p7zvo+ZGaHybVqx5SABnDVfLWxFZuJQ6E+DoZ29K119LsoEkW3p2VWOzoIf X-Received: by 2002:a05:6870:64a2:b0:25e:3b8b:6985 with SMTP id 586e51a60fabf-25eae8b61e5mr2430056fac.35.1720547629714; Tue, 09 Jul 2024 10:53:49 -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-25ea9fa6e3csm71798fac.8.2024.07.09.10.53.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jul 2024 10:53:49 -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 9C6F1605C351; Tue, 9 Jul 2024 13:53:47 -0400 (EDT) From: jspewock@iol.unh.edu To: thomas@monjalon.net, Honnappa.Nagarahalli@arm.com, yoan.picchi@foss.arm.com, paul.szczepanek@arm.com, probb@iol.unh.edu, juraj.linkes@pantheon.tech, Luca.Vizzarro@arm.com, npratte@iol.unh.edu, wathsala.vithanage@arm.com Cc: dev@dpdk.org, Jeremy Spewock Subject: [PATCH v7 2/2] dts: add test case that utilizes offload to pmd_buffer_scatter Date: Tue, 9 Jul 2024 13:53:41 -0400 Message-ID: <20240709175341.183888-3-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240709175341.183888-1-jspewock@iol.unh.edu> References: <20240514201436.2496-1-jspewock@iol.unh.edu> <20240709175341.183888-1-jspewock@iol.unh.edu> MIME-Version: 1.0 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/framework/testbed_model/sut_node.py | 4 +- dts/tests/TestSuite_pmd_buffer_scatter.py | 88 ++++++++++++++++------- 2 files changed, 66 insertions(+), 26 deletions(-) diff --git a/dts/framework/testbed_model/sut_node.py b/dts/framework/testbed_model/sut_node.py index 1fb536735d..b2d0e913f6 100644 --- a/dts/framework/testbed_model/sut_node.py +++ b/dts/framework/testbed_model/sut_node.py @@ -246,7 +246,9 @@ def get_supported_capabilities( for capability in capabilities: if capability not in supported_capas or capability not in unsupported_capas: capability.value(testpmd_shell, supported_capas, unsupported_capas) - del testpmd_shell + testpmd_shell.close() + # it can take up to 3 seconds for a host to cleanup EAL before testpmd can be used again. + time.sleep(3) return supported_capas def _set_up_build_target(self, build_target_config: BuildTargetConfiguration) -> None: diff --git a/dts/tests/TestSuite_pmd_buffer_scatter.py b/dts/tests/TestSuite_pmd_buffer_scatter.py index 3701c47408..0374693526 100644 --- a/dts/tests/TestSuite_pmd_buffer_scatter.py +++ b/dts/tests/TestSuite_pmd_buffer_scatter.py @@ -16,14 +16,20 @@ """ import struct +import time +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 +54,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 +79,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,48 +101,71 @@ 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 = 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, ) 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, - f"Payload of scattered packet did not match expected payload with offset {offset}.", + 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) + testpmd.close() + # it can take up to 3 seconds for a host to cleanup EAL before testpmd can be used again. + time.sleep(3) + + @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.