[dpdk-stable] patch 'app/pdump: remove only created vdevs' 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 04/16/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.

Kevin Traynor

---
>From 35abe5bc24c40c288dc5898e292f6e80fab4b8c9 Mon Sep 17 00:00:00 2001
From: Gage Eads <gage.eads at intel.com>
Date: Tue, 26 Feb 2019 10:04:37 -0600
Subject: [PATCH] app/pdump: remove only created vdevs

[ upstream commit 499ca6161007d95d6727c4236b53fe8036efda00 ]

This commit fixes a bug in which a unidirectional pdump could attempt to
remove devices it didn't create.

Fixes: 35cb223ab7be ("app/pdump: fix vdev cleanup")

Signed-off-by: Gage Eads <gage.eads at intel.com>
Acked-by: Reshma Pattan <reshma.pattan at intel.com>
---
 app/pdump/main.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/pdump/main.c b/app/pdump/main.c
index 5e183ea90..ccf2a1d2f 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -513,10 +513,17 @@ cleanup_pdump_resources(void)
 			free_ring_data(pt->tx_ring, pt->tx_vdev_id, &pt->stats);
 
-		/* Remove the vdev created */
-		rte_eth_dev_get_name_by_port(pt->rx_vdev_id, name);
-		rte_eal_hotplug_remove("vdev", name);
+		/* Remove the vdev(s) created */
+		if (pt->dir & RTE_PDUMP_FLAG_RX) {
+			rte_eth_dev_get_name_by_port(pt->rx_vdev_id, name);
+			rte_eal_hotplug_remove("vdev", name);
+		}
 
-		rte_eth_dev_get_name_by_port(pt->tx_vdev_id, name);
-		rte_eal_hotplug_remove("vdev", name);
+		if (pt->single_pdump_dev)
+			continue;
+
+		if (pt->dir & RTE_PDUMP_FLAG_TX) {
+			rte_eth_dev_get_name_by_port(pt->tx_vdev_id, name);
+			rte_eal_hotplug_remove("vdev", name);
+		}
 
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-10 14:06:10.654856069 +0100
+++ 0036-app-pdump-remove-only-created-vdevs.patch	2019-04-10 14:06:07.928292778 +0100
@@ -1,13 +1,14 @@
-From 499ca6161007d95d6727c4236b53fe8036efda00 Mon Sep 17 00:00:00 2001
+From 35abe5bc24c40c288dc5898e292f6e80fab4b8c9 Mon Sep 17 00:00:00 2001
 From: Gage Eads <gage.eads at intel.com>
 Date: Tue, 26 Feb 2019 10:04:37 -0600
 Subject: [PATCH] app/pdump: remove only created vdevs
 
+[ upstream commit 499ca6161007d95d6727c4236b53fe8036efda00 ]
+
 This commit fixes a bug in which a unidirectional pdump could attempt to
 remove devices it didn't create.
 
 Fixes: 35cb223ab7be ("app/pdump: fix vdev cleanup")
-Cc: stable at dpdk.org
 
 Signed-off-by: Gage Eads <gage.eads at intel.com>
 Acked-by: Reshma Pattan <reshma.pattan at intel.com>