From patchwork Thu Apr 18 16:10:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Pratte X-Patchwork-Id: 139495 X-Patchwork-Delegate: thomas@monjalon.net 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 B3D0A43EA6; Thu, 18 Apr 2024 18:10:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5150340272; Thu, 18 Apr 2024 18:10:42 +0200 (CEST) Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by mails.dpdk.org (Postfix) with ESMTP id 016B640042 for ; Thu, 18 Apr 2024 18:10:40 +0200 (CEST) Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-437618fb928so2253261cf.3 for ; Thu, 18 Apr 2024 09:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1713456640; x=1714061440; 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=iC30U2UqvOdA3kOrUO5oFXqG0aLRGTr0R4UWFMtGm3Q=; b=RkFMvFfb7RaMbCujV/isWCn6Q1J3hXbw5vxbysjwxkpGg1N5idRbmlrz9vI0AZdHI1 YMKxeUJ/gG984DrdglIS8sCC1T0DIuWbZJoyCTgghlS39HeN2MGn5Neas2PH9LG1/LUB O6+p8jkfh9s3fETcg/oth9AaqUCII21T1/HJo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713456640; x=1714061440; 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=iC30U2UqvOdA3kOrUO5oFXqG0aLRGTr0R4UWFMtGm3Q=; b=fCmOv0uQYVTsYfxYvwZCxrdbET1rALjld9J06Dtn/W03M130ov3EpjuYnPNolW6NHn baELqsB358mVLT3BNrSxUYaBQDCCMzTvkGtvGfYAt2P5XbqfPqElrRiWmAHuwLKX/SMA oXbkC+rM2tQqZdBI0rPomdD4vtW3TnPuXSfU2Vw+eoI06TG5usWyRseFvx0PckAepqv2 bsqjZ4QV2vesjb26qdca5+ZksP9OKT3699mY5UgyCo5BwMWQ0Xp195WOu1y/jia4AtsM KN+bSb/fRoHd+GjjPB0b3705x7NbkcPowOdJ6qmwekRzhKx8WsD6MNTkg+4+XTAU85g9 vF9g== X-Gm-Message-State: AOJu0YzEJohT2v6EJj3tkWxbpQ/Dbc4Bu6y0LQ/MhW7X/Z3Vh9TNm0TV 2mgOJj9+0bIzstDefkdVgIevhDAMw/Bj1gLovNsrHf27F3PX3+8hX4apTer4yHE= X-Google-Smtp-Source: AGHT+IGlkabH3f0yZhGQ0bOCVsmH41oMIzyIEbMzmfUlEH3hIuIWePrHYPCiZNvFcvzWHsaN4+EQOg== X-Received: by 2002:ad4:5c8f:0:b0:69b:ce6:271b with SMTP id o15-20020ad45c8f000000b0069b0ce6271bmr3641548qvh.2.1713456640189; Thu, 18 Apr 2024 09:10:40 -0700 (PDT) Received: from d121028.iol.unh.edu ([2606:4100:3880:1210:6b7c:4d95:9fb1:d9d6]) by smtp.gmail.com with ESMTPSA id d17-20020a0cf0d1000000b006a04769b5a7sm742095qvl.110.2024.04.18.09.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 09:10:39 -0700 (PDT) From: Nicholas Pratte To: jspewock@iol.unh.edu, wathsala.vithanage@arm.com, Honnappa.Nagarahalli@arm.com, probb@iol.unh.edu, thomas@monjalon.net, mb@smartsharesystems.com, bruce.richardson@intel.com, juraj.linkes@pantheon.tech, yoan.picchi@foss.arm.com, paul.szczepanek@arm.com Cc: dev@dpdk.org, Nicholas Pratte Subject: [PATCH v4] dts: Change hugepage runtime config to 2MB Exclusively Date: Thu, 18 Apr 2024 12:10:26 -0400 Message-ID: <20240418161026.2839-1-npratte@iol.unh.edu> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240404153106.19047-1-npratte@iol.unh.edu> References: <20240404153106.19047-1-npratte@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 The previous implementation configures and allocates hugepage sizes based on a system default. This can lead to two problems: overallocation of hugepages (which may crash the remote host), and configuration of hugepage sizes that are not recommended during runtime. This new implementation allows only 2MB hugepage allocation during runtime; any other unique hugepage size must be configured by the end-user for initializing DTS. If the amount of 2MB hugepages requested exceeds the amount of 2MB hugepages already configured on the system, then the system will remount hugepages to cover the difference. If the amount of hugepages requested is either less than or equal to the amount already configured on the system, then nothing is done. Bugzilla ID: 1370 Signed-off-by: Nicholas Pratte Reviewed-by: Jeremy Spewock --- v4: * dts.rst punctuation/grammar corrections and 2mb exclusivity justifications included in documentation --- doc/guides/tools/dts.rst | 6 ++++- dts/conf.yaml | 4 ++-- dts/framework/config/__init__.py | 4 ++-- dts/framework/config/conf_yaml_schema.json | 6 ++--- dts/framework/config/types.py | 2 +- dts/framework/testbed_model/linux_session.py | 24 +++++++++++--------- dts/framework/testbed_model/node.py | 8 ++++++- dts/framework/testbed_model/os_session.py | 5 +++- 8 files changed, 37 insertions(+), 22 deletions(-) diff --git a/doc/guides/tools/dts.rst b/doc/guides/tools/dts.rst index 47b218b2c6..71473dbb3d 100644 --- a/doc/guides/tools/dts.rst +++ b/doc/guides/tools/dts.rst @@ -131,7 +131,11 @@ There are two areas that need to be set up on a System Under Test: You may specify the optional hugepage configuration in the DTS config file. If you do, DTS will take care of configuring hugepages, - overwriting your current SUT hugepage configuration. + overwriting your current SUT hugepage configuration. Configuration of hugepages via DTS + allows only for allocation of 2MB hugepages, as doing so prevents accidental/over + allocation of hugepages and hugepages sizes not recommended during runtime due to + contiguous memory space requirements. Thus, if you require hugepage + sizes not equal to 2MB, then this configuration must be done outside of the DTS framework. * System under test configuration diff --git a/dts/conf.yaml b/dts/conf.yaml index 8068345dd5..56c3ae6f4c 100644 --- a/dts/conf.yaml +++ b/dts/conf.yaml @@ -35,7 +35,7 @@ nodes: lcores: "" # use all the available logical cores use_first_core: false # tells DPDK to use any physical core memory_channels: 4 # tells DPDK to use 4 memory channels - hugepages: # optional; if removed, will use system hugepage configuration + hugepages_2mb: # optional; if removed, will use system hugepage configuration amount: 256 force_first_numa: false ports: @@ -71,7 +71,7 @@ nodes: os_driver: rdma peer_node: "SUT 1" peer_pci: "0000:00:08.1" - hugepages: # optional; if removed, will use system hugepage configuration + hugepages_2mb: # optional; if removed, will use system hugepage configuration amount: 256 force_first_numa: false traffic_generator: diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py index 4cb5c74059..b6f820e39e 100644 --- a/dts/framework/config/__init__.py +++ b/dts/framework/config/__init__.py @@ -255,8 +255,8 @@ def from_dict( Either an SUT or TG configuration instance. """ hugepage_config = None - if "hugepages" in d: - hugepage_config_dict = d["hugepages"] + if "hugepages_2mb" in d: + hugepage_config_dict = d["hugepages_2mb"] if "force_first_numa" not in hugepage_config_dict: hugepage_config_dict["force_first_numa"] = False hugepage_config = HugepageConfiguration(**hugepage_config_dict) diff --git a/dts/framework/config/conf_yaml_schema.json b/dts/framework/config/conf_yaml_schema.json index 4731f4511d..f4d7199523 100644 --- a/dts/framework/config/conf_yaml_schema.json +++ b/dts/framework/config/conf_yaml_schema.json @@ -146,7 +146,7 @@ "compiler" ] }, - "hugepages": { + "hugepages_2mb": { "type": "object", "description": "Optional hugepage configuration. If not specified, hugepages won't be configured and DTS will use system configuration.", "properties": { @@ -253,8 +253,8 @@ "type": "integer", "description": "How many memory channels to use. Optional, defaults to 1." }, - "hugepages": { - "$ref": "#/definitions/hugepages" + "hugepages_2mb": { + "$ref": "#/definitions/hugepages_2mb" }, "ports": { "type": "array", diff --git a/dts/framework/config/types.py b/dts/framework/config/types.py index 1927910d88..016e0c3dbd 100644 --- a/dts/framework/config/types.py +++ b/dts/framework/config/types.py @@ -46,7 +46,7 @@ class NodeConfigDict(TypedDict): """Allowed keys and values.""" #: - hugepages: HugepageConfigurationDict + hugepages_2mb: HugepageConfigurationDict #: name: str #: diff --git a/dts/framework/testbed_model/linux_session.py b/dts/framework/testbed_model/linux_session.py index 5d24030c3d..d0f7cfa77c 100644 --- a/dts/framework/testbed_model/linux_session.py +++ b/dts/framework/testbed_model/linux_session.py @@ -15,7 +15,7 @@ from typing_extensions import NotRequired -from framework.exception import RemoteCommandExecutionError +from framework.exception import ConfigurationError, RemoteCommandExecutionError from framework.utils import expand_range from .cpu import LogicalCore @@ -84,14 +84,20 @@ def get_dpdk_file_prefix(self, dpdk_prefix: str) -> str: """Overrides :meth:`~.os_session.OSSession.get_dpdk_file_prefix`.""" return dpdk_prefix - def setup_hugepages(self, hugepage_count: int, force_first_numa: bool) -> None: + def setup_hugepages( + self, hugepage_count: int, hugepage_size: int, force_first_numa: bool + ) -> None: """Overrides :meth:`~.os_session.OSSession.setup_hugepages`.""" self._logger.info("Getting Hugepage information.") - hugepage_size = self._get_hugepage_size() - hugepages_total = self._get_hugepages_total() + hugepages_total = self._get_hugepages_total(hugepage_size) + if ( + f"hugepages-{hugepage_size}kB" + not in self.send_command("ls /sys/kernel/mm/hugepages").stdout + ): + raise ConfigurationError("hugepage size not supported by operating system") self._numa_nodes = self._get_numa_nodes() - if force_first_numa or hugepages_total != hugepage_count: + if force_first_numa or hugepages_total < hugepage_count: # when forcing numa, we need to clear existing hugepages regardless # of size, so they can be moved to the first numa node self._configure_huge_pages(hugepage_count, hugepage_size, force_first_numa) @@ -99,13 +105,9 @@ def setup_hugepages(self, hugepage_count: int, force_first_numa: bool) -> None: self._logger.info("Hugepages already configured.") self._mount_huge_pages() - def _get_hugepage_size(self) -> int: - hugepage_size = self.send_command("awk '/Hugepagesize/ {print $2}' /proc/meminfo").stdout - return int(hugepage_size) - - def _get_hugepages_total(self) -> int: + def _get_hugepages_total(self, hugepage_size: int) -> int: hugepages_total = self.send_command( - "awk '/HugePages_Total/ { print $2 }' /proc/meminfo" + f"cat /sys/kernel/mm/hugepages/hugepages-{hugepage_size}kB/nr_hugepages" ).stdout return int(hugepages_total) diff --git a/dts/framework/testbed_model/node.py b/dts/framework/testbed_model/node.py index 74061f6262..056a031ca0 100644 --- a/dts/framework/testbed_model/node.py +++ b/dts/framework/testbed_model/node.py @@ -97,6 +97,10 @@ def __init__(self, node_config: NodeConfiguration): self.virtual_devices = [] self._init_ports() + @property + def _hugepage_default_size(self) -> int: + return 2048 + def _init_ports(self) -> None: self.ports = [Port(self.name, port_config) for port_config in self.config.ports] self.main_session.update_ports(self.ports) @@ -266,7 +270,9 @@ def _setup_hugepages(self) -> None: """ if self.config.hugepages: self.main_session.setup_hugepages( - self.config.hugepages.amount, self.config.hugepages.force_first_numa + self.config.hugepages.amount, + self._hugepage_default_size, + self.config.hugepages.force_first_numa, ) def configure_port_state(self, port: Port, enable: bool = True) -> None: diff --git a/dts/framework/testbed_model/os_session.py b/dts/framework/testbed_model/os_session.py index d5bf7e0401..5d58400cbe 100644 --- a/dts/framework/testbed_model/os_session.py +++ b/dts/framework/testbed_model/os_session.py @@ -345,7 +345,9 @@ def get_dpdk_file_prefix(self, dpdk_prefix: str) -> str: """ @abstractmethod - def setup_hugepages(self, hugepage_count: int, force_first_numa: bool) -> None: + def setup_hugepages( + self, hugepage_count: int, hugepage_size: int, force_first_numa: bool + ) -> None: """Configure hugepages on the node. Get the node's Hugepage Size, configure the specified count of hugepages @@ -353,6 +355,7 @@ def setup_hugepages(self, hugepage_count: int, force_first_numa: bool) -> None: Args: hugepage_count: Configure this many hugepages. + hugepage_size: Configure hugepages of this size (currently not used in the config) force_first_numa: If :data:`True`, configure hugepages just on the first numa node. """