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 9886CA0C4C; Tue, 21 Sep 2021 13:50:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2092640683; Tue, 21 Sep 2021 13:50:29 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 6BAA94003C for ; Tue, 21 Sep 2021 13:50:26 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10113"; a="220142781" X-IronPort-AV: E=Sophos;i="5.85,311,1624345200"; d="scan'208";a="220142781" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2021 04:50:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,311,1624345200"; d="scan'208";a="585001348" Received: from silpixa00399952.ir.intel.com ([10.55.129.13]) by orsmga004.jf.intel.com with ESMTP; 21 Sep 2021 04:50:21 -0700 From: David Hunt To: dev@dpdk.org Cc: bruce.richardson@intel.com, thomas@monjalon.net, david.marchand@redhat.com, David Hunt Date: Tue, 21 Sep 2021 12:50:14 +0100 Message-Id: <20210921115015.36442-1-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915121104.30581-1-david.hunt@intel.com> References: <20210915121104.30581-1-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v3 1/2] eal: add additional info if core list 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 -l, the eal will exit with "EAL: invalid core list 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. There is no change in functionalty, just additional messages suggesting how the --lcores option might be used for the supplied list of lcores. For example, if "-l 12-16,130,132" is used, we see the following additional output on the command line: EAL: Error = One of the 7 cores provided exceeds RTE_MAX_LCORE (128) EAL: Please use --lcores instead, e.g. --lcores 0@12,1@13,2@14,3@15,4@16,5@130,6@132 Signed-off-by: David Hunt --- changes in v2 * Rather than increasing the default max lcores (as in v1), it was agreed to do this instead (switch to --lcores). * As the other patches in the v1 of the set are no longer related to this change, I'll submit as a separate patch set. changes in v3 * separated out some of the corelist cheking into separate function * added extra messages for the different failure conditions. * changed allocation of the core strings from static to dynamic * now prints out a message for each core above RTE_MAX_LCORE --- lib/eal/common/eal_common_options.c | 102 ++++++++++++++++++++++++---- 1 file changed, 89 insertions(+), 13 deletions(-) diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index ff5861b5f3..6139b2b21e 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -709,6 +709,47 @@ update_lcore_config(int *cores) return ret; } +static int +check_core_list(int *lcores, unsigned int count) +{ + unsigned int i, j; + char *lcorestr; + int len = 0; + bool overflow = false; + + for (j = 0; j < count; j++) { + if (lcores[j] >= RTE_MAX_LCORE) { + RTE_LOG(ERR, EAL, "lcore %d >= RTE_MAX_LCORE (%d)\n", + lcores[j], RTE_MAX_LCORE); + overflow = true; + } + } + if (overflow) { + /* + * If we've encountered a core that's greater than + * RTE_MAX_LCORE, suggest using --lcores option to + * map lcores onto physical cores greater than + * RTE_MAX_LCORE, then return. + */ + lcorestr = calloc(1, RTE_MAX_LCORE * 10); + if (lcorestr == NULL) { + RTE_LOG(ERR, EAL, "Unable to allocate lcore string\n"); + return -ENOMEM; + } + for (i = 0; i < count; i++) + len = len + snprintf(&lcorestr[len], + RTE_MAX_LCORE * 10 - len, + "%d@%d,", i, lcores[i]); + if (len > 0) + lcorestr[len-1] = 0; + RTE_LOG(ERR, EAL, "Please use --lcores instead, e.g. --lcores %s\n", + lcorestr); + free(lcorestr); + return -1; + } + return 0; +} + static int eal_parse_coremask(const char *coremask, int *cores) { @@ -839,54 +880,89 @@ eal_parse_service_corelist(const char *corelist) static int eal_parse_corelist(const char *corelist, int *cores) { - unsigned count = 0; + unsigned int count = 0, k; char *end = NULL; int min, max; int idx; + int lcores[RTE_MAX_LCORE]; + char *corelist_copy; for (idx = 0; idx < RTE_MAX_LCORE; idx++) cores[idx] = -1; + corelist_copy = calloc(1, strlen(corelist)+1); + if (corelist_copy == NULL) { + RTE_LOG(ERR, EAL, "Unable to allocate corelist copy\n"); + return -ENOMEM; + } + + strlcpy(corelist_copy, corelist, strlen(corelist)+1); + /* Remove all blank characters ahead */ while (isblank(*corelist)) corelist++; /* Get list of cores */ - min = RTE_MAX_LCORE; + min = -1; do { while (isblank(*corelist)) corelist++; if (*corelist == '\0') - return -1; + goto err; errno = 0; idx = strtol(corelist, &end, 10); if (errno || end == NULL) - return -1; - if (idx < 0 || idx >= RTE_MAX_LCORE) - return -1; + goto err; + if (idx < 0) + goto err; while (isblank(*end)) end++; if (*end == '-') { min = idx; } else if ((*end == ',') || (*end == '\0')) { max = idx; - if (min == RTE_MAX_LCORE) + if (min == -1) min = idx; for (idx = min; idx <= max; idx++) { - if (cores[idx] == -1) { - cores[idx] = count; - count++; + lcores[count] = idx; + count++; + if (count > RTE_MAX_LCORE) { + RTE_LOG(ERR, EAL, "Too many lcores provided. Cannot exceed %d\n", + RTE_MAX_LCORE); + goto err; } } - min = RTE_MAX_LCORE; + min = -1; } else - return -1; + goto err; corelist = end + 1; } while (*end != '\0'); if (count == 0) - return -1; + goto err; + + if (check_core_list(lcores, count)) + goto err; + + /* + * 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. + */ + + for (k = 0; k < count; k++) + cores[lcores[k]] = k; + + if (corelist_copy) + free(corelist_copy); + return 0; +err: + if (corelist_copy) + free(corelist_copy); + + return -1; } /* Changes the lcore id of the main thread */ -- 2.17.1