[dpdk-stable] patch 'net/thunderx: fix crash on detach' has been queued to LTS release 18.11.3
Kevin Traynor
ktraynor at redhat.com
Thu Sep 5 12:17:41 CEST 2019
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 <agupta3 at marvell.com>
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 <agupta3 at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
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 at 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,
More information about the stable
mailing list