From patchwork Tue Apr 30 18:45:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Pratte X-Patchwork-Id: 139746 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 5A88343F32; Tue, 30 Apr 2024 20:48:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 33538402BA; Tue, 30 Apr 2024 20:47:58 +0200 (CEST) Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) by mails.dpdk.org (Postfix) with ESMTP id 26682402AD for ; Tue, 30 Apr 2024 20:47:57 +0200 (CEST) Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-5afbcf8059cso118916eaf.1 for ; Tue, 30 Apr 2024 11:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1714502876; x=1715107676; 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=bhXZM6ke8pyVDtzl88TXVR9AsPng3J/jGrVRdcTxEX4=; b=ZJqeywuu7z0KE3ajgdj3sHucD5Fqr8ntHpvt7y8nI8cGECamXEPyxzjWl7IMBzrIkn H4I9LKtRz5/K/9XrgkYGKuhRmnOq7tmAStsBNwxpcCzabtE4PHsrMwbZ56gbkw12qhx2 GvDDpP0c2KdcSYxu6Ku4NSrYrvCXXIYP/FC/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714502876; x=1715107676; 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=bhXZM6ke8pyVDtzl88TXVR9AsPng3J/jGrVRdcTxEX4=; b=daXhOnm6IEYfH6rWXmgd0OdxrV+jPRLSpOdwtYR65j/yXWC1YvamK1XVI/OkC9/ji4 I21vblMY/SfGh2JZyykCTKrTY1aSXG5RW8W3ZsE3Ildfm0g4AarfA2qhaEFGEu2P0vvm SOZsEEWkBMzQLqxE8zizUTpAPA68sn/CVnpv58+18K6wnNZCHQGqWVBDFazFC9b8iIPI XJu5xepxbFUele68Z/Y/KptUIE3qKDaZ28tzVNYY+kK3V8a9neLxF4ppY/r6DlRhRFDk kizci90Tdf4Zd9foNncFRfQ2k+UEUjpV2t/VarrH+0tvS3hf8FAr2uiYpXKqrd27tcuO 3S/w== X-Gm-Message-State: AOJu0YxD7AT/cV3jLkvdAntCTo3BOhr8Hb1qysUMHcdmb+7R4biQYdmT 7GoahZ40Lp9iz8JiI+Llb/n+pzKPVoKuZpV+twl2S3Bq2JC7k0RVMqe+lLneLAg= X-Google-Smtp-Source: AGHT+IEQePP1/iHVnWbMmZ3iqve1lqoZgxvIv6nn6uovFKs+k41Sl7CH7OlGJAhgW5qNYMAdJW8rPQ== X-Received: by 2002:a4a:654d:0:b0:5aa:241a:7f4b with SMTP id z13-20020a4a654d000000b005aa241a7f4bmr304320oog.1.1714502876182; Tue, 30 Apr 2024 11:47:56 -0700 (PDT) Received: from d121012.iol.unh.edu ([2606:4100:3880:1271:e2f8:4ec3:8bf3:864c]) by smtp.gmail.com with ESMTPSA id dj14-20020a05622a4e8e00b0043ae234c0f2sm2182479qtb.36.2024.04.30.11.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 11:47:55 -0700 (PDT) From: Nicholas Pratte To: "jspewock@iol.unh.edumb@smartsharesystems.combruce.richardson"@intel.com, yoan.picchi@foss.arm.com, juraj.linkes@pantheon.tech, paul.szczepanek@arm.com, wathsala.vithanage@arm.com, thomas@monjalon.net, Honnappa.Nagarahalli@arm.com, probb@iol.unh.edu Cc: dev@dpdk.org, Nicholas Pratte Subject: [PATCH v5 2/2] dts: Change hugepage 'amount' to a different term Date: Tue, 30 Apr 2024 14:45:33 -0400 Message-ID: <20240430184533.29247-3-npratte@iol.unh.edu> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430184533.29247-2-npratte@iol.unh.edu> References: <20240430184533.29247-2-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 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. Signed-off-by: Nicholas Pratte Reviewed-by: Juraj Linkeš Reviewed-by: Luca Vizzarro --- 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 | 4 ++-- dts/framework/testbed_model/node.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dts/conf.yaml b/dts/conf.yaml index 56c3ae6f4c..44b5e4ec84 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 + quantity: 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 + quantity: 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..3a617ef599 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. + quantity: The quantity of hugepages. force_first_numa: If :data:`True`, the hugepages will be configured on the first NUMA node. """ - amount: int + quantity: 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..10a8025084 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": { + "quantity": { "type": "integer", - "description": "The amount of hugepages to configure. Hugepage size will be the system default." + "description": "The quantity of hugepages to configure. Hugepage size will be the system default." }, "force_first_numa": { "type": "boolean", @@ -161,7 +161,7 @@ }, "additionalProperties": false, "required": [ - "amount" + "quantity" ] }, "mac_address": { diff --git a/dts/framework/config/types.py b/dts/framework/config/types.py index 016e0c3dbd..57807b0a73 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 + quantity: 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..ae7d0ba7d2 100644 --- a/dts/framework/testbed_model/linux_session.py +++ b/dts/framework/testbed_model/linux_session.py @@ -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, quantity: 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 {quantity} | 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..512fd01db1 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.quantity, self.main_session.hugepage_size, self.config.hugepages.force_first_numa, )