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 BDAAF45585; Thu, 4 Jul 2024 09:48:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB6A94025C; Thu, 4 Jul 2024 09:48:33 +0200 (CEST) Received: from lf-2-32.ptr.blmpb.com (lf-2-32.ptr.blmpb.com [101.36.218.32]) by mails.dpdk.org (Postfix) with ESMTP id 76B614029E for ; Wed, 3 Jul 2024 13:59:54 +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=1720007989; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=TgT8VvPRShOr5s8FWlbFSZeS+50+d6F8vHW2iBIYLVE=; b=ILoudBpzLwJ5LM1SZxL2vUItSxxkQi4ptBx9Rj6InW3TTVCHnnV+gnAVAwtiUXXSvwArLL tPObrIGu+EhmpxSI4xPvhwWLQZUjpNAuudb/wgDP4zVCegD3AXanQVLvSKA9QAfiAJiHna MK3c1Uc8ShChPdCYQ1RSVuMdNWOTQHySdXGrLNJzmAUwQ+Dg5uFQ23l6omJ1LGJKyc1SVA /efcF+uuGP1DhBz5/NeIdv6yfZGzM5M/+sBaiaDdoVRDf0I5uoPXEYZ7V3uulXER7vecrL 2yZs/rESMLlUZlCMk4qdaQsstql5FplaD0s0Pe2Y37/jJRX8kSfuHa1fGIZOLQ== From: "BillXiang" X-Lms-Return-Path: Received: from localhost.localdomain ([124.64.23.180]) by smtp.feishu.cn with ESMTPS; Wed, 03 Jul 2024 19:59:47 +0800 X-Mailer: git-send-email 2.30.0 Content-Transfer-Encoding: 7bit To: "Tyler Retzlaff" , "Anatoly Burakov" Date: Wed, 3 Jul 2024 19:59:43 +0800 Mime-Version: 1.0 Cc: , "BillXiang" Subject: [PATCH v3] vfio: combine container_create and group_bind Message-Id: <20240703115943.44539-1-xiangwencheng@dayudpu.com> X-Original-From: xiangwencheng@dayudpu.com Content-Type: text/plain; charset=UTF-8 X-Mailman-Approved-At: Thu, 04 Jul 2024 09:48:32 +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..f26b65a504 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; # WINDOWS_NO_EXPORT }; INTERNAL { -- 2.30.0