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 B78ED4559B; Fri, 5 Jul 2024 19:15:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A6B8642F41; Fri, 5 Jul 2024 19:15:28 +0200 (CEST) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by mails.dpdk.org (Postfix) with ESMTP id EA69442F3F for ; Fri, 5 Jul 2024 19:15:26 +0200 (CEST) Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6b5e883d266so1234566d6.1 for ; Fri, 05 Jul 2024 10:15:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1720199726; x=1720804526; 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=yjQ3pSbo/a80oFZM2tzQhbSXVFQ6PO+c2n+ZzCA6LWU=; b=Lz1h1DL+Tl8//tKOF84UtZScJTR5Qc6VDapLLtK42xposoy/obnA/BOOkxAPYQQ9HD CciJmf648+SHXGv/ZncLq+jciRCfXEFGurOrtfTFBJpgdENck4lwjtyNO38jzgFywUpP mZ1uiOuTe0viT+y2WRHC5BadSIjHVpaxScoQI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720199726; x=1720804526; 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=yjQ3pSbo/a80oFZM2tzQhbSXVFQ6PO+c2n+ZzCA6LWU=; b=FUSZ+GrGXMVuhpSfmJCPcRW+H/wX2jKeXTGJ/uIPVIKFkxBXL+ZucD/dVzUeeVpKEA h54Ab1jvK/Som+aABydvbmGEsvGJGUQaKk5/KWY4+KDUE96bjDU5OngYWlOcP/50yhH/ 2dxd5ElZk0f62T6Sujhtlry0KChsl3AUfhlRNw/mhJeHULNpbSdBLn8tgBEdM80bMpWG i6l3ky4tk+DjlcxkXbv3g8Qfx66JQtHQ3Cmocwln38gN0sU+Fa4BQCnuqhbtpkw4M9jg 7FKP5icpu7eXbjkDKKafjQC6O1QpwIKStVoVFheLJLK3p5npeO1gZeyJKNKbSldjFdxV hGlw== X-Gm-Message-State: AOJu0YzlX9WQNO9Su8C/VdzGC6y05ztws9YYQpqwbvHNK+B9JIQvf4s+ e3uu62QHrYV2iiSViIcnxmNAl7l2fIvzxlu5/tc3UY2YlhAgaaP+ye3Dh+wqUNY= X-Google-Smtp-Source: AGHT+IFgpd+5TfAeHypgwdD9TbqszqcjtPiXFp5fg9YiY080R69/kSogi9qdBvvaIkREV0gcJd1qYw== X-Received: by 2002:a05:6214:529c:b0:6b2:b5b5:124e with SMTP id 6a1803df08f44-6b5ece8f375mr53572186d6.0.1720199726305; Fri, 05 Jul 2024 10:15:26 -0700 (PDT) Received: from localhost.unh.edu ([2606:4100:3880:1257::1003]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b5f92e7a08sm6534366d6.74.2024.07.05.10.15.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jul 2024 10:15:25 -0700 (PDT) From: Nicholas Pratte To: probb@iol.unh.edu, dmarx@iol.unh.edu, jspewock@iol.unh.edu, luca.vizzarro@arm.com, yoan.picchi@foss.arm.com, Honnappa.Nagarahalli@arm.com, paul.szczepanek@arm.com, juraj.linkes@pantheon.tech Cc: dev@dpdk.org, Nicholas Pratte Subject: [PATCH v2 2/6] dts: Use First Core Logic Change Date: Fri, 5 Jul 2024 13:13:35 -0400 Message-ID: <20240705171341.23894-6-npratte@iol.unh.edu> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240613201831.9748-3-npratte@iol.unh.edu> References: <20240613201831.9748-3-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 Removed use_first_core from the conf.yaml in favor of determining this within the framework. use_first_core continue to serve a purpose in that it is only enabled when core 0 is explicitly provided in the configuration. Any other configuration, including "" or "any," will omit core 0. Documentation reworks are included to reflect the changes made. Bugzilla ID: 1360 Signed-off-by: Nicholas Pratte --- dts/conf.yaml | 3 +-- dts/framework/config/__init__.py | 11 +++++++---- dts/framework/config/conf_yaml_schema.json | 6 +----- dts/framework/testbed_model/node.py | 9 +++++++++ 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dts/conf.yaml b/dts/conf.yaml index 56cc08ced2..53192e0761 100644 --- a/dts/conf.yaml +++ b/dts/conf.yaml @@ -29,8 +29,7 @@ nodes: user: dtsuser arch: x86_64 os: linux - lcores: "" # use all the available logical cores - use_first_core: false # tells DPDK to use any physical core + lcores: "" # use all available logical cores (Skips first core) memory_channels: 4 # tells DPDK to use 4 memory channels hugepages_2mb: # optional; if removed, will use system hugepage configuration number_of: 256 diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py index 456a8a83ab..4c05373ef3 100644 --- a/dts/framework/config/__init__.py +++ b/dts/framework/config/__init__.py @@ -246,6 +246,9 @@ def from_dict( hugepage_config_dict["force_first_numa"] = False hugepage_config = HugepageConfiguration(**hugepage_config_dict) + lcores = "1" if "lcores" not in d else d["lcores"] if "any" not in d["lcores"] else "" + use_first_core = "0" in lcores + # The calls here contain duplicated code which is here because Mypy doesn't # properly support dictionary unpacking with TypedDicts if "traffic_generator" in d: @@ -256,8 +259,8 @@ def from_dict( password=d.get("password"), arch=Architecture(d["arch"]), os=OS(d["os"]), - lcores=d.get("lcores", "1"), - use_first_core=d.get("use_first_core", False), + lcores=lcores, + use_first_core=use_first_core, hugepages=hugepage_config, ports=[PortConfig.from_dict(d["name"], port) for port in d["ports"]], traffic_generator=TrafficGeneratorConfig.from_dict(d["traffic_generator"]), @@ -270,8 +273,8 @@ def from_dict( password=d.get("password"), arch=Architecture(d["arch"]), os=OS(d["os"]), - lcores=d.get("lcores", "1"), - use_first_core=d.get("use_first_core", False), + lcores=lcores, + use_first_core=use_first_core, hugepages=hugepage_config, ports=[PortConfig.from_dict(d["name"], port) for port in d["ports"]], memory_channels=d.get("memory_channels", 1), diff --git a/dts/framework/config/conf_yaml_schema.json b/dts/framework/config/conf_yaml_schema.json index 3f7bc2acae..01a6afdc72 100644 --- a/dts/framework/config/conf_yaml_schema.json +++ b/dts/framework/config/conf_yaml_schema.json @@ -163,13 +163,9 @@ }, "lcores": { "type": "string", - "pattern": "^(([0-9]+|([0-9]+-[0-9]+))(,([0-9]+|([0-9]+-[0-9]+)))*)?$", + "pattern": "^(([0-9]+|([0-9]+-[0-9]+))(,([0-9]+|([0-9]+-[0-9]+)))*)?$|any", "description": "Optional comma-separated list of logical cores to use, e.g.: 1,2,3,4,5,18-22. Defaults to 1. An empty string means use all lcores." }, - "use_first_core": { - "type": "boolean", - "description": "Indicate whether DPDK should use the first physical core. It won't be used by default." - }, "memory_channels": { "type": "integer", "description": "How many memory channels to use. Optional, defaults to 1." diff --git a/dts/framework/testbed_model/node.py b/dts/framework/testbed_model/node.py index 12a40170ac..9b3f01f1e9 100644 --- a/dts/framework/testbed_model/node.py +++ b/dts/framework/testbed_model/node.py @@ -86,6 +86,15 @@ def __init__(self, node_config: NodeConfiguration): self.lcores, LogicalCoreList(self.config.lcores) ).filter() + if LogicalCore(lcore=0, core=0, socket=0, node=0) in self.lcores: + self._logger.info( + """ + WARNING: First core being used; + using the first core is considered risky and should only + be done by advanced users. + """ + ) + self._other_sessions = [] self._init_ports() -- 2.44.0