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 07B9341D52; Thu, 23 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 0D3404300F; Thu, 23 Feb 2023 16:28:59 +0100 (CET) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mails.dpdk.org (Postfix) with ESMTP id A58F542D49 for ; Thu, 23 Feb 2023 16:28:50 +0100 (CET) Received: by mail-ed1-f45.google.com with SMTP id x10so42652010edd.13 for ; Thu, 23 Feb 2023 07:28:50 -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=gwpomXvQ5ohcQo1GIv1IfW9vLWL82JIhiAShINbaSKY=; b=kV+pyeB/q3O+50H13q1ECamQ6x6HRW9ajrDqzlW5rLOcr7iavkJvHMyRcIcqd0QeYN SGDE4civG5SIjFK+s7pKqVzT+rRIW2vBdBE9l+7zoRFozT2V37fWX/ZQq/wziN87xVoo 7nFjTQib+MABbeT0AjSJu4WdL4O7xU0nkCEfgn6lrHbJm6euJacJPpB7hmDrByMHg3v5 EMLIKgu9hWeqaxNZ/AJJGDfXYaMVdXb+PWsZhmgtsxfzM2U5IXEyde8XsLhnpBP8wkoI PnI0TBSXq408QkPv0oipnNFvvudfPuccmC6s9dz5mm97dcCO3m28dtiFd0KPx2HKtfBX zQlw== 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=gwpomXvQ5ohcQo1GIv1IfW9vLWL82JIhiAShINbaSKY=; b=E0KHumwUqSZN77BGKl4KbB2gRjO9cAwq/YpDBnbpaThgGAGwp6PADoxjJb70+7DjvN ll6TFEkopxKBi9lB52W5O5Me8B5lBhzTQuA9dCpDtloVIGbvsL6NH9Oxctf9GjEyTuPH vi5kLx4QWVdE3CxCbiq5tsch92AIyjowfJonFeqUmirmCCw/C9OM0jGyK2J1vE9UTfsy ayi0kwW4TrOoq+XaUterI98BYIOeS1UCLZTa2wI9CwPPTeuFU5CO2jATCB5bwk//SPFa 2xK1F0XcP4WWi/9xyXPUjek5n9FrhdNTZboGq3e63k1bcegTyVJ3mOSbGKzI+egEQlpk EORA== X-Gm-Message-State: AO0yUKUCorwaEHGFSWZq7XqJfl8Z2uPuQre29LMm8JQsCxGpwHCB+FPP hEaaQU4WTYnPFglkFkXTjuLmCg== X-Google-Smtp-Source: AK7set+25ylUZ3rNU9wnJLUHrfxQ3lEhyneow7UZIxrPBdEcVOBiSx/5nN9+BOEsOcQH/cLq0T1OZQ== X-Received: by 2002:a05:6402:1203:b0:4ac:c1bf:2a26 with SMTP id c3-20020a056402120300b004acc1bf2a26mr13428813edw.12.1677166130404; Thu, 23 Feb 2023 07:28:50 -0800 (PST) Received: from localhost.localdomain ([84.245.121.112]) by smtp.gmail.com with ESMTPSA id r6-20020a50c006000000b004af6a8617ffsm1158892edb.46.2023.02.23.07.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:28:50 -0800 (PST) From: =?UTF-8?q?Juraj=20Linke=C5=A1?= To: thomas@monjalon.net, Honnappa.Nagarahalli@arm.com, lijuan.tu@intel.com, bruce.richardson@intel.com, probb@iol.unh.edu Cc: dev@dpdk.org, =?UTF-8?q?Juraj=20Linke=C5=A1?= Subject: [PATCH v5 05/10] dts: add node memory setup Date: Thu, 23 Feb 2023 16:28:35 +0100 Message-Id: <20230223152840.634183-6-juraj.linkes@pantheon.tech> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230223152840.634183-1-juraj.linkes@pantheon.tech> References: <20230213152846.284191-1-juraj.linkes@pantheon.tech> <20230223152840.634183-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..6540a45ef7 100644 --- a/dts/conf.yaml +++ b/dts/conf.yaml @@ -18,3 +18,6 @@ nodes: lcores: "" use_first_core: false memory_channels: 4 + hugepages: # optional; if removed, will use system hugepage configuration + 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 c49b6bb1d7..a1e3bc3a92 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 b93b9d238e..2dcbd64e71 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: @@ -150,6 +151,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