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 352F1440E3; Thu, 30 May 2024 19:59:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5142410E8; Thu, 30 May 2024 19:59:18 +0200 (CEST) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by mails.dpdk.org (Postfix) with ESMTP id 66F92406FF for ; Thu, 30 May 2024 19:59:17 +0200 (CEST) Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-794b0af01d7so2399285a.2 for ; Thu, 30 May 2024 10:59:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1717091957; x=1717696757; 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=U3IaS1Ay9p2LUGEpHyu9TZeS1opAVGBSkiLjpASH+GE=; b=U+FtMvEMF90kLL0hXd6EJyA2C77PzGhx6kZU01aOAmPHsUi6gM5w//RVdQq/890oNj S7SUYIG+Wp6sbofDnz0IVLjDUHjxqoAUhJ4dTsmKfAxSjYGEwbkFzkqdj8J56ixz8DaZ 9LQDYNB4tQ2E9pecqv9w8ZiNv6P26GZMT8fZE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717091957; x=1717696757; 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=U3IaS1Ay9p2LUGEpHyu9TZeS1opAVGBSkiLjpASH+GE=; b=HGB/pjTHwFumVuQUt6o7mI5KWxoR7CyTI/NFi1Gp0saZcwfgkgndszOwZtb3+geNEE quOgjblcoueJzL9761dyjySq/SGZMcZHNTmLhweIicdFzTNVllFlOCZzWNcuB1TSFzn8 jeq0Cy1n8Gb4/w9I1pxRI17PjVhZeRiWmGB+8vrmEwiZHQAi70pS65OnlWQ65sRkilD8 iHs0L1QGOc5/DvdDlj29Y4bFvNUgUKEttMOPMF/Y2TbIcIFio87QKy+Jv5zzIedVzNVW SRIz2lOxcOyQROT3kn14BTXVFBOWZrZWepHw+Annaz37U805Ra2g66R+8y5G+spLLOE6 rr+w== X-Gm-Message-State: AOJu0Yw43dexteM27Zdr5fHkA13Pm/hjFMpUzQ44861UVQ8J0nnmCKAJ PAgPAgI+i715tZ58dPS5u2kd3uxudxWEQ8qedhMx37qVKpgtU4JCjQvin6FyFBM= X-Google-Smtp-Source: AGHT+IEyrlVRIFACM3+FuDkqbsh6gK4jyfISundtJ6WWJZsYeu2FVNcHQaKKTAczKU6P6Ysi1+w/fw== X-Received: by 2002:a05:620a:4048:b0:794:c6a0:258a with SMTP id af79cd13be357-794e9e16b8cmr318001285a.4.1717091956638; Thu, 30 May 2024 10:59:16 -0700 (PDT) Received: from localhost.unh.edu ([2606:4100:3880:1271:e2f8:4ec3:8bf3:864c]) by smtp.gmail.com with ESMTPSA id af79cd13be357-794f2f12a49sm2826385a.46.2024.05.30.10.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 May 2024 10:59:16 -0700 (PDT) From: Nicholas Pratte To: Honnappa.Nagarahalli@arm.com, jspewock@iol.unh.edu, paul.szczepanek@arm.com, bruce.richardson@intel.com, yoan.picchi@foss.arm.com, probb@iol.unh.edu, luca.vizzarro@arm.com, juraj.linkes@pantheon.tech Cc: dev@dpdk.org, Nicholas Pratte Subject: [PATCH v7 2/2] dts: Change hugepage 'amount' to a different term Date: Thu, 30 May 2024 13:58:49 -0400 Message-ID: <20240530175852.7382-3-npratte@iol.unh.edu> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240530175852.7382-1-npratte@iol.unh.edu> References: <20240430184533.29247-4-npratte@iol.unh.edu> <20240530175852.7382-1-npratte@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 The term 'amount' is used for uncountable nouns. Since total hugepages is a discrete value (i.e. countable), the declaration of the 'amount' key value pair should be changes to a different term in both the config and the rest of the code. --- * v8: Decided on a variable name "number_of" to be used throughout the * configuration. --- 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 | 10 +++++----- dts/framework/testbed_model/node.py | 2 +- dts/framework/testbed_model/os_session.py | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dts/conf.yaml b/dts/conf.yaml index 56c3ae6f4c..ce475776a7 100644 --- a/dts/conf.yaml +++ b/dts/conf.yaml @@ -36,7 +36,7 @@ nodes: use_first_core: false # tells DPDK to use any physical core memory_channels: 4 # tells DPDK to use 4 memory channels hugepages_2mb: # optional; if removed, will use system hugepage configuration - amount: 256 + number_of: 256 force_first_numa: false ports: # sets up the physical link between "SUT 1"@000:00:08.0 and "TG 1"@0000:00:08.0 @@ -72,7 +72,7 @@ nodes: peer_node: "SUT 1" peer_pci: "0000:00:08.1" hugepages_2mb: # optional; if removed, will use system hugepage configuration - amount: 256 + number_of: 256 force_first_numa: false traffic_generator: type: SCAPY diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py index b6f820e39e..81dd321b18 100644 --- a/dts/framework/config/__init__.py +++ b/dts/framework/config/__init__.py @@ -127,11 +127,11 @@ class HugepageConfiguration: r"""The hugepage configuration of :class:`~framework.testbed_model.node.Node`\s. Attributes: - amount: The number of hugepages. + number_of: The number of hugepages to allocate. force_first_numa: If :data:`True`, the hugepages will be configured on the first NUMA node. """ - amount: int + number_of: int force_first_numa: bool diff --git a/dts/framework/config/conf_yaml_schema.json b/dts/framework/config/conf_yaml_schema.json index f4d7199523..71c893662a 100644 --- a/dts/framework/config/conf_yaml_schema.json +++ b/dts/framework/config/conf_yaml_schema.json @@ -150,9 +150,9 @@ "type": "object", "description": "Optional hugepage configuration. If not specified, hugepages won't be configured and DTS will use system configuration.", "properties": { - "amount": { + "number_of": { "type": "integer", - "description": "The amount of hugepages to configure. Hugepage size will be the system default." + "description": "The number of hugepages to configure. Hugepage size will be the system default." }, "force_first_numa": { "type": "boolean", @@ -161,7 +161,7 @@ }, "additionalProperties": false, "required": [ - "amount" + "number_of" ] }, "mac_address": { diff --git a/dts/framework/config/types.py b/dts/framework/config/types.py index 016e0c3dbd..5c9d659901 100644 --- a/dts/framework/config/types.py +++ b/dts/framework/config/types.py @@ -37,7 +37,7 @@ class HugepageConfigurationDict(TypedDict): """Allowed keys and values.""" #: - amount: int + number_of: int #: force_first_numa: bool diff --git a/dts/framework/testbed_model/linux_session.py b/dts/framework/testbed_model/linux_session.py index d0f7cfa77c..6a09d0e69a 100644 --- a/dts/framework/testbed_model/linux_session.py +++ b/dts/framework/testbed_model/linux_session.py @@ -85,7 +85,7 @@ def get_dpdk_file_prefix(self, dpdk_prefix: str) -> str: return dpdk_prefix def setup_hugepages( - self, hugepage_count: int, hugepage_size: int, force_first_numa: bool + self, number_of: int, hugepage_size: int, force_first_numa: bool ) -> None: """Overrides :meth:`~.os_session.OSSession.setup_hugepages`.""" self._logger.info("Getting Hugepage information.") @@ -97,10 +97,10 @@ def setup_hugepages( 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 < number_of: # 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) + self._configure_huge_pages(number_of, hugepage_size, force_first_numa) else: self._logger.info("Hugepages already configured.") self._mount_huge_pages() @@ -138,7 +138,7 @@ def _supports_numa(self) -> bool: # 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: + def _configure_huge_pages(self, number_of: 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(): @@ -149,7 +149,7 @@ def _configure_huge_pages(self, amount: int, size: int, force_first_numa: bool) f"/hugepages-{size}kB/nr_hugepages" ) - self.send_command(f"echo {amount} | tee {hugepage_config_path}", privileged=True) + self.send_command(f"echo {number_of} | tee {hugepage_config_path}", privileged=True) def update_ports(self, ports: list[Port]) -> None: """Overrides :meth:`~.os_session.OSSession.update_ports`.""" diff --git a/dts/framework/testbed_model/node.py b/dts/framework/testbed_model/node.py index 3f2a727c3b..6818a057d0 100644 --- a/dts/framework/testbed_model/node.py +++ b/dts/framework/testbed_model/node.py @@ -266,7 +266,7 @@ def _setup_hugepages(self) -> None: """ if self.config.hugepages: self.main_session.setup_hugepages( - self.config.hugepages.amount, + self.config.hugepages.number_of, self.main_session.hugepage_size, self.config.hugepages.force_first_numa, ) diff --git a/dts/framework/testbed_model/os_session.py b/dts/framework/testbed_model/os_session.py index 19dcf5f963..1f23f5524f 100644 --- a/dts/framework/testbed_model/os_session.py +++ b/dts/framework/testbed_model/os_session.py @@ -348,7 +348,7 @@ def get_dpdk_file_prefix(self, dpdk_prefix: str) -> str: @abstractmethod def setup_hugepages( - self, hugepage_count: int, hugepage_size: int, force_first_numa: bool + self, number_of: int, hugepage_size: int, force_first_numa: bool ) -> None: """Configure hugepages on the node. @@ -356,9 +356,9 @@ def setup_hugepages( if needed and mount the hugepages if needed. Args: - hugepage_count: Configure this many hugepages. + number_of: Configure this many hugepages. hugepage_size: Configure hugepages of this size. - force_first_numa: If :data:`True`, configure hugepages just on the first numa node. + force_first_numa: If :data:`True`, configure just on the first numa node. """ @abstractmethod -- 2.44.0