From mboxrd@z Thu Jan 1 00:00:00 1970 From: Darek Stojaczyk Subject: [PATCH 1/2] eal/vfio: check if we already have the group fd open Date: Mon, 17 Sep 2018 15:46:42 +0200 Message-ID: <20180917134643.103871-1-dariusz.stojaczyk@intel.com> Cc: Alejandro Lucero , Anatoly Burakov , stable@dpdk.org, Dariusz Stojaczyk , xiao.w.wang@intel.com To: dev@dpdk.org Return-path: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Dariusz Stojaczyk Always attempt to find already opened fd for an iommu group as subsequent attempts to open it will fail. There's no public API to check if a group was already bound and has a container, so rte_vfio_container_group_bind() shouldn't fail in such case. Fixes: ea2dc1066870 ("vfio: add multi container support") Cc: xiao.w.wang@intel.com Signed-off-by: Dariusz Stojaczyk --- lib/librte_eal/linuxapp/eal/eal_vfio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c index c68dc38e0..bcb869be1 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c @@ -1680,6 +1680,11 @@ rte_vfio_container_group_bind(int container_fd, int iommu_group_num) return -1; } + /* check if we already have the group descriptor open */ + for (i = 0; i < VFIO_MAX_GROUPS; i++) + if (vfio_cfg->vfio_groups[i].group_num == iommu_group_num) + return vfio_cfg->vfio_groups[i].fd; + /* Check room for new group */ if (vfio_cfg->vfio_active_groups == VFIO_MAX_GROUPS) { RTE_LOG(ERR, EAL, "Maximum number of VFIO groups reached!\n"); -- 2.17.1