[dpdk-stable] patch 'examples/multi_process: fix client crash with sparse ports' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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

Thanks.

Luca Boccassi

---
>From d8b5e014364d4baf67424236cd7575caf793ee32 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin at microsoft.com>
Date: Mon, 5 Aug 2019 09:38:17 -0700
Subject: [PATCH] examples/multi_process: fix client crash with sparse ports

[ upstream commit 6b124806a3181855fed969d0ad8520831ae0d7e2 ]

The mp_client crashes if run on Azure or any system where ethdev
ports are owned. In that case, the tx_buffer and tx_stats for the
real port were initialized correctly, but the wrong port was used.

For example if the server has Ports 3 and 5. Then calling
rte_eth_tx_buffer_flush on any other buffer will dereference null
because the tx buffer for that port was not allocated.

Also:
   - the flush code is common enough that it should not be marked
     unlikely
   - combine conditions to reduce indentation
   - avoid unnecessary if() if sent is zero.

Fixes: e2366e74e029 ("examples: use buffered Tx")

Signed-off-by: Stephen Hemminger <sthemmin at microsoft.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 .../client_server_mp/mp_client/client.c        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/multi_process/client_server_mp/mp_client/client.c b/examples/multi_process/client_server_mp/mp_client/client.c
index 30ce4b34c8..a9076d1e0b 100644
--- a/examples/multi_process/client_server_mp/mp_client/client.c
+++ b/examples/multi_process/client_server_mp/mp_client/client.c
@@ -275,19 +275,19 @@ main(int argc, char *argv[])
 
 	for (;;) {
 		uint16_t i, rx_pkts;
-		uint16_t port;
 
 		rx_pkts = rte_ring_dequeue_burst(rx_ring, pkts,
 				PKT_READ_SIZE, NULL);
 
-		if (unlikely(rx_pkts == 0)){
-			if (need_flush)
-				for (port = 0; port < ports->num_ports; port++) {
-					sent = rte_eth_tx_buffer_flush(ports->id[port], client_id,
-							tx_buffer[port]);
-					if (unlikely(sent))
-						tx_stats->tx[port] += sent;
-				}
+		if (rx_pkts == 0 && need_flush) {
+			for (i = 0; i < ports->num_ports; i++) {
+				uint16_t port = ports->id[i];
+
+				sent = rte_eth_tx_buffer_flush(port,
+							       client_id,
+							       tx_buffer[port]);
+				tx_stats->tx[port] += sent;
+			}
 			need_flush = 0;
 			continue;
 		}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:31.530834635 +0000
+++ 0131-examples-multi_process-fix-client-crash-with-sparse-.patch	2019-12-19 14:32:26.337302426 +0000
@@ -1,8 +1,10 @@
-From 6b124806a3181855fed969d0ad8520831ae0d7e2 Mon Sep 17 00:00:00 2001
+From d8b5e014364d4baf67424236cd7575caf793ee32 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <sthemmin at microsoft.com>
 Date: Mon, 5 Aug 2019 09:38:17 -0700
 Subject: [PATCH] examples/multi_process: fix client crash with sparse ports
 
+[ upstream commit 6b124806a3181855fed969d0ad8520831ae0d7e2 ]
+
 The mp_client crashes if run on Azure or any system where ethdev
 ports are owned. In that case, the tx_buffer and tx_stats for the
 real port were initialized correctly, but the wrong port was used.
@@ -18,7 +20,6 @@
    - avoid unnecessary if() if sent is zero.
 
 Fixes: e2366e74e029 ("examples: use buffered Tx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <sthemmin at microsoft.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -27,10 +28,10 @@
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/examples/multi_process/client_server_mp/mp_client/client.c b/examples/multi_process/client_server_mp/mp_client/client.c
-index c23dd3f378..361d90b54b 100644
+index 30ce4b34c8..a9076d1e0b 100644
 --- a/examples/multi_process/client_server_mp/mp_client/client.c
 +++ b/examples/multi_process/client_server_mp/mp_client/client.c
-@@ -246,19 +246,19 @@ main(int argc, char *argv[])
+@@ -275,19 +275,19 @@ main(int argc, char *argv[])
  
  	for (;;) {
  		uint16_t i, rx_pkts;