patches for DPDK stable branches
 help / color / mirror / Atom feed

From: "Nélio Laranjeiro" <nelio.laranjeiro@6wind.com>
To: Yongseok Koh <yskoh@mellanox.com>
Cc: ferruh.yigit@intel.com, dev@dpdk.org, adrien.mazarguil@6wind.com,
	stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH] net/mlx5: fix reusing Rx/Tx queues
Date: Tue, 21 Mar 2017 09:03:41 +0100	[thread overview]
Message-ID: <20170321080341.GL12013@autoinstall.dev.6wind.com> (raw)
In-Reply-To: <20170320233804.47489-1-yskoh@mellanox.com>

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,

-- 
Nélio Laranjeiro
6WIND

next prev parent reply	other threads:[~2017-03-21  8:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-20 23:38 Yongseok Koh
2017-03-21  8:03 ` Nélio Laranjeiro [this message]
2017-03-21 17:50 ` [dpdk-stable] [PATCH v2] " Yongseok Koh
2017-03-22  7:50   ` Nélio Laranjeiro
2017-03-22 14:56     ` Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170321080341.GL12013@autoinstall.dev.6wind.com \
    --to=nelio.laranjeiro@6wind.com \
    --cc=adrien.mazarguil@6wind.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=stable@dpdk.org \
    --cc=yskoh@mellanox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).