From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D6D2C79FB9 for ; Thu, 10 Sep 2026 12:55:04 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B58942DA1; Thu, 10 Sep 2026 14:53:45 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by mails.dpdk.org (Postfix) with ESMTP id A3D2A42D45 for ; Thu, 10 Sep 2026 14:53:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789044823; x=1820580823; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1EReeE6gvv/fG7gUp+EsTmlNmi9rvXzJWobCSoDUfNQ=; b=XOWDx3dPGDtzaGWCfHdW+NXxaBhNYHHHdA4MoTMxxIds5DTMsWSSIJ4G j1GmEimeb5r1fjvFDgFYLjsu8N08qU9sczMYKSutSkuB9TMZTqcYRm0QO jAusPDDy9DIMzJiv6rWpm6TabegeyA7sUdR9gW8qVaD2FEVEAEPSrPaku QDutTYWo/6fb07jASOSPU+RPhqIeMdPlwMA6LQJ5YdvUFgwLsmzQ+I0vm eMs6Jel3eaiSdyoXaWzuEI00Wm67oZ5XMNAEUbq1kiiklOfZ7gjxVN/sI D0LHclQ81pmxyV7wCJJXbYvCsRdtMx9dImUujwxjlWgy5aEgzX+jGUzvR A==; X-CSE-ConnectionGUID: Ik4ivBKST+OIMp8XqftCsQ== X-CSE-MsgGUID: QEb+5TcKQfKfqbcXRYlibg== X-IronPort-AV: E=McAfee;i="6800,10657,11900"; a="89334071" X-IronPort-AV: E=Sophos;i="6.27,95,1787036400"; d="scan'208";a="89334071" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2026 05:53:42 -0700 X-CSE-ConnectionGUID: 0UMBnjiZTlGTGbEOKY0sPQ== X-CSE-MsgGUID: InR6FRFkRleJGILdKmPMHw== X-ExtLoop1: 1 Received: from silpixa00401119.ir.intel.com ([10.20.224.206]) by fmviesa003.fm.intel.com with ESMTP; 10 Sep 2026 05:53:42 -0700 From: Anatoly Burakov To: dev@dpdk.org, Chaoyong He Subject: [PATCH v17 15/26] vdpa/nfp: use container device assignment API Date: Thu, 10 Sep 2026 13:52:59 +0100 Message-ID: <1b54e4c3098f5c2e317a04e9ca65c1a72900036a.1789044747.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 2.52.0 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 NFP 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. Since group API is no longer used after these changes, remove its implementation. Signed-off-by: Anatoly Burakov --- drivers/vdpa/nfp/nfp_vdpa.c | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c index 94740e768d..76d7d616a6 100644 --- a/drivers/vdpa/nfp/nfp_vdpa.c +++ b/drivers/vdpa/nfp/nfp_vdpa.c @@ -36,9 +36,7 @@ struct nfp_vdpa_dev { struct nfp_vdpa_hw hw; int vfio_container_fd; - int vfio_group_fd; int vfio_dev_fd; - int iommu_group; rte_thread_t tid; /**< Thread for notify relay */ int epoll_fd; @@ -120,33 +118,26 @@ nfp_vdpa_vfio_setup(struct nfp_vdpa_dev *device) struct rte_pci_device *pci_dev = device->pci_dev; rte_pci_device_name(&pci_dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN); - ret = dev_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name, - &device->iommu_group); - if (ret <= 0) - return -1; device->vfio_container_fd = dev_vfio_container_create(); if (device->vfio_container_fd < 0) return -1; - device->vfio_group_fd = dev_vfio_container_group_bind( - device->vfio_container_fd, device->iommu_group); - if (device->vfio_group_fd < 0) + ret = dev_vfio_container_assign_device(device->vfio_container_fd, + rte_pci_get_sysfs_path(), dev_name); + if (ret < 0) goto container_destroy; - DRV_VDPA_LOG(DEBUG, "The container_fd=%d, group_fd=%d.", - device->vfio_container_fd, device->vfio_group_fd); + DRV_VDPA_LOG(DEBUG, "container_fd=%d", device->vfio_container_fd); ret = rte_pci_map_device(pci_dev); if (ret != 0) - goto group_unbind; + goto container_destroy; device->vfio_dev_fd = rte_intr_dev_fd_get(pci_dev->intr_handle); return 0; -group_unbind: - dev_vfio_container_group_unbind(device->vfio_container_fd, device->iommu_group); container_destroy: dev_vfio_container_destroy(device->vfio_container_fd); @@ -157,7 +148,6 @@ static void nfp_vdpa_vfio_teardown(struct nfp_vdpa_dev *device) { rte_pci_unmap_device(device->pci_dev); - dev_vfio_container_group_unbind(device->vfio_container_fd, device->iommu_group); dev_vfio_container_destroy(device->vfio_container_fd); } @@ -1023,22 +1013,6 @@ nfp_vdpa_dev_close(int vid) return 0; } -static int -nfp_vdpa_get_vfio_group_fd(int vid) -{ - struct rte_vdpa_device *vdev; - struct nfp_vdpa_dev_node *node; - - vdev = rte_vhost_get_vdpa_device(vid); - node = nfp_vdpa_find_node_by_vdev(vdev); - if (node == NULL) { - DRV_VDPA_LOG(ERR, "Invalid vDPA device: %p.", vdev); - return -ENODEV; - } - - return node->device->vfio_group_fd; -} - static int nfp_vdpa_get_vfio_device_fd(int vid) { @@ -1190,7 +1164,6 @@ struct rte_vdpa_dev_ops nfp_vdpa_ops = { .dev_close = nfp_vdpa_dev_close, .set_vring_state = nfp_vdpa_set_vring_state, .set_features = nfp_vdpa_set_features, - .get_vfio_group_fd = nfp_vdpa_get_vfio_group_fd, .get_vfio_device_fd = nfp_vdpa_get_vfio_device_fd, .get_notify_area = nfp_vdpa_get_notify_area, }; -- 2.52.0