From: Yuan Wang <yuanx.wang@intel.com>
To: maxime.coquelin@redhat.com, chenbo.xia@intel.com, dev@dpdk.org
Cc: jiayu.hu@intel.com, xingguang.he@intel.com, weix.ling@intel.com,
Yuan Wang <yuanx.wang@intel.com>,
stable@dpdk.org
Subject: [PATCH v2] net/virtio: unmap PCI device in secondary process
Date: Mon, 6 Jun 2022 23:55:43 +0800 [thread overview]
Message-ID: <20220606155543.1213665-1-yuanx.wang@intel.com> (raw)
In-Reply-To: <20220421111537.935333-1-yuanx.wang@intel.com>
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")
Cc: stable@dpdk.org
Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
Tested-by: Wei Ling <weix.ling@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
next parent reply other threads:[~2022-06-06 8:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220421111537.935333-1-yuanx.wang@intel.com>
2022-06-06 15:55 ` Yuan Wang [this message]
2022-06-06 9:24 ` Ling, WeiX
2022-06-20 3:37 ` Xia, Chenbo
2022-06-20 9:53 ` Wang, YuanX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220606155543.1213665-1-yuanx.wang@intel.com \
--to=yuanx.wang@intel.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=jiayu.hu@intel.com \
--cc=maxime.coquelin@redhat.com \
--cc=stable@dpdk.org \
--cc=weix.ling@intel.com \
--cc=xingguang.he@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).