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 315C1CF319D for ; Wed, 19 Nov 2025 11:09:55 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 657FD40DCD; Wed, 19 Nov 2025 12:08:48 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by mails.dpdk.org (Postfix) with ESMTP id 777BF40B8F for ; Wed, 19 Nov 2025 12:08:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763550526; x=1795086526; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=CAbMWAn3Y5WPW3uCiBtD2OsYjcnkknEUwRLePkHiqKs=; b=H2E2mVgdgGovoQJ97pDdmQG4UjaDTXIWo1hKui22d4KaL7OzdKhGR7M1 YfsuFm3D5TmtfIVrgMBJaDNJkBOIoHlLzdiVsUZrtt03ZGHg91jvyP3cJ Jlpb4Ocbk6yLVm2egmUKryc9Vg5L+MhwnW6qefuEqK0gPijZ4W5khmIzE q3DWFwQZCtipI71et96IZQfs1g1+pwiobt8Fa8xPgbu90jQuzNtUd5TW3 xqxFPV+l3y6P/UP4chMUMBE7+WH+RD7+gQk8fPX7O96a7xweTptpZ2Lfk 7SHg3xoaY4utQsyKxDSjezb4Sur/TmiZchQbPedFvL5kmlQc6t0fCXwiq A==; X-CSE-ConnectionGUID: oxW4IE7fQWeNoX8SHxiQsA== X-CSE-MsgGUID: 4vLgFzGDRq+GP3jwudRZdg== X-IronPort-AV: E=McAfee;i="6800,10657,11617"; a="65744992" X-IronPort-AV: E=Sophos;i="6.19,315,1754982000"; d="scan'208";a="65744992" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2025 03:08:45 -0800 X-CSE-ConnectionGUID: eAEkzc6sTo2vUMmQxPnygQ== X-CSE-MsgGUID: HZzelXLcRs2HCLAvuPXLjA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,315,1754982000"; d="scan'208";a="191158220" Received: from silpixa00401119.ir.intel.com ([10.20.224.206]) by orviesa008.jf.intel.com with ESMTP; 19 Nov 2025 03:08:44 -0800 From: Anatoly Burakov To: dev@dpdk.org, Hemant Agrawal , Sachin Saxena Subject: [PATCH v5 14/18] bus/fslmc: use the new VFIO mode API Date: Wed, 19 Nov 2025 11:08:12 +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 FSLMC bus only supports operating in group mode, and relies on no-IOMMU mode checks. Use the new VFIO API's to query no-IOMMU status, as well as protect the bus from initializing in non-group mode. Signed-off-by: Anatoly Burakov --- drivers/bus/fslmc/fslmc_bus.c | 10 +++++++++- drivers/bus/fslmc/fslmc_vfio.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 4529ec5085..82b53bcc54 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -335,6 +335,13 @@ rte_fslmc_scan(void) goto scan_fail; } + /* for container groups to work, VFIO must be in group mode */ + if (rte_vfio_get_mode() != RTE_VFIO_MODE_GROUP && + rte_vfio_get_mode() != RTE_VFIO_MODE_NOIOMMU) { + ret = -EINVAL; + goto scan_fail; + } + ret = fslmc_get_container_group(group_name, &groupid); if (ret != 0) goto scan_fail; @@ -582,7 +589,8 @@ rte_dpaa2_get_iommu_class(void) return RTE_IOVA_DC; /* check if all devices on the bus support Virtual addressing or not */ - if (fslmc_all_device_support_iova() != 0 && rte_vfio_noiommu_is_enabled() == 0) + if (fslmc_all_device_support_iova() != 0 && + rte_vfio_get_mode() != RTE_VFIO_MODE_NOIOMMU) return RTE_IOVA_VA; return RTE_IOVA_PA; diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 4b11b38322..afde967e34 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -192,7 +192,7 @@ fslmc_vfio_add_group(int vfio_group_fd, group->fd = vfio_group_fd; group->groupid = iommu_group_num; rte_strscpy(group->group_name, group_name, sizeof(group->group_name)); - if (rte_vfio_noiommu_is_enabled() > 0) + if (rte_vfio_get_mode() == RTE_VFIO_MODE_NOIOMMU) group->iommu_type = VFIO_NOIOMMU_IOMMU; else group->iommu_type = VFIO_TYPE1_IOMMU; -- 2.47.3