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 4C171A2E1B for ; Thu, 5 Sep 2019 12:19:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4493F1EF7B; Thu, 5 Sep 2019 12:19:26 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0BB3A1EF86 for ; Thu, 5 Sep 2019 12:19:24 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79A1E30024DB; Thu, 5 Sep 2019 10:19:23 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D3B319C77; Thu, 5 Sep 2019 10:19:22 +0000 (UTC) From: Kevin Traynor To: Amit Gupta Cc: Jerin Jacob , dpdk stable Date: Thu, 5 Sep 2019 11:17:41 +0100 Message-Id: <20190905101754.21933-41-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 05 Sep 2019 10:19:23 +0000 (UTC) Subject: [dpdk-stable] patch 'net/thunderx: fix crash on detach' 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/12/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/9878db5f5215350a60d9f92aa601b3e248d5c1fa Thanks. Kevin Traynor --- >From 9878db5f5215350a60d9f92aa601b3e248d5c1fa Mon Sep 17 00:00:00 2001 From: Amit Gupta Date: Mon, 5 Aug 2019 13:30:44 +0530 Subject: [PATCH] net/thunderx: fix crash on detach [ upstream commit 230dce6461b92f36c819f1cf29c0c0e0f8d11ea8 ] Fix the PCIe detach segfault by releasing eth_dev resources by adding nicvf cleanup support on PCI detach. Fixes: fdf91e0f2fac ("drivers/net: do not use ethdev driver") Signed-off-by: Amit Gupta Acked-by: Jerin Jacob --- drivers/net/thunderx/nicvf_ethdev.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index 8f5664d7b..ae5a33e3a 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -2084,4 +2084,14 @@ kvlist_free: } static int +nicvf_eth_dev_uninit(struct rte_eth_dev *dev) +{ + PMD_INIT_FUNC_TRACE(); + + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + nicvf_dev_close(dev); + + return 0; +} +static int nicvf_eth_dev_init(struct rte_eth_dev *eth_dev) { @@ -2256,5 +2266,5 @@ static int nicvf_eth_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, static int nicvf_eth_pci_remove(struct rte_pci_device *pci_dev) { - return rte_eth_dev_pci_generic_remove(pci_dev, NULL); + return rte_eth_dev_pci_generic_remove(pci_dev, nicvf_eth_dev_uninit); } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:49.992064361 +0100 +++ 0041-net-thunderx-fix-crash-on-detach.patch 2019-09-05 10:36:47.544699708 +0100 @@ -1 +1 @@ -From 230dce6461b92f36c819f1cf29c0c0e0f8d11ea8 Mon Sep 17 00:00:00 2001 +From 9878db5f5215350a60d9f92aa601b3e248d5c1fa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 230dce6461b92f36c819f1cf29c0c0e0f8d11ea8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ec57692fb..56769ef85 100644 +index 8f5664d7b..ae5a33e3a 100644 @@ -37 +38 @@ -@@ -2257,5 +2267,5 @@ static int nicvf_eth_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, +@@ -2256,5 +2266,5 @@ static int nicvf_eth_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,