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 5FF4246E5E; Wed, 3 Sep 2025 17:19:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2124740E4D; Wed, 3 Sep 2025 17:19:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7E4E440E4D for ; Wed, 3 Sep 2025 17:19:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756912752; 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=Mm7q91x0HFzUIlzghxy7wKMWEYEk9mnwcd4KWG9kkLs=; b=AQTEeLD4vm5/4EUifoUE3sW90g2bAOwnrlIVBi0Qk4owGXXCx7e5oocz6nvDtzhCWBznV/ uE/D9Jj0cq3X8WpaEw2UawqT7JXpBchN3aAmiP52vSeS3iRVR3oGA7gXBZjGAz7+jXo0DR 5RDqR/HfYZOC8vQPCjUJ7dyS/tW5ZRg= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-HQ-5g6OjMiSDUOn-4vLJVQ-1; Wed, 03 Sep 2025 11:19:09 -0400 X-MC-Unique: HQ-5g6OjMiSDUOn-4vLJVQ-1 X-Mimecast-MFC-AGG-ID: HQ-5g6OjMiSDUOn-4vLJVQ_1756912747 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 05D1419560B5; Wed, 3 Sep 2025 15:19:06 +0000 (UTC) Received: from dmarchan.lan (unknown [10.44.33.82]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DB77F1800446; Wed, 3 Sep 2025 15:18:59 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, maxime.coquelin@redhat.com, anatoly.burakov@intel.com, Rosen Xu , Nipun Gupta , Nikhil Agarwal , Hemant Agrawal , Sachin Saxena , Chenbo Xia , Tomasz Duszynski , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Harman Kalra , Ajit Khaparde , Vikas Gupta , Chaoyong He , Vijay Kumar Srivastava Subject: [RFC v2 9/9] vfio: use imported uAPI header Date: Wed, 3 Sep 2025 17:17:59 +0200 Message-ID: <20250903151800.1965006-10-david.marchand@redhat.com> In-Reply-To: <20250903151800.1965006-1-david.marchand@redhat.com> References: <20250903072826.1727004-1-david.marchand@redhat.com> <20250903151800.1965006-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: 17ifmM_rjLCJKxFxHQ9msk-5k0ldmj0i6ICxCUu4zHI_1756912747 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 Now that we have a v6.16 header in DPDK, we can remove all remaining wrappers around VFIO uapi. Signed-off-by: David Marchand Reviewed-by: Rosen Xu --- drivers/bus/cdx/cdx_vfio.c | 45 +++++----------------- drivers/bus/fslmc/fslmc_vfio.c | 3 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 3 +- drivers/bus/pci/linux/pci_vfio.c | 2 +- drivers/bus/platform/platform.c | 2 +- drivers/common/cnxk/roc_platform.c | 3 +- drivers/crypto/bcmfs/bcmfs_vfio.c | 2 +- drivers/raw/ifpga/afu_pmd_n3000.c | 2 +- drivers/raw/ifpga/base/ifpga_feature_dev.c | 3 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- drivers/vdpa/nfp/nfp_vdpa.c | 2 +- drivers/vdpa/sfc/sfc_vdpa_ops.c | 2 +- lib/eal/linux/eal_interrupts.c | 2 +- lib/eal/linux/eal_vfio.c | 3 +- 14 files changed, 27 insertions(+), 49 deletions(-) diff --git a/drivers/bus/cdx/cdx_vfio.c b/drivers/bus/cdx/cdx_vfio.c index 576718a659..f9f19b4122 100644 --- a/drivers/bus/cdx/cdx_vfio.c +++ b/drivers/bus/cdx/cdx_vfio.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -616,33 +616,6 @@ rte_cdx_vfio_intr_disable(const struct rte_intr_handle *intr_handle) return ret; } -/* VFIO_DEVICE_FEATURE is defined for kernel version 5.7 and newer. */ -#ifdef VFIO_DEVICE_FEATURE -#define RTE_VFIO_DEVICE_FEATURE VFIO_DEVICE_FEATURE -#else -#define RTE_VFIO_DEVICE_FEATURE _IO(VFIO_TYPE, VFIO_BASE + 17) -struct vfio_device_feature { - __u32 argsz; - __u32 flags; -#define VFIO_DEVICE_FEATURE_MASK (0xffff) /* 16-bit feature index */ -#define VFIO_DEVICE_FEATURE_GET (1 << 16) /* Get feature into data[] */ -#define VFIO_DEVICE_FEATURE_SET (1 << 17) /* Set feature from data[] */ -#define VFIO_DEVICE_FEATURE_PROBE (1 << 18) /* Probe feature support */ - __u8 data[]; -}; -#endif - -#ifdef VFIO_DEVICE_FEATURE_BUS_MASTER -#define RTE_VFIO_DEVICE_FEATURE_BUS_MASTER VFIO_DEVICE_FEATURE_BUS_MASTER -#else -#define RTE_VFIO_DEVICE_FEATURE_BUS_MASTER 10 -struct vfio_device_feature_bus_master { - __u32 op; -#define VFIO_DEVICE_FEATURE_CLEAR_MASTER 0 /* Clear Bus Master */ -#define VFIO_DEVICE_FEATURE_SET_MASTER 1 /* Set Bus Master */ -}; -#endif - /* Enable Bus Mastering */ RTE_EXPORT_INTERNAL_SYMBOL(rte_cdx_vfio_bm_enable) int @@ -668,9 +641,9 @@ rte_cdx_vfio_bm_enable(struct rte_cdx_device *dev) feature->argsz = argsz; - feature->flags = RTE_VFIO_DEVICE_FEATURE_BUS_MASTER | VFIO_DEVICE_FEATURE_PROBE; + feature->flags = VFIO_DEVICE_FEATURE_BUS_MASTER | VFIO_DEVICE_FEATURE_PROBE; feature->flags |= VFIO_DEVICE_FEATURE_SET; - ret = ioctl(vfio_dev_fd, RTE_VFIO_DEVICE_FEATURE, feature); + ret = ioctl(vfio_dev_fd, VFIO_DEVICE_FEATURE, feature); if (ret) { CDX_BUS_ERR("Bus Master configuring not supported for device: %s, error: %d (%s)", dev->name, errno, strerror(errno)); @@ -678,9 +651,9 @@ rte_cdx_vfio_bm_enable(struct rte_cdx_device *dev) return ret; } - feature->flags = RTE_VFIO_DEVICE_FEATURE_BUS_MASTER | VFIO_DEVICE_FEATURE_SET; + feature->flags = VFIO_DEVICE_FEATURE_BUS_MASTER | VFIO_DEVICE_FEATURE_SET; vfio_bm_feature->op = VFIO_DEVICE_FEATURE_SET_MASTER; - ret = ioctl(vfio_dev_fd, RTE_VFIO_DEVICE_FEATURE, feature); + ret = ioctl(vfio_dev_fd, VFIO_DEVICE_FEATURE, feature); if (ret < 0) CDX_BUS_ERR("BM Enable Error for device: %s, Error: %d (%s)", dev->name, errno, strerror(errno)); @@ -713,9 +686,9 @@ rte_cdx_vfio_bm_disable(struct rte_cdx_device *dev) feature->argsz = argsz; - feature->flags = RTE_VFIO_DEVICE_FEATURE_BUS_MASTER | VFIO_DEVICE_FEATURE_PROBE; + feature->flags = VFIO_DEVICE_FEATURE_BUS_MASTER | VFIO_DEVICE_FEATURE_PROBE; feature->flags |= VFIO_DEVICE_FEATURE_SET; - ret = ioctl(vfio_dev_fd, RTE_VFIO_DEVICE_FEATURE, feature); + ret = ioctl(vfio_dev_fd, VFIO_DEVICE_FEATURE, feature); if (ret) { CDX_BUS_ERR("Bus Master configuring not supported for device: %s, Error: %d (%s)", dev->name, errno, strerror(errno)); @@ -723,9 +696,9 @@ rte_cdx_vfio_bm_disable(struct rte_cdx_device *dev) return ret; } - feature->flags = RTE_VFIO_DEVICE_FEATURE_BUS_MASTER | VFIO_DEVICE_FEATURE_SET; + feature->flags = VFIO_DEVICE_FEATURE_BUS_MASTER | VFIO_DEVICE_FEATURE_SET; vfio_bm_feature->op = VFIO_DEVICE_FEATURE_CLEAR_MASTER; - ret = ioctl(vfio_dev_fd, RTE_VFIO_DEVICE_FEATURE, feature); + ret = ioctl(vfio_dev_fd, VFIO_DEVICE_FEATURE, feature); if (ret < 0) CDX_BUS_ERR("BM Disable Error for device: %s, Error: %d (%s)", dev->name, errno, strerror(errno)); diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 3f041f447c..abf38a7bf6 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -20,7 +20,8 @@ #include #include #include -#include + +#include #include #include diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index cffbf3c28a..18909811a1 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -22,7 +22,8 @@ #include #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 46b87c7c38..ec54b7ac69 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/bus/platform/platform.c b/drivers/bus/platform/platform.c index 149cba81a7..905b258595 100644 --- a/drivers/bus/platform/platform.c +++ b/drivers/bus/platform/platform.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/common/cnxk/roc_platform.c b/drivers/common/cnxk/roc_platform.c index 88f229163a..323892c06d 100644 --- a/drivers/common/cnxk/roc_platform.c +++ b/drivers/common/cnxk/roc_platform.c @@ -11,11 +11,12 @@ #if defined(__linux__) #include -#include #include #include #include +#include + #define MSIX_IRQ_SET_BUF_LEN \ (sizeof(struct vfio_irq_set) + sizeof(int) * (plt_intr_max_intr_get(intr_handle))) diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c b/drivers/crypto/bcmfs/bcmfs_vfio.c index e747bef924..5f309a6b34 100644 --- a/drivers/crypto/bcmfs/bcmfs_vfio.c +++ b/drivers/crypto/bcmfs/bcmfs_vfio.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/drivers/raw/ifpga/afu_pmd_n3000.c b/drivers/raw/ifpga/afu_pmd_n3000.c index ec2fdd46df..5e792ead8c 100644 --- a/drivers/raw/ifpga/afu_pmd_n3000.c +++ b/drivers/raw/ifpga/afu_pmd_n3000.c @@ -13,7 +13,7 @@ #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 3402ad97e4..17e913a749 100644 --- a/drivers/raw/ifpga/base/ifpga_feature_dev.c +++ b/drivers/raw/ifpga/base/ifpga_feature_dev.c @@ -3,7 +3,8 @@ */ #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 c8e47e41c1..ce63abd275 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c index c1ffbd1f91..df31851cb6 100644 --- a/drivers/vdpa/nfp/nfp_vdpa.c +++ b/drivers/vdpa/nfp/nfp_vdpa.c @@ -8,7 +8,7 @@ #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 1ece47d373..dc64c4d213 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c index d1789cbda2..346a2d4c72 100644 --- a/lib/eal/linux/eal_interrupts.c +++ b/lib/eal/linux/eal_interrupts.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c index 62f9d05e63..89a8fb0a12 100644 --- a/lib/eal/linux/eal_vfio.c +++ b/lib/eal/linux/eal_vfio.c @@ -8,7 +8,8 @@ #include #include #include -#include + +#include #include #include -- 2.51.0