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 C9F7E46F43; Fri, 19 Sep 2025 10:39:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A35DA40659; Fri, 19 Sep 2025 10:39:20 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C857C402B7 for ; Fri, 19 Sep 2025 10:39:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758271158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HIhF6C6HQ3Ng49NB/is/Kh/rqTq1EMSe1HgDteY1CW8=; b=M2Z+qBm3KRCnOgkDtZhwCziiDn8UsH7+WsvuOTrW7dWzNnqCg+Sl6grQSstLOSkJq4WfCn NZXCqL25hlGg5kM5TBqqDG2YSmmuoragE3vOxi6XbtFvzszg81vZuCdzgLBSkEjSvaSzsg iubPvvf8JNn17CFf0i/OMWNhrEaL2Qg= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-iZIO_QnGPwuLBtqcW5AJqQ-1; Fri, 19 Sep 2025 04:39:12 -0400 X-MC-Unique: iZIO_QnGPwuLBtqcW5AJqQ-1 X-Mimecast-MFC-AGG-ID: iZIO_QnGPwuLBtqcW5AJqQ_1758271150 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8233A1800284; Fri, 19 Sep 2025 08:39:10 +0000 (UTC) Received: from dmarchan.lan (unknown [10.45.225.72]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 057CD180057D; Fri, 19 Sep 2025 08:39:03 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, maxime.coquelin@redhat.com, anatoly.burakov@intel.com, stephen@networkplumber.org, Rosen Xu , Nipun Gupta , Nikhil Agarwal , Hemant Agrawal , Sachin Saxena , Chenbo Xia , Tomasz Duszynski , Ajit Khaparde , Vikas Gupta , Chaoyong He , Vijay Kumar Srivastava , Tyler Retzlaff , Harman Kalra Subject: [PATCH v3 08/10] vfio: stop including Linux kernel header in public and driver API Date: Fri, 19 Sep 2025 10:38:05 +0200 Message-ID: <20250919083808.1667491-9-david.marchand@redhat.com> In-Reply-To: <20250919083808.1667491-1-david.marchand@redhat.com> References: <20250903072826.1727004-1-david.marchand@redhat.com> <20250919083808.1667491-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: aQydgp93gySbhBHe9WbgaCtrzDmiqTwIkJWG1lo8dxk_1758271150 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 DPDK API is not dependent on the VFIO API itself. Remove inclusion in rte_vfio.h (and bus_fslmc_driver.h) and add explicit inclusion where needed. Signed-off-by: David Marchand Reviewed-by: Rosen Xu Acked-by: Anatoly Burakov --- drivers/bus/cdx/cdx_vfio.c | 3 +++ drivers/bus/fslmc/bus_fslmc_driver.h | 3 ++- drivers/bus/fslmc/fslmc_bus.c | 1 + drivers/bus/fslmc/fslmc_vfio.c | 2 ++ drivers/bus/fslmc/fslmc_vfio.h | 1 - drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 1 + drivers/bus/pci/linux/pci_vfio.c | 2 ++ drivers/bus/platform/platform.c | 2 ++ drivers/crypto/bcmfs/bcmfs_vfio.c | 2 ++ drivers/raw/ifpga/afu_pmd_n3000.c | 3 ++- drivers/raw/ifpga/base/ifpga_feature_dev.c | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 ++ drivers/vdpa/nfp/nfp_vdpa.c | 2 ++ drivers/vdpa/sfc/sfc_vdpa_ops.c | 3 ++- lib/eal/include/rte_vfio.h | 6 +----- lib/eal/linux/eal_interrupts.c | 3 ++- lib/eal/linux/eal_vfio.c | 1 + 17 files changed, 28 insertions(+), 11 deletions(-) diff --git a/drivers/bus/cdx/cdx_vfio.c b/drivers/bus/cdx/cdx_vfio.c index 03d156388e..576718a659 100644 --- a/drivers/bus/cdx/cdx_vfio.c +++ b/drivers/bus/cdx/cdx_vfio.c @@ -17,6 +17,9 @@ #include #include #include + +#include + #include #include #include diff --git a/drivers/bus/fslmc/bus_fslmc_driver.h b/drivers/bus/fslmc/bus_fslmc_driver.h index 442de1a3fb..74ce7381d7 100644 --- a/drivers/bus/fslmc/bus_fslmc_driver.h +++ b/drivers/bus/fslmc/bus_fslmc_driver.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -37,6 +36,8 @@ extern "C" { #endif +struct vfio_device_info; + #define FSLMC_OBJECT_MAX_LEN 32 /**< Length of each device on bus */ #define DPAA2_INVALID_MBUF_SEQN 0 diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 20458d5030..49c61c9d2d 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "private.h" #include diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index f0c593507f..6219057a4e 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -32,6 +33,7 @@ #include #include #include +#include #include #include "private.h" diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h index 815970ec38..c995fd67b8 100644 --- a/drivers/bus/fslmc/fslmc_vfio.h +++ b/drivers/bus/fslmc/fslmc_vfio.h @@ -9,7 +9,6 @@ #define _FSLMC_VFIO_H_ #include -#include /* Pathname of FSL-MC devices directory. */ #define SYSFS_FSL_MC_DEVICES "/sys/bus/fsl-mc/devices" diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index e32471d8b5..cffbf3c28a 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 9e5776ce3c..46b87c7c38 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include diff --git a/drivers/bus/platform/platform.c b/drivers/bus/platform/platform.c index 90524fd961..149cba81a7 100644 --- a/drivers/bus/platform/platform.c +++ b/drivers/bus/platform/platform.c @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c b/drivers/crypto/bcmfs/bcmfs_vfio.c index 9138f96eb0..e747bef924 100644 --- a/drivers/crypto/bcmfs/bcmfs_vfio.c +++ b/drivers/crypto/bcmfs/bcmfs_vfio.c @@ -7,6 +7,8 @@ #include #include +#include + #include #include "bcmfs_device.h" diff --git a/drivers/raw/ifpga/afu_pmd_n3000.c b/drivers/raw/ifpga/afu_pmd_n3000.c index 0882a27701..ec2fdd46df 100644 --- a/drivers/raw/ifpga/afu_pmd_n3000.c +++ b/drivers/raw/ifpga/afu_pmd_n3000.c @@ -13,11 +13,12 @@ #include #include +#include + #include #include #include #include -#include #include #include #include diff --git a/drivers/raw/ifpga/base/ifpga_feature_dev.c b/drivers/raw/ifpga/base/ifpga_feature_dev.c index 0a00af1b6b..3402ad97e4 100644 --- a/drivers/raw/ifpga/base/ifpga_feature_dev.c +++ b/drivers/raw/ifpga/base/ifpga_feature_dev.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include "ifpga_feature_dev.h" diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index 65de383b95..c8e47e41c1 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c index 7f2f21ec6c..c1ffbd1f91 100644 --- a/drivers/vdpa/nfp/nfp_vdpa.c +++ b/drivers/vdpa/nfp/nfp_vdpa.c @@ -8,6 +8,8 @@ #include #include +#include + #include #include #include diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c index 00f9a4b04c..1ece47d373 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -6,10 +6,11 @@ #include #include +#include + #include #include #include -#include #include #include diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h index 65cd803449..80951517fa 100644 --- a/lib/eal/include/rte_vfio.h +++ b/lib/eal/include/rte_vfio.h @@ -21,8 +21,6 @@ extern "C" { #ifdef RTE_EXEC_ENV_LINUX -#include - #define RTE_VFIO_DIR "/dev/vfio" #define RTE_VFIO_CONTAINER_PATH "/dev/vfio/vfio" #define RTE_VFIO_GROUP_FMT "/dev/vfio/%u" @@ -30,13 +28,11 @@ extern "C" { #define RTE_VFIO_NOIOMMU_MODE \ "/sys/module/vfio/parameters/enable_unsafe_noiommu_mode" -#else /* ! RTE_EXEC_ENV_LINUX */ +#endif /* RTE_EXEC_ENV_LINUX */ /* we don't need an actual definition, only pointer is used */ struct vfio_device_info; -#endif /* RTE_EXEC_ENV_LINUX */ - #define RTE_VFIO_DEFAULT_CONTAINER_FD (-1) /** diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c index 43e05c86a2..d1789cbda2 100644 --- a/lib/eal/linux/eal_interrupts.c +++ b/lib/eal/linux/eal_interrupts.c @@ -15,6 +15,8 @@ #include #include +#include + #include #include #include @@ -28,7 +30,6 @@ #include #include #include -#include #include "eal_private.h" diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c index ad5de935d7..91e85225db 100644 --- a/lib/eal/linux/eal_vfio.c +++ b/lib/eal/linux/eal_vfio.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include -- 2.51.0