[dpdk-stable] patch 'net/bnxt: fix mbuf free when clearing Tx queue' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Tue Dec 10 15:58:57 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/16/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/34afffbb2f7f29d9c1e1ac994b10fa6328fdd075

Thanks.

Kevin.

---
>From 34afffbb2f7f29d9c1e1ac994b10fa6328fdd075 Mon Sep 17 00:00:00 2001
From: Lance Richardson <lance.richardson at broadcom.com>
Date: Wed, 23 Oct 2019 10:27:35 -0400
Subject: [PATCH] net/bnxt: fix mbuf free when clearing Tx queue

[ upstream commit 00932678c6bbbe922a2790e59fd68b34719f3171 ]

When freeing pending transmit mbufs, use rte_pktmbuf_free_seg()
instead of rte_pktmbuf_free(), otherwise linked mbufs may be freed
more than once.

Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code")

Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Signed-off-by: Lance Richardson <lance.richardson at broadcom.com>
---
 drivers/net/bnxt/bnxt_txq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index d6b93b44a..b76ad05fe 100644
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -36,5 +36,5 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq)
 		for (i = 0; i < txq->tx_ring->tx_ring_struct->ring_size; i++) {
 			if (sw_ring[i].mbuf) {
-				rte_pktmbuf_free(sw_ring[i].mbuf);
+				rte_pktmbuf_free_seg(sw_ring[i].mbuf);
 				sw_ring[i].mbuf = NULL;
 			}
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:40.640999049 +0000
+++ 0023-net-bnxt-fix-mbuf-free-when-clearing-Tx-queue.patch	2019-12-10 14:49:39.025458271 +0000
@@ -1 +1 @@
-From 00932678c6bbbe922a2790e59fd68b34719f3171 Mon Sep 17 00:00:00 2001
+From 34afffbb2f7f29d9c1e1ac994b10fa6328fdd075 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 00932678c6bbbe922a2790e59fd68b34719f3171 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index ebb9199d2..6b866d445 100644
+index d6b93b44a..b76ad05fe 100644
@@ -23 +24 @@
-@@ -35,5 +35,5 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq)
+@@ -36,5 +36,5 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq)



More information about the stable mailing list