[dpdk-dev] [PATCH] net/thunderx: fix nicvf cleanup on detaching PCI dev

[dpdk-dev] [PATCH] net/thunderx: fix nicvf cleanup on detaching PCI dev

[agupta3]

From: Amit Gupta <agupta3@marvell.com>

There was a bug while doing PCI detach because of that
app gets seg fault as eth_dev is released without
stopping/cleaning up mapped nicvf.

Fixed this bug by adding nicvf cleanup stupport on PCI detach.

Fixes: fdf91e0f2fac ("drivers/net: do not use ethdev driver")
Signed-off-by: Amit Gupta <agupta3@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 ec57692..56769ef 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -2083,6 +2083,16 @@ static void nicvf_vf_stop(struct rte_eth_dev *dev, struct nicvf *nic,
 	return ret;
 }
 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)
 {
 	int ret;
@@ -2256,7 +2266,7 @@ 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);
 }
 
 static struct rte_pci_driver rte_nicvf_pmd = {
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH] net/thunderx: fix nicvf cleanup on detaching PCI dev

[Jerin Jacob Kollanukkaran]

> -----Original Message-----
> From: agupta3@marvell.com <agupta3@marvell.com>
> Sent: Monday, August 5, 2019 1:31 PM
> To: Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Maciej Czekaj
> <mczekaj@marvell.com>; Anatoly Burakov <anatoly.burakov@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org; Amit Gupta <agupta3@marvell.com>
> Subject: [PATCH] net/thunderx: fix nicvf cleanup on detaching PCI dev
> 
> From: Amit Gupta <agupta3@marvell.com>
> 
> There was a bug while doing PCI detach because of that app gets seg fault as
> eth_dev is released without stopping/cleaning up mapped nicvf.
> 
> Fixed this bug by adding nicvf cleanup stupport on PCI detach.
> 
> Fixes: fdf91e0f2fac ("drivers/net: do not use ethdev driver")
> Signed-off-by: Amit Gupta <agupta3@marvell.com>

Cc: stable@dpdk.org

Acked-by: Jerin Jacob <jerinj@marvell.com>

Fixed check-git-log.sh issues and applied to dpdk-next-net-mrvl/master. Thanks

> ---
>  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 ec57692..56769ef 100644
> --- a/drivers/net/thunderx/nicvf_ethdev.c
> +++ b/drivers/net/thunderx/nicvf_ethdev.c
> @@ -2083,6 +2083,16 @@ static void nicvf_vf_stop(struct rte_eth_dev *dev,
> struct nicvf *nic,
>  	return ret;
>  }
>  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)  {
>  	int ret;
> @@ -2256,7 +2266,7 @@ 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);
>  }
> 
>  static struct rte_pci_driver rte_nicvf_pmd = {
> --
> 1.8.3.1