Re: [PATCH v2] net/mlx5: fix reusing Rx/Tx queues

["Nélio Laranjeiro" <nelio.laranjeiro@6wind.com>]

On Tue, Mar 21, 2017 at 10:50:51AM -0700, Yongseok Koh wrote:
> When configuring Rx/Tx queue, if queue already exists, it is reused. But if
> the queue size is changed, it must be resized to not access/overwrite
> invalid memory.
> 
> Fixes: 2e22920b85d9 ("mlx5: support non-scattered Tx and Rx")
> 
> CC: stable@dpdk.org
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
> ---
> 
> v2:
> * fix typo and indentataion
> 
>  drivers/net/mlx5/mlx5_rxq.c | 13 +++++++++++++
>  drivers/net/mlx5/mlx5_txq.c | 13 +++++++++++++
>  2 files changed, 26 insertions(+)
> 
> diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
> index e6070a0e5..98fa05063 100644
> --- a/drivers/net/mlx5/mlx5_rxq.c
> +++ b/drivers/net/mlx5/mlx5_rxq.c
> @@ -1261,6 +1261,19 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
>  		}
>  		(*priv->rxqs)[idx] = NULL;
>  		rxq_cleanup(rxq_ctrl);
> +		/* Resize if rxq size is changed. */
> +		if (rxq_ctrl->rxq.elts_n != log2above(desc)) {
> +			rxq_ctrl = rte_realloc(rxq_ctrl,
> +					       sizeof(*rxq_ctrl) +
> +					       desc * sizeof(struct rte_mbuf *),
> +					       RTE_CACHE_LINE_SIZE);
> +			if (!rxq_ctrl) {
> +				ERROR("%p: unable to reallocate queue index %u",
> +					(void *)dev, idx);
> +				priv_unlock(priv);
> +				return -ENOMEM;
> +			}
> +		}
>  	} else {
>  		rxq_ctrl = rte_calloc_socket("RXQ", 1, sizeof(*rxq_ctrl) +
>  					     desc * sizeof(struct rte_mbuf *),
> diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
> index bbfce756b..e9b837d10 100644
> --- a/drivers/net/mlx5/mlx5_txq.c
> +++ b/drivers/net/mlx5/mlx5_txq.c
> @@ -532,6 +532,19 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
>  		}
>  		(*priv->txqs)[idx] = NULL;
>  		txq_cleanup(txq_ctrl);
> +		/* Resize if txq size is changed. */
> +		if (txq_ctrl->txq.elts_n != log2above(desc)) {
> +			txq_ctrl = rte_realloc(txq_ctrl,
> +					       sizeof(*txq_ctrl) +
> +					       desc * sizeof(struct rte_mbuf *),
> +					       RTE_CACHE_LINE_SIZE);
> +			if (!txq_ctrl) {
> +				ERROR("%p: unable to reallocate queue index %u",
> +					(void *)dev, idx);
> +				priv_unlock(priv);
> +				return -ENOMEM;
> +			}
> +		}
>  	} else {
>  		txq_ctrl =
>  			rte_calloc_socket("TXQ", 1,
> -- 
> 2.11.0
 
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

-- 
Nélio Laranjeiro
6WIND