Currently, VFIO has explicit group bind API's, but the way they're used is such that no one actually cares about VFIO groups, and the real goal of everyone using VFIO group bind API is to bind devices to particular VFIO container, such that when `rte_vfio_setup_device` call eventually comes, VFIO will pick up the correct container.
To remove dependency on group API's, add a new "container assign device" API call that will do the same thing, but will not depend on managing VFIO group fd's. Signed-off-by: Anatoly Burakov <[email protected]> --- lib/eal/freebsd/eal.c | 10 ++++++++++ lib/eal/include/rte_vfio.h | 26 ++++++++++++++++++++++++++ lib/eal/linux/eal_vfio.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index dea32ae428..a7360db7a7 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -936,3 +936,13 @@ rte_vfio_container_dma_unmap(__rte_unused int container_fd, rte_errno = ENOTSUP; return -1; } + +RTE_EXPORT_INTERNAL_SYMBOL(rte_vfio_container_assign_device) +int +rte_vfio_container_assign_device(__rte_unused int vfio_container_fd, + __rte_unused const char *sysfs_base, + __rte_unused const char *dev_addr) +{ + rte_errno = ENOTSUP; + return -1; +} diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h index fb666141f6..e7e2ee950b 100644 --- a/lib/eal/include/rte_vfio.h +++ b/lib/eal/include/rte_vfio.h @@ -271,6 +271,32 @@ __rte_internal int rte_vfio_container_destroy(int container_fd); +/** + * @internal + * + * Assign a device to a VFIO container. + * + * Doing so will cause `rte_vfio_setup_device()` to set up the device with the VFIO container + * specified in this assign operation. + * + * This function is only relevant on Linux. + * + * @param vfio_container_fd + * VFIO container file descriptor. + * @param sysfs_base + * Sysfs path prefix. + * @param dev_addr + * Device identifier. + * + * @return + * 0 on success. + * <0 on failure, rte_errno is set. + */ +__rte_internal +int +rte_vfio_container_assign_device(int vfio_container_fd, const char *sysfs_base, + const char *dev_addr); + /** * @internal * Bind a IOMMU group to a container. diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c index 47c973e49a..02fec64658 100644 --- a/lib/eal/linux/eal_vfio.c +++ b/lib/eal/linux/eal_vfio.c @@ -2102,6 +2102,38 @@ rte_vfio_container_destroy(int container_fd) return 0; } +RTE_EXPORT_INTERNAL_SYMBOL(rte_vfio_container_assign_device) +int +rte_vfio_container_assign_device(int vfio_container_fd, const char *sysfs_base, + const char *dev_addr) +{ + int iommu_group_num; + int ret; + + ret = rte_vfio_get_group_num(sysfs_base, dev_addr, &iommu_group_num); + if (ret < 0) { + EAL_LOG(ERR, "Cannot get IOMMU group number for device %s", + dev_addr); + return -1; + } else if (ret == 0) { + EAL_LOG(ERR, + "Device %s is not assigned to any IOMMU group", + dev_addr); + return -1; + } + + ret = rte_vfio_container_group_bind(vfio_container_fd, + iommu_group_num); + if (ret < 0) { + EAL_LOG(ERR, + "Cannot bind IOMMU group %d for device %s", + iommu_group_num, dev_addr); + return -1; + } + + return 0; +} + RTE_EXPORT_INTERNAL_SYMBOL(rte_vfio_container_group_bind) int rte_vfio_container_group_bind(int container_fd, int iommu_group_num) -- 2.47.3
