[dpdk-dev] net/mlx5: fix reusing Rx/Tx queues

Message ID 20170320233804.47489-1-yskoh@mellanox.com
State Superseded
Delegated to: Ferruh Yigit
Headers show

Checks

Context Check Description
checkpatch success coding style OK
Intel-compilation success Compilation OK

Commit Message

Yongseok Koh March 20, 2017, 11:38 p.m.
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>
---
 drivers/net/mlx5/mlx5_rxq.c | 13 +++++++++++++
 drivers/net/mlx5/mlx5_txq.c | 13 +++++++++++++
 2 files changed, 26 insertions(+)

Comments

Nélio Laranjeiro March 21, 2017, 8:03 a.m.
Yongseok,

Please see few comments below

On Mon, Mar 20, 2017 at 04:38:04PM -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>
> ---
>  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..aa28efc3d 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 chagned. */

Typo in the comment (chagned instead of change).

> +		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..371dcd2f6 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 chagned. */

Same here.

> +		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

By the same time, can you also fix the indentation please?

Thanks,

Patch hide | download patch | download mbox

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index e6070a0e5..aa28efc3d 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 chagned. */
+		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..371dcd2f6 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 chagned. */
+		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,