[dpdk-stable] patch 'app/testpmd: fix mempool free on exit' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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 can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 22c214874fba5f426a787ae95fcb8196268c5cde Mon Sep 17 00:00:00 2001
From: Shahaf Shuler <shahafs at mellanox.com>
Date: Sun, 7 Apr 2019 08:02:24 +0300
Subject: [PATCH] app/testpmd: fix mempool free on exit

[ upstream commit 401b744da2cf0f87991127e5b422cde6cde3d726 ]

Allocated mempools were never free. it is bad practice.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Shahaf Shuler <shahafs at mellanox.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 app/test-pmd/testpmd.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 55a4ee407..27b3c1183 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -189,4 +189,6 @@ struct fwd_engine * fwd_engines[] = {
 };
 
+struct rte_mempool *mempools[RTE_MAX_NUMA_NODES];
+
 struct fwd_config cur_fwd_config;
 struct fwd_engine *cur_fwd_eng = &io_fwd_engine; /**< IO mode by default. */
@@ -845,5 +847,5 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
  * Configuration initialisation done once at init time.
  */
-static void
+static struct rte_mempool *
 mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
 		 unsigned int socket_id)
@@ -923,4 +925,5 @@ err:
 		rte_mempool_dump(stdout, rte_mp);
 	}
+	return rte_mp;
 }
 
@@ -1140,12 +1143,16 @@ init_config(void)
 
 		for (i = 0; i < num_sockets; i++)
-			mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool,
-					 socket_ids[i]);
+			mempools[i] = mbuf_pool_create(mbuf_data_size,
+						       nb_mbuf_per_pool,
+						       socket_ids[i]);
 	} else {
 		if (socket_num == UMA_NO_CONFIG)
-			mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool, 0);
+			mempools[0] = mbuf_pool_create(mbuf_data_size,
+						       nb_mbuf_per_pool, 0);
 		else
-			mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool,
-						 socket_num);
+			mempools[socket_num] = mbuf_pool_create
+							(mbuf_data_size,
+							 nb_mbuf_per_pool,
+							 socket_num);
 	}
 
@@ -2385,4 +2392,5 @@ pmd_test_exit(void)
 	portid_t pt_id;
 	int ret;
+	int i;
 
 	if (test_done == 0)
@@ -2438,4 +2446,8 @@ pmd_test_exit(void)
 		}
 	}
+	for (i = 0 ; i < RTE_MAX_NUMA_NODES ; i++) {
+		if (mempools[i])
+			rte_mempool_free(mempools[i]);
+	}
 
 	printf("\nBye...\n");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.527667970 +0100
+++ 0015-app-testpmd-fix-mempool-free-on-exit.patch	2019-04-30 17:58:13.779140353 +0100
@@ -1 +1 @@
-From 401b744da2cf0f87991127e5b422cde6cde3d726 Mon Sep 17 00:00:00 2001
+From 22c214874fba5f426a787ae95fcb8196268c5cde Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 401b744da2cf0f87991127e5b422cde6cde3d726 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index aeaa74c98..b7f70b0c4 100644
+index 55a4ee407..27b3c1183 100644
@@ -28 +29 @@
-@@ -836,5 +838,5 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
+@@ -845,5 +847,5 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
@@ -35 +36 @@
-@@ -914,4 +916,5 @@ err:
+@@ -923,4 +925,5 @@ err:
@@ -41 +42 @@
-@@ -1131,12 +1134,16 @@ init_config(void)
+@@ -1140,12 +1143,16 @@ init_config(void)
@@ -63 +64 @@
-@@ -2395,4 +2402,5 @@ pmd_test_exit(void)
+@@ -2385,4 +2392,5 @@ pmd_test_exit(void)
@@ -69 +70 @@
-@@ -2448,4 +2456,8 @@ pmd_test_exit(void)
+@@ -2438,4 +2446,8 @@ pmd_test_exit(void)