[dpdk-stable] patch 'examples/multi_process: fix buffer underrun' has been queued to LTS release 18.11.2

[Kevin Traynor <ktraynor@redhat.com>]

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/14/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/c35f7d9bc396b94556820bb148c5393d4bfbb8d7

Thanks.

Kevin Traynor

---
From c35f7d9bc396b94556820bb148c5393d4bfbb8d7 Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Wed, 10 Apr 2019 12:41:54 -0700
Subject: [PATCH] examples/multi_process: fix buffer underrun

[ upstream commit 7c22ccdd91bc91e60f1ee32a3c79192a172dc5ea ]

For client_server_mp, the total number of buffers for the mbuf mempool
should be correctly calculated. Otherwise, having more clients will stop
traffic.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
---
 .../multi_process/client_server_mp/mp_server/init.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index 30c8e44bc..3af5dc699 100644
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -38,6 +38,4 @@
 #include "init.h"
 
-#define MBUFS_PER_CLIENT 1536
-#define MBUFS_PER_PORT 1536
 #define MBUF_CACHE_SIZE 512
 
@@ -64,6 +62,13 @@ static int
 init_mbuf_pools(void)
 {
-	const unsigned num_mbufs = (num_clients * MBUFS_PER_CLIENT) \
-			+ (ports->num_ports * MBUFS_PER_PORT);
+	const unsigned int num_mbufs_server =
+		RTE_MP_RX_DESC_DEFAULT * ports->num_ports;
+	const unsigned int num_mbufs_client =
+		num_clients * (CLIENT_QUEUE_RINGSIZE +
+			       RTE_MP_TX_DESC_DEFAULT * ports->num_ports);
+	const unsigned int num_mbufs_mp_cache =
+		(num_clients + 1) * MBUF_CACHE_SIZE;
+	const unsigned int num_mbufs =
+		num_mbufs_server + num_mbufs_client + num_mbufs_mp_cache;
 
 	/* don't pass single-producer/single-consumer flags to mbuf create as it
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 16:33:57.759756307 +0100
+++ 0005-examples-multi_process-fix-buffer-underrun.patch	2019-05-08 16:33:57.359579845 +0100
@@ -1 +1 @@
-From 7c22ccdd91bc91e60f1ee32a3c79192a172dc5ea Mon Sep 17 00:00:00 2001
+From c35f7d9bc396b94556820bb148c5393d4bfbb8d7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7c22ccdd91bc91e60f1ee32a3c79192a172dc5ea ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org