bus/pci: fix secondary process PCI uio resource map problem
Checks
Commit Message
From: Zerun Fu <zerun.fu@corigine.com>
For the primary process, the logic loops all BARs and will skip
the map of BAR with an invalid physical address (0), also will
assign 'uio_res->nb_maps' with the real mapped BARs number. But
for the secondary process, instead of loops all BARs, the logic
using the 'uio_res->nb_map' as index. If the device uses continuous
BARs there will be no problem, whereas if it uses discrete BARs,
it will lead to mapping errors.
Fix this problem by also loops all BARs and skip the map of BAR
with an invalid physical address in secondary process.
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/pci_common_uio.c | 94 ++++++++++++++++++++------------
1 file changed, 60 insertions(+), 34 deletions(-)
Comments
A gentle ping~
> -----Original Message-----
> From: Chaoyong He
> Sent: Monday, January 29, 2024 5:23 PM
> To: dev@dpdk.org
> Cc: oss-drivers <oss-drivers@corigine.com>; Chaoyong He
> <chaoyong.he@corigine.com>
> Subject: [PATCH v2 0/2] fix secondary process PCI UIO resource problem
>
> This patch series aims to fix some problems in secondary process PCI UIO
> resource map logic.
>
> Zerun Fu (2):
> bus/pci: fix secondary process PCI uio resource map problem
> bus/pci: fix secondary process save 'FD' problem
>
> drivers/bus/pci/linux/pci_uio.c | 5 +-
> drivers/bus/pci/pci_common_uio.c | 102 +++++++++++++++++++------------
> 2 files changed, 68 insertions(+), 39 deletions(-)
>
> --
> 2.39.1
@@ -23,10 +23,57 @@ static struct rte_tailq_elem rte_uio_tailq = {
};
EAL_REGISTER_TAILQ(rte_uio_tailq)
+static int
+pci_uio_map_secondary_resource_by_index(struct rte_pci_device *dev,
+ int res_idx, struct mapped_pci_resource *uio_res, int map_idx)
+{
+ int fd, i;
+
+ if (map_idx >= uio_res->nb_maps)
+ return -1;
+
+ /*
+ * open devname, to mmap it
+ */
+ fd = open(uio_res->maps[map_idx].path, O_RDWR);
+ if (fd < 0) {
+ RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
+ uio_res->maps[map_idx].path, strerror(errno));
+ return -1;
+ }
+
+ void *mapaddr = pci_map_resource(uio_res->maps[map_idx].addr,
+ fd, (off_t)uio_res->maps[map_idx].offset,
+ (size_t)uio_res->maps[map_idx].size, 0);
+
+ /* fd is not needed in secondary process, close it */
+ close(fd);
+ if (mapaddr != uio_res->maps[map_idx].addr) {
+ RTE_LOG(ERR, EAL,
+ "Cannot mmap device resource file %s to address: %p\n",
+ uio_res->maps[map_idx].path,
+ uio_res->maps[map_idx].addr);
+ if (mapaddr != NULL) {
+ /* unmap addrs correctly mapped */
+ for (i = 0; i < map_idx; i++)
+ pci_unmap_resource(
+ uio_res->maps[i].addr,
+ (size_t)uio_res->maps[i].size);
+ /* unmap addr wrongly mapped */
+ pci_unmap_resource(mapaddr,
+ (size_t)uio_res->maps[map_idx].size);
+ }
+ return -1;
+ }
+ dev->mem_resource[res_idx].addr = mapaddr;
+
+ return 0;
+}
+
static int
pci_uio_map_secondary(struct rte_pci_device *dev)
{
- int fd, i, j;
+ int map_idx = 0, res_idx, ret;
struct mapped_pci_resource *uio_res;
struct mapped_pci_res_list *uio_res_list =
RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
@@ -37,41 +84,20 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
if (rte_pci_addr_cmp(&uio_res->pci_addr, &dev->addr))
continue;
- for (i = 0; i != uio_res->nb_maps; i++) {
- /*
- * open devname, to mmap it
- */
- fd = open(uio_res->maps[i].path, O_RDWR);
- if (fd < 0) {
- RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
- uio_res->maps[i].path, strerror(errno));
- return -1;
+ /* Map all BARs */
+ for (res_idx = 0; res_idx != PCI_MAX_RESOURCE; res_idx++) {
+ /* skip empty BAR */
+ if (dev->mem_resource[res_idx].phys_addr == 0)
+ continue;
+
+ ret = pci_uio_map_secondary_resource_by_index(dev, res_idx,
+ uio_res, map_idx);
+ if (ret < 0) {
+ RTE_LOG(ERR, EAL, "Failed to map resources\n");
+ return ret;
}
- void *mapaddr = pci_map_resource(uio_res->maps[i].addr,
- fd, (off_t)uio_res->maps[i].offset,
- (size_t)uio_res->maps[i].size, 0);
-
- /* fd is not needed in secondary process, close it */
- close(fd);
- if (mapaddr != uio_res->maps[i].addr) {
- RTE_LOG(ERR, EAL,
- "Cannot mmap device resource file %s to address: %p\n",
- uio_res->maps[i].path,
- uio_res->maps[i].addr);
- if (mapaddr != NULL) {
- /* unmap addrs correctly mapped */
- for (j = 0; j < i; j++)
- pci_unmap_resource(
- uio_res->maps[j].addr,
- (size_t)uio_res->maps[j].size);
- /* unmap addr wrongly mapped */
- pci_unmap_resource(mapaddr,
- (size_t)uio_res->maps[i].size);
- }
- return -1;
- }
- dev->mem_resource[i].addr = mapaddr;
+ map_idx++;
}
return 0;
}