diff mbox series

net/virtio: unmap PCI device in secondary process

Message ID 20220421111537.935333-1-yuanx.wang@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Maxime Coquelin
Headers show
Series net/virtio: unmap PCI device in secondary process | expand

Checks

Context Check Description
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-intel-Functional success Functional Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Yuan Wang April 21, 2022, 11:15 a.m. UTC
In multi-process, the secondary process will remap PCI during
initialization, but the mapping is not removed in the uninit path,
the device is not closed, and the device busy error will be reported
when the device is hotplugged.

This patch unmap PCI device at secondary process uninitialization
based on virtio_rempa_pci().

Fixes: 36a7a2e7a53 ("net/virtio: move PCI device init in dedicated file")

Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
---
 drivers/net/virtio/virtio_pci_ethdev.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Wei Ling April 22, 2022, 9:25 a.m. UTC | #1
> -----Original Message-----
> From: Yuan Wang <yuanx.wang@intel.com>
> Sent: Thursday, April 21, 2022 7:16 PM
> To: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>
> Cc: dev@dpdk.org; Hu, Jiayu <jiayu.hu@intel.com>; He, Xingguang
> <xingguang.he@intel.com>; Wang, YuanX <yuanx.wang@intel.com>
> Subject: [PATCH] net/virtio: unmap PCI device in secondary process
> 
Tested-by: Wei Ling <weix.ling@intel.com>
Xia, Chenbo May 30, 2022, 2:49 a.m. UTC | #2
> -----Original Message-----
> From: Wang, YuanX <yuanx.wang@intel.com>
> Sent: Thursday, April 21, 2022 7:16 PM
> To: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>
> Cc: dev@dpdk.org; Hu, Jiayu <jiayu.hu@intel.com>; He, Xingguang
> <xingguang.he@intel.com>; Wang, YuanX <yuanx.wang@intel.com>
> Subject: [PATCH] net/virtio: unmap PCI device in secondary process
> 
> In multi-process, the secondary process will remap PCI during
> initialization, but the mapping is not removed in the uninit path,
> the device is not closed, and the device busy error will be reported
> when the device is hotplugged.
> 
> This patch unmap PCI device at secondary process uninitialization

unmaps

> based on virtio_rempa_pci().

Virtio_remap_pci

> 
> Fixes: 36a7a2e7a53 ("net/virtio: move PCI device init in dedicated file")

Miss cc-stable tag. Patch LGTM

Thanks,
Chenbo

> 
> Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
> ---
>  drivers/net/virtio/virtio_pci_ethdev.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/virtio/virtio_pci_ethdev.c
> b/drivers/net/virtio/virtio_pci_ethdev.c
> index 54645dc62e..1f6bdeddda 100644
> --- a/drivers/net/virtio/virtio_pci_ethdev.c
> +++ b/drivers/net/virtio/virtio_pci_ethdev.c
> @@ -122,10 +122,20 @@ static int
>  eth_virtio_pci_uninit(struct rte_eth_dev *eth_dev)
>  {
>  	int ret;
> +	struct virtio_pci_dev *dev;
> +	struct virtio_hw *hw;
>  	PMD_INIT_FUNC_TRACE();
> 
> -	if (rte_eal_process_type() == RTE_PROC_SECONDARY)
> +	if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
> +		dev = eth_dev->data->dev_private;
> +		hw = &dev->hw;
> +
> +		if (dev->modern)
> +			rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
> +		else
> +			vtpci_legacy_ioport_unmap(hw);
>  		return 0;
> +	}
> 
>  	ret = virtio_dev_stop(eth_dev);
>  	virtio_dev_close(eth_dev);
> --
> 2.25.1
Yuan Wang May 30, 2022, 10:03 a.m. UTC | #3
Hi Chenbo,

> -----Original Message-----
> From: Xia, Chenbo <chenbo.xia@intel.com>
> Sent: Monday, May 30, 2022 10:49 AM
> To: Wang, YuanX <yuanx.wang@intel.com>; maxime.coquelin@redhat.com
> Cc: dev@dpdk.org; Hu, Jiayu <jiayu.hu@intel.com>; He, Xingguang
> <xingguang.he@intel.com>
> Subject: RE: [PATCH] net/virtio: unmap PCI device in secondary process
> 
> > -----Original Message-----
> > From: Wang, YuanX <yuanx.wang@intel.com>
> > Sent: Thursday, April 21, 2022 7:16 PM
> > To: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>
> > Cc: dev@dpdk.org; Hu, Jiayu <jiayu.hu@intel.com>; He, Xingguang
> > <xingguang.he@intel.com>; Wang, YuanX <yuanx.wang@intel.com>
> > Subject: [PATCH] net/virtio: unmap PCI device in secondary process
> >
> > In multi-process, the secondary process will remap PCI during
> > initialization, but the mapping is not removed in the uninit path, the
> > device is not closed, and the device busy error will be reported when
> > the device is hotplugged.
> >
> > This patch unmap PCI device at secondary process uninitialization
> 
> unmaps
> 
> > based on virtio_rempa_pci().
> 
> Virtio_remap_pci
> 
> >
> > Fixes: 36a7a2e7a53 ("net/virtio: move PCI device init in dedicated
> > file")
> 
> Miss cc-stable tag. Patch LGTM

Thanks, will fix it in next version.

Regards,
Yuan

> 
> Thanks,
> Chenbo
> 
> >
> > Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
> > ---
> >  drivers/net/virtio/virtio_pci_ethdev.c | 12 +++++++++++-
> >  1 file changed, 11 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/virtio/virtio_pci_ethdev.c
> > b/drivers/net/virtio/virtio_pci_ethdev.c
> > index 54645dc62e..1f6bdeddda 100644
> > --- a/drivers/net/virtio/virtio_pci_ethdev.c
> > +++ b/drivers/net/virtio/virtio_pci_ethdev.c
> > @@ -122,10 +122,20 @@ static int
> >  eth_virtio_pci_uninit(struct rte_eth_dev *eth_dev)  {
> >  	int ret;
> > +	struct virtio_pci_dev *dev;
> > +	struct virtio_hw *hw;
> >  	PMD_INIT_FUNC_TRACE();
> >
> > -	if (rte_eal_process_type() == RTE_PROC_SECONDARY)
> > +	if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
> > +		dev = eth_dev->data->dev_private;
> > +		hw = &dev->hw;
> > +
> > +		if (dev->modern)
> > +
> 	rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
> > +		else
> > +			vtpci_legacy_ioport_unmap(hw);
> >  		return 0;
> > +	}
> >
> >  	ret = virtio_dev_stop(eth_dev);
> >  	virtio_dev_close(eth_dev);
> > --
> > 2.25.1
diff mbox series

Patch

diff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c
index 54645dc62e..1f6bdeddda 100644
--- a/drivers/net/virtio/virtio_pci_ethdev.c
+++ b/drivers/net/virtio/virtio_pci_ethdev.c
@@ -122,10 +122,20 @@  static int
 eth_virtio_pci_uninit(struct rte_eth_dev *eth_dev)
 {
 	int ret;
+	struct virtio_pci_dev *dev;
+	struct virtio_hw *hw;
 	PMD_INIT_FUNC_TRACE();
 
-	if (rte_eal_process_type() == RTE_PROC_SECONDARY)
+	if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+		dev = eth_dev->data->dev_private;
+		hw = &dev->hw;
+
+		if (dev->modern)
+			rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
+		else
+			vtpci_legacy_ioport_unmap(hw);
 		return 0;
+	}
 
 	ret = virtio_dev_stop(eth_dev);
 	virtio_dev_close(eth_dev);