[dpdk-stable] patch 'net/tap: fix check for mbuf number of segment' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/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.

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/782d5424188706c305cc9ebb838b341a9aba811f

Thanks.

Kevin.

---
>From 782d5424188706c305cc9ebb838b341a9aba811f Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Thu, 16 Apr 2020 11:04:35 +0800
Subject: [PATCH] net/tap: fix check for mbuf number of segment

[ upstream commit cc6cf04f59ec20757990b3e8586b7c3a7f497720 ]

Now the rxq->pool is mbuf concatenation, but its nb_segs is 1. When
conducting some sanity checks on the mbuf with debug enabled, it fails.

Fixes: 0781f5762cfe ("net/tap: support segmented mbufs")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/tap/rte_eth_tap.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index c6cfb4c683..5b486dacfc 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -341,4 +341,21 @@ tap_rx_offload_get_queue_capa(void)
 }
 
+static void
+tap_rxq_pool_free(struct rte_mbuf *pool)
+{
+	struct rte_mbuf *mbuf = pool;
+	uint16_t nb_segs = 1;
+
+	if (mbuf == NULL)
+		return;
+
+	while (mbuf->next) {
+		mbuf = mbuf->next;
+		nb_segs++;
+	}
+	pool->nb_segs = nb_segs;
+	rte_pktmbuf_free(pool);
+}
+
 /* Callback to handle the rx burst of packets to the correct interface and
  * file descriptor(s) in a multi-queue setup.
@@ -391,5 +408,5 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 
 				seg->next = NULL;
-				rte_pktmbuf_free(mbuf);
+				tap_rxq_pool_free(mbuf);
 
 				goto end;
@@ -1023,5 +1040,5 @@ tap_dev_close(struct rte_eth_dev *dev)
 			close(process_private->rxq_fds[i]);
 			process_private->rxq_fds[i] = -1;
-			rte_pktmbuf_free(rxq->pool);
+			tap_rxq_pool_free(rxq->pool);
 			rte_free(rxq->iovecs);
 			rxq->pool = NULL;
@@ -1062,5 +1079,5 @@ tap_rx_queue_release(void *queue)
 		close(process_private->rxq_fds[rxq->queue_id]);
 		process_private->rxq_fds[rxq->queue_id] = -1;
-		rte_pktmbuf_free(rxq->pool);
+		tap_rxq_pool_free(rxq->pool);
 		rte_free(rxq->iovecs);
 		rxq->pool = NULL;
@@ -1406,5 +1423,5 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
 
 error:
-	rte_pktmbuf_free(rxq->pool);
+	tap_rxq_pool_free(rxq->pool);
 	rxq->pool = NULL;
 	rte_free(rxq->iovecs);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:03.247254392 +0100
+++ 0080-net-tap-fix-check-for-mbuf-number-of-segment.patch	2020-05-28 17:12:59.166554929 +0100
@@ -1 +1 @@
-From cc6cf04f59ec20757990b3e8586b7c3a7f497720 Mon Sep 17 00:00:00 2001
+From 782d5424188706c305cc9ebb838b341a9aba811f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cc6cf04f59ec20757990b3e8586b7c3a7f497720 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 9c88b9268e..2846ce0d3e 100644
+index c6cfb4c683..5b486dacfc 100644
@@ -23 +24 @@
-@@ -339,4 +339,21 @@ tap_rx_offload_get_queue_capa(void)
+@@ -341,4 +341,21 @@ tap_rx_offload_get_queue_capa(void)
@@ -45 +46 @@
-@@ -389,5 +406,5 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+@@ -391,5 +408,5 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
@@ -52 +53 @@
-@@ -1036,5 +1053,5 @@ tap_dev_close(struct rte_eth_dev *dev)
+@@ -1023,5 +1040,5 @@ tap_dev_close(struct rte_eth_dev *dev)
@@ -59 +60 @@
-@@ -1075,5 +1092,5 @@ tap_rx_queue_release(void *queue)
+@@ -1062,5 +1079,5 @@ tap_rx_queue_release(void *queue)
@@ -66 +67 @@
-@@ -1485,5 +1502,5 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -1406,5 +1423,5 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,