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 6137548B68; Fri, 21 Nov 2025 11:10:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A632140669; Fri, 21 Nov 2025 11:09:26 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by mails.dpdk.org (Postfix) with ESMTP id F30054065A for ; Fri, 21 Nov 2025 11:09:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763719764; x=1795255764; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=pSaJUnKvo4EHm41+Ni1ZVF4d6PjaOQMemQOWvOPGga8=; b=aEDeiCihswH0qOWOxJ+FC9b+tgJaWJBmGEFAdyuC940hHljYgUqBvsSa FVGIu9LR5CvCh61lqAbMLDvijAKg/nDTt6aqAfZ/nEpshQbWMLj3xT83Z WVaKL520JxHv50hVdjbW/JZPCewTf/mWK/iT+mdDrOCdcAiM2JNreYdZT JMl/HryE9iW15zakM9Yis0PJUNpAx8pO9erqeLpfXd+HNmvO+4Zl89yaY y+mVZ1QJIo3bp/0o5W5fHfeFCml+19WFcggAnBP0ridI/PTgDPaiunbYj L3NBC3EIi0Vx3/rfSNCUJ/OrXJq0dD8aVpk6pZSoU6sOztAqUXPntE/A8 A==; X-CSE-ConnectionGUID: 3CjQBzbIRemtr8X4yN6VtQ== X-CSE-MsgGUID: UEcY68pzSvGNPaw8bPIZlA== X-IronPort-AV: E=McAfee;i="6800,10657,11619"; a="76490998" X-IronPort-AV: E=Sophos;i="6.20,215,1758610800"; d="scan'208";a="76490998" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2025 02:09:23 -0800 X-CSE-ConnectionGUID: lzZCeFZuTLyeS9m1fgOCYg== X-CSE-MsgGUID: iTbn3JJBQCqadIQqi8CwPw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,215,1758610800"; d="scan'208";a="196121567" Received: from silpixa00401119.ir.intel.com ([10.20.224.206]) by orviesa004.jf.intel.com with ESMTP; 21 Nov 2025 02:09:22 -0800 From: Anatoly Burakov To: dev@dpdk.org, Vijay Kumar Srivastava Subject: [PATCH v6 09/18] vdpa/sfc: use container device assignment API Date: Fri, 21 Nov 2025 10:08:54 +0000 Message-ID: X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 The SFC vDPA driver uses VFIO group bind/unbind functionality for container device assignment purposes. Use the new container device assignment API instead to provide clearer semantics. Signed-off-by: Anatoly Burakov --- drivers/vdpa/sfc/sfc_vdpa.c | 39 +++++++------------------------------ drivers/vdpa/sfc/sfc_vdpa.h | 2 -- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c index eda111954f..99b4ced3f4 100644 --- a/drivers/vdpa/sfc/sfc_vdpa.c +++ b/drivers/vdpa/sfc/sfc_vdpa.c @@ -80,22 +80,12 @@ sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva) goto fail_container_create; } - rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name, - &sva->iommu_group_num); - if (rc <= 0) { - sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s", - dev_name, rte_strerror(-rc)); - goto fail_get_group_num; - } - - sva->vfio_group_fd = - rte_vfio_container_group_bind(sva->vfio_container_fd, - sva->iommu_group_num); - if (sva->vfio_group_fd < 0) { - sfc_vdpa_err(sva, - "failed to bind IOMMU group %d to container %d", - sva->iommu_group_num, sva->vfio_container_fd); - goto fail_group_bind; + rc = rte_vfio_container_assign_device(sva->vfio_container_fd, + rte_pci_get_sysfs_path(), dev_name); + if (rc < 0) { + sfc_vdpa_err(sva, "failed to assign device %s to container %d", + dev_name, sva->vfio_container_fd); + goto fail_device_assign; } if (rte_pci_map_device(dev) != 0) { @@ -109,15 +99,7 @@ sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva) return 0; fail_pci_map_device: - if (rte_vfio_container_group_unbind(sva->vfio_container_fd, - sva->iommu_group_num) != 0) { - sfc_vdpa_err(sva, - "failed to unbind IOMMU group %d from container %d", - sva->iommu_group_num, sva->vfio_container_fd); - } - -fail_group_bind: -fail_get_group_num: +fail_device_assign: if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) { sfc_vdpa_err(sva, "failed to destroy container %d", sva->vfio_container_fd); @@ -132,13 +114,6 @@ sfc_vdpa_vfio_teardown(struct sfc_vdpa_adapter *sva) { rte_pci_unmap_device(sva->pdev); - if (rte_vfio_container_group_unbind(sva->vfio_container_fd, - sva->iommu_group_num) != 0) { - sfc_vdpa_err(sva, - "failed to unbind IOMMU group %d from container %d", - sva->iommu_group_num, sva->vfio_container_fd); - } - if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) { sfc_vdpa_err(sva, "failed to destroy container %d", diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h index 2b843e563d..99a81fd1b0 100644 --- a/drivers/vdpa/sfc/sfc_vdpa.h +++ b/drivers/vdpa/sfc/sfc_vdpa.h @@ -70,10 +70,8 @@ struct sfc_vdpa_adapter { sfc_vdpa_filter_t filters; - int vfio_group_fd; int vfio_dev_fd; int vfio_container_fd; - int iommu_group_num; struct sfc_vdpa_ops_data *ops_data; }; -- 2.47.3