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 2B1ED45837; Wed, 21 Aug 2024 21:40:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F17C42DD9; Wed, 21 Aug 2024 21:40:00 +0200 (CEST) Received: from mail-oo1-f99.google.com (mail-oo1-f99.google.com [209.85.161.99]) by mails.dpdk.org (Postfix) with ESMTP id 9803042DCB for ; Wed, 21 Aug 2024 21:39:59 +0200 (CEST) Received: by mail-oo1-f99.google.com with SMTP id 006d021491bc7-5da6865312eso62164eaf.3 for ; Wed, 21 Aug 2024 12:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1724269199; x=1724873999; 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=uJx0m/kGeb+KOPJAwB0kPUBYvSVqmOend5CoDhP1jOc=; b=a/ugs1bFh+X8Jdpu7bT7pJBoGyBIO2MSlCyp8FXgyhbBUmpe6r9+fnDOBuPjqf5TIV ZFJlgO1uSXWVyojywP+8RLDN9GPKlTb8XgHkTAi7mQGtV+5iWSemvv0dOzykx19tOfWz CCfJW5LX242ZTZNX2XRzwbotj8Q0TG+o+fN5I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724269199; x=1724873999; 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=uJx0m/kGeb+KOPJAwB0kPUBYvSVqmOend5CoDhP1jOc=; b=vPhZUBdi++/QqmmFasbAaMMt6WWDay8OgE0SswS/M2ISl4QRbdYnUutvIJlH3aewPg aDwXft6Ir/Aok/BXn8miqtGZDln9MiWT34mcZE3JAH8TAhbKi5JT1gvHzfkyQ1VcmJkp i6RV0GTCzN8MUS8LIlZaYnF05qY/uNVvbHeMQ8ORqU6M1ohJyta/6t572C0iWN3eT9tw ZbR/aJWpWCKnYpISLtvPOxBx9DhAl4x2KkGI9C5SMn2Vk/aE+wQpKKCThbjuQdgAaxOy PDlHlErTjsFUqbAWEu5W2II2uu76vsMFpQyn523sK6QwkaZGzEv3EZi+OvsvG69nPsOn xV5g== X-Gm-Message-State: AOJu0YyBgqji1hfsVRMPW8WQBvrPRyMAJK2FKWpTuBI31Q/sLKLluGq8 WeFTYatLXsk/+G8newCI/t+7IyDCfT37RmJISNuj4qJmkvjCUGpb3NDhSDvic4efrkT+1snhsXR FqotmYSg4CCaPC+6mAbfhkFIs4ffHKetf X-Google-Smtp-Source: AGHT+IFYdqo+JXXuz0MG0Fx0IQU2yUkve8OudO0cUD3Yky6xIYiPEDLQLydlsUEDbT/Thyk7c7VKJsV7nVmf X-Received: by 2002:a05:6820:1ad5:b0:5da:a358:98d9 with SMTP id 006d021491bc7-5dca05f704dmr4013845eaf.5.1724269198836; Wed, 21 Aug 2024 12:39:58 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id 006d021491bc7-5dc93aeb3a4sm153806eaf.14.2024.08.21.12.39.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Aug 2024 12:39:58 -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 C5EA3605C351; Wed, 21 Aug 2024 15:39:57 -0400 (EDT) From: jspewock@iol.unh.edu To: npratte@iol.unh.edu, paul.szczepanek@arm.com, thomas@monjalon.net, probb@iol.unh.edu, yoan.picchi@foss.arm.com, juraj.linkes@pantheon.tech, wathsala.vithanage@arm.com, Luca.Vizzarro@arm.com, alex.chapman@arm.com, Honnappa.Nagarahalli@arm.com Cc: dev@dpdk.org, Jeremy Spewock Subject: [RFC PATCH v2 4/5] dts: add OS abstractions for creating virtual functions Date: Wed, 21 Aug 2024 15:38:40 -0400 Message-ID: <20240821193841.21033-5-jspewock@iol.unh.edu> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821193841.21033-1-jspewock@iol.unh.edu> References: <20240821191557.18744-1-jspewock@iol.unh.edu> <20240821193841.21033-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 Virtual functions in the framework are created using SR-IOV. The process for doing this can vary depending on the operating system, so the commands to create VFs have to be abstracted into different classes based on the operating system. This patch adds the stubs for methods that create VFs and get the PCI addresses of all VFs on a port to the abstract class as well as a linux implementation for the methods. Bugzilla ID: 1500 Signed-off-by: Jeremy Spewock --- dts/framework/testbed_model/linux_session.py | 40 +++++++++++++++++++- dts/framework/testbed_model/os_session.py | 40 ++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dts/framework/testbed_model/linux_session.py b/dts/framework/testbed_model/linux_session.py index 99abc21353..738ddd7600 100644 --- a/dts/framework/testbed_model/linux_session.py +++ b/dts/framework/testbed_model/linux_session.py @@ -15,7 +15,11 @@ from typing_extensions import NotRequired -from framework.exception import ConfigurationError, RemoteCommandExecutionError +from framework.exception import ( + ConfigurationError, + InternalError, + RemoteCommandExecutionError, +) from framework.utils import expand_range from .cpu import LogicalCore @@ -210,3 +214,37 @@ def configure_ipv4_forwarding(self, enable: bool) -> None: """Overrides :meth:`~.os_session.OSSession.configure_ipv4_forwarding`.""" state = 1 if enable else 0 self.send_command(f"sysctl -w net.ipv4.ip_forward={state}", privileged=True) + + def set_num_virtual_functions(self, num: int, pf_port: Port) -> bool: + """Overrides :meth:`~.os_session.OSSession.set_num_virtual_functions`.""" + sys_bus_path = f"/sys/bus/pci/devices/{pf_port.pci}/sriov_numvfs".replace(":", "\\:") + curr_num_vfs = int(self.send_command(f"cat {sys_bus_path}").stdout) + if num > 0 and curr_num_vfs >= num: + self._logger.info( + f"{curr_num_vfs} VFs already configured on port {pf_port.identifier.pci} on node " + f"{pf_port.identifier.node}." + ) + return False + elif num > 0 and curr_num_vfs > 0: + self._logger.error( + f"Not enough VFs configured on port {pf_port.identifier.pci} on node " + f"{pf_port.identifier.node}. Need {num} but only {curr_num_vfs} are configured. " + "DTS is unable to modify number of preexisting VFs." + ) + raise InternalError("Failed to create VFs on port.") + self.send_command(f"echo {num} > {sys_bus_path}", privileged=True, verify=True) + return True + + def get_pci_addr_of_vfs(self, pf_port: Port) -> list[str]: + """Overrides :meth:`~.os_session.OSSession.get_pci_addr_of_vfs`.""" + sys_bus_path = f"/sys/bus/pci/devices/{pf_port.pci}".replace(":", "\\:") + curr_num_vfs = int(self.send_command(f"cat {sys_bus_path}/sriov_numvfs").stdout) + if curr_num_vfs > 0: + pci_addrs = self.send_command( + 'awk -F "PCI_SLOT_NAME=" "/PCI_SLOT_NAME=/ {print \\$2}" ' + + f"{sys_bus_path}/virtfn*/uevent", + privileged=True, + ) + return pci_addrs.stdout.splitlines() + else: + return [] diff --git a/dts/framework/testbed_model/os_session.py b/dts/framework/testbed_model/os_session.py index 79f56b289b..191fc3c0c8 100644 --- a/dts/framework/testbed_model/os_session.py +++ b/dts/framework/testbed_model/os_session.py @@ -395,3 +395,43 @@ def configure_ipv4_forwarding(self, enable: bool) -> None: Args: enable: If :data:`True`, enable the forwarding, otherwise disable it. """ + + @abstractmethod + def set_num_virtual_functions(self, num: int, pf_port: Port) -> bool: + """Update the number of virtual functions (VFs) on a port. + + It should be noted that, due to the nature of VFs, if there are already VFs that exist on + the physical function (PF) prior to calling this function, additional ones cannot be added. + The only way to add more VFs is to remove the existing and then set the desired amount. For + this reason, this method will handle creation in the following order: + + 1. Use existing VFs on the PF if the number of existing VFs is greater than or equal to + `num` + 2. Throw an exception noting that VFs cannot be created if the PF has some VFs already set + on it, but the total VFs that it has are less then `num`. + 3. Create `num` VFs on the PF if there are none on it already + + Args: + num: The number of VFs to set on the port. + pf_port: The port to add the VFs to. + + Raises: + InternalError: If `pf_port` has less than `num` VFs configured on it + already. + + Returns: + :data:`True` if this method successfully created VFs, :data:`False` if existing VFs + were used instead. + """ + + @abstractmethod + def get_pci_addr_of_vfs(self, pf_port: Port) -> list[str]: + """Find the PCI addresses of all virtual functions (VFs) on the port `pf_port`. + + Args: + pf_port: The port to find the VFs on. + + Returns: + A list containing all of the PCI addresses of the VFs on the port. If the port has no + VFs then the list will be empty. + """ -- 2.46.0