[dpdk-stable] patch 'net/bnxt: fix crash in vector mode Tx' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 10/30/20. 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.

Thanks.

Luca Boccassi

---
>From 7ca263db77d64431aa64f91cac6ec64b05734a5b Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Fri, 28 Aug 2020 10:31:10 +0530
Subject: [PATCH] net/bnxt: fix crash in vector mode Tx

[ upstream commit 301cc1b4db590df8bbadbad9a0b2ea2ed125ba86 ]

rte_pktmbuf_prefree_seg() can return NULL if the mbuf still
has remaining references on it.

Adding a NULL check to prevent segfault.

Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode")
Fixes: 398358341419 ("net/bnxt: support NEON")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Lance Richardson <lance.richardson at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
index 8b4c396821..7529d0316b 100644
--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
@@ -338,6 +338,8 @@ bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts)
 		tx_buf = &txr->tx_buf_ring[cons];
 		cons = RING_NEXT(txr->tx_ring_struct, cons);
 		mbuf = rte_pktmbuf_prefree_seg(tx_buf->mbuf);
+		if (unlikely(mbuf == NULL))
+			continue;
 		tx_buf->mbuf = NULL;
 
 		if (blk && mbuf->pool != free[0]->pool) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.229346377 +0000
+++ 0014-net-bnxt-fix-crash-in-vector-mode-Tx.patch	2020-10-28 10:35:11.420828787 +0000
@@ -1,8 +1,10 @@
-From 301cc1b4db590df8bbadbad9a0b2ea2ed125ba86 Mon Sep 17 00:00:00 2001
+From 7ca263db77d64431aa64f91cac6ec64b05734a5b Mon Sep 17 00:00:00 2001
 From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Date: Fri, 28 Aug 2020 10:31:10 +0530
 Subject: [PATCH] net/bnxt: fix crash in vector mode Tx
 
+[ upstream commit 301cc1b4db590df8bbadbad9a0b2ea2ed125ba86 ]
+
 rte_pktmbuf_prefree_seg() can return NULL if the mbuf still
 has remaining references on it.
 
@@ -10,35 +12,20 @@
 
 Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode")
 Fixes: 398358341419 ("net/bnxt: support NEON")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Reviewed-by: Lance Richardson <lance.richardson at broadcom.com>
 Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
 Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
 ---
- drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 2 ++
- drivers/net/bnxt/bnxt_rxtx_vec_sse.c  | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
-index 488a0b4667..bf76c2ac26 100644
---- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
-+++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
-@@ -329,6 +329,8 @@ bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts)
- 		tx_buf = &txr->tx_buf_ring[cons];
- 		cons = RING_NEXT(txr->tx_ring_struct, cons);
- 		mbuf = rte_pktmbuf_prefree_seg(tx_buf->mbuf);
-+		if (unlikely(mbuf == NULL))
-+			continue;
- 		tx_buf->mbuf = NULL;
- 
- 		if (blk && mbuf->pool != free[0]->pool) {
+ drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
 diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
-index c4ca5cf2dd..98220bc1b3 100644
+index 8b4c396821..7529d0316b 100644
 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
 +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
-@@ -334,6 +334,8 @@ bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts)
+@@ -338,6 +338,8 @@ bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts)
  		tx_buf = &txr->tx_buf_ring[cons];
  		cons = RING_NEXT(txr->tx_ring_struct, cons);
  		mbuf = rte_pktmbuf_prefree_seg(tx_buf->mbuf);