[PATCH v2 1/6] examples/l3fwd: fix lcore ID restriction

[Konstantin Ananyev]

> 
> > 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: af75078fece3 ("first public release")
> > Cc: stable at dpdk.org
> >
> > Signed-off-by: Sivaprasad Tummala <sivaprasad.tummala at amd.com>
> > ---
> >  examples/l3fwd/main.c | 19 +++++++++++--------
> >  1 file changed, 11 insertions(+), 8 deletions(-)
> >
> > diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
> > index 3bf28aec0c..ed116da09c 100644
> > --- a/examples/l3fwd/main.c
> > +++ b/examples/l3fwd/main.c
> > @@ -99,7 +99,7 @@ struct parm_cfg parm_config;
> >  struct lcore_params {
> >  	uint16_t port_id;
> >  	uint8_t queue_id;

Actually one comment: 
As lcore_id becomes uint16_t it might be worth to do the same queue_id,
they usually are very much related. 

> > -	uint8_t lcore_id;
> > +	uint16_t lcore_id;
> >  } __rte_cache_aligned;
> >
> >  static struct lcore_params lcore_params_array[MAX_LCORE_PARAMS];
> > @@ -292,8 +292,8 @@ setup_l3fwd_lookup_tables(void)
> >  static int
> >  check_lcore_params(void)
> >  {
> > -	uint8_t queue, lcore;
> > -	uint16_t i;
> > +	uint8_t queue;
> > +	uint16_t i, lcore;
> >  	int socketid;
> >
> >  	for (i = 0; i < nb_lcore_params; ++i) {
> > @@ -304,12 +304,12 @@ check_lcore_params(void)
> >  		}
> >  		lcore = lcore_params[i].lcore_id;
> >  		if (!rte_lcore_is_enabled(lcore)) {
> > -			printf("error: lcore %hhu is not enabled in lcore mask\n", lcore);
> > +			printf("error: lcore %hu is not enabled in lcore mask\n", lcore);
> >  			return -1;
> >  		}
> >  		if ((socketid = rte_lcore_to_socket_id(lcore) != 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);
> >  		}
> >  	}
> > @@ -359,7 +359,7 @@ 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;
> > @@ -500,6 +500,8 @@ parse_config(const char *q_arg)
> >  	char *str_fld[_NUM_FLD];
> >  	int i;
> >  	unsigned size;
> > +	unsigned int max_fld[_NUM_FLD] = {RTE_MAX_ETHPORTS,
> > +					255, RTE_MAX_LCORE};
> >
> >  	nb_lcore_params = 0;
> >
> > @@ -518,7 +520,8 @@ parse_config(const char *q_arg)
> >  		for (i = 0; i < _NUM_FLD; i++){
> >  			errno = 0;
> >  			int_fld[i] = strtoul(str_fld[i], &end, 0);
> > -			if (errno != 0 || end == str_fld[i] || int_fld[i] > 255)
> > +			if (errno != 0 || end == str_fld[i] || int_fld[i] >
> > +									max_fld[i])
> >  				return -1;
> >  		}
> >  		if (nb_lcore_params >= MAX_LCORE_PARAMS) {
> > @@ -531,7 +534,7 @@ parse_config(const char *q_arg)
> >  		lcore_params_array[nb_lcore_params].queue_id =
> >  			(uint8_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;
> > --
> 
> Acked-by: Konstantin Ananyev <konstantin.ananyev at huawei.com>
> 
> 
> > 2.25.1