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 09700C79FB6 for ; Wed, 9 Sep 2026 10:04:44 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5816B427E2; Wed, 9 Sep 2026 12:03:06 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by mails.dpdk.org (Postfix) with ESMTP id 019B740EE4 for ; Wed, 9 Sep 2026 12:03:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1788948183; x=1820484183; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=dq0REXOCFueaSsjdDMMHhX41WbqTJpJK1qRbIBEVW4I=; b=AtF12J+USSh0t77TS/x0rcH7boymptd3PEtzghIDhDov2UCellQL18bP KioCP43x86nBBZjqTUckIgLYol0dPa1TCNWyaUfj5dw6MUhtwMwiKuuW5 tipfzmra9w6coVlqA2U+T8XY2ewvkiT7g2tUPeRdT8d/JEkMWxPR/5YYr cs3AgPH/2ojAc5oHW6dm+DOo6aMzpi5Jd3kJqfUt5AhTwBjVlFDb/wROk bUW4RQAIoO0KgWp7+us5JgfiQlqThOS5RKEH5ECXYrCEYnfQzjFCuOl03 NquSEt/N1Vn75dQ2EAdmzo41aePUggmWEAjZzf2UfS5OpjVAyf7uYoi8+ g==; X-CSE-ConnectionGUID: CrhwHvlqRemBOSSh4Qii5w== X-CSE-MsgGUID: nFQG6szyQq2okGGN6RoIFw== X-IronPort-AV: E=McAfee;i="6800,10657,11900"; a="89492291" X-IronPort-AV: E=Sophos;i="6.25,270,1779174000"; d="scan'208";a="89492291" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2026 03:03:02 -0700 X-CSE-ConnectionGUID: TLNezi/5Ry6+rGdMbJAi6g== X-CSE-MsgGUID: amycr+RfSgGuOwD1ajvEJw== X-ExtLoop1: 1 Received: from silpixa00401119.ir.intel.com ([10.20.224.206]) by fmviesa003.fm.intel.com with ESMTP; 09 Sep 2026 03:03:01 -0700 From: Anatoly Burakov To: dev@dpdk.org, Hemant Agrawal , Sachin Saxena Subject: [PATCH v16 22/26] bus/fslmc: use the new VFIO IOMMU mode API Date: Wed, 9 Sep 2026 11:02:15 +0100 Message-ID: <04408cd1987d5982c5e472faa817ac443837ba3a.1788947938.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 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 to protect the bus from initializing in non-group mode. Signed-off-by: Anatoly Burakov Acked-by: Hemant Agrawal --- 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 d55c414ead..aeef49a5ff 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -332,6 +332,13 @@ rte_fslmc_scan(void) goto scan_fail; } + /* for container groups to work, VFIO must be in group mode */ + if (dev_vfio_get_mode() != DEV_VFIO_MODE_GROUP) { + DPAA2_BUS_DEBUG("DPAA2: VFIO not in group mode"); + ret = -EINVAL; + goto scan_fail; + } + ret = fslmc_get_container_group(group_name, &groupid); if (ret != 0) goto scan_fail; @@ -500,7 +507,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 && dev_vfio_noiommu_is_enabled() == 0) + if (fslmc_all_device_support_iova() != 0 && + dev_vfio_get_iommu_mode() == DEV_VFIO_IOMMU_MODE_UNSAFE) 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 c2b6ac1f3f..0926ec9349 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -204,7 +204,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 (dev_vfio_noiommu_is_enabled() > 0) + if (dev_vfio_get_iommu_mode() == DEV_VFIO_IOMMU_MODE_UNSAFE) group->iommu_type = VFIO_NOIOMMU_IOMMU; else group->iommu_type = VFIO_TYPE1_IOMMU; -- 2.52.0