[PATCH v2] net/virtio: unmap PCI device in secondary process

[Wang, YuanX]

Hi Chenbo,

> -----Original Message-----
> From: Xia, Chenbo <chenbo.xia at intel.com>
> Sent: Monday, June 20, 2022 11:38 AM
> To: Wang, YuanX <yuanx.wang at intel.com>; maxime.coquelin at redhat.com;
> dev at dpdk.org
> Cc: Hu, Jiayu <jiayu.hu at intel.com>; He, Xingguang
> <xingguang.he at intel.com>; Ling, WeiX <weix.ling at intel.com>;
> stable at dpdk.org
> Subject: RE: [PATCH v2] net/virtio: unmap PCI device in secondary process
> 
> > -----Original Message-----
> > From: Wang, YuanX <yuanx.wang at intel.com>
> > Sent: Monday, June 6, 2022 11:56 PM
> > To: maxime.coquelin at redhat.com; Xia, Chenbo <chenbo.xia at intel.com>;
> > dev at dpdk.org
> > Cc: Hu, Jiayu <jiayu.hu at intel.com>; He, Xingguang
> > <xingguang.he at intel.com>; Ling, WeiX <weix.ling at intel.com>; Wang,
> > YuanX <yuanx.wang at intel.com>; stable at dpdk.org
> > Subject: [PATCH v2] 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 unmaps PCI device at secondary process uninitialization
> > based on virtio_rempa_pci.
> >
> > Fixes: 36a7a2e7a53 ("net/virtio: move PCI device init in dedicated
> > file")
> 
> This should be 12 digits, not 11

Thanks, will be fixed at the next version.

Thanks,
Yuan
> 
> With this fixed:
> 
> Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
> 
> > Cc: stable at dpdk.org
> >
> > Signed-off-by: Yuan Wang <yuanx.wang at intel.com>
> > Tested-by: Wei Ling <weix.ling at 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