d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bus/fslmc: fix VFIO setup

Browse Source 
At device probe, the fslmc bus driver calls rte_vfio_get_group_fd() to
get a fd associated to a vfio group. This function first checks if the
group is already opened, else it opens /dev/vfio/%u, and increases the
number of active groups in default_vfio_cfg (which references the
default vfio container).

When adding the first group to a vfio_cfg, the caller is supposed to
pick an IOMMU type and set up DMA mappings for container, as it's done
by pci bus, but it is not done here. Instead, a new container is created
and used.

This prevents the pci bus driver, which uses the default_vfio_cfg
container, to configure the container because
default_vfio_cfg->active_group > 1.

This patch fixes the issue by always creating a new container (and its
associated vfio_cfg) and binding the group to it.

Fixes: a69f793002 ("bus/fslmc: support multi VFIO group")
Cc: stable@dpdk.org

Signed-off-by: Romain Delhomel <romain.delhomel@6wind.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Romain Delhomel 2022-06-03 17:18:30 +02:00 committed by Thomas Monjalon
parent 013b4c52c7
commit 36c3c4df13
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/bus/fslmc/fslmc_vfio.c
View File

@ -995,6 +995,7 @@ fslmc_vfio_setup_group(void)
{ {
int groupid; int groupid;
int ret; int ret;
int vfio_container_fd;
struct vfio_group_status status = { .argsz = sizeof(status) }; struct vfio_group_status status = { .argsz = sizeof(status) };
/* if already done once */ /* if already done once */
@ -1013,8 +1014,15 @@ fslmc_vfio_setup_group(void)
return 0; return 0;
} }
ret = rte_vfio_container_create();
if (ret < 0) {
DPAA2_BUS_ERR("Failed to open VFIO container");
return ret;
}
vfio_container_fd = ret;
/* Get the actual group fd */ /* Get the actual group fd */
ret = rte_vfio_get_group_fd(groupid); ret = rte_vfio_container_group_bind(vfio_container_fd, groupid);
if (ret < 0) if (ret < 0)
return ret; return ret;
vfio_group.fd = ret; vfio_group.fd = ret;