On Thu, Sep 1, 2022 at 11:46 AM Hanumanth Pothula <hpoth...@marvell.com> wrote:
>
> While configuring NIX, local variables 'nb_rxq' and 'nb_txq'
> are declared as 8bit variables, leading to an integer overflow
> when an application sends Rxq/Txq value greater than 255.
>
> Hence, declare local variables, 'nb_rxq' and 'nb_txq' as 16bit
> variable.
> Also, during the cleanup, make sure PFC tree is not created.
>
> Signed-off-by: Hanumanth Pothula <hpoth...@marvell.com>
Applied to dpdk-next-net-mrvl/for-next-net. Thanks
> ---
> drivers/net/cnxk/cnxk_ethdev.c | 2 +-
> drivers/net/cnxk/cnxk_ethdev_ops.c | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
> index cfcc4df916..c0a8e901a3 100644
> --- a/drivers/net/cnxk/cnxk_ethdev.c
> +++ b/drivers/net/cnxk/cnxk_ethdev.c
> @@ -1074,7 +1074,7 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
> struct roc_nix_fc_cfg fc_cfg = {0};
> struct roc_nix *nix = &dev->nix;
> struct rte_ether_addr *ea;
> - uint8_t nb_rxq, nb_txq;
> + uint16_t nb_rxq, nb_txq;
> uint64_t rx_cfg;
> void *qs;
> int rc;
> diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c
> b/drivers/net/cnxk/cnxk_ethdev_ops.c
> index 1592971073..b417d61771 100644
> --- a/drivers/net/cnxk/cnxk_ethdev_ops.c
> +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c
> @@ -1142,8 +1142,10 @@ nix_priority_flow_ctrl_sq_conf(struct rte_eth_dev
> *eth_dev, uint16_t qid,
> if (qid >= eth_dev->data->nb_tx_queues)
> return -ENOTSUP;
>
> - /* Check if RX pause frame is enabled or not */
> - if (!pfc->rx_pause_en) {
> + /* Check if RX pause frame is enabled or not and
> + * confirm user requested for PFC.
> + */
> + if (!pfc->rx_pause_en && rx_pause) {
> if ((roc_nix_tm_tree_type_get(nix) == ROC_NIX_TM_DEFAULT) &&
> eth_dev->data->nb_tx_queues > 1) {
> /*
> --
> 2.25.1
>
