diff mbox

[dpdk-dev] net/mlx5: fix redundant free of Tx buffer

Message ID 20170531174845.35951-1-yskoh@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

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

Commit Message

Yongseok Koh May 31, 2017, 5:48 p.m. UTC 
  SW completion ring of Tx (txq->elts) stores individual mbufs even if a
multi-segmented packet is sent. rte_pktmbuf_free_seg() must be used when
cleaning up the completion ring. Otherwise, chained mbufs are redundantly
freed and finally it would cause a crash.

CC: stable@dpdk.org
Fixes: 1d88ba171942 ("net/mlx5: refactor Tx data path")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5_txq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nélio Laranjeiro June 1, 2017, 8:08 a.m. UTC | #1 
On Wed, May 31, 2017 at 10:48:45AM -0700, Yongseok Koh wrote:
> SW completion ring of Tx (txq->elts) stores individual mbufs even if a
> multi-segmented packet is sent. rte_pktmbuf_free_seg() must be used when
> cleaning up the completion ring. Otherwise, chained mbufs are redundantly
> freed and finally it would cause a crash.
> 
> CC: stable@dpdk.org
> Fixes: 1d88ba171942 ("net/mlx5: refactor Tx data path")
> 
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_txq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
> index 6c1387e56..bf72468d5 100644
> --- a/drivers/net/mlx5/mlx5_txq.c
> +++ b/drivers/net/mlx5/mlx5_txq.c
> @@ -117,7 +117,7 @@ txq_free_elts(struct txq_ctrl *txq_ctrl)
>  		struct rte_mbuf *elt = (*elts)[elts_tail];
>  
>  		assert(elt != NULL);
> -		rte_pktmbuf_free(elt);
> +		rte_pktmbuf_free_seg(elt);
>  #ifndef NDEBUG
>  		/* Poisoning. */
>  		memset(&(*elts)[elts_tail],
> -- 
> 2.11.0
 
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Ferruh Yigit June 1, 2017, 10:33 a.m. UTC | #2 
On 6/1/2017 9:08 AM, Nélio Laranjeiro wrote:
> On Wed, May 31, 2017 at 10:48:45AM -0700, Yongseok Koh wrote:
>> SW completion ring of Tx (txq->elts) stores individual mbufs even if a
>> multi-segmented packet is sent. rte_pktmbuf_free_seg() must be used when
>> cleaning up the completion ring. Otherwise, chained mbufs are redundantly
>> freed and finally it would cause a crash.
>>
>> CC: stable@dpdk.org
>> Fixes: 1d88ba171942 ("net/mlx5: refactor Tx data path")
>>
>> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>

> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

Applied to dpdk-next-net/master, thanks.
diff mbox

Patch

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 6c1387e56..bf72468d5 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -117,7 +117,7 @@  txq_free_elts(struct txq_ctrl *txq_ctrl)
 		struct rte_mbuf *elt = (*elts)[elts_tail];
 
 		assert(elt != NULL);
-		rte_pktmbuf_free(elt);
+		rte_pktmbuf_free_seg(elt);
 #ifndef NDEBUG
 		/* Poisoning. */
 		memset(&(*elts)[elts_tail],