From f93c7cd0823c2b268dda209e1ca8827e01900b3f Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Tue, 20 Feb 2018 12:05:57 +0000 Subject: [PATCH] examples/exception_path: limit core count to 64 Application doesn't support more that 64 lcores due to command line limitation of using a coremask that is parsed as a 64bit value, so changed it to reflect this limitation. Coverity issue: 30688 Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: Radu Nicolau --- examples/exception_path/main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/examples/exception_path/main.c b/examples/exception_path/main.c index 3e5b1e718f..dda391cd51 100644 --- a/examples/exception_path/main.c +++ b/examples/exception_path/main.c @@ -41,13 +41,21 @@ #include #include +#ifndef APP_MAX_LCORE +#if (RTE_MAX_LCORE > 64) +#define APP_MAX_LCORE 64 +#else +#define APP_MAX_LCORE RTE_MAX_LCORE +#endif +#endif + /* Macros for printing using RTE_LOG */ #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1 #define FATAL_ERROR(fmt, args...) rte_exit(EXIT_FAILURE, fmt "\n", ##args) #define PRINT_INFO(fmt, args...) RTE_LOG(INFO, APP, fmt "\n", ##args) /* Max ports than can be used (each port is associated with two lcores) */ -#define MAX_PORTS (RTE_MAX_LCORE / 2) +#define MAX_PORTS (APP_MAX_LCORE / 2) /* Max size of a single packet */ #define MAX_PACKET_SZ (2048) @@ -101,7 +109,7 @@ static uint64_t input_cores_mask = 0; static uint64_t output_cores_mask = 0; /* Array storing port_id that is associated with each lcore */ -static uint16_t port_ids[RTE_MAX_LCORE]; +static uint16_t port_ids[APP_MAX_LCORE]; /* Structure type for recording lcore-specific stats */ struct stats { @@ -111,7 +119,7 @@ struct stats { } __rte_cache_aligned; /* Array of lcore-specific stats */ -static struct stats lcore_stats[RTE_MAX_LCORE]; +static struct stats lcore_stats[APP_MAX_LCORE]; /* Print out statistics on packets handled */ static void @@ -330,7 +338,9 @@ setup_port_lcore_affinities(void) uint16_t rx_port = 0; /* Setup port_ids[] array, and check masks were ok */ - RTE_LCORE_FOREACH(i) { + for (i = 0; i < APP_MAX_LCORE; i++) { + if (!rte_lcore_is_enabled(i)) + continue; if (input_cores_mask & (1ULL << i)) { /* Skip ports that are not enabled */ while ((ports_mask & (1 << rx_port)) == 0) { -- 2.20.1