[dpdk-dev] [PATCH v3 5/6] app/testpmd: fix valid desc id check

[Ferruh Yigit]

On 9/19/2020 11:47 AM, Wei Hu (Xavier) wrote:
> From: Chengchang Tang <tangchengchang at huawei.com>
> 
> The number of desc is a per queue configuration. But in the check function,
> nb_txd & nb_rxd are used to check whether the desc_id is valid. nb_txd &
> nb_rxd are the global configuration of number of desc. If the queue
> configuration is changed by cmdline liks: "port config xx txq xx ring_size
> xxx", the real value will be changed.
> 
> This patch use the real value to check whether the desc_id is valid. And if
> these are not configured by user. It will use the default value to check
> it, since the rte_eth_rx_queue_setup & rte_eth_tx_queue_setup will use a
> default value to confiure the queue if nb_rx_desc or nb_tx_desc is zero.
> 
> Fixes: af75078fece3 ("first public release")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Chengchang Tang <tangchengchang at huawei.com>
> Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
> ---
>   app/test-pmd/config.c | 53 +++++++++++++++++++++++++++++++++++++++++----------
>   1 file changed, 43 insertions(+), 10 deletions(-)
> 
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index 882de2d..b7851c7 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -1891,22 +1891,55 @@ tx_queue_id_is_invalid(queueid_t txq_id)
>   }
>   
>   static int
> -rx_desc_id_is_invalid(uint16_t rxdesc_id)
> +rx_desc_id_is_invalid(portid_t port_id, queueid_t rxq_id, uint16_t rxdesc_id)
>   {
> -	if (rxdesc_id < nb_rxd)
> +	struct rte_port *port = &ports[port_id];
> +	uint16_t ring_size;
> +
> +	/*
> +	 * When configure the rxq by rte_eth_rx_queue_setup with nb_rx_desc
> +	 * being 0, it will use a default value provided by PMDs to setup this
> +	 * rxq. If the default value is 0, it will use the
> +	 * RTE_ETH_DEV_FALLBACK_RX_RINGSIZE to setup this rxq.
> +	 */
> +	if (port->nb_rx_desc[rxq_id])
> +		ring_size = port->nb_rx_desc[rxq_id];
> +	else if (port->dev_info.default_rxportconf.ring_size)
> +		ring_size = port->dev_info.default_rxportconf.ring_size;
> +	else
> +		ring_size =  RTE_ETH_DEV_FALLBACK_RX_RINGSIZE;
> +
> +	if (rxdesc_id < ring_size)
>   		return 0;
> -	printf("Invalid RX descriptor %d (must be < nb_rxd=%d)\n",
> -	       rxdesc_id, nb_rxd);
> +	printf("Invalid RX descriptor %d (must be < ring_size=%d)\n",
> +	       rxdesc_id, ring_size);
>   	return 1;

+1 to fix, but similar comment as previous patch, can 
'rte_eth_rx_queue_info_get()' be used to detect the 'ring_size'?