From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 07C014555B; Wed, 3 Jul 2024 11:44:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E607640E7C; Wed, 3 Jul 2024 11:44:19 +0200 (CEST) Received: from lf-2-33.ptr.blmpb.com (lf-2-33.ptr.blmpb.com [101.36.218.33]) by mails.dpdk.org (Postfix) with ESMTP id EFD0040E7C for ; Wed, 3 Jul 2024 11:17:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=s1; d=dayudpu-com.20200927.dkim.feishu.cn; t=1719998223; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=h4zabuYgmHE7cfDbBVT+t42yNVKnKZ8wPqzujigbxPM=; b=JOmmg8ZxsTrSW5QhECXOm6XgGbllbAU78G3fIFT6EsggFU42bpSRO1R2q8wZODf6ASdXlT grSfwSVHWzy7w029gmWfUmOVxl4LBIScytKqvDEJJTRWtKI+mxERVULkHBpYf5i1+ATuYL 1+yHW+B6Tsq12ZKmRbXzdUJftGIiwRFX2VtWzejIHG9+Swb8YnHFAOztGwgWWuKCa4kUnN MHQUoaDvMDV+WxGa3Lj6horn9YqDnEHHpWmBLRd/7tzpPO08UkfeJlTfu75uCVIF+9O7qs zjq0qlwtNskB2BvQGI9I7wZTl73Yw2JbzojpC6nTMmFWBQmdEEs6nUstH1sAJw== X-Lms-Return-Path: X-Mailer: git-send-email 2.30.0 X-Original-From: xiangwencheng@dayudpu.com To: "Tyler Retzlaff" , "Anatoly Burakov" Cc: , "BillXiang" From: "BillXiang" Message-Id: <20240703091657.14104-1-xiangwencheng@dayudpu.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 Subject: [PATCH v2] vfio: combine container_create and group_bind Date: Wed, 3 Jul 2024 17:16:57 +0800 Mime-Version: 1.0 Received: from localhost.localdomain ([124.64.23.180]) by smtp.feishu.cn with ESMTPS; Wed, 03 Jul 2024 17:17:01 +0800 X-Mailman-Approved-At: Wed, 03 Jul 2024 11:44:18 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: BillXiang For multi-devices in one group we can only create and bind to one container. With this new function, device driver does not need to save the binding info additionally between different devices. Signed-off-by: BillXiang --- lib/eal/include/rte_vfio.h | 17 +++++++++++++++++ lib/eal/linux/eal_vfio.c | 24 ++++++++++++++++++++++++ lib/eal/version.map | 3 +++ 3 files changed, 44 insertions(+) diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h index b774625d9f..f6743b3620 100644 --- a/lib/eal/include/rte_vfio.h +++ b/lib/eal/include/rte_vfio.h @@ -407,6 +407,23 @@ int rte_vfio_container_dma_unmap(int container_fd, uint64_t vaddr, uint64_t iova, uint64_t len); +/** + * Get vfio group fd bound with container fd for certain iommu group. + * + * @param iommu_group_num + * iommu group num + * @param vfio_group_fd + * vfio group fd of the iommu group. + * @param vfio_container_fd + * vfio container fd of the iommu group. + * @return + * 0 if successful + * <0 if failed + */ +__rte_experimental +int +rte_vfio_get_fd(int iommu_group_num, int *vfio_group_fd, int *vfio_container_fd); + #ifdef __cplusplus } #endif diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c index 4e69e72e3b..08510df7e2 100644 --- a/lib/eal/linux/eal_vfio.c +++ b/lib/eal/linux/eal_vfio.c @@ -2196,3 +2196,27 @@ rte_vfio_container_dma_unmap(int container_fd, uint64_t vaddr, uint64_t iova, return container_dma_unmap(vfio_cfg, vaddr, iova, len); } + +int +rte_vfio_get_fd(int iommu_group_num, int *vfio_group_fd, int *vfio_container_fd) +{ + struct vfio_config *vfio_cfg; + vfio_cfg = get_vfio_cfg_by_group_num(iommu_group_num); + /* do not create new container if the group has bound with one */ + if (vfio_cfg) { + *vfio_container_fd = vfio_cfg->vfio_container_fd; + } else { + *vfio_container_fd = rte_vfio_container_create(); + if (*vfio_container_fd < 0) + goto err; + + vfio_cfg = get_vfio_cfg_by_container_fd(*vfio_container_fd); + } + *vfio_group_fd = vfio_get_group_fd(vfio_cfg, iommu_group_num); + if (*vfio_group_fd < 0) + goto err; + + return 0; +err: + return -1; +} diff --git a/lib/eal/version.map b/lib/eal/version.map index 3df50c3fbb..39536bba41 100644 --- a/lib/eal/version.map +++ b/lib/eal/version.map @@ -396,6 +396,9 @@ EXPERIMENTAL { # added in 24.03 rte_vfio_get_device_info; # WINDOWS_NO_EXPORT + + # added in 24.07 + rte_vfio_get_fd; }; INTERNAL { -- 2.30.0