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 C439741C8A; Mon, 13 Feb 2023 16:29:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CDCD342D3C; Mon, 13 Feb 2023 16:29:05 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 4E30E42D1A for ; Mon, 13 Feb 2023 16:28:57 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id m10so3733531wrn.4 for ; Mon, 13 Feb 2023 07:28:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pantheon-tech.20210112.gappssmtp.com; s=20210112; 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=gBDj+5ADqlYCkwAAlfSnmwTUuRNk13H6KBdRKT5cxPo=; b=0OJScfoQjdpAfLoRKBQp2CWk6yKTy6ZhzJpVQMRPZlz5gk8JG2BG5tr5TunSwSqVnH 4V0/ddlTtfLgeZcI2WYq3QhnyhugBCc2aq1kLlUjBXqF+0WLG5h1LPRc8d6ndArp1VNs wqXJz1ewn+67rNX10Yxwbz8JjM3+0+mUTgPS/FNMBRYvXriuRpDi3M9TgHreU5YiXE8H /7oANAoLVnqQemOxR680Iy11NWWM+SkLRL5ZWLF3CRSGWkT0LpUhibi0eTeBX4WnZgDw Q6E7nMpjDhfKH83cWk8aYJ2isBC54uN0DhOcb5dKzuCt1LgTVGs08Uym/2S+Jp+RT9yQ HMWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=gBDj+5ADqlYCkwAAlfSnmwTUuRNk13H6KBdRKT5cxPo=; b=uQsD0AsmWe7+huA90FohiHFo9f5VhJV8MpeLsPe/3RgWo9NiowOvdmshB2EVxEL4CP 9uiW9NWgm9IDeXCCWOEtrchQlqpF+JHS7D23o4yr3lqwomfJaSgL2iT4fi39XeyGZV+K qlozhzIHcG0GiEsGGpzmhlVeCTi4nWDCBYdkBZlc+eFSaaWM2G1rJrVEjYBCENZm6+E2 74cIwQ2nAeKDpXmaEuhfV0udThB7qQQAzJyzUp231KQfZH/P3vKfV3c83+9uDKIBfqR/ h86L53D6xLl+DI1o5hVTgaAHL42bVNw8aJFDDA2Xvpu6aj+DX8/Z5L73iya9x1vCfa4A cPAA== X-Gm-Message-State: AO0yUKV9zKDPbkMCJPKCsmGTT31FAs+sZlpUbM5rt1T5XMLgh1b32Uhy 01sNi6dQhRcau75wCQjegp868g== X-Google-Smtp-Source: AK7set8QZcQkDdR84lGPqOvnfOooMGUEsSwC7vGdGkRFJ5Hv8nlzmiD1k6G6v2OEUfBtuim4Jx830w== X-Received: by 2002:adf:f311:0:b0:2c5:530d:404e with SMTP id i17-20020adff311000000b002c5530d404emr5235276wro.30.1676302136921; Mon, 13 Feb 2023 07:28:56 -0800 (PST) Received: from localhost.localdomain ([84.245.121.112]) by smtp.gmail.com with ESMTPSA id d13-20020adfe88d000000b002c54f4d0f71sm5848613wrm.38.2023.02.13.07.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 07:28:56 -0800 (PST) From: =?UTF-8?q?Juraj=20Linke=C5=A1?= To: thomas@monjalon.net, Honnappa.Nagarahalli@arm.com, ohilyard@iol.unh.edu, lijuan.tu@intel.com, bruce.richardson@intel.com, wathsala.vithanage@arm.com, probb@iol.unh.edu Cc: dev@dpdk.org, =?UTF-8?q?Juraj=20Linke=C5=A1?= Subject: [PATCH v4 05/10] dts: add node memory setup Date: Mon, 13 Feb 2023 16:28:41 +0100 Message-Id: <20230213152846.284191-6-juraj.linkes@pantheon.tech> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230213152846.284191-1-juraj.linkes@pantheon.tech> References: <20230117154906.860916-1-juraj.linkes@pantheon.tech> <20230213152846.284191-1-juraj.linkes@pantheon.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 Setup hugepages on nodes. This is useful not only on SUT nodes, but also on TG nodes which use TGs that utilize hugepages. The setup is opt-in, i.e. users need to supply hugepage configuration to instruct DTS to configure them. It not configured, hugepage configuration will be skipped. This is helpful if users don't want DTS to tamper with hugepages on their system. Signed-off-by: Juraj Linkeš --- dts/conf.yaml | 3 + dts/framework/config/__init__.py | 14 ++++ dts/framework/config/conf_yaml_schema.json | 21 +++++ dts/framework/remote_session/linux_session.py | 78 +++++++++++++++++++ dts/framework/remote_session/os_session.py | 8 ++ dts/framework/testbed_model/node.py | 12 +++ 6 files changed, 136 insertions(+) diff --git a/dts/conf.yaml b/dts/conf.yaml index 1648e5c3c5..32ec6e97a5 100644 --- a/dts/conf.yaml +++ b/dts/conf.yaml @@ -18,3 +18,6 @@ nodes: lcores: "" use_first_core: false memory_channels: 4 + hugepages: + amount: 256 + force_first_numa: false diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py index 17b917f3b3..0e5f493c5d 100644 --- a/dts/framework/config/__init__.py +++ b/dts/framework/config/__init__.py @@ -66,6 +66,12 @@ class Compiler(StrEnum): # # Frozen makes the object immutable. This enables further optimizations, # and makes it thread safe should we every want to move in that direction. +@dataclass(slots=True, frozen=True) +class HugepageConfiguration: + amount: int + force_first_numa: bool + + @dataclass(slots=True, frozen=True) class NodeConfiguration: name: str @@ -77,9 +83,16 @@ class NodeConfiguration: lcores: str use_first_core: bool memory_channels: int + hugepages: HugepageConfiguration | None @staticmethod def from_dict(d: dict) -> "NodeConfiguration": + hugepage_config = d.get("hugepages") + if hugepage_config: + if "force_first_numa" not in hugepage_config: + hugepage_config["force_first_numa"] = False + hugepage_config = HugepageConfiguration(**hugepage_config) + return NodeConfiguration( name=d["name"], hostname=d["hostname"], @@ -90,6 +103,7 @@ def from_dict(d: dict) -> "NodeConfiguration": lcores=d.get("lcores", "1"), use_first_core=d.get("use_first_core", False), memory_channels=d.get("memory_channels", 1), + hugepages=hugepage_config, ) diff --git a/dts/framework/config/conf_yaml_schema.json b/dts/framework/config/conf_yaml_schema.json index 334b4bd8ab..56f93def36 100644 --- a/dts/framework/config/conf_yaml_schema.json +++ b/dts/framework/config/conf_yaml_schema.json @@ -75,6 +75,24 @@ "cpu", "compiler" ] + }, + "hugepages": { + "type": "object", + "description": "Optional hugepage configuration. If not specified, hugepages won't be configured and DTS will use system configuration.", + "properties": { + "amount": { + "type": "integer", + "description": "The amount of hugepages to configure. Hugepage size will be the system default." + }, + "force_first_numa": { + "type": "boolean", + "description": "Set to True to force configuring hugepages on the first NUMA node. Defaults to False." + } + }, + "additionalProperties": false, + "required": [ + "amount" + ] } }, "type": "object", @@ -118,6 +136,9 @@ "memory_channels": { "type": "integer", "description": "How many memory channels to use. Optional, defaults to 1." + }, + "hugepages": { + "$ref": "#/definitions/hugepages" } }, "additionalProperties": false, diff --git a/dts/framework/remote_session/linux_session.py b/dts/framework/remote_session/linux_session.py index 6809102038..5257d5e381 100644 --- a/dts/framework/remote_session/linux_session.py +++ b/dts/framework/remote_session/linux_session.py @@ -2,7 +2,9 @@ # Copyright(c) 2023 PANTHEON.tech s.r.o. # Copyright(c) 2023 University of New Hampshire +from framework.exception import RemoteCommandExecutionError from framework.testbed_model import LogicalCore +from framework.utils import expand_range from .posix_session import PosixSession @@ -27,3 +29,79 @@ def get_remote_cpus(self, use_first_core: bool) -> list[LogicalCore]: def get_dpdk_file_prefix(self, dpdk_prefix) -> str: return dpdk_prefix + + def setup_hugepages(self, hugepage_amount: int, force_first_numa: bool) -> None: + self._logger.info("Getting Hugepage information.") + hugepage_size = self._get_hugepage_size() + hugepages_total = self._get_hugepages_total() + self._numa_nodes = self._get_numa_nodes() + + if force_first_numa or hugepages_total != hugepage_amount: + # 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_amount, hugepage_size, force_first_numa) + else: + self._logger.info("Hugepages already configured.") + self._mount_huge_pages() + + def _get_hugepage_size(self) -> int: + hugepage_size = self.remote_session.send_command( + "awk '/Hugepagesize/ {print $2}' /proc/meminfo" + ).stdout + return int(hugepage_size) + + def _get_hugepages_total(self) -> int: + hugepages_total = self.remote_session.send_command( + "awk '/HugePages_Total/ { print $2 }' /proc/meminfo" + ).stdout + return int(hugepages_total) + + def _get_numa_nodes(self) -> list[int]: + try: + numa_count = self.remote_session.send_command( + "cat /sys/devices/system/node/online", verify=True + ).stdout + numa_range = expand_range(numa_count) + except RemoteCommandExecutionError: + # the file doesn't exist, meaning the node doesn't support numa + numa_range = [] + return numa_range + + def _mount_huge_pages(self) -> None: + self._logger.info("Re-mounting Hugepages.") + hugapge_fs_cmd = "awk '/hugetlbfs/ { print $2 }' /proc/mounts" + self.remote_session.send_command(f"umount $({hugapge_fs_cmd})") + result = self.remote_session.send_command(hugapge_fs_cmd) + if result.stdout == "": + remote_mount_path = "/mnt/huge" + self.remote_session.send_command(f"mkdir -p {remote_mount_path}") + self.remote_session.send_command( + f"mount -t hugetlbfs nodev {remote_mount_path}" + ) + + def _supports_numa(self) -> bool: + # the system supports numa if self._numa_nodes is non-empty and there are more + # than one numa node (in the latter case it may actually support numa, but + # there's no reason to do any numa specific configuration) + return len(self._numa_nodes) > 1 + + def _configure_huge_pages( + self, amount: int, size: int, force_first_numa: bool + ) -> None: + self._logger.info("Configuring Hugepages.") + hugepage_config_path = ( + f"/sys/kernel/mm/hugepages/hugepages-{size}kB/nr_hugepages" + ) + if force_first_numa and self._supports_numa(): + # clear non-numa hugepages + self.remote_session.send_command( + f"echo 0 | sudo tee {hugepage_config_path}" + ) + hugepage_config_path = ( + f"/sys/devices/system/node/node{self._numa_nodes[0]}/hugepages" + f"/hugepages-{size}kB/nr_hugepages" + ) + + self.remote_session.send_command( + f"echo {amount} | sudo tee {hugepage_config_path}" + ) diff --git a/dts/framework/remote_session/os_session.py b/dts/framework/remote_session/os_session.py index c30753e0b8..4753c70e91 100644 --- a/dts/framework/remote_session/os_session.py +++ b/dts/framework/remote_session/os_session.py @@ -151,3 +151,11 @@ def get_dpdk_file_prefix(self, dpdk_prefix) -> str: """ Get the DPDK file prefix that will be used when running DPDK apps. """ + + @abstractmethod + def setup_hugepages(self, hugepage_amount: int, force_first_numa: bool) -> None: + """ + Get the node's Hugepage Size, configure the specified amount of hugepages + if needed and mount the hugepages if needed. + If force_first_numa is True, configure hugepages just on the first socket. + """ diff --git a/dts/framework/testbed_model/node.py b/dts/framework/testbed_model/node.py index cf2af2ca72..6c9e976947 100644 --- a/dts/framework/testbed_model/node.py +++ b/dts/framework/testbed_model/node.py @@ -59,6 +59,7 @@ def set_up_execution(self, execution_config: ExecutionConfiguration) -> None: Perform the execution setup that will be done for each execution this node is part of. """ + self._setup_hugepages() self._set_up_execution(execution_config) def _set_up_execution(self, execution_config: ExecutionConfiguration) -> None: @@ -153,6 +154,17 @@ def _get_remote_cpus(self) -> None: self._logger.info("Getting CPU information.") self.lcores = self.main_session.get_remote_cpus(self.config.use_first_core) + def _setup_hugepages(self): + """ + Setup hugepages on the Node. Different architectures can supply different + amounts of memory for hugepages and numa-based hugepage allocation may need + to be considered. + """ + if self.config.hugepages: + self.main_session.setup_hugepages( + self.config.hugepages.amount, self.config.hugepages.force_first_numa + ) + def close(self) -> None: """ Close all connections and free other resources. -- 2.30.2