[PATCH v4 3/6] examples/l3fwd-graph: fix lcore ID restriction

[Sivaprasad Tummala]

Currently the config option allows lcore IDs up to 255,
irrespective of RTE_MAX_LCORES and needs to be fixed.

The patch allows config options based on DPDK config.

Fixes: 08bd1a174461 ("examples/l3fwd-graph: add graph-based l3fwd skeleton")
Cc: ndabilpu...@marvell.com
Cc: sta...@dpdk.org

Signed-off-by: Sivaprasad Tummala <sivaprasad.tumm...@amd.com>
---
 examples/l3fwd-graph/main.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c
index 96cb1c81ff..ffb6900fee 100644
--- a/examples/l3fwd-graph/main.c
+++ b/examples/l3fwd-graph/main.c
@@ -90,7 +90,7 @@ static int pcap_trace_enable;
 
 struct lcore_rx_queue {
        uint16_t port_id;
-       uint8_t queue_id;
+       uint16_t queue_id;
        char node_name[RTE_NODE_NAMESIZE];
 };
 
@@ -110,8 +110,8 @@ static struct lcore_conf lcore_conf[RTE_MAX_LCORE];
 
 struct lcore_params {
        uint16_t port_id;
-       uint8_t queue_id;
-       uint8_t lcore_id;
+       uint16_t queue_id;
+       uint16_t lcore_id;
 } __rte_cache_aligned;
 
 static struct lcore_params lcore_params_array[MAX_LCORE_PARAMS];
@@ -205,19 +205,19 @@ check_worker_model_params(void)
 static int
 check_lcore_params(void)
 {
-       uint8_t queue, lcore;
+       uint16_t queue;
        int socketid;
-       uint16_t i;
+       uint16_t i, lcore;
 
        for (i = 0; i < nb_lcore_params; ++i) {
                queue = lcore_params[i].queue_id;
                if (queue >= MAX_RX_QUEUE_PER_PORT) {
-                       printf("Invalid queue number: %hhu\n", queue);
+                       printf("Invalid queue number: %hu\n", queue);
                        return -1;
                }
                lcore = lcore_params[i].lcore_id;
                if (!rte_lcore_is_enabled(lcore)) {
-                       printf("Error: lcore %hhu is not enabled in lcore 
mask\n",
+                       printf("Error: lcore %hu is not enabled in lcore 
mask\n",
                               lcore);
                        return -1;
                }
@@ -228,7 +228,7 @@ check_lcore_params(void)
                }
                socketid = rte_lcore_to_socket_id(lcore);
                if ((socketid != 0) && (numa_on == 0)) {
-                       printf("Warning: lcore %hhu is on socket %d with numa 
off\n",
+                       printf("Warning: lcore %hu is on socket %d with numa 
off\n",
                               lcore, socketid);
                }
        }
@@ -257,7 +257,7 @@ check_port_config(void)
        return 0;
 }
 
-static uint8_t
+static uint16_t
 get_port_n_rx_queues(const uint16_t port)
 {
        int queue = -1;
@@ -275,14 +275,14 @@ get_port_n_rx_queues(const uint16_t port)
                }
        }
 
-       return (uint8_t)(++queue);
+       return (uint16_t)(++queue);
 }
 
 static int
 init_lcore_rx_queues(void)
 {
        uint16_t i, nb_rx_queue;
-       uint8_t lcore;
+       uint16_t lcore;
 
        for (i = 0; i < nb_lcore_params; ++i) {
                lcore = lcore_params[i].lcore_id;
@@ -448,11 +448,11 @@ parse_config(const char *q_arg)
                }
 
                lcore_params_array[nb_lcore_params].port_id =
-                       (uint8_t)int_fld[FLD_PORT];
+                       (uint16_t)int_fld[FLD_PORT];
                lcore_params_array[nb_lcore_params].queue_id =
-                       (uint8_t)int_fld[FLD_QUEUE];
+                       (uint16_t)int_fld[FLD_QUEUE];
                lcore_params_array[nb_lcore_params].lcore_id =
-                       (uint8_t)int_fld[FLD_LCORE];
+                       (uint16_t)int_fld[FLD_LCORE];
                ++nb_lcore_params;
        }
        lcore_params = lcore_params_array;
@@ -1011,7 +1011,8 @@ main(int argc, char **argv)
                "ethdev_tx-*",
                "pkt_drop",
        };
-       uint8_t nb_rx_queue, queue, socketid;
+       uint8_t socketid;
+       uint16_t nb_rx_queue, queue;
        struct rte_graph_param graph_conf;
        struct rte_eth_dev_info dev_info;
        uint32_t nb_ports, nb_conf = 0;
-- 
2.25.1