From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id BC52EA0096 for ; Wed, 10 Apr 2019 18:45:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C0921B130; Wed, 10 Apr 2019 18:45:23 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C5C181B105 for ; Wed, 10 Apr 2019 18:45:22 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30B52308429F; Wed, 10 Apr 2019 16:45:22 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-94.ams2.redhat.com [10.36.117.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20EBE5D961; Wed, 10 Apr 2019 16:45:20 +0000 (UTC) From: Kevin Traynor To: Gage Eads Cc: Reshma Pattan , dpdk stable Date: Wed, 10 Apr 2019 17:43:44 +0100 Message-Id: <20190410164411.10546-36-ktraynor@redhat.com> In-Reply-To: <20190410164411.10546-1-ktraynor@redhat.com> References: <20190410164411.10546-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 10 Apr 2019 16:45:22 +0000 (UTC) Subject: [dpdk-stable] patch 'app/pdump: remove only created vdevs' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Reshma Pattan --- 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 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@dpdk.org Signed-off-by: Gage Eads Acked-by: Reshma Pattan