From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Zerun Fu <zerun.fu@corigine.com>,
mukawa@igel.co.jp, stable@dpdk.org,
Chaoyong He <chaoyong.he@corigine.com>,
Long Wu <long.wu@corigine.com>,
Peng Zhang <peng.zhang@corigine.com>
Subject: [PATCH v4 3/3] bus/pci: fix secondary process save 'FD' problem
Date: Fri, 28 Jun 2024 15:36:24 +0800 [thread overview]
Message-ID: <20240628073624.4122899-4-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20240628073624.4122899-1-chaoyong.he@corigine.com>
From: Zerun Fu <zerun.fu@corigine.com>
In the previous logic the 'fd' was only saved in the primary process,
but for some devices this value is also used in the secondary logic.
For example, the call of 'rte_pci_find_ext_capability()' will fail in
the secondary process.
Fix this problem by getting and saving the value of 'fd' also in the
secondary process logic.
Fixes: 9b957f378abf ("pci: merge uio functions for linux and bsd")
Cc: mukawa@igel.co.jp
Cc: stable@dpdk.org
Signed-off-by: Zerun Fu <zerun.fu@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
---
drivers/bus/pci/linux/pci_uio.c | 5 ++++-
drivers/bus/pci/pci_common_uio.c | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/bus/pci/linux/pci_uio.c b/drivers/bus/pci/linux/pci_uio.c
index 97d740dfe5..6680e42efb 100644
--- a/drivers/bus/pci/linux/pci_uio.c
+++ b/drivers/bus/pci/linux/pci_uio.c
@@ -237,7 +237,7 @@ pci_uio_alloc_resource(struct rte_pci_device *dev,
}
snprintf(devname, sizeof(devname), "/dev/uio%u", uio_num);
- /* save fd if in primary process */
+ /* save fd */
fd = open(devname, O_RDWR);
if (fd < 0) {
RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
@@ -261,6 +261,9 @@ pci_uio_alloc_resource(struct rte_pci_device *dev,
if (rte_intr_dev_fd_set(dev->intr_handle, uio_cfg_fd))
goto error;
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
if (dev->kdrv == RTE_PCI_KDRV_IGB_UIO) {
if (rte_intr_type_set(dev->intr_handle, RTE_INTR_HANDLE_UIO))
goto error;
diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_common_uio.c
index 432d68b12c..8688862738 100644
--- a/drivers/bus/pci/pci_common_uio.c
+++ b/drivers/bus/pci/pci_common_uio.c
@@ -106,15 +106,15 @@ pci_uio_map_resource(struct rte_pci_device *dev)
if (rte_intr_dev_fd_set(dev->intr_handle, -1))
return -1;
- /* secondary processes - use already recorded details */
- if (rte_eal_process_type() != RTE_PROC_PRIMARY)
- return pci_uio_map_secondary(dev);
-
/* allocate uio resource */
ret = pci_uio_alloc_resource(dev, &uio_res);
if (ret)
return ret;
+ /* secondary processes - use already recorded details */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return pci_uio_map_secondary(dev);
+
/* Map all BARs */
for (i = 0; i != PCI_MAX_RESOURCE; i++) {
/* skip empty BAR */
--
2.39.1
next prev parent reply other threads:[~2024-06-28 7:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 10:45 [PATCH] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
[not found] ` <20240129092231.3531217-1-chaoyong.he@corigine.com>
2024-01-29 9:22 ` [PATCH v2 1/2] " Chaoyong He
2024-01-30 4:00 ` fengchengwen
2024-01-30 7:12 ` huangdengdui
2024-03-14 10:55 ` Burakov, Anatoly
2024-01-29 9:22 ` [PATCH v2 2/2] bus/pci: fix secondary process save 'FD' problem Chaoyong He
2024-01-30 6:16 ` fengchengwen
2024-03-14 11:01 ` Burakov, Anatoly
[not found] ` <20240419032630.1215256-1-chaoyong.he@corigine.com>
2024-04-19 3:26 ` [PATCH v3 1/2] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-06-27 14:00 ` Thomas Monjalon
2024-06-28 1:03 ` Chaoyong He
2024-04-19 3:26 ` [PATCH v3 2/2] bus/pci: fix secondary process save 'FD' problem Chaoyong He
[not found] ` <20240628073624.4122899-1-chaoyong.he@corigine.com>
2024-06-28 7:36 ` [PATCH v4 2/3] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-06-28 7:36 ` Chaoyong He [this message]
2024-07-01 14:14 ` [PATCH v4 3/3] bus/pci: fix secondary process save 'FD' problem David Marchand
2024-07-02 1:53 ` Chaoyong He
[not found] ` <20240702021946.4194102-1-chaoyong.he@corigine.com>
2024-07-02 2:19 ` [PATCH v5 2/3] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-07-02 2:19 ` [PATCH v5 3/3] bus/pci: fix secondary process save 'FD' problem Chaoyong He
[not found] ` <20240702074007.1547-1-chaoyong.he@corigine.com>
2024-07-02 7:40 ` [PATCH v6 1/2] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-07-04 9:00 ` Chenbo Xia
2024-07-02 7:40 ` [PATCH v6 2/2] bus/pci: fix secondary process save 'FD' problem Chaoyong He
2024-07-12 17:30 ` David Marchand
2024-07-15 2:24 ` Chenbo Xia
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=20240628073624.4122899-4-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=long.wu@corigine.com \
--cc=mukawa@igel.co.jp \
--cc=oss-drivers@corigine.com \
--cc=peng.zhang@corigine.com \
--cc=stable@dpdk.org \
--cc=zerun.fu@corigine.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).