From 5729407fa4d612b93ceefacef13f57c1de2ceaa6 Mon Sep 17 00:00:00 2001 From: Yuan Wang Date: Mon, 6 Jun 2022 23:55:43 +0800 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 unmaps PCI device at secondary process uninitialization based on virtio_rempa_pci. Fixes: 36a7a2e7a53f ("net/virtio: move PCI device init in dedicated file") Cc: stable@dpdk.org Signed-off-by: Yuan Wang Tested-by: Wei Ling Reviewed-by: Chenbo Xia --- 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.39.5