From patchwork Thu Sep 23 11:02:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 99482 X-Patchwork-Delegate: david.marchand@redhat.com 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 11DB4A0C43; Thu, 23 Sep 2021 13:03:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B94D41260; Thu, 23 Sep 2021 13:03:24 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id B0BBF41225 for ; Thu, 23 Sep 2021 13:03:18 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="223850723" X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="223850723" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2021 04:03:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="702678274" Received: from silpixa00399952.ir.intel.com ([10.55.129.13]) by fmsmga006.fm.intel.com with ESMTP; 23 Sep 2021 04:03:13 -0700 From: David Hunt To: dev@dpdk.org Cc: bruce.richardson@intel.com, thomas@monjalon.net, david.marchand@redhat.com, David Hunt Date: Thu, 23 Sep 2021 12:02:13 +0100 Message-Id: <20210923110213.21350-2-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210923110213.21350-1-david.hunt@intel.com> References: <20210922122920.34759-1-david.hunt@intel.com> <20210923110213.21350-1-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v5 2/2] eal: add additional info if core mask too long 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 Sender: "dev" If the user requests to use an lcore above 128 using -c, the eal will exit with "EAL: invalid coremask syntax" and very little else useful information. This patch adds some extra information suggesting to use --lcores so that physical cores above RTE_MAX_LCORE (default 128) can be used. This is achieved by using the --lcores option by mapping the logical cores in the application to physical cores. For example, if "-c 0x300000000000000000000000000000000" is used, we see the following additional output on the command line: EAL: lcore 128 >= RTE_MAX_LCORE (128) EAL: lcore 129 >= RTE_MAX_LCORE (128) EAL: to use high physical core ids , please use --lcores to map them to lcore ids below RTE_MAX_LCORE, EAL: e.g. --lcores 0@128,1@129 Signed-off-by: David Hunt Acked-by: Bruce Richardson --- changes in v3 * added this patch to the set. Addresses the changes for the -c option. changes in v4 * fixed buffer overrun in populating lcore array. * switched from strlcpy to strdup due to a clang error. changes in v5 * replaced strdup and frees with a const char *, as we just need to keep track of original pointer location. * reverted err: usage to return -1, as no free() needed. * other minod code cleanups. --- --- lib/eal/common/eal_common_options.c | 47 ++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 72735e0b09..7f715e4c15 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -750,10 +750,12 @@ check_core_list(int *lcores, unsigned int count) static int eal_parse_coremask(const char *coremask, int *cores) { - unsigned count = 0; + unsigned int count = 0; int i, j, idx; int val; char c; + int lcores[RTE_MAX_LCORE]; + const char *coremask_orig = coremask; for (idx = 0; idx < RTE_MAX_LCORE; idx++) cores[idx] = -1; @@ -770,29 +772,60 @@ eal_parse_coremask(const char *coremask, int *cores) i = strlen(coremask); while ((i > 0) && isblank(coremask[i - 1])) i--; - if (i == 0) + if (i == 0) { + RTE_LOG(ERR, EAL, "No lcores in coremask: [%s]\n", + coremask_orig); return -1; + } - for (i = i - 1; i >= 0 && idx < RTE_MAX_LCORE; i--) { + for (i = i - 1; i >= 0; i--) { c = coremask[i]; if (isxdigit(c) == 0) { /* invalid characters */ + RTE_LOG(ERR, EAL, "invalid characters in coremask: [%s]\n", + coremask_orig); return -1; } val = xdigit2val(c); - for (j = 0; j < BITS_PER_HEX && idx < RTE_MAX_LCORE; j++, idx++) + for (j = 0; j < BITS_PER_HEX; j++, idx++) { if ((1 << j) & val) { - cores[idx] = count; + if (count >= RTE_MAX_LCORE) { + RTE_LOG(ERR, EAL, "Too many lcores provided. Cannot exceed %d\n", + RTE_MAX_LCORE); + return -1; + } + lcores[count] = idx; count++; } } } for (; i >= 0; i--) - if (coremask[i] != '0') + if (coremask[i] != '0') { + RTE_LOG(ERR, EAL, "invalid characters in coremask: [%s]\n", + coremask_orig); return -1; - if (count == 0) + } + if (count == 0) { + RTE_LOG(ERR, EAL, "No lcores in coremask: [%s]\n", + coremask_orig); + return -1; + } + + if (check_core_list(lcores, count)) return -1; + + /* + * Now that we've gto a list of cores no longer than + * RTE_MAX_LCORE, and no lcore in that list is greater + * than RTE_MAX_LCORE, populate the cores + * array and return. + */ + do { + count--; + cores[lcores[count]] = count; + } while (count != 0); + return 0; }