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 2F4E84541F; Thu, 13 Jun 2024 20:15:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 14D48427CC; Thu, 13 Jun 2024 20:15:53 +0200 (CEST) Received: from mail-io1-f98.google.com (mail-io1-f98.google.com [209.85.166.98]) by mails.dpdk.org (Postfix) with ESMTP id 0CD97427D1 for ; Thu, 13 Jun 2024 20:15:52 +0200 (CEST) Received: by mail-io1-f98.google.com with SMTP id ca18e2360f4ac-7ebcc7676c3so53908639f.0 for ; Thu, 13 Jun 2024 11:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1718302551; x=1718907351; 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=w4zL3mL74Mm7K31s43fnUGoAWiml9wzu58xUoK8N2Fg=; b=CUOTxa5FnBGNpEZnDHH9U6b40TOHPeaRoUOYJdoDQu0kVinNGyVVlSRnlbtPu+HALo qR2jQZ7eNPgOER6uPCCpzj06Plk2UwvRrmz5Wn6T+Vb5jRETXnsejB3huu0nvksHnSYT 74O5iHPoN2K59oIR8lVRZbkCmLIFvT1+9O6nU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718302551; x=1718907351; 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=w4zL3mL74Mm7K31s43fnUGoAWiml9wzu58xUoK8N2Fg=; b=iupaqIgPwe5demRS6PtutrHoQDJzgx6OSQ/lEG1q7Pq/oGnKkY8N9JcQchJgdgyRdo YD/rekmgZuJBSsWl/v5HWKTB7WuzMMjLbocG9Ul9ppvDFXKu/LkjnWXXnc4qL/3HJWJC 5Z/g08pYOr3CPHtDHczJ2Q4uPSchDQJtLedmfqIgd7QECsQtuKTwO/Lz7gSSVd9MxA40 a3SZgZvSNhjwV1fABluGwfcl+4WtaCSaNhYjTRD6eMnZ20+pG5zAnVQ9OgZJYRAkgGwy +7Du8SVfw9GKgpYUOHMvJMuhQq3X/B7EvOW9syI4GGLVOzV/YHxXFWZHEpIKgSCnT0kk nQAg== X-Gm-Message-State: AOJu0Yzm/VZ1ZgTgKOHt4F0f3/yiCCxst2udxlMVgg/T1gwZfPs+19B6 E09IVai72lDTB8Z9OzVJ6uXmOhF8C7zghoxkyVXdGRd4Fv+7AD1XE7FKhdHdZH19ecHf+fMDVa/ eUCsWX4lqmH1vLwDbJaJosexOuXBxgwdNshveg2650he80r4k X-Google-Smtp-Source: AGHT+IGX6Grppy14yJV8f/ALXuWTWhxcFs58DoXEsAdkinUQAZy8kul+zW+gkHQUx8NBBEvHbCvJdPjELvSl X-Received: by 2002:a05:6602:60cb:b0:7eb:7ebd:1fa6 with SMTP id ca18e2360f4ac-7ebeaef0e30mr34160839f.0.1718302551285; Thu, 13 Jun 2024 11:15:51 -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 8926c6da1cb9f-4b956992175sm41217173.30.2024.06.13.11.15.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2024 11:15:51 -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 591F3605C380; Thu, 13 Jun 2024 14:15:50 -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 3/4] dts: add methods for modifying MTU to testpmd shell Date: Thu, 13 Jun 2024 14:15:09 -0400 Message-ID: <20240613181510.30135-4-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 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 | 102 +++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/dts/framework/remote_session/testpmd_shell.py b/dts/framework/remote_session/testpmd_shell.py index 805bb3a77d..09f80cb250 100644 --- a/dts/framework/remote_session/testpmd_shell.py +++ b/dts/framework/remote_session/testpmd_shell.py @@ -20,7 +20,7 @@ from enum import Enum, auto from functools import partial from pathlib import PurePath -from typing import Callable, ClassVar +from typing import Any, Callable, ClassVar from framework.exception import InteractiveCommandExecutionError from framework.settings import SETTINGS @@ -82,6 +82,39 @@ class TestPmdForwardingModes(StrEnum): recycle_mbufs = auto() +def stop_then_start_port_decorator( + func: Callable[["TestPmdShell", int, Any, bool], None] +) -> Callable[["TestPmdShell", int, Any, bool], None]: + """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 and has a "verify" parameter (as a bool) as its last + parameter. The port ID and verify parameters will be passed into + :meth:`TestPmdShell._stop_port` so that the correct port is stopped/started and verification + takes place if desired. + + Args: + func: The function to run while the port is stopped. + + Returns: + Wrapper function that stops a port, runs the decorated function, 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. + """ + verify_value = kwargs["verify"] if "verify" in kwargs else args[-1] + shell._stop_port(port_id, verify_value) + func(shell, port_id, *args, **kwargs) + shell._start_port(port_id, verify_value) + + return wrapper + + class TestPmdShell(SingleActiveInteractiveShell): """Testpmd interactive shell. @@ -227,6 +260,73 @@ 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. + + Args: + port_id: ID of the port to take down. + verify: If :data:`True` the output will be scanned in an attempt to verify that the + stopping of ports was successful. Defaults to True. + + 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 `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. + + Args: + port_id: ID of the port to start. + verify: If :data:`True` the output will be scanned in an attempt to verify that the + port came back up without error. Defaults to True. + + 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_decorator + 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.stop() -- 2.45.1