From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AD4A1A0613 for ; Tue, 27 Aug 2019 11:30:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A277254AE; Tue, 27 Aug 2019 11:30:50 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 54C8E54AE for ; Tue, 27 Aug 2019 11:30:49 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6243618BF915; Tue, 27 Aug 2019 09:30:48 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3D585C1B2; Tue, 27 Aug 2019 09:30:46 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Ivan Malov , David Marchand , Ferruh Yigit , dpdk stable Date: Tue, 27 Aug 2019 10:29:42 +0100 Message-Id: <20190827093032.20423-5-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 27 Aug 2019 09:30:48 +0000 (UTC) Subject: [dpdk-stable] patch 'ethdev: avoid error on PCI unplug of closed port' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/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/48ece96d63f88c0aa28b85bed4ecac744b894c8d Thanks. Kevin Traynor --- >From 48ece96d63f88c0aa28b85bed4ecac744b894c8d Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Fri, 21 Jun 2019 10:40:39 +0100 Subject: [PATCH] ethdev: avoid error on PCI unplug of closed port [ upstream commit ca5ba1b6972f381d410f9e53b650ba179e776225 ] If PCI Ethernet device driver removes it on close (RTE_ETH_DEV_CLOSE_REMOVE) and later PCI device itself is unplugged, it should not fail because of Ethernet device is already removed. Fixes: 23ea57a2a0ce ("ethdev: complete closing of port") Signed-off-by: Andrew Rybchenko Reviewed-by: Ivan Malov Reported-by: David Marchand Acked-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev_pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h index 23257e986..ccdbb46ec 100644 --- a/lib/librte_ethdev/rte_ethdev_pci.h +++ b/lib/librte_ethdev/rte_ethdev_pci.h @@ -185,5 +185,5 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device *pci_dev, eth_dev = rte_eth_dev_allocated(pci_dev->device.name); if (!eth_dev) - return -ENODEV; + return 0; if (dev_uninit) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:11.196263124 +0100 +++ 0005-ethdev-avoid-error-on-PCI-unplug-of-closed-port.patch 2019-08-27 09:40:10.846146185 +0100 @@ -1 +1 @@ -From ca5ba1b6972f381d410f9e53b650ba179e776225 Mon Sep 17 00:00:00 2001 +From 48ece96d63f88c0aa28b85bed4ecac744b894c8d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ca5ba1b6972f381d410f9e53b650ba179e776225 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org