From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by dpdk.org (Postfix) with ESMTP id 3D79111C5 for ; Tue, 21 Mar 2017 09:03:50 +0100 (CET) Received: by mail-wr0-f172.google.com with SMTP id u108so106683981wrb.3 for ; Tue, 21 Mar 2017 01:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=ALDSOnP2ConfeaaiK5ivnBkrT3ObD5kMEiA28MibnTU=; b=LYVttRN0lXycieqRA6Fqv0SljC8lAb4b6B4Y+psAQxKtPmzzaDsZRiwE/pN2aavwnx 7ub5/khiQahtY0GnDYP3RmgvHAK6o7Arm9PFiQxMRrFXBccQi/NWT0TTPdJ0ab35UpE7 jsuObZCpsYEj0H85kY7kmttng2ybTneZRwl4iH3Q6B2C+hjtkX7iYP4kkBnokwrIvCEo tHQ354OejjOs8iXN6bG7BfPpkvIcUykrTlkrym652PSNl9UYfI5aVD1r9H0tAcxBGnxg PhkufvNaWXMQ9WggNwVy2LIFxw5scW4Pewst+GlcAkVThpj+WbqDZxiuM3O40GJaTw/r UlqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=ALDSOnP2ConfeaaiK5ivnBkrT3ObD5kMEiA28MibnTU=; b=rRMjP46OYlhkfM39EW1T8XSqMGLwJ4+qfoPY+zS5gZUALTd/CvztviMtT2uk8QT6en 8XoP5A/9M14aqsnhaq7P7aP/HpPYnowdlsFtgDvo1E0acoD74v8PFKrw8frDZKbeiy7K gYXslIW177VexxYIEAGZAip0sbcIK6CvhXsdXP5Hs//1afjj3yWRLqcstvf7AA7t6FHg IJ9JeJFI3B9k+nrWsIH1JacnpO+ZXH+hyyjRLEunQOoRz2yf/PWwdDci434IG2BpVCHu cuaEs2Bu8NWuuaR10Og+2ZhRfCMLjDTxAu2P67AnGDdoP81ac9N2JVY3OUgy/2Z0A1FV mbWw== X-Gm-Message-State: AFeK/H3mfITnGFBJahh82GyDRTzGk+PWtqxgGS+MxR7bVbm15UApfrkjlm2ZbFJBNhlYH86S X-Received: by 10.223.177.218 with SMTP id r26mr32792235wra.194.1490083429777; Tue, 21 Mar 2017 01:03:49 -0700 (PDT) Received: from autoinstall.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 92sm13244244wrh.8.2017.03.21.01.03.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 01:03:49 -0700 (PDT) Date: Tue, 21 Mar 2017 09:03:41 +0100 From: =?iso-8859-1?Q?N=E9lio?= Laranjeiro To: Yongseok Koh Cc: ferruh.yigit@intel.com, dev@dpdk.org, adrien.mazarguil@6wind.com, stable@dpdk.org Message-ID: <20170321080341.GL12013@autoinstall.dev.6wind.com> References: <20170320233804.47489-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170320233804.47489-1-yskoh@mellanox.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-stable] [PATCH] net/mlx5: fix reusing Rx/Tx queues X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2017 08:03:50 -0000 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 > --- > 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