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 7BD9648B68; Fri, 21 Nov 2025 11:10:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C8EC40693; Fri, 21 Nov 2025 11:09:37 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by mails.dpdk.org (Postfix) with ESMTP id 1A2564067A for ; Fri, 21 Nov 2025 11:09:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763719774; x=1795255774; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=DKyLxwm20S4Wbvay+sRIOSbWSYQ6+Cj8JLPRf84ftzA=; b=GhaARM27MXs47b+iwZ3wjGqwxWbZbBffwX7I4EOIdUHUd5jcHiuRX7Mr GwvQ56PQw9xU2ChvMQkomWKkpNrCi6S5ropN9Uc6bLRHlLu74dr+R/6F3 5YSvdb65Qob90KP5AjkdGpGP1Rq5QUWaKILE8OmggvcV/hgJJRk1k7ZC/ BvP5WXtx/V1wEu45KO1p9QoArvni0QeGrimkNTVXkQs/YmvLWzw02C80V 0aV0GlcHtNEttxXmzWqzRysFMPSUZEeKCUL2Z7p6D/qzzoumGf4uUcY8m vonAjlfyJ+TziCiMndh5wJ0a+x/QLMCx1uUIKsI6p/jDxyTkg3HbfAcUX g==; X-CSE-ConnectionGUID: rRluocdLSaiTthO1+0epqw== X-CSE-MsgGUID: Ph8xIkWZToKmZA1Rtfl60w== X-IronPort-AV: E=McAfee;i="6800,10657,11619"; a="76491039" X-IronPort-AV: E=Sophos;i="6.20,215,1758610800"; d="scan'208";a="76491039" 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:33 -0800 X-CSE-ConnectionGUID: 2HCVY+tdTXKAmsQS9lNtEg== X-CSE-MsgGUID: 2E4sWTY+TPaoKq/KBQG0Ng== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,215,1758610800"; d="scan'208";a="196121587" Received: from silpixa00401119.ir.intel.com ([10.20.224.206]) by orviesa004.jf.intel.com with ESMTP; 21 Nov 2025 02:09:32 -0800 From: Anatoly Burakov To: dev@dpdk.org, Hemant Agrawal , Sachin Saxena Subject: [PATCH v6 14/18] bus/fslmc: use the new VFIO mode API Date: Fri, 21 Nov 2025 10:08:59 +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 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 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