From: Mingjin Ye <mingjinx.ye@intel.com>
To: dev@dpdk.org
Cc: qiming.yang@intel.com, Mingjin Ye <mingjinx.ye@intel.com>,
stable@dpdk.org, Anatoly Burakov <anatoly.burakov@intel.com>,
Chenbo Xia <chenbo.xia@intel.com>,
Nipun Gupta <nipun.gupta@amd.com>
Subject: [PATCH v6] bus/pci: fix legacy device IO port map
Date: Tue, 14 Nov 2023 10:24:18 +0000 [thread overview]
Message-ID: <20231114102418.409285-1-mingjinx.ye@intel.com> (raw)
In-Reply-To: <20231024020021.116278-1-wenwux.ma@intel.com>
When doing IO port mapping for legacy device in secondary process, the
region information is missing, so, we need to refill it.
Fixes: 4b741542ecde ("bus/pci: avoid depending on private kernel value")
Cc: stable@dpdk.org
Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
---
v6:
- split patch
v5:
- adding checks to vfio setup
v4:
- adjusting commit log
v3:
- adjusting variable settings
v2:
- add release of device in pci_vfio_ioport_unmap
---
drivers/bus/pci/linux/pci_vfio.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 3f3201daf2..a18161c27b 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -1230,6 +1230,32 @@ pci_vfio_ioport_map(struct rte_pci_device *dev, int bar,
return -1;
}
+ if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+ struct vfio_device_info device_info = { .argsz = sizeof(device_info) };
+ char pci_addr[PATH_MAX];
+ int vfio_dev_fd;
+ struct rte_pci_addr *loc = &dev->addr;
+
+ /* store PCI address string */
+ snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
+ loc->domain, loc->bus, loc->devid, loc->function);
+
+ vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
+ if (vfio_dev_fd < 0) {
+ return -1;
+ } else if (vfio_dev_fd == 0) {
+ if (rte_vfio_get_device_info(rte_pci_get_sysfs_path(), pci_addr,
+ &vfio_dev_fd, &device_info) != 0)
+ return -1;
+ /* we need save vfio_dev_fd, so it can be used during release */
+ if (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd))
+ return -1;
+
+ if (pci_vfio_fill_regions(dev, vfio_dev_fd, &device_info) != 0)
+ return -1;
+ }
+ }
+
if (pci_vfio_get_region(dev, bar, &size, &offset) != 0) {
RTE_LOG(ERR, EAL, "Cannot get offset of region %d.\n", bar);
return -1;
--
2.25.1
next prev parent reply other threads:[~2023-11-14 10:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 1:58 [PATCH] bus/pci: fix legacy device IO port map in secondary process Wenwu Ma
2023-08-13 6:15 ` Gupta, Nipun
2023-08-16 1:11 ` Ma, WenwuX
2023-08-21 1:27 ` [PATCH v2] " Wenwu Ma
2023-08-21 2:53 ` Stephen Hemminger
2023-08-22 2:13 ` Ma, WenwuX
2023-08-22 2:18 ` [PATCH v3] " Wenwu Ma
2023-08-28 6:06 ` Gupta, Nipun
2023-08-29 8:00 ` Ma, WenwuX
2023-08-30 5:07 ` [PATCH v4] " Wenwu Ma
2023-09-04 15:06 ` Gupta, Nipun
2023-09-05 3:10 ` Ling, WeiX
2023-10-03 10:21 ` David Marchand
2023-10-09 3:06 ` Ma, WenwuX
2023-10-18 10:05 ` David Marchand
2023-10-18 12:38 ` Gupta, Nipun
2023-10-18 13:44 ` David Marchand
2023-10-24 2:00 ` [PATCH v5] " Wenwu Ma
2023-10-27 12:50 ` Gupta, Nipun
2023-11-14 10:24 ` Mingjin Ye [this message]
2023-11-15 11:26 ` [PATCH v6] bus/pci: fix legacy device IO port map Gupta, Nipun
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=20231114102418.409285-1-mingjinx.ye@intel.com \
--to=mingjinx.ye@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=nipun.gupta@amd.com \
--cc=qiming.yang@intel.com \
--cc=stable@dpdk.org \
/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).