[dpdk-stable] patch 'test/distributor: collect return mbufs' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

Thanks.

Kevin.

---
>From 6a938ac29a5f2962ec44bbd947807bedf064da82 Mon Sep 17 00:00:00 2001
From: Lukasz Wojciechowski <l.wojciechow at partner.samsung.com>
Date: Sat, 17 Oct 2020 05:06:53 +0200
Subject: [PATCH] test/distributor: collect return mbufs

[ upstream commit 79c5e12ac29567ed6c1750f732f04619c2a9cc7a ]

During quit_workers function distributor's main core processes
some packets to wake up pending worker cores so they can quit.
As quit_workers acts also as a cleanup procedure for next test
case it should also collect these packets returned by workers'
handlers, so the cyclic buffer with returned packets
in distributor remains empty.

Fixes: c3eabff124e6 ("distributor: add unit tests")
Fixes: c0de0eb82e40 ("distributor: switch over to new API")

Signed-off-by: Lukasz Wojciechowski <l.wojciechow at partner.samsung.com>
Acked-by: David Hunt <david.hunt at intel.com>
---
 test/test/test_distributor.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c
index d8e007c47b..43fd231904 100644
--- a/test/test/test_distributor.c
+++ b/test/test/test_distributor.c
@@ -591,4 +591,5 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p)
 	unsigned i;
 	struct rte_mbuf *bufs[RTE_MAX_LCORE];
+	struct rte_mbuf *returns[RTE_MAX_LCORE];
 	if (rte_mempool_get_bulk(p, (void *)bufs, num_workers) != 0) {
 		printf("line %d: Error getting mbufs from pool\n", __LINE__);
@@ -606,4 +607,8 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p)
 	rte_eal_mp_wait_lcore();
 
+	while (rte_distributor_returned_pkts(d, returns, RTE_MAX_LCORE))
+		;
+
+	rte_distributor_clear_returns(d);
 	rte_mempool_put_bulk(p, (void *)bufs, num_workers);
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:38.456246720 +0000
+++ 0026-test-distributor-collect-return-mbufs.patch	2020-11-18 16:33:37.930215063 +0000
@@ -1 +1 @@
-From 79c5e12ac29567ed6c1750f732f04619c2a9cc7a Mon Sep 17 00:00:00 2001
+From 6a938ac29a5f2962ec44bbd947807bedf064da82 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 79c5e12ac29567ed6c1750f732f04619c2a9cc7a ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
- app/test/test_distributor.c | 5 +++++
+ test/test/test_distributor.c | 5 +++++
@@ -23,5 +24,5 @@
-diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
-index 4343efed14..3f0aeb7b90 100644
---- a/app/test/test_distributor.c
-+++ b/app/test/test_distributor.c
-@@ -592,4 +592,5 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p)
+diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c
+index d8e007c47b..43fd231904 100644
+--- a/test/test/test_distributor.c
++++ b/test/test/test_distributor.c
+@@ -591,4 +591,5 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p)
@@ -33 +34 @@
-@@ -607,4 +608,8 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p)
+@@ -606,4 +607,8 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p)