* [RFC 1/8] vfio: remove confusing check on VFIO presence
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
@ 2025-09-03 7:28 ` David Marchand
2025-09-03 9:38 ` Xu, Rosen
2025-09-03 7:28 ` [RFC 2/8] vfio: assume VFIO is always and only present on Linux David Marchand
` (10 subsequent siblings)
11 siblings, 1 reply; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:28 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, Ajit Khaparde, Vikas Gupta,
Hemant Agrawal, Sachin Saxena, Chenbo Xia, Nipun Gupta,
Anatoly Burakov, Tomasz Duszynski, Rosen Xu, Tyler Retzlaff,
Harman Kalra
Contrary to what the VFIO_PRESENT macro may suggest, there is no check on
whether VFIO is enabled in the (build system) Linux kernel configuration.
Replace check on VFIO_PRESENT with RTE_EAL_VFIO (for components built on
FreeBSD or Windows), or simply remove it otherwise.
Then remove inclusion of rte_vfio.h when the only purpose was checking
VFIO_PRESENT.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
doc/api/doxy-api.conf.in | 1 -
doc/guides/cryptodevs/bcmfs.rst | 4 ----
drivers/bus/fslmc/fslmc_bus.c | 12 +----------
drivers/bus/pci/linux/pci.c | 22 --------------------
drivers/bus/pci/linux/pci_init.h | 6 ------
drivers/bus/pci/linux/pci_vfio.c | 12 -----------
drivers/bus/platform/bus_platform_driver.h | 20 +-----------------
drivers/bus/platform/platform.c | 4 ----
drivers/bus/platform/platform_params.c | 5 -----
drivers/crypto/bcmfs/bcmfs_vfio.c | 11 +++++-----
drivers/raw/ifpga/afu_pmd_n3000.c | 4 ----
lib/eal/include/rte_vfio.h | 24 ++++++++--------------
lib/eal/linux/eal.c | 4 ----
lib/eal/linux/eal_interrupts.c | 15 --------------
lib/eal/linux/eal_vfio.h | 16 ---------------
lib/eal/linux/eal_vfio_mp_sync.c | 10 ---------
16 files changed, 16 insertions(+), 154 deletions(-)
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 28cec3232f..bedd944681 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -92,7 +92,6 @@ FILE_PATTERNS = rte_*.h \
PREDEFINED = __DOXYGEN__ \
RTE_ATOMIC \
RTE_HAS_CPUSET \
- VFIO_PRESENT \
__rte_lockable= \
__rte_guarded_by(x)= \
__rte_exclusive_locks_required(x)= \
diff --git a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst
index d18a253913..049808a49c 100644
--- a/doc/guides/cryptodevs/bcmfs.rst
+++ b/doc/guides/cryptodevs/bcmfs.rst
@@ -59,10 +59,6 @@ Information about kernel, rootfs and toolchain can be found at
`Broadcom Official Website <https://www.broadcom.com/products/ethernet-connectivity
/network-adapters/smartnic/stingray-software>`__.
- .. Note::
- To execute BCMFS PMD, it must be compiled with VFIO_PRESENT flag on the
- compiling platform and same gets enabled in rte_vfio.h.
-
The BCMFS PMD may be compiled natively on a Stingray platform or
cross-compiled on an x86 platform. For example, below commands can be executed
for cross compiling on x86 platform.
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index ebc0c1fb4f..20458d5030 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -574,9 +574,6 @@ fslmc_all_device_support_iova(void)
static enum rte_iova_mode
rte_dpaa2_get_iommu_class(void)
{
- bool is_vfio_noiommu_enabled = 1;
- bool has_iova_va;
-
if (rte_eal_iova_mode() == RTE_IOVA_PA)
return RTE_IOVA_PA;
@@ -584,14 +581,7 @@ rte_dpaa2_get_iommu_class(void)
return RTE_IOVA_DC;
/* check if all devices on the bus support Virtual addressing or not */
- has_iova_va = fslmc_all_device_support_iova();
-
-#ifdef VFIO_PRESENT
- is_vfio_noiommu_enabled = rte_vfio_noiommu_is_enabled() == true ?
- true : false;
-#endif
-
- if (has_iova_va && !is_vfio_noiommu_enabled)
+ if (fslmc_all_device_support_iova() != 0 && rte_vfio_noiommu_is_enabled() == 0)
return RTE_IOVA_VA;
return RTE_IOVA_PA;
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index c20d159218..66d7e09a6e 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -64,10 +64,8 @@ rte_pci_map_device(struct rte_pci_device *dev)
/* try mapping the NIC resources using VFIO if it exists */
switch (dev->kdrv) {
case RTE_PCI_KDRV_VFIO:
-#ifdef VFIO_PRESENT
if (pci_vfio_is_enabled())
ret = pci_vfio_map_resource(dev);
-#endif
break;
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
@@ -93,10 +91,8 @@ rte_pci_unmap_device(struct rte_pci_device *dev)
/* try unmapping the NIC resources using VFIO if it exists */
switch (dev->kdrv) {
case RTE_PCI_KDRV_VFIO:
-#ifdef VFIO_PRESENT
if (pci_vfio_is_enabled())
pci_vfio_unmap_resource(dev);
-#endif
break;
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
@@ -599,7 +595,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv,
switch (pdev->kdrv) {
case RTE_PCI_KDRV_VFIO: {
-#ifdef VFIO_PRESENT
static int is_vfio_noiommu_enabled = -1;
if (is_vfio_noiommu_enabled == -1) {
@@ -612,7 +607,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv,
iova_mode = RTE_IOVA_PA;
else if ((pdrv->drv_flags & RTE_PCI_DRV_NEED_IOVA_AS_VA) != 0)
iova_mode = RTE_IOVA_VA;
-#endif
break;
}
@@ -641,10 +635,8 @@ int rte_pci_read_config(const struct rte_pci_device *device,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_read_config(intr_handle, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_read_config(device, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -665,10 +657,8 @@ int rte_pci_write_config(const struct rte_pci_device *device,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_write_config(intr_handle, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_write_config(device, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -688,10 +678,8 @@ int rte_pci_mmio_read(const struct rte_pci_device *device, int bar,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_mmio_read(device, bar, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_mmio_read(device, bar, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -711,10 +699,8 @@ int rte_pci_mmio_write(const struct rte_pci_device *device, int bar,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_mmio_write(device, bar, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_mmio_write(device, bar, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -731,12 +717,10 @@ rte_pci_ioport_map(struct rte_pci_device *dev, int bar,
int ret = -1;
switch (dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
if (pci_vfio_is_enabled())
ret = pci_vfio_ioport_map(dev, bar, p);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
ret = pci_uio_ioport_map(dev, bar, p);
@@ -757,11 +741,9 @@ rte_pci_ioport_read(struct rte_pci_ioport *p,
void *data, size_t len, off_t offset)
{
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
pci_vfio_ioport_read(p, data, len, offset);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
pci_uio_ioport_read(p, data, len, offset);
@@ -777,11 +759,9 @@ rte_pci_ioport_write(struct rte_pci_ioport *p,
const void *data, size_t len, off_t offset)
{
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
pci_vfio_ioport_write(p, data, len, offset);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
pci_uio_ioport_write(p, data, len, offset);
@@ -798,12 +778,10 @@ rte_pci_ioport_unmap(struct rte_pci_ioport *p)
int ret = -1;
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
if (pci_vfio_is_enabled())
ret = pci_vfio_ioport_unmap(p);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
ret = pci_uio_ioport_unmap(p);
diff --git a/drivers/bus/pci/linux/pci_init.h b/drivers/bus/pci/linux/pci_init.h
index a4d37c0d0a..6949dd57d9 100644
--- a/drivers/bus/pci/linux/pci_init.h
+++ b/drivers/bus/pci/linux/pci_init.h
@@ -5,8 +5,6 @@
#ifndef EAL_PCI_INIT_H_
#define EAL_PCI_INIT_H_
-#include <rte_vfio.h>
-
#include "private.h"
/** IO resource type: */
@@ -50,8 +48,6 @@ void pci_uio_ioport_write(struct rte_pci_ioport *p,
const void *data, size_t len, off_t offset);
int pci_uio_ioport_unmap(struct rte_pci_ioport *p);
-#ifdef VFIO_PRESENT
-
/* access config space */
int pci_vfio_read_config(const struct rte_pci_device *dev,
void *buf, size_t len, off_t offs);
@@ -77,6 +73,4 @@ int pci_vfio_unmap_resource(struct rte_pci_device *dev);
int pci_vfio_is_enabled(void);
-#endif
-
#endif /* EAL_PCI_INIT_H_ */
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 5317170231..d0844585fe 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -27,17 +27,6 @@
#include "pci_init.h"
#include "private.h"
-/**
- * @file
- * PCI probing using Linux VFIO.
- *
- * This code tries to determine if the PCI device is bound to VFIO driver,
- * and initialize it (map BARs, set up interrupts) if that's the case.
- *
- */
-
-#ifdef VFIO_PRESENT
-
static struct rte_tailq_elem rte_vfio_tailq = {
.name = "VFIO_RESOURCE_LIST",
};
@@ -1327,4 +1316,3 @@ pci_vfio_is_enabled(void)
}
return status;
}
-#endif
diff --git a/drivers/bus/platform/bus_platform_driver.h b/drivers/bus/platform/bus_platform_driver.h
index ef4b27c0c0..76403043c1 100644
--- a/drivers/bus/platform/bus_platform_driver.h
+++ b/drivers/bus/platform/bus_platform_driver.h
@@ -15,9 +15,9 @@
#include <dev_driver.h>
#include <rte_common.h>
+#include <rte_compat.h>
#include <rte_dev.h>
#include <rte_os.h>
-#include <rte_vfio.h>
#ifdef __cplusplus
extern "C" {
@@ -144,8 +144,6 @@ RTE_PMD_EXPORT_NAME(nm)
#define RTE_PMD_REGISTER_ALIAS(nm, alias) \
static const char *pdrvinit_ ## nm ## _alias = RTE_STR(alias)
-#ifdef VFIO_PRESENT
-
/**
* Register a platform device driver.
*
@@ -170,22 +168,6 @@ void rte_platform_register(struct rte_platform_driver *pdrv);
__rte_internal
void rte_platform_unregister(struct rte_platform_driver *pdrv);
-#else
-
-__rte_internal
-static inline void
-rte_platform_register(struct rte_platform_driver *pdrv __rte_unused)
-{
-}
-
-__rte_internal
-static inline void
-rte_platform_unregister(struct rte_platform_driver *pdrv __rte_unused)
-{
-}
-
-#endif /* VFIO_PRESENT */
-
#ifdef __cplusplus
}
#endif
diff --git a/drivers/bus/platform/platform.c b/drivers/bus/platform/platform.c
index 0f50027236..90524fd961 100644
--- a/drivers/bus/platform/platform.c
+++ b/drivers/bus/platform/platform.c
@@ -25,8 +25,6 @@
#include "private.h"
-#ifdef VFIO_PRESENT
-
#define PLATFORM_BUS_DEVICES_PATH "/sys/bus/platform/devices"
RTE_EXPORT_INTERNAL_SYMBOL(rte_platform_register)
@@ -647,5 +645,3 @@ struct rte_platform_bus platform_bus = {
RTE_REGISTER_BUS(platform, platform_bus.bus);
RTE_LOG_REGISTER_DEFAULT(platform_bus_logtype, NOTICE);
-
-#endif /* VFIO_PRESENT */
diff --git a/drivers/bus/platform/platform_params.c b/drivers/bus/platform/platform_params.c
index 8a6214b97c..65b20d121f 100644
--- a/drivers/bus/platform/platform_params.c
+++ b/drivers/bus/platform/platform_params.c
@@ -10,13 +10,10 @@
#include <rte_dev.h>
#include <rte_errno.h>
#include <rte_kvargs.h>
-#include <rte_vfio.h>
#include "bus_platform_driver.h"
#include "private.h"
-#ifdef VFIO_PRESENT
-
enum platform_params {
RTE_PLATFORM_PARAM_NAME,
};
@@ -73,5 +70,3 @@ platform_bus_dev_iterate(const void *start, const char *str,
return dev;
}
-
-#endif /* VFIO_PRESENT */
diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c b/drivers/crypto/bcmfs/bcmfs_vfio.c
index dc2def580f..8d6ea16544 100644
--- a/drivers/crypto/bcmfs/bcmfs_vfio.c
+++ b/drivers/crypto/bcmfs/bcmfs_vfio.c
@@ -7,13 +7,14 @@
#include <sys/mman.h>
#include <sys/ioctl.h>
-#include <rte_vfio.h>
-
#include "bcmfs_device.h"
#include "bcmfs_logs.h"
#include "bcmfs_vfio.h"
-#ifdef VFIO_PRESENT
+#ifdef RTE_EAL_VFIO
+
+#include <rte_vfio.h>
+
static int
vfio_map_dev_obj(const char *path, const char *dev_obj,
uint32_t *size, void **addr, int *dev_fd)
@@ -93,7 +94,7 @@ bcmfs_release_vfio(struct bcmfs_device *dev)
return;
}
}
-#else
+#else /* ! RTE_EAL_VFIO */
int
bcmfs_attach_vfio(struct bcmfs_device *dev __rte_unused)
{
@@ -104,4 +105,4 @@ void
bcmfs_release_vfio(struct bcmfs_device *dev __rte_unused)
{
}
-#endif
+#endif /* RTE_EAL_VFIO */
diff --git a/drivers/raw/ifpga/afu_pmd_n3000.c b/drivers/raw/ifpga/afu_pmd_n3000.c
index 6aae1b224e..0882a27701 100644
--- a/drivers/raw/ifpga/afu_pmd_n3000.c
+++ b/drivers/raw/ifpga/afu_pmd_n3000.c
@@ -1473,7 +1473,6 @@ static struct rte_pci_device *n3000_afu_get_pci_dev(struct afu_rawdev *dev)
return RTE_DEV_TO_PCI(afudev->rawdev->device);
}
-#ifdef VFIO_PRESENT
static int dma_afu_set_irqs(struct afu_rawdev *dev, uint32_t vec_start,
uint32_t count, int *efds)
{
@@ -1511,7 +1510,6 @@ static int dma_afu_set_irqs(struct afu_rawdev *dev, uint32_t vec_start,
rte_free(irq_set);
return ret;
}
-#endif
static void *n3000_afu_get_port_addr(struct afu_rawdev *dev)
{
@@ -1724,10 +1722,8 @@ static int dma_afu_ctx_init(struct afu_rawdev *dev, int index, uint8_t *addr)
IFPGA_RAWDEV_PMD_ERR("eventfd create failed");
return -EBADF;
}
-#ifdef VFIO_PRESENT
if (dma_afu_set_irqs(dev, vec_start, 1, efds))
IFPGA_RAWDEV_PMD_ERR("DMA interrupt setup failed");
-#endif
}
ctx->event_fd = efds[0];
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 923293040b..594d504c56 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -15,24 +15,16 @@
#include <rte_compat.h>
-/*
- * determine if VFIO is present on the system
- */
-#if !defined(VFIO_PRESENT) && defined(RTE_EAL_VFIO)
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-#define VFIO_PRESENT
-#endif /* kernel version >= 3.6.0 */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-#define HAVE_VFIO_DEV_REQ_INTERFACE
-#endif /* kernel version >= 4.0.0 */
-#endif /* RTE_EAL_VFIO */
-
#ifdef __cplusplus
extern "C" {
#endif
-#ifdef VFIO_PRESENT
+#ifdef RTE_EAL_VFIO
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
+#define HAVE_VFIO_DEV_REQ_INTERFACE
+#endif /* kernel version >= 4.0.0 */
#include <linux/vfio.h>
@@ -102,12 +94,12 @@ struct vfio_device_feature_bus_master {
};
#endif
-#else /* not VFIO_PRESENT */
+#else /* ! RTE_EAL_VFIO */
/* we don't need an actual definition, only pointer is used */
struct vfio_device_info;
-#endif /* VFIO_PRESENT */
+#endif /* RTE_EAL_VFIO */
#define RTE_VFIO_DEFAULT_CONTAINER_FD (-1)
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 52efb8626b..708a387265 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -1121,14 +1121,12 @@ rte_eal_init(int argc, char **argv)
#endif
}
-#ifdef VFIO_PRESENT
if (rte_vfio_enable("vfio")) {
rte_eal_init_alert("Cannot init VFIO");
rte_errno = EAGAIN;
rte_atomic_store_explicit(&run_once, 0, rte_memory_order_relaxed);
return -1;
}
-#endif
/* in secondary processes, memory init may allocate additional fbarrays
* not present in primary processes, so to avoid any potential issues,
* initialize memzones first.
@@ -1330,9 +1328,7 @@ rte_eal_cleanup(void)
rte_memseg_walk(mark_freeable, NULL);
rte_service_finalize();
-#ifdef VFIO_PRESENT
vfio_mp_sync_cleanup();
-#endif
rte_mp_channel_cleanup();
eal_bus_cleanup();
rte_eal_alarm_cleanup();
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index 4ec78de82c..d420ecf947 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -57,9 +57,7 @@ union intr_pipefds{
*/
union rte_intr_read_buffer {
int uio_intr_count; /* for uio device */
-#ifdef VFIO_PRESENT
uint64_t vfio_intr_count; /* for vfio device */
-#endif
uint64_t timerfd_num; /* for timerfd */
char charbuf[16]; /* for others */
};
@@ -95,8 +93,6 @@ static struct rte_intr_source_list intr_sources;
static rte_thread_t intr_thread;
/* VFIO interrupts */
-#ifdef VFIO_PRESENT
-
#define IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + sizeof(int))
/* irq set buffer length for queue interrupts and LSC interrupt */
#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \
@@ -401,7 +397,6 @@ vfio_disable_req(const struct rte_intr_handle *intr_handle)
return ret;
}
#endif
-#endif
static int
uio_intx_intr_disable(const struct rte_intr_handle *intr_handle)
@@ -734,7 +729,6 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_ALARM:
rc = -1;
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
if (vfio_enable_msix(intr_handle))
rc = -1;
@@ -752,7 +746,6 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
if (vfio_enable_req(intr_handle))
rc = -1;
break;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -807,7 +800,6 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
/* not used at this moment */
case RTE_INTR_HANDLE_ALARM:
return -1;
-#ifdef VFIO_PRESENT
/* VFIO MSI* is implicitly acked unlike INTx, nothing to do */
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
@@ -819,7 +811,6 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
return -1;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -868,7 +859,6 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_ALARM:
rc = -1;
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
if (vfio_disable_msix(intr_handle))
rc = -1;
@@ -886,7 +876,6 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
if (vfio_disable_req(intr_handle))
rc = -1;
break;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -948,7 +937,6 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_ALARM:
bytes_read = sizeof(buf.timerfd_num);
break;
-#ifdef VFIO_PRESENT
#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
#endif
@@ -957,7 +945,6 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_VFIO_LEGACY:
bytes_read = sizeof(buf.vfio_intr_count);
break;
-#endif
case RTE_INTR_HANDLE_VDEV:
case RTE_INTR_HANDLE_EXT:
bytes_read = 0;
@@ -1221,13 +1208,11 @@ eal_intr_proc_rxtx_intr(int fd, const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_UIO_INTX:
bytes_read = sizeof(buf.uio_intr_count);
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
case RTE_INTR_HANDLE_VFIO_LEGACY:
bytes_read = sizeof(buf.vfio_intr_count);
break;
-#endif
case RTE_INTR_HANDLE_VDEV:
bytes_read = rte_intr_efd_counter_size_get(intr_handle);
/* For vdev, number of bytes to read is set by driver */
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index 23a787ad20..e7d855c032 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -7,20 +7,6 @@
#include <rte_common.h>
-/*
- * determine if VFIO is present on the system
- */
-#if !defined(VFIO_PRESENT) && defined(RTE_EAL_VFIO)
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-#define VFIO_PRESENT
-#else
-#pragma message("VFIO configured but not supported by this kernel, disabling.")
-#endif /* kernel version >= 3.6.0 */
-#endif /* RTE_EAL_VFIO */
-
-#ifdef VFIO_PRESENT
-
#include <stdint.h>
#include <linux/vfio.h>
@@ -154,6 +140,4 @@ struct vfio_mp_param {
};
};
-#endif /* VFIO_PRESENT */
-
#endif /* EAL_VFIO_H_ */
diff --git a/lib/eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c
index ce14e260fe..8230f3d24d 100644
--- a/lib/eal/linux/eal_vfio_mp_sync.c
+++ b/lib/eal/linux/eal_vfio_mp_sync.c
@@ -14,15 +14,6 @@
#include "eal_private.h"
#include "eal_vfio.h"
-/**
- * @file
- * VFIO socket for communication between primary and secondary processes.
- *
- * This file is only compiled if RTE_EAL_VFIO is set.
- */
-
-#ifdef VFIO_PRESENT
-
static int
vfio_mp_primary(const struct rte_mp_msg *msg, const void *peer)
{
@@ -129,4 +120,3 @@ vfio_mp_sync_cleanup(void)
rte_mp_action_unregister(EAL_VFIO_MP);
}
-#endif
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* RE: [RFC 1/8] vfio: remove confusing check on VFIO presence
2025-09-03 7:28 ` [RFC 1/8] vfio: remove confusing check on VFIO presence David Marchand
@ 2025-09-03 9:38 ` Xu, Rosen
0 siblings, 0 replies; 35+ messages in thread
From: Xu, Rosen @ 2025-09-03 9:38 UTC (permalink / raw)
To: David Marchand, dev
Cc: thomas, maxime.coquelin, Ajit Khaparde, Vikas Gupta,
Hemant Agrawal, Sachin Saxena, Chenbo Xia, Nipun Gupta,
Anatoly Burakov, Tomasz Duszynski, Tyler Retzlaff, Harman Kalra
Hi,
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Wednesday, September 3, 2025 3:28 PM
> To: dev@dpdk.org
> Cc: thomas@monjalon.net; maxime.coquelin@redhat.com; Ajit Khaparde
> <ajit.khaparde@broadcom.com>; Vikas Gupta
> <vikas.gupta@broadcom.com>; Hemant Agrawal
> <hemant.agrawal@nxp.com>; Sachin Saxena <sachin.saxena@nxp.com>;
> Chenbo Xia <chenbox@nvidia.com>; Nipun Gupta <nipun.gupta@amd.com>;
> Anatoly Burakov <anatoly.burakov@intel.com>; Tomasz Duszynski
> <tduszynski@marvell.com>; Xu, Rosen <rosen.xu@altera.com>; Tyler
> Retzlaff <roretzla@linux.microsoft.com>; Harman Kalra
> <hkalra@marvell.com>
> Subject: [RFC 1/8] vfio: remove confusing check on VFIO presence
>
> [CAUTION: This email is from outside your organization. Unless you trust the
> sender, do not click on links or open attachments as it may be a fraudulent
> email attempting to steal your information and/or compromise your
> computer.]
>
> Contrary to what the VFIO_PRESENT macro may suggest, there is no check
> on whether VFIO is enabled in the (build system) Linux kernel configuration.
>
> Replace check on VFIO_PRESENT with RTE_EAL_VFIO (for components built
> on FreeBSD or Windows), or simply remove it otherwise.
>
> Then remove inclusion of rte_vfio.h when the only purpose was checking
> VFIO_PRESENT.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> doc/api/doxy-api.conf.in | 1 -
> doc/guides/cryptodevs/bcmfs.rst | 4 ----
> drivers/bus/fslmc/fslmc_bus.c | 12 +----------
> drivers/bus/pci/linux/pci.c | 22 --------------------
> drivers/bus/pci/linux/pci_init.h | 6 ------
> drivers/bus/pci/linux/pci_vfio.c | 12 -----------
> drivers/bus/platform/bus_platform_driver.h | 20 +-----------------
> drivers/bus/platform/platform.c | 4 ----
> drivers/bus/platform/platform_params.c | 5 -----
> drivers/crypto/bcmfs/bcmfs_vfio.c | 11 +++++-----
> drivers/raw/ifpga/afu_pmd_n3000.c | 4 ----
> lib/eal/include/rte_vfio.h | 24 ++++++++--------------
> lib/eal/linux/eal.c | 4 ----
> lib/eal/linux/eal_interrupts.c | 15 --------------
> lib/eal/linux/eal_vfio.h | 16 ---------------
> lib/eal/linux/eal_vfio_mp_sync.c | 10 ---------
> 16 files changed, 16 insertions(+), 154 deletions(-)
>
> diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in index
> 28cec3232f..bedd944681 100644
> --- a/doc/api/doxy-api.conf.in
> +++ b/doc/api/doxy-api.conf.in
> @@ -92,7 +92,6 @@ FILE_PATTERNS = rte_*.h \
> PREDEFINED = __DOXYGEN__ \
> RTE_ATOMIC \
> RTE_HAS_CPUSET \
> - VFIO_PRESENT \
> __rte_lockable= \
> __rte_guarded_by(x)= \
> __rte_exclusive_locks_required(x)= \ diff --git
> a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst
> index d18a253913..049808a49c 100644
> --- a/doc/guides/cryptodevs/bcmfs.rst
> +++ b/doc/guides/cryptodevs/bcmfs.rst
> @@ -59,10 +59,6 @@ Information about kernel, rootfs and toolchain can be
> found at `Broadcom Official Website
> <https://nam10.safelinks.protection.outlook.com/?url=https%3A%2F%2Fw
> ww.broadcom.com%2Fproducts%2Fethernet-
> connectivity&data=05%7C02%7Crosen.xu%40altera.com%7C038088ded0da4
> 442083008ddeabb86b0%7Cfbd72e03d4a54110adce614d51f2077a%7C0%7C0%
> 7C638924813366144785%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGki
> OnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjo
> yfQ%3D%3D%7C0%7C%7C%7C&sdata=3YpCIi%2BJEuMnf4j%2B6pmg0k6frao
> XiQu2J%2BftRefGL2Q%3D&reserved=0
> /network-adapters/smartnic/stingray-software>`__.
>
> - .. Note::
> - To execute BCMFS PMD, it must be compiled with VFIO_PRESENT flag
> on the
> - compiling platform and same gets enabled in rte_vfio.h.
> -
> The BCMFS PMD may be compiled natively on a Stingray platform or cross-
> compiled on an x86 platform. For example, below commands can be
> executed for cross compiling on x86 platform.
> diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
> index ebc0c1fb4f..20458d5030 100644
> --- a/drivers/bus/fslmc/fslmc_bus.c
> +++ b/drivers/bus/fslmc/fslmc_bus.c
> @@ -574,9 +574,6 @@ fslmc_all_device_support_iova(void)
> static enum rte_iova_mode
> rte_dpaa2_get_iommu_class(void)
> {
> - bool is_vfio_noiommu_enabled = 1;
> - bool has_iova_va;
> -
> if (rte_eal_iova_mode() == RTE_IOVA_PA)
> return RTE_IOVA_PA;
>
> @@ -584,14 +581,7 @@ rte_dpaa2_get_iommu_class(void)
> return RTE_IOVA_DC;
>
> /* check if all devices on the bus support Virtual addressing or not */
> - has_iova_va = fslmc_all_device_support_iova();
> -
> -#ifdef VFIO_PRESENT
> - is_vfio_noiommu_enabled = rte_vfio_noiommu_is_enabled() == true ?
> - true : false;
> -#endif
> -
> - if (has_iova_va && !is_vfio_noiommu_enabled)
> + if (fslmc_all_device_support_iova() != 0 &&
> + rte_vfio_noiommu_is_enabled() == 0)
> return RTE_IOVA_VA;
>
> return RTE_IOVA_PA;
> diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index
> c20d159218..66d7e09a6e 100644
> --- a/drivers/bus/pci/linux/pci.c
> +++ b/drivers/bus/pci/linux/pci.c
> @@ -64,10 +64,8 @@ rte_pci_map_device(struct rte_pci_device *dev)
> /* try mapping the NIC resources using VFIO if it exists */
> switch (dev->kdrv) {
> case RTE_PCI_KDRV_VFIO:
> -#ifdef VFIO_PRESENT
> if (pci_vfio_is_enabled())
> ret = pci_vfio_map_resource(dev); -#endif
> break;
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> @@ -93,10 +91,8 @@ rte_pci_unmap_device(struct rte_pci_device *dev)
> /* try unmapping the NIC resources using VFIO if it exists */
> switch (dev->kdrv) {
> case RTE_PCI_KDRV_VFIO:
> -#ifdef VFIO_PRESENT
> if (pci_vfio_is_enabled())
> pci_vfio_unmap_resource(dev); -#endif
> break;
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> @@ -599,7 +595,6 @@ pci_device_iova_mode(const struct rte_pci_driver
> *pdrv,
>
> switch (pdev->kdrv) {
> case RTE_PCI_KDRV_VFIO: {
> -#ifdef VFIO_PRESENT
> static int is_vfio_noiommu_enabled = -1;
>
> if (is_vfio_noiommu_enabled == -1) { @@ -612,7 +607,6 @@
> pci_device_iova_mode(const struct rte_pci_driver *pdrv,
> iova_mode = RTE_IOVA_PA;
> else if ((pdrv->drv_flags & RTE_PCI_DRV_NEED_IOVA_AS_VA) != 0)
> iova_mode = RTE_IOVA_VA; -#endif
> break;
> }
>
> @@ -641,10 +635,8 @@ int rte_pci_read_config(const struct rte_pci_device
> *device,
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> return pci_uio_read_config(intr_handle, buf, len, offset); -#ifdef
> VFIO_PRESENT
> case RTE_PCI_KDRV_VFIO:
> return pci_vfio_read_config(device, buf, len, offset); -#endif
> default:
> rte_pci_device_name(&device->addr, devname,
> RTE_DEV_NAME_MAX_LEN); @@ -665,10 +657,8 @@ int
> rte_pci_write_config(const struct rte_pci_device *device,
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> return pci_uio_write_config(intr_handle, buf, len, offset); -#ifdef
> VFIO_PRESENT
> case RTE_PCI_KDRV_VFIO:
> return pci_vfio_write_config(device, buf, len, offset); -#endif
> default:
> rte_pci_device_name(&device->addr, devname,
> RTE_DEV_NAME_MAX_LEN); @@ -688,10 +678,8 @@ int
> rte_pci_mmio_read(const struct rte_pci_device *device, int bar,
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> return pci_uio_mmio_read(device, bar, buf, len, offset); -#ifdef
> VFIO_PRESENT
> case RTE_PCI_KDRV_VFIO:
> return pci_vfio_mmio_read(device, bar, buf, len, offset); -#endif
> default:
> rte_pci_device_name(&device->addr, devname,
> RTE_DEV_NAME_MAX_LEN); @@ -711,10 +699,8 @@ int
> rte_pci_mmio_write(const struct rte_pci_device *device, int bar,
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> return pci_uio_mmio_write(device, bar, buf, len, offset); -#ifdef
> VFIO_PRESENT
> case RTE_PCI_KDRV_VFIO:
> return pci_vfio_mmio_write(device, bar, buf, len, offset); -#endif
> default:
> rte_pci_device_name(&device->addr, devname,
> RTE_DEV_NAME_MAX_LEN); @@ -731,12 +717,10 @@
> rte_pci_ioport_map(struct rte_pci_device *dev, int bar,
> int ret = -1;
>
> switch (dev->kdrv) {
> -#ifdef VFIO_PRESENT
> case RTE_PCI_KDRV_VFIO:
> if (pci_vfio_is_enabled())
> ret = pci_vfio_ioport_map(dev, bar, p);
> break;
> -#endif
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> ret = pci_uio_ioport_map(dev, bar, p); @@ -757,11 +741,9 @@
> rte_pci_ioport_read(struct rte_pci_ioport *p,
> void *data, size_t len, off_t offset) {
> switch (p->dev->kdrv) {
> -#ifdef VFIO_PRESENT
> case RTE_PCI_KDRV_VFIO:
> pci_vfio_ioport_read(p, data, len, offset);
> break;
> -#endif
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> pci_uio_ioport_read(p, data, len, offset); @@ -777,11 +759,9 @@
> rte_pci_ioport_write(struct rte_pci_ioport *p,
> const void *data, size_t len, off_t offset) {
> switch (p->dev->kdrv) {
> -#ifdef VFIO_PRESENT
> case RTE_PCI_KDRV_VFIO:
> pci_vfio_ioport_write(p, data, len, offset);
> break;
> -#endif
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> pci_uio_ioport_write(p, data, len, offset); @@ -798,12 +778,10 @@
> rte_pci_ioport_unmap(struct rte_pci_ioport *p)
> int ret = -1;
>
> switch (p->dev->kdrv) {
> -#ifdef VFIO_PRESENT
> case RTE_PCI_KDRV_VFIO:
> if (pci_vfio_is_enabled())
> ret = pci_vfio_ioport_unmap(p);
> break;
> -#endif
> case RTE_PCI_KDRV_IGB_UIO:
> case RTE_PCI_KDRV_UIO_GENERIC:
> ret = pci_uio_ioport_unmap(p); diff --git
> a/drivers/bus/pci/linux/pci_init.h b/drivers/bus/pci/linux/pci_init.h
> index a4d37c0d0a..6949dd57d9 100644
> --- a/drivers/bus/pci/linux/pci_init.h
> +++ b/drivers/bus/pci/linux/pci_init.h
> @@ -5,8 +5,6 @@
> #ifndef EAL_PCI_INIT_H_
> #define EAL_PCI_INIT_H_
>
> -#include <rte_vfio.h>
> -
> #include "private.h"
>
> /** IO resource type: */
> @@ -50,8 +48,6 @@ void pci_uio_ioport_write(struct rte_pci_ioport *p,
> const void *data, size_t len, off_t offset); int
> pci_uio_ioport_unmap(struct rte_pci_ioport *p);
>
> -#ifdef VFIO_PRESENT
> -
> /* access config space */
> int pci_vfio_read_config(const struct rte_pci_device *dev,
> void *buf, size_t len, off_t offs); @@ -77,6 +73,4 @@ int
> pci_vfio_unmap_resource(struct rte_pci_device *dev);
>
> int pci_vfio_is_enabled(void);
>
> -#endif
> -
> #endif /* EAL_PCI_INIT_H_ */
> diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
> index 5317170231..d0844585fe 100644
> --- a/drivers/bus/pci/linux/pci_vfio.c
> +++ b/drivers/bus/pci/linux/pci_vfio.c
> @@ -27,17 +27,6 @@
> #include "pci_init.h"
> #include "private.h"
>
> -/**
> - * @file
> - * PCI probing using Linux VFIO.
> - *
> - * This code tries to determine if the PCI device is bound to VFIO driver,
> - * and initialize it (map BARs, set up interrupts) if that's the case.
> - *
> - */
> -
> -#ifdef VFIO_PRESENT
> -
> static struct rte_tailq_elem rte_vfio_tailq = {
> .name = "VFIO_RESOURCE_LIST",
> };
> @@ -1327,4 +1316,3 @@ pci_vfio_is_enabled(void)
> }
> return status;
> }
> -#endif
> diff --git a/drivers/bus/platform/bus_platform_driver.h
> b/drivers/bus/platform/bus_platform_driver.h
> index ef4b27c0c0..76403043c1 100644
> --- a/drivers/bus/platform/bus_platform_driver.h
> +++ b/drivers/bus/platform/bus_platform_driver.h
> @@ -15,9 +15,9 @@
>
> #include <dev_driver.h>
> #include <rte_common.h>
> +#include <rte_compat.h>
> #include <rte_dev.h>
> #include <rte_os.h>
> -#include <rte_vfio.h>
>
> #ifdef __cplusplus
> extern "C" {
> @@ -144,8 +144,6 @@ RTE_PMD_EXPORT_NAME(nm) #define
> RTE_PMD_REGISTER_ALIAS(nm, alias) \ static const char *pdrvinit_ ## nm
> ## _alias = RTE_STR(alias)
>
> -#ifdef VFIO_PRESENT
> -
> /**
> * Register a platform device driver.
> *
> @@ -170,22 +168,6 @@ void rte_platform_register(struct
> rte_platform_driver *pdrv); __rte_internal void
> rte_platform_unregister(struct rte_platform_driver *pdrv);
>
> -#else
> -
> -__rte_internal
> -static inline void
> -rte_platform_register(struct rte_platform_driver *pdrv __rte_unused) -{ -}
> -
> -__rte_internal
> -static inline void
> -rte_platform_unregister(struct rte_platform_driver *pdrv __rte_unused) -
> { -}
> -
> -#endif /* VFIO_PRESENT */
> -
> #ifdef __cplusplus
> }
> #endif
> diff --git a/drivers/bus/platform/platform.c
> b/drivers/bus/platform/platform.c index 0f50027236..90524fd961 100644
> --- a/drivers/bus/platform/platform.c
> +++ b/drivers/bus/platform/platform.c
> @@ -25,8 +25,6 @@
>
> #include "private.h"
>
> -#ifdef VFIO_PRESENT
> -
> #define PLATFORM_BUS_DEVICES_PATH "/sys/bus/platform/devices"
>
> RTE_EXPORT_INTERNAL_SYMBOL(rte_platform_register)
> @@ -647,5 +645,3 @@ struct rte_platform_bus platform_bus = {
>
> RTE_REGISTER_BUS(platform, platform_bus.bus);
> RTE_LOG_REGISTER_DEFAULT(platform_bus_logtype, NOTICE);
> -
> -#endif /* VFIO_PRESENT */
> diff --git a/drivers/bus/platform/platform_params.c
> b/drivers/bus/platform/platform_params.c
> index 8a6214b97c..65b20d121f 100644
> --- a/drivers/bus/platform/platform_params.c
> +++ b/drivers/bus/platform/platform_params.c
> @@ -10,13 +10,10 @@
> #include <rte_dev.h>
> #include <rte_errno.h>
> #include <rte_kvargs.h>
> -#include <rte_vfio.h>
>
> #include "bus_platform_driver.h"
> #include "private.h"
>
> -#ifdef VFIO_PRESENT
> -
> enum platform_params {
> RTE_PLATFORM_PARAM_NAME,
> };
> @@ -73,5 +70,3 @@ platform_bus_dev_iterate(const void *start, const char
> *str,
>
> return dev;
> }
> -
> -#endif /* VFIO_PRESENT */
> diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c
> b/drivers/crypto/bcmfs/bcmfs_vfio.c
> index dc2def580f..8d6ea16544 100644
> --- a/drivers/crypto/bcmfs/bcmfs_vfio.c
> +++ b/drivers/crypto/bcmfs/bcmfs_vfio.c
> @@ -7,13 +7,14 @@
> #include <sys/mman.h>
> #include <sys/ioctl.h>
>
> -#include <rte_vfio.h>
> -
> #include "bcmfs_device.h"
> #include "bcmfs_logs.h"
> #include "bcmfs_vfio.h"
>
> -#ifdef VFIO_PRESENT
> +#ifdef RTE_EAL_VFIO
> +
> +#include <rte_vfio.h>
> +
> static int
> vfio_map_dev_obj(const char *path, const char *dev_obj,
> uint32_t *size, void **addr, int *dev_fd) @@ -93,7 +94,7 @@
> bcmfs_release_vfio(struct bcmfs_device *dev)
> return;
> }
> }
> -#else
> +#else /* ! RTE_EAL_VFIO */
> int
> bcmfs_attach_vfio(struct bcmfs_device *dev __rte_unused) { @@ -104,4
> +105,4 @@ void bcmfs_release_vfio(struct bcmfs_device *dev
> __rte_unused) { } -#endif
> +#endif /* RTE_EAL_VFIO */
> diff --git a/drivers/raw/ifpga/afu_pmd_n3000.c
> b/drivers/raw/ifpga/afu_pmd_n3000.c
> index 6aae1b224e..0882a27701 100644
> --- a/drivers/raw/ifpga/afu_pmd_n3000.c
> +++ b/drivers/raw/ifpga/afu_pmd_n3000.c
> @@ -1473,7 +1473,6 @@ static struct rte_pci_device
> *n3000_afu_get_pci_dev(struct afu_rawdev *dev)
> return RTE_DEV_TO_PCI(afudev->rawdev->device);
> }
>
> -#ifdef VFIO_PRESENT
> static int dma_afu_set_irqs(struct afu_rawdev *dev, uint32_t vec_start,
> uint32_t count, int *efds)
> {
> @@ -1511,7 +1510,6 @@ static int dma_afu_set_irqs(struct afu_rawdev
> *dev, uint32_t vec_start,
> rte_free(irq_set);
> return ret;
> }
> -#endif
>
> static void *n3000_afu_get_port_addr(struct afu_rawdev *dev) { @@ -
> 1724,10 +1722,8 @@ static int dma_afu_ctx_init(struct afu_rawdev *dev, int
> index, uint8_t *addr)
> IFPGA_RAWDEV_PMD_ERR("eventfd create failed");
> return -EBADF;
> }
> -#ifdef VFIO_PRESENT
> if (dma_afu_set_irqs(dev, vec_start, 1, efds))
> IFPGA_RAWDEV_PMD_ERR("DMA interrupt setup failed"); -
> #endif
> }
> ctx->event_fd = efds[0];
>
> diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h index
> 923293040b..594d504c56 100644
> --- a/lib/eal/include/rte_vfio.h
> +++ b/lib/eal/include/rte_vfio.h
> @@ -15,24 +15,16 @@
>
> #include <rte_compat.h>
>
> -/*
> - * determine if VFIO is present on the system
> - */
> -#if !defined(VFIO_PRESENT) && defined(RTE_EAL_VFIO) -#include
> <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) -
> #define VFIO_PRESENT -#endif /* kernel version >= 3.6.0 */ -#if
> LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) -#define
> HAVE_VFIO_DEV_REQ_INTERFACE -#endif /* kernel version >= 4.0.0 */ -
> #endif /* RTE_EAL_VFIO */
> -
> #ifdef __cplusplus
> extern "C" {
> #endif
>
> -#ifdef VFIO_PRESENT
> +#ifdef RTE_EAL_VFIO
> +
> +#include <linux/version.h>
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) #define
> +HAVE_VFIO_DEV_REQ_INTERFACE #endif /* kernel version >= 4.0.0 */
>
> #include <linux/vfio.h>
>
> @@ -102,12 +94,12 @@ struct vfio_device_feature_bus_master { }; #endif
>
> -#else /* not VFIO_PRESENT */
> +#else /* ! RTE_EAL_VFIO */
>
> /* we don't need an actual definition, only pointer is used */ struct
> vfio_device_info;
>
> -#endif /* VFIO_PRESENT */
> +#endif /* RTE_EAL_VFIO */
>
> #define RTE_VFIO_DEFAULT_CONTAINER_FD (-1)
>
> diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index
> 52efb8626b..708a387265 100644
> --- a/lib/eal/linux/eal.c
> +++ b/lib/eal/linux/eal.c
> @@ -1121,14 +1121,12 @@ rte_eal_init(int argc, char **argv) #endif
> }
>
> -#ifdef VFIO_PRESENT
> if (rte_vfio_enable("vfio")) {
> rte_eal_init_alert("Cannot init VFIO");
> rte_errno = EAGAIN;
> rte_atomic_store_explicit(&run_once, 0,
> rte_memory_order_relaxed);
> return -1;
> }
> -#endif
> /* in secondary processes, memory init may allocate additional fbarrays
> * not present in primary processes, so to avoid any potential issues,
> * initialize memzones first.
> @@ -1330,9 +1328,7 @@ rte_eal_cleanup(void)
> rte_memseg_walk(mark_freeable, NULL);
>
> rte_service_finalize();
> -#ifdef VFIO_PRESENT
> vfio_mp_sync_cleanup();
> -#endif
> rte_mp_channel_cleanup();
> eal_bus_cleanup();
> rte_eal_alarm_cleanup();
> diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
> index 4ec78de82c..d420ecf947 100644
> --- a/lib/eal/linux/eal_interrupts.c
> +++ b/lib/eal/linux/eal_interrupts.c
> @@ -57,9 +57,7 @@ union intr_pipefds{
> */
> union rte_intr_read_buffer {
> int uio_intr_count; /* for uio device */
> -#ifdef VFIO_PRESENT
> uint64_t vfio_intr_count; /* for vfio device */
> -#endif
> uint64_t timerfd_num; /* for timerfd */
> char charbuf[16]; /* for others */
> };
> @@ -95,8 +93,6 @@ static struct rte_intr_source_list intr_sources; static
> rte_thread_t intr_thread;
>
> /* VFIO interrupts */
> -#ifdef VFIO_PRESENT
> -
> #define IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + sizeof(int))
> /* irq set buffer length for queue interrupts and LSC interrupt */ #define
> MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \ @@ -401,7 +397,6
> @@ vfio_disable_req(const struct rte_intr_handle *intr_handle)
> return ret;
> }
> #endif
> -#endif
>
> static int
> uio_intx_intr_disable(const struct rte_intr_handle *intr_handle) @@ -734,7
> +729,6 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
> case RTE_INTR_HANDLE_ALARM:
> rc = -1;
> break;
> -#ifdef VFIO_PRESENT
> case RTE_INTR_HANDLE_VFIO_MSIX:
> if (vfio_enable_msix(intr_handle))
> rc = -1;
> @@ -752,7 +746,6 @@ rte_intr_enable(const struct rte_intr_handle
> *intr_handle)
> if (vfio_enable_req(intr_handle))
> rc = -1;
> break;
> -#endif
> #endif
> /* not used at this moment */
> case RTE_INTR_HANDLE_DEV_EVENT:
> @@ -807,7 +800,6 @@ rte_intr_ack(const struct rte_intr_handle
> *intr_handle)
> /* not used at this moment */
> case RTE_INTR_HANDLE_ALARM:
> return -1;
> -#ifdef VFIO_PRESENT
> /* VFIO MSI* is implicitly acked unlike INTx, nothing to do */
> case RTE_INTR_HANDLE_VFIO_MSIX:
> case RTE_INTR_HANDLE_VFIO_MSI:
> @@ -819,7 +811,6 @@ rte_intr_ack(const struct rte_intr_handle
> *intr_handle) #ifdef HAVE_VFIO_DEV_REQ_INTERFACE
> case RTE_INTR_HANDLE_VFIO_REQ:
> return -1;
> -#endif
> #endif
> /* not used at this moment */
> case RTE_INTR_HANDLE_DEV_EVENT:
> @@ -868,7 +859,6 @@ rte_intr_disable(const struct rte_intr_handle
> *intr_handle)
> case RTE_INTR_HANDLE_ALARM:
> rc = -1;
> break;
> -#ifdef VFIO_PRESENT
> case RTE_INTR_HANDLE_VFIO_MSIX:
> if (vfio_disable_msix(intr_handle))
> rc = -1;
> @@ -886,7 +876,6 @@ rte_intr_disable(const struct rte_intr_handle
> *intr_handle)
> if (vfio_disable_req(intr_handle))
> rc = -1;
> break;
> -#endif
> #endif
> /* not used at this moment */
> case RTE_INTR_HANDLE_DEV_EVENT:
> @@ -948,7 +937,6 @@ eal_intr_process_interrupts(struct epoll_event
> *events, int nfds)
> case RTE_INTR_HANDLE_ALARM:
> bytes_read = sizeof(buf.timerfd_num);
> break;
> -#ifdef VFIO_PRESENT
> #ifdef HAVE_VFIO_DEV_REQ_INTERFACE
> case RTE_INTR_HANDLE_VFIO_REQ:
> #endif
> @@ -957,7 +945,6 @@ eal_intr_process_interrupts(struct epoll_event
> *events, int nfds)
> case RTE_INTR_HANDLE_VFIO_LEGACY:
> bytes_read = sizeof(buf.vfio_intr_count);
> break;
> -#endif
> case RTE_INTR_HANDLE_VDEV:
> case RTE_INTR_HANDLE_EXT:
> bytes_read = 0;
> @@ -1221,13 +1208,11 @@ eal_intr_proc_rxtx_intr(int fd, const struct
> rte_intr_handle *intr_handle)
> case RTE_INTR_HANDLE_UIO_INTX:
> bytes_read = sizeof(buf.uio_intr_count);
> break;
> -#ifdef VFIO_PRESENT
> case RTE_INTR_HANDLE_VFIO_MSIX:
> case RTE_INTR_HANDLE_VFIO_MSI:
> case RTE_INTR_HANDLE_VFIO_LEGACY:
> bytes_read = sizeof(buf.vfio_intr_count);
> break;
> -#endif
> case RTE_INTR_HANDLE_VDEV:
> bytes_read = rte_intr_efd_counter_size_get(intr_handle);
> /* For vdev, number of bytes to read is set by driver */ diff --git
> a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h index
> 23a787ad20..e7d855c032 100644
> --- a/lib/eal/linux/eal_vfio.h
> +++ b/lib/eal/linux/eal_vfio.h
> @@ -7,20 +7,6 @@
>
> #include <rte_common.h>
>
> -/*
> - * determine if VFIO is present on the system
> - */
> -#if !defined(VFIO_PRESENT) && defined(RTE_EAL_VFIO) -#include
> <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) -
> #define VFIO_PRESENT -#else -#pragma message("VFIO configured but not
> supported by this kernel, disabling.") -#endif /* kernel version >= 3.6.0 */ -
> #endif /* RTE_EAL_VFIO */
> -
> -#ifdef VFIO_PRESENT
> -
> #include <stdint.h>
> #include <linux/vfio.h>
>
> @@ -154,6 +140,4 @@ struct vfio_mp_param {
> };
> };
>
> -#endif /* VFIO_PRESENT */
> -
> #endif /* EAL_VFIO_H_ */
> diff --git a/lib/eal/linux/eal_vfio_mp_sync.c
> b/lib/eal/linux/eal_vfio_mp_sync.c
> index ce14e260fe..8230f3d24d 100644
> --- a/lib/eal/linux/eal_vfio_mp_sync.c
> +++ b/lib/eal/linux/eal_vfio_mp_sync.c
> @@ -14,15 +14,6 @@
> #include "eal_private.h"
> #include "eal_vfio.h"
>
> -/**
> - * @file
> - * VFIO socket for communication between primary and secondary
> processes.
> - *
> - * This file is only compiled if RTE_EAL_VFIO is set.
> - */
> -
> -#ifdef VFIO_PRESENT
> -
> static int
> vfio_mp_primary(const struct rte_mp_msg *msg, const void *peer) { @@ -
> 129,4 +120,3 @@ vfio_mp_sync_cleanup(void)
>
> rte_mp_action_unregister(EAL_VFIO_MP);
> }
> -#endif
> --
> 2.51.0
Reviewed-by: Rosen Xu <rosen.xu@altera.com>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [RFC 2/8] vfio: assume VFIO is always and only present on Linux
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
2025-09-03 7:28 ` [RFC 1/8] vfio: remove confusing check on VFIO presence David Marchand
@ 2025-09-03 7:28 ` David Marchand
2025-09-03 7:28 ` [RFC 3/8] vfio: remove public wrappers David Marchand
` (9 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:28 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, Bruce Richardson, Ajit Khaparde,
Vikas Gupta, Tyler Retzlaff
RTE_EAL_VFIO is directly mapped to is_linux in meson.
Replace this intermediate build knob with RTE_EXEC_ENV_LINUX.
This is an intermediate state before importing the VFIO uapi header.
Note: crypto/bcmfs was functional only for OSes supporting VFIO iow
Linux. Stop compiling it on other OSes.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
config/meson.build | 3 ---
drivers/crypto/bcmfs/bcmfs_vfio.c | 18 ++----------------
drivers/crypto/bcmfs/meson.build | 4 ++--
lib/eal/include/rte_vfio.h | 6 +++---
4 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 55497f0bf5..b5e894de3c 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -459,9 +459,6 @@ dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
install_headers(['rte_config.h'],
subdir: get_option('include_subdir_arch'))
-# enable VFIO only if it is linux OS
-dpdk_conf.set('RTE_EAL_VFIO', is_linux)
-
# specify -D_GNU_SOURCE unconditionally
add_project_arguments('-D_GNU_SOURCE', language: 'c')
diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c b/drivers/crypto/bcmfs/bcmfs_vfio.c
index 8d6ea16544..9138f96eb0 100644
--- a/drivers/crypto/bcmfs/bcmfs_vfio.c
+++ b/drivers/crypto/bcmfs/bcmfs_vfio.c
@@ -7,14 +7,12 @@
#include <sys/mman.h>
#include <sys/ioctl.h>
+#include <rte_vfio.h>
+
#include "bcmfs_device.h"
#include "bcmfs_logs.h"
#include "bcmfs_vfio.h"
-#ifdef RTE_EAL_VFIO
-
-#include <rte_vfio.h>
-
static int
vfio_map_dev_obj(const char *path, const char *dev_obj,
uint32_t *size, void **addr, int *dev_fd)
@@ -94,15 +92,3 @@ bcmfs_release_vfio(struct bcmfs_device *dev)
return;
}
}
-#else /* ! RTE_EAL_VFIO */
-int
-bcmfs_attach_vfio(struct bcmfs_device *dev __rte_unused)
-{
- return -1;
-}
-
-void
-bcmfs_release_vfio(struct bcmfs_device *dev __rte_unused)
-{
-}
-#endif /* RTE_EAL_VFIO */
diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index 5842f83a3b..925dde2ee2 100644
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build
@@ -3,9 +3,9 @@
# All rights reserved.
#
-if is_windows
+if not is_linux
build = false
- reason = 'not supported on Windows'
+ reason = 'only supported on Linux'
subdir_done()
endif
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 594d504c56..035b727dd0 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -19,7 +19,7 @@
extern "C" {
#endif
-#ifdef RTE_EAL_VFIO
+#ifdef RTE_EXEC_ENV_LINUX
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
@@ -94,12 +94,12 @@ struct vfio_device_feature_bus_master {
};
#endif
-#else /* ! RTE_EAL_VFIO */
+#else /* ! RTE_EXEC_ENV_LINUX */
/* we don't need an actual definition, only pointer is used */
struct vfio_device_info;
-#endif /* RTE_EAL_VFIO */
+#endif /* RTE_EXEC_ENV_LINUX */
#define RTE_VFIO_DEFAULT_CONTAINER_FD (-1)
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC 3/8] vfio: remove public wrappers
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
2025-09-03 7:28 ` [RFC 1/8] vfio: remove confusing check on VFIO presence David Marchand
2025-09-03 7:28 ` [RFC 2/8] vfio: assume VFIO is always and only present on Linux David Marchand
@ 2025-09-03 7:28 ` David Marchand
2025-09-03 7:28 ` [RFC 4/8] eal/linux: remove more internal VFIO macros David Marchand
` (8 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:28 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, Nipun Gupta, Nikhil Agarwal,
Hemant Agrawal, Sachin Saxena, Anatoly Burakov, Chenbo Xia,
Tyler Retzlaff, Harman Kalra
The public header defines a number of wrappers that can be removed or
hidden internally.
Either, those concern old Linux kernel versions that are not supported by
dpdk anymore (DPDK now requires Linux v5.4 at least), like:
- the request notifier feature, present since Linux v4.0,
- the noiommu mode, present since Linux v4.5,
- the capability support, present since Linux v4.6,
- the msix mapping feature, present since Linux v4.16,
Or, those wrappers can be made private as only consumed internally.
- VFIO_GET_REGION_IDX() has no equivalent in the Linux uapi, but
is only used by the Linux PCI bus code,
- VFIO_DEVICE_FEATURE is only used by the CDX bus code,
- the various macros around /dev/vfio/ or the noiommu kmod parameter are
only used by eal_vfio.c,
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/bus/cdx/cdx_vfio.c | 27 ++++++++++++
drivers/bus/fslmc/fslmc_vfio.c | 17 ++++----
drivers/bus/pci/linux/pci_vfio.c | 23 +++--------
drivers/bus/pci/pci_common.c | 2 -
lib/eal/include/rte_vfio.h | 71 --------------------------------
lib/eal/linux/eal_interrupts.c | 10 -----
lib/eal/linux/eal_vfio.c | 23 ++++-------
7 files changed, 50 insertions(+), 123 deletions(-)
diff --git a/drivers/bus/cdx/cdx_vfio.c b/drivers/bus/cdx/cdx_vfio.c
index 37e0c424d4..03d156388e 100644
--- a/drivers/bus/cdx/cdx_vfio.c
+++ b/drivers/bus/cdx/cdx_vfio.c
@@ -613,6 +613,33 @@ 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
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 68439cbd8c..cc4311989b 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -190,7 +190,7 @@ fslmc_vfio_add_group(int 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)
- group->iommu_type = RTE_VFIO_NOIOMMU;
+ group->iommu_type = VFIO_NOIOMMU_IOMMU;
else
group->iommu_type = VFIO_TYPE1_IOMMU;
LIST_INSERT_HEAD(&s_vfio_container.groups, group, next);
@@ -396,8 +396,7 @@ fslmc_vfio_open_group_fd(const char *group_name)
/* if primary, try to open the group */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
/* try regular group format */
- snprintf(filename, sizeof(filename),
- VFIO_GROUP_FMT, iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/%u", iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
goto add_vfio_group;
@@ -451,7 +450,7 @@ fslmc_vfio_check_extensions(int vfio_container_fd)
int ret;
uint32_t idx, n_extensions = 0;
static const int type_id[] = {RTE_VFIO_TYPE1, RTE_VFIO_SPAPR,
- RTE_VFIO_NOIOMMU};
+ VFIO_NOIOMMU_IOMMU};
static const char * const type_id_nm[] = {"Type 1",
"sPAPR", "No-IOMMU"};
@@ -495,10 +494,10 @@ fslmc_vfio_open_container_fd(void)
/* if we're in a primary process, try to open the container */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- vfio_container_fd = open(VFIO_CONTAINER_PATH, O_RDWR);
+ vfio_container_fd = open("/dev/vfio/vfio", O_RDWR);
if (vfio_container_fd < 0) {
- DPAA2_BUS_ERR("Open VFIO container(%s), err(%d)",
- VFIO_CONTAINER_PATH, vfio_container_fd);
+ DPAA2_BUS_ERR("Open VFIO container, err(%d)",
+ vfio_container_fd);
ret = vfio_container_fd;
goto err_exit;
}
@@ -851,7 +850,7 @@ fslmc_map_dma(uint64_t vaddr, rte_iova_t iovaddr, size_t len)
return fd;
return -EIO;
}
- if (fslmc_vfio_iommu_type(fd) == RTE_VFIO_NOIOMMU) {
+ if (fslmc_vfio_iommu_type(fd) == VFIO_NOIOMMU_IOMMU) {
DPAA2_BUS_DEBUG("Running in NOIOMMU mode");
if (phy != iovaddr) {
DPAA2_BUS_ERR("IOVA should support with IOMMU");
@@ -951,7 +950,7 @@ fslmc_unmap_dma(uint64_t vaddr, uint64_t iovaddr, size_t len)
return fd;
return -EIO;
}
- if (fslmc_vfio_iommu_type(fd) == RTE_VFIO_NOIOMMU) {
+ if (fslmc_vfio_iommu_type(fd) == VFIO_NOIOMMU_IOMMU) {
DPAA2_BUS_DEBUG("Running in NOIOMMU mode");
return 0;
}
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index d0844585fe..9e5776ce3c 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -273,7 +273,6 @@ pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)
return -1;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
/*
* Spinlock for device hot-unplug failure handling.
* If it tries to access bus or device, such as handle sigbus on bus
@@ -390,7 +389,6 @@ pci_vfio_disable_notifier(struct rte_pci_device *dev)
return 0;
}
-#endif
static int
pci_vfio_is_ioport_bar(const struct rte_pci_device *dev, int vfio_dev_fd,
@@ -665,12 +663,12 @@ pci_vfio_info_cap(struct vfio_region_info *info, int cap)
struct vfio_info_cap_header *h;
size_t offset;
- if ((info->flags & RTE_VFIO_INFO_FLAG_CAPS) == 0) {
+ if ((info->flags & VFIO_REGION_INFO_FLAG_CAPS) == 0) {
/* VFIO info does not advertise capabilities */
return NULL;
}
- offset = VFIO_CAP_OFFSET(info);
+ offset = info->cap_offset;
while (offset != 0) {
h = RTE_PTR_ADD(info, offset);
if (h->id == cap)
@@ -690,7 +688,7 @@ pci_vfio_msix_is_mappable(int vfio_dev_fd, int msix_region)
if (ret < 0)
return -1;
- ret = pci_vfio_info_cap(info, RTE_VFIO_CAP_MSIX_MAPPABLE) != NULL;
+ ret = pci_vfio_info_cap(info, VFIO_REGION_INFO_CAP_MSIX_MAPPABLE) != NULL;
/* cleanup */
free(info);
@@ -745,10 +743,8 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
if (rte_intr_fd_set(dev->intr_handle, -1))
return -1;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_fd_set(dev->vfio_req_intr_handle, -1))
return -1;
-#endif
/* store PCI address string */
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
@@ -904,13 +900,11 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
goto err_map;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (pci_vfio_enable_notifier(dev, vfio_dev_fd) != 0) {
PCI_LOG(ERR, "Error setting up notifier!");
goto err_map;
}
-#endif
TAILQ_INSERT_TAIL(vfio_res_list, vfio_res, next);
return 0;
@@ -945,10 +939,8 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
if (rte_intr_fd_set(dev->intr_handle, -1))
return -1;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_fd_set(dev->vfio_req_intr_handle, -1))
return -1;
-#endif
/* store PCI address string */
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
@@ -1002,10 +994,8 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
/* we need save vfio_dev_fd, so it can be used during release */
if (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd))
goto err_vfio_dev_fd;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_dev_fd_set(dev->vfio_req_intr_handle, vfio_dev_fd))
goto err_vfio_dev_fd;
-#endif
return 0;
err_vfio_dev_fd:
@@ -1085,14 +1075,12 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
loc->domain, loc->bus, loc->devid, loc->function);
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
ret = pci_vfio_disable_notifier(dev);
if (ret) {
PCI_LOG(ERR, "fail to disable req notifier.");
return -1;
}
-#endif
if (rte_intr_fd_get(dev->intr_handle) < 0)
return -1;
@@ -1226,6 +1214,7 @@ pci_vfio_ioport_map(struct rte_pci_device *dev, int bar,
return 0;
}
+#define PCI_VFIO_GET_REGION_IDX(x) (x >> 40)
void
pci_vfio_ioport_read(struct rte_pci_ioport *p,
void *data, size_t len, off_t offset)
@@ -1239,7 +1228,7 @@ pci_vfio_ioport_read(struct rte_pci_ioport *p,
if (pread(vfio_dev_fd, data,
len, p->base + offset) <= 0)
PCI_LOG(ERR, "Can't read from PCI bar (%" PRIu64 ") : offset (%x)",
- VFIO_GET_REGION_IDX(p->base), (int)offset);
+ PCI_VFIO_GET_REGION_IDX(p->base), (int)offset);
}
void
@@ -1255,7 +1244,7 @@ pci_vfio_ioport_write(struct rte_pci_ioport *p,
if (pwrite(vfio_dev_fd, data,
len, p->base + offset) <= 0)
PCI_LOG(ERR, "Can't write to PCI bar (%" PRIu64 ") : offset (%x)",
- VFIO_GET_REGION_IDX(p->base), (int)offset);
+ PCI_VFIO_GET_REGION_IDX(p->base), (int)offset);
}
int
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index c88634f790..bf5df3d94e 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -603,7 +603,6 @@ pci_hot_unplug_handler(struct rte_device *dev)
return -1;
switch (pdev->kdrv) {
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_PCI_KDRV_VFIO:
/*
* vfio kernel module guaranty the pci device would not be
@@ -614,7 +613,6 @@ pci_hot_unplug_handler(struct rte_device *dev)
rte_dev_event_callback_process(dev->name,
RTE_DEV_EVENT_REMOVE);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
case RTE_PCI_KDRV_NIC_UIO:
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 035b727dd0..509ffec80c 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -21,79 +21,8 @@ extern "C" {
#ifdef RTE_EXEC_ENV_LINUX
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-#define HAVE_VFIO_DEV_REQ_INTERFACE
-#endif /* kernel version >= 4.0.0 */
-
#include <linux/vfio.h>
-#define VFIO_DIR "/dev/vfio"
-#define VFIO_CONTAINER_PATH "/dev/vfio/vfio"
-#define VFIO_GROUP_FMT "/dev/vfio/%u"
-#define VFIO_NOIOMMU_GROUP_FMT "/dev/vfio/noiommu-%u"
-#define VFIO_GET_REGION_IDX(x) (x >> 40)
-#define VFIO_NOIOMMU_MODE \
- "/sys/module/vfio/parameters/enable_unsafe_noiommu_mode"
-
-/* NOIOMMU is defined from kernel version 4.5 onwards */
-#ifdef VFIO_NOIOMMU_IOMMU
-#define RTE_VFIO_NOIOMMU VFIO_NOIOMMU_IOMMU
-#else
-#define RTE_VFIO_NOIOMMU 8
-#endif
-
-/*
- * capabilities are only supported on kernel 4.6+. there were also some API
- * changes as well, so add a macro to get cap offset.
- */
-#ifdef VFIO_REGION_INFO_FLAG_CAPS
-#define RTE_VFIO_INFO_FLAG_CAPS VFIO_REGION_INFO_FLAG_CAPS
-#define VFIO_CAP_OFFSET(x) (x->cap_offset)
-#else
-#define RTE_VFIO_INFO_FLAG_CAPS (1 << 3)
-#define VFIO_CAP_OFFSET(x) (x->resv)
-struct vfio_info_cap_header {
- uint16_t id;
- uint16_t version;
- uint32_t next;
-};
-#endif
-
-/* kernels 4.16+ can map BAR containing MSI-X table */
-#ifdef VFIO_REGION_INFO_CAP_MSIX_MAPPABLE
-#define RTE_VFIO_CAP_MSIX_MAPPABLE VFIO_REGION_INFO_CAP_MSIX_MAPPABLE
-#else
-#define RTE_VFIO_CAP_MSIX_MAPPABLE 3
-#endif
-
-/* 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
-
#else /* ! RTE_EXEC_ENV_LINUX */
/* we don't need an actual definition, only pointer is used */
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index d420ecf947..43e05c86a2 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -336,7 +336,6 @@ vfio_disable_msix(const struct rte_intr_handle *intr_handle) {
return ret;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
/* enable req notifier */
static int
vfio_enable_req(const struct rte_intr_handle *intr_handle)
@@ -396,7 +395,6 @@ vfio_disable_req(const struct rte_intr_handle *intr_handle)
return ret;
}
-#endif
static int
uio_intx_intr_disable(const struct rte_intr_handle *intr_handle)
@@ -741,12 +739,10 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
if (vfio_enable_intx(intr_handle))
rc = -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
if (vfio_enable_req(intr_handle))
rc = -1;
break;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
rc = -1;
@@ -808,10 +804,8 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
if (vfio_ack_intx(intr_handle))
return -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
return -1;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
return -1;
@@ -871,12 +865,10 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
if (vfio_disable_intx(intr_handle))
rc = -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
if (vfio_disable_req(intr_handle))
rc = -1;
break;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
rc = -1;
@@ -937,9 +929,7 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_ALARM:
bytes_read = sizeof(buf.timerfd_num);
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
-#endif
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
case RTE_INTR_HANDLE_VFIO_LEGACY:
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index 805f0ff92c..dfc3bd6e62 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -85,7 +85,7 @@ static const struct vfio_iommu_type iommu_types[] = {
},
/* IOMMU-less mode */
{
- .type_id = RTE_VFIO_NOIOMMU,
+ .type_id = VFIO_NOIOMMU_IOMMU,
.name = "No-IOMMU",
.partial_unmap = true,
.dma_map_func = &vfio_noiommu_dma_map,
@@ -363,8 +363,7 @@ vfio_open_group_fd(int iommu_group_num)
/* if primary, try to open the group */
if (internal_conf->process_type == RTE_PROC_PRIMARY) {
/* try regular group format */
- snprintf(filename, sizeof(filename),
- VFIO_GROUP_FMT, iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/%u", iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
if (vfio_group_fd < 0) {
/* if file not found, it's not an error */
@@ -375,9 +374,8 @@ vfio_open_group_fd(int iommu_group_num)
}
/* special case: try no-IOMMU path as well */
- snprintf(filename, sizeof(filename),
- VFIO_NOIOMMU_GROUP_FMT,
- iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/noiommu-%u",
+ iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
if (vfio_group_fd < 0) {
if (errno != ENOENT) {
@@ -1128,7 +1126,7 @@ rte_vfio_enable(const char *modname)
}
/* VFIO directory might not exist (e.g., unprivileged containers) */
- dir = opendir(VFIO_DIR);
+ dir = opendir("/dev/vfio");
if (dir == NULL) {
EAL_LOG(DEBUG,
"VFIO directory does not exist, skipping VFIO support...");
@@ -1315,15 +1313,12 @@ rte_vfio_get_container_fd(void)
const struct internal_config *internal_conf =
eal_get_internal_configuration();
-
/* if we're in a primary process, try to open the container */
if (internal_conf->process_type == RTE_PROC_PRIMARY) {
- vfio_container_fd = open(VFIO_CONTAINER_PATH, O_RDWR);
+ vfio_container_fd = open("/dev/vfio/vfio", O_RDWR);
if (vfio_container_fd < 0) {
- EAL_LOG(ERR,
- "Cannot open VFIO container %s, error "
- "%i (%s)", VFIO_CONTAINER_PATH,
- errno, strerror(errno));
+ EAL_LOG(ERR, "Cannot open VFIO container, error %i (%s)",
+ errno, strerror(errno));
return -1;
}
@@ -2053,7 +2048,7 @@ rte_vfio_noiommu_is_enabled(void)
ssize_t cnt;
char c;
- fd = open(VFIO_NOIOMMU_MODE, O_RDONLY);
+ fd = open("/sys/module/vfio/parameters/enable_unsafe_noiommu_mode", O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
EAL_LOG(ERR, "Cannot open VFIO noiommu file "
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC 4/8] eal/linux: remove more internal VFIO macros
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (2 preceding siblings ...)
2025-09-03 7:28 ` [RFC 3/8] vfio: remove public wrappers David Marchand
@ 2025-09-03 7:28 ` David Marchand
2025-09-03 7:28 ` [RFC 5/8] eal/linux: remove internal VFIO wrappers for old Linux David Marchand
` (7 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:28 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin, Anatoly Burakov
No need to redefine some VFIO_* macros that look like a define coming
from standard linux/vfio.h header.
Use RTE_DIM() and remove unneeded checks (like in get_vfio_group_idx()
where j can't be >= RTE_DIM(vfio_cfg->vfio_groups)).
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/eal/linux/eal_vfio.c | 97 ++++++++++++++++++++--------------------
lib/eal/linux/eal_vfio.h | 3 --
2 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index dfc3bd6e62..1eab90a261 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -29,7 +29,7 @@
* was registered by the user themselves, so we need to store the user mappings
* somewhere, to recreate them later.
*/
-#define VFIO_MAX_USER_MEM_MAPS 256
+#define EAL_VFIO_MAX_USER_MEM_MAPS 256
struct user_mem_map {
uint64_t addr; /**< start VA */
uint64_t iova; /**< start IOVA */
@@ -40,7 +40,7 @@ struct user_mem_map {
struct user_mem_maps {
rte_spinlock_recursive_t lock;
int n_maps;
- struct user_mem_map maps[VFIO_MAX_USER_MEM_MAPS];
+ struct user_mem_map maps[EAL_VFIO_MAX_USER_MEM_MAPS];
};
struct vfio_config {
@@ -48,12 +48,12 @@ struct vfio_config {
int vfio_container_fd;
int vfio_active_groups;
const struct vfio_iommu_type *vfio_iommu_type;
- struct vfio_group vfio_groups[VFIO_MAX_GROUPS];
+ struct vfio_group vfio_groups[RTE_MAX_VFIO_GROUPS];
struct user_mem_maps mem_maps;
};
/* per-process VFIO config */
-static struct vfio_config vfio_cfgs[VFIO_MAX_CONTAINERS];
+static struct vfio_config vfio_cfgs[RTE_MAX_VFIO_CONTAINERS];
static struct vfio_config *default_vfio_cfg = &vfio_cfgs[0];
static int vfio_type1_dma_map(int);
@@ -183,10 +183,10 @@ static void
delete_maps(struct user_mem_maps *user_mem_maps, struct user_mem_map *del_maps,
size_t n_del)
{
- int i;
+ unsigned int i;
size_t j;
- for (i = 0, j = 0; i < VFIO_MAX_USER_MEM_MAPS && j < n_del; i++) {
+ for (i = 0, j = 0; i < RTE_DIM(user_mem_maps->maps) && j < n_del; i++) {
struct user_mem_map *left = &user_mem_maps->maps[i];
struct user_mem_map *right = &del_maps[j];
@@ -202,10 +202,10 @@ static void
copy_maps(struct user_mem_maps *user_mem_maps, struct user_mem_map *add_maps,
size_t n_add)
{
- int i;
+ unsigned int i;
size_t j;
- for (i = 0, j = 0; i < VFIO_MAX_USER_MEM_MAPS && j < n_add; i++) {
+ for (i = 0, j = 0; i < RTE_DIM(user_mem_maps->maps) && j < n_add; i++) {
struct user_mem_map *left = &user_mem_maps->maps[i];
struct user_mem_map *right = &add_maps[j];
@@ -321,13 +321,13 @@ find_user_mem_maps(struct user_mem_maps *user_mem_maps, uint64_t addr,
static void
compact_user_maps(struct user_mem_maps *user_mem_maps)
{
- int i;
+ unsigned int i;
- qsort(user_mem_maps->maps, VFIO_MAX_USER_MEM_MAPS,
+ qsort(user_mem_maps->maps, RTE_DIM(user_mem_maps->maps),
sizeof(user_mem_maps->maps[0]), user_mem_map_cmp);
/* we'll go over the list backwards when merging */
- for (i = VFIO_MAX_USER_MEM_MAPS - 2; i >= 0; i--) {
+ for (i = RTE_DIM(user_mem_maps->maps) - 2; i != 0; i--) {
struct user_mem_map *l, *r;
l = &user_mem_maps->maps[i];
@@ -344,7 +344,7 @@ compact_user_maps(struct user_mem_maps *user_mem_maps)
/* the entries are still sorted, but now they have holes in them, so
* sort the list again.
*/
- qsort(user_mem_maps->maps, VFIO_MAX_USER_MEM_MAPS,
+ qsort(user_mem_maps->maps, RTE_DIM(user_mem_maps->maps),
sizeof(user_mem_maps->maps[0]), user_mem_map_cmp);
}
@@ -423,11 +423,11 @@ static struct vfio_config *
get_vfio_cfg_by_group_num(int iommu_group_num)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++) {
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++) {
if (vfio_cfg->vfio_groups[j].group_num ==
iommu_group_num)
return vfio_cfg;
@@ -441,30 +441,30 @@ static int
vfio_get_group_fd(struct vfio_config *vfio_cfg,
int iommu_group_num)
{
- int i;
+ struct vfio_group *cur_grp = NULL;
int vfio_group_fd;
- struct vfio_group *cur_grp;
+ unsigned int i;
/* check if we already have the group descriptor open */
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num == iommu_group_num)
return vfio_cfg->vfio_groups[i].fd;
/* Lets see first if there is room for a new group */
- if (vfio_cfg->vfio_active_groups == VFIO_MAX_GROUPS) {
+ if (vfio_cfg->vfio_active_groups == RTE_DIM(vfio_cfg->vfio_groups)) {
EAL_LOG(ERR, "Maximum number of VFIO groups reached!");
return -1;
}
/* Now lets get an index for the new group */
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num == -1) {
cur_grp = &vfio_cfg->vfio_groups[i];
break;
}
/* This should not happen */
- if (i == VFIO_MAX_GROUPS) {
+ if (cur_grp == NULL) {
EAL_LOG(ERR, "No VFIO group free slot found");
return -1;
}
@@ -487,11 +487,11 @@ static struct vfio_config *
get_vfio_cfg_by_group_fd(int vfio_group_fd)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++)
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++)
if (vfio_cfg->vfio_groups[j].fd == vfio_group_fd)
return vfio_cfg;
}
@@ -502,12 +502,12 @@ get_vfio_cfg_by_group_fd(int vfio_group_fd)
static struct vfio_config *
get_vfio_cfg_by_container_fd(int container_fd)
{
- int i;
+ unsigned int i;
if (container_fd == RTE_VFIO_DEFAULT_CONTAINER_FD)
return default_vfio_cfg;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
if (vfio_cfgs[i].vfio_container_fd == container_fd)
return &vfio_cfgs[i];
}
@@ -532,11 +532,11 @@ static int
get_vfio_group_idx(int vfio_group_fd)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++)
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++)
if (vfio_cfg->vfio_groups[j].fd == vfio_group_fd)
return j;
}
@@ -557,7 +557,7 @@ vfio_group_device_get(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1))
+ if (i < 0)
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
else
vfio_cfg->vfio_groups[i].devices++;
@@ -576,7 +576,7 @@ vfio_group_device_put(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1))
+ if (i < 0)
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
else
vfio_cfg->vfio_groups[i].devices--;
@@ -595,7 +595,7 @@ vfio_group_device_count(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1)) {
+ if (i < 0) {
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
return -1;
}
@@ -1086,7 +1086,7 @@ int
rte_vfio_enable(const char *modname)
{
/* initialize group list */
- int i, j;
+ unsigned int i, j;
int vfio_available;
DIR *dir;
const struct internal_config *internal_conf =
@@ -1094,13 +1094,13 @@ rte_vfio_enable(const char *modname)
rte_spinlock_recursive_t lock = RTE_SPINLOCK_RECURSIVE_INITIALIZER;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfgs[i].vfio_container_fd = -1;
vfio_cfgs[i].vfio_active_groups = 0;
vfio_cfgs[i].vfio_iommu_type = NULL;
vfio_cfgs[i].mem_maps.lock = lock;
- for (j = 0; j < VFIO_MAX_GROUPS; j++) {
+ for (j = 0; j < RTE_DIM(vfio_cfgs[i].vfio_groups); j++) {
vfio_cfgs[i].vfio_groups[j].fd = -1;
vfio_cfgs[i].vfio_groups[j].group_num = -1;
vfio_cfgs[i].vfio_groups[j].devices = 0;
@@ -1895,7 +1895,7 @@ container_dma_map(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
user_mem_maps = &vfio_cfg->mem_maps;
rte_spinlock_recursive_lock(&user_mem_maps->lock);
- if (user_mem_maps->n_maps == VFIO_MAX_USER_MEM_MAPS) {
+ if (user_mem_maps->n_maps == RTE_DIM(user_mem_maps->maps)) {
EAL_LOG(ERR, "No more space for user mem maps");
rte_errno = ENOMEM;
ret = -1;
@@ -1935,11 +1935,12 @@ static int
container_dma_unmap(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
uint64_t len)
{
- struct user_mem_map orig_maps[VFIO_MAX_USER_MEM_MAPS];
+ struct user_mem_map orig_maps[RTE_DIM(vfio_cfg->mem_maps.maps)];
struct user_mem_map new_maps[2]; /* can be at most 2 */
struct user_mem_maps *user_mem_maps;
- int n_orig, n_new, newlen, ret = 0;
+ int n_orig, n_new, ret = 0;
bool has_partial_unmap;
+ unsigned int newlen;
user_mem_maps = &vfio_cfg->mem_maps;
rte_spinlock_recursive_lock(&user_mem_maps->lock);
@@ -2005,7 +2006,7 @@ container_dma_unmap(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
/* can we store the new maps in our list? */
newlen = (user_mem_maps->n_maps - n_orig) + n_new;
- if (newlen >= VFIO_MAX_USER_MEM_MAPS) {
+ if (newlen >= RTE_DIM(user_mem_maps->maps)) {
EAL_LOG(ERR, "Not enough space to store partial mapping");
rte_errno = ENOMEM;
ret = -1;
@@ -2077,15 +2078,15 @@ RTE_EXPORT_SYMBOL(rte_vfio_container_create)
int
rte_vfio_container_create(void)
{
- int i;
+ unsigned int i;
/* Find an empty slot to store new vfio config */
- for (i = 1; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 1; i < RTE_DIM(vfio_cfgs); i++) {
if (vfio_cfgs[i].vfio_container_fd == -1)
break;
}
- if (i == VFIO_MAX_CONTAINERS) {
+ if (i == RTE_DIM(vfio_cfgs)) {
EAL_LOG(ERR, "Exceed max VFIO container limit");
return -1;
}
@@ -2104,7 +2105,7 @@ int
rte_vfio_container_destroy(int container_fd)
{
struct vfio_config *vfio_cfg;
- int i;
+ unsigned int i;
vfio_cfg = get_vfio_cfg_by_container_fd(container_fd);
if (vfio_cfg == NULL) {
@@ -2112,7 +2113,7 @@ rte_vfio_container_destroy(int container_fd)
return -1;
}
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num != -1)
rte_vfio_container_group_unbind(container_fd,
vfio_cfg->vfio_groups[i].group_num);
@@ -2144,9 +2145,9 @@ RTE_EXPORT_SYMBOL(rte_vfio_container_group_unbind)
int
rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
{
- struct vfio_config *vfio_cfg;
struct vfio_group *cur_grp = NULL;
- int i;
+ struct vfio_config *vfio_cfg;
+ unsigned int i;
vfio_cfg = get_vfio_cfg_by_container_fd(container_fd);
if (vfio_cfg == NULL) {
@@ -2154,7 +2155,7 @@ rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
return -1;
}
- for (i = 0; i < VFIO_MAX_GROUPS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++) {
if (vfio_cfg->vfio_groups[i].group_num == iommu_group_num) {
cur_grp = &vfio_cfg->vfio_groups[i];
break;
@@ -2162,7 +2163,7 @@ rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
}
/* This should not happen */
- if (i == VFIO_MAX_GROUPS || cur_grp == NULL) {
+ if (cur_grp == NULL) {
EAL_LOG(ERR, "Specified VFIO group number not found");
return -1;
}
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index e7d855c032..413c8f18df 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -69,9 +69,6 @@ struct vfio_iommu_spapr_tce_info {
#define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU
#endif
-#define VFIO_MAX_GROUPS RTE_MAX_VFIO_GROUPS
-#define VFIO_MAX_CONTAINERS RTE_MAX_VFIO_CONTAINERS
-
/*
* we don't need to store device fd's anywhere since they can be obtained from
* the group fd via an ioctl() call.
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC 5/8] eal/linux: remove internal VFIO wrappers for old Linux
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (3 preceding siblings ...)
2025-09-03 7:28 ` [RFC 4/8] eal/linux: remove more internal VFIO macros David Marchand
@ 2025-09-03 7:28 ` David Marchand
2025-09-03 7:28 ` [RFC 6/8] vfio: stop including Linux kernel header in public and driver API David Marchand
` (6 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:28 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, Hemant Agrawal, Sachin Saxena, Anatoly Burakov
DPDK now requires Linux v5.4 at least.
VFIO_SPAPR_TCE_IOMMU is present in Linux since v3.11.
VFIO_SPAPR_TCE_v2_IOMMU is present in Linux since v4.2.
Remove wrappers accordingly.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/bus/fslmc/fslmc_vfio.c | 2 +-
lib/eal/linux/eal_vfio.c | 4 +--
lib/eal/linux/eal_vfio.h | 60 ----------------------------------
3 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index cc4311989b..c08c316c94 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -449,7 +449,7 @@ fslmc_vfio_check_extensions(int vfio_container_fd)
{
int ret;
uint32_t idx, n_extensions = 0;
- static const int type_id[] = {RTE_VFIO_TYPE1, RTE_VFIO_SPAPR,
+ static const int type_id[] = {VFIO_TYPE1_IOMMU, VFIO_SPAPR_TCE_v2_IOMMU,
VFIO_NOIOMMU_IOMMU};
static const char * const type_id_nm[] = {"Type 1",
"sPAPR", "No-IOMMU"};
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index 1eab90a261..c6aed44946 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -69,7 +69,7 @@ static int vfio_dma_mem_map(struct vfio_config *vfio_cfg, uint64_t vaddr,
static const struct vfio_iommu_type iommu_types[] = {
/* x86 IOMMU, otherwise known as type 1 */
{
- .type_id = RTE_VFIO_TYPE1,
+ .type_id = VFIO_TYPE1_IOMMU,
.name = "Type 1",
.partial_unmap = false,
.dma_map_func = &vfio_type1_dma_map,
@@ -77,7 +77,7 @@ static const struct vfio_iommu_type iommu_types[] = {
},
/* ppc64 IOMMU, otherwise known as spapr */
{
- .type_id = RTE_VFIO_SPAPR,
+ .type_id = VFIO_SPAPR_TCE_v2_IOMMU,
.name = "sPAPR",
.partial_unmap = true,
.dma_map_func = &vfio_spapr_dma_map,
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index 413c8f18df..5c5742b429 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -8,66 +8,6 @@
#include <rte_common.h>
#include <stdint.h>
-#include <linux/vfio.h>
-
-#define RTE_VFIO_TYPE1 VFIO_TYPE1_IOMMU
-
-#ifndef VFIO_SPAPR_TCE_v2_IOMMU
-#define RTE_VFIO_SPAPR 7
-#define VFIO_IOMMU_SPAPR_REGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 17)
-#define VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 18)
-#define VFIO_IOMMU_SPAPR_TCE_CREATE _IO(VFIO_TYPE, VFIO_BASE + 19)
-#define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20)
-
-struct vfio_iommu_spapr_register_memory {
- uint32_t argsz;
- uint32_t flags;
- uint64_t vaddr;
- uint64_t size;
-};
-
-struct vfio_iommu_spapr_tce_create {
- uint32_t argsz;
- uint32_t flags;
- /* in */
- uint32_t page_shift;
- uint32_t __resv1;
- uint64_t window_size;
- uint32_t levels;
- uint32_t __resv2;
- /* out */
- uint64_t start_addr;
-};
-
-struct vfio_iommu_spapr_tce_remove {
- uint32_t argsz;
- uint32_t flags;
- /* in */
- uint64_t start_addr;
-};
-
-struct vfio_iommu_spapr_tce_ddw_info {
- uint64_t pgsizes;
- uint32_t max_dynamic_windows_supported;
- uint32_t levels;
-};
-
-/* SPAPR_v2 is not present, but SPAPR might be */
-#ifndef VFIO_SPAPR_TCE_IOMMU
-#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
-
-struct vfio_iommu_spapr_tce_info {
- uint32_t argsz;
- uint32_t flags;
- uint32_t dma32_window_start;
- uint32_t dma32_window_size;
- struct vfio_iommu_spapr_tce_ddw_info ddw;
-};
-#endif /* VFIO_SPAPR_TCE_IOMMU */
-
-#else /* VFIO_SPAPR_TCE_v2_IOMMU */
-#define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU
-#endif
/*
* we don't need to store device fd's anywhere since they can be obtained from
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC 6/8] vfio: stop including Linux kernel header in public and driver API
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (4 preceding siblings ...)
2025-09-03 7:28 ` [RFC 5/8] eal/linux: remove internal VFIO wrappers for old Linux David Marchand
@ 2025-09-03 7:28 ` David Marchand
2025-09-03 9:38 ` Xu, Rosen
2025-09-03 7:28 ` [RFC 7/8] uapi: import VFIO header David Marchand
` (5 subsequent siblings)
11 siblings, 1 reply; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:28 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, Nipun Gupta, Nikhil Agarwal,
Hemant Agrawal, Sachin Saxena, Anatoly Burakov, Chenbo Xia,
Tomasz Duszynski, Kai Ji, Ajit Khaparde, Vikas Gupta,
Dengdui Huang, Rosen Xu, Chaoyong He, Vijay Kumar Srivastava,
Tyler Retzlaff, Harman Kalra
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 <david.marchand@redhat.com>
---
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/common/qat/dev/qat_dev_gen_lce.c | 3 ++-
drivers/crypto/bcmfs/bcmfs_vfio.c | 2 ++
drivers/net/hns3/hns3_ethdev_vf.c | 1 -
drivers/raw/ifpga/afu_pmd_he_hssi.c | 1 -
drivers/raw/ifpga/afu_pmd_he_lpbk.c | 1 -
drivers/raw/ifpga/afu_pmd_he_mem.c | 1 -
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 | 8 --------
lib/eal/linux/eal_interrupts.c | 3 ++-
lib/eal/linux/eal_vfio.c | 1 +
22 files changed, 29 insertions(+), 19 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 <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
+
+#include <linux/vfio.h>
+
#include <eal_export.h>
#include <rte_eal_paging.h>
#include <rte_malloc.h>
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 <sys/queue.h>
#include <stdint.h>
#include <inttypes.h>
-#include <linux/vfio.h>
#include <rte_compat.h>
#include <rte_debug.h>
@@ -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 <rte_memcpy.h>
#include <ethdev_driver.h>
#include <rte_mbuf_dyn.h>
+#include <rte_vfio.h>
#include "private.h"
#include <fslmc_vfio.h>
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index c08c316c94..3f041f447c 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -20,6 +20,7 @@
#include <dirent.h>
#include <sys/eventfd.h>
#include <ctype.h>
+#include <linux/vfio.h>
#include <eal_export.h>
#include <eal_filesystem.h>
@@ -32,6 +33,7 @@
#include <rte_kvargs.h>
#include <dev_driver.h>
#include <rte_eal_memconfig.h>
+#include <rte_vfio.h>
#include <eal_vfio.h>
#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 <rte_compat.h>
-#include <rte_vfio.h>
/* 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 <sys/epoll.h>
#include <sys/eventfd.h>
#include <sys/syscall.h>
+#include <linux/vfio.h>
#include <eal_export.h>
#include <rte_mbuf.h>
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 <sys/mman.h>
#include <stdbool.h>
+#include <linux/vfio.h>
+
#include <rte_log.h>
#include <rte_pci.h>
#include <rte_bus_pci.h>
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 <sys/queue.h>
#include <unistd.h>
+#include <linux/vfio.h>
+
#include <bus_driver.h>
#include <bus_platform_driver.h>
#include <eal_export.h>
diff --git a/drivers/common/qat/dev/qat_dev_gen_lce.c b/drivers/common/qat/dev/qat_dev_gen_lce.c
index 6514321c32..466878bf76 100644
--- a/drivers/common/qat/dev/qat_dev_gen_lce.c
+++ b/drivers/common/qat/dev/qat_dev_gen_lce.c
@@ -3,7 +3,8 @@
*/
#include <rte_pci.h>
-#include <rte_vfio.h>
+
+#include <linux/vfio.h>
#include "qat_device.h"
#include "qat_qp.h"
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 <sys/mman.h>
#include <sys/ioctl.h>
+#include <linux/vfio.h>
+
#include <rte_vfio.h>
#include "bcmfs_device.h"
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index f9ef3dbb06..59fb790240 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -5,7 +5,6 @@
#include <rte_alarm.h>
#include <ethdev_pci.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include "hns3_ethdev.h"
#include "hns3_common.h"
diff --git a/drivers/raw/ifpga/afu_pmd_he_hssi.c b/drivers/raw/ifpga/afu_pmd_he_hssi.c
index 859f28dcc1..bcb952935a 100644
--- a/drivers/raw/ifpga/afu_pmd_he_hssi.c
+++ b/drivers/raw/ifpga/afu_pmd_he_hssi.c
@@ -17,7 +17,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
diff --git a/drivers/raw/ifpga/afu_pmd_he_lpbk.c b/drivers/raw/ifpga/afu_pmd_he_lpbk.c
index c7c5cda48c..df3b093157 100644
--- a/drivers/raw/ifpga/afu_pmd_he_lpbk.c
+++ b/drivers/raw/ifpga/afu_pmd_he_lpbk.c
@@ -17,7 +17,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
diff --git a/drivers/raw/ifpga/afu_pmd_he_mem.c b/drivers/raw/ifpga/afu_pmd_he_mem.c
index a1db533eeb..b595cd729c 100644
--- a/drivers/raw/ifpga/afu_pmd_he_mem.c
+++ b/drivers/raw/ifpga/afu_pmd_he_mem.c
@@ -16,7 +16,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.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 <sys/eventfd.h>
#include <sys/ioctl.h>
+#include <linux/vfio.h>
+
#include <rte_eal.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
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 <sys/ioctl.h>
-#include <rte_vfio.h>
+#include <linux/vfio.h>
#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 <linux/virtio_net.h>
#include <stdbool.h>
+#include <linux/vfio.h>
+
#include <rte_eal_paging.h>
#include <rte_malloc.h>
#include <rte_memory.h>
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 <sys/ioctl.h>
#include <unistd.h>
+#include <linux/vfio.h>
+
#include <nfp_common_pci.h>
#include <nfp_dev.h>
#include <rte_vfio.h>
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 <unistd.h>
#include <sys/ioctl.h>
+#include <linux/vfio.h>
+
#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
-#include <rte_vfio.h>
#include <rte_vhost.h>
#include <vdpa_driver.h>
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 509ffec80c..683affa933 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -19,17 +19,9 @@
extern "C" {
#endif
-#ifdef RTE_EXEC_ENV_LINUX
-
-#include <linux/vfio.h>
-
-#else /* ! 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 <assert.h>
#include <stdbool.h>
+#include <linux/vfio.h>
+
#include <eal_export.h>
#include <eal_trace_internal.h>
#include <rte_common.h>
@@ -28,7 +30,6 @@
#include <rte_errno.h>
#include <rte_spinlock.h>
#include <rte_pause.h>
-#include <rte_vfio.h>
#include "eal_private.h"
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index c6aed44946..62f9d05e63 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -8,6 +8,7 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <dirent.h>
+#include <linux/vfio.h>
#include <rte_errno.h>
#include <rte_log.h>
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* RE: [RFC 6/8] vfio: stop including Linux kernel header in public and driver API
2025-09-03 7:28 ` [RFC 6/8] vfio: stop including Linux kernel header in public and driver API David Marchand
@ 2025-09-03 9:38 ` Xu, Rosen
0 siblings, 0 replies; 35+ messages in thread
From: Xu, Rosen @ 2025-09-03 9:38 UTC (permalink / raw)
To: David Marchand, dev
Cc: thomas, maxime.coquelin, Nipun Gupta, Nikhil Agarwal,
Hemant Agrawal, Sachin Saxena, Anatoly Burakov, Chenbo Xia,
Tomasz Duszynski, Kai Ji, Ajit Khaparde, Vikas Gupta,
Dengdui Huang, Chaoyong He, Vijay Kumar Srivastava,
Tyler Retzlaff, Harman Kalra
Hi
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Wednesday, September 3, 2025 3:28 PM
> To: dev@dpdk.org
> Cc: thomas@monjalon.net; maxime.coquelin@redhat.com; Nipun Gupta
> <nipun.gupta@amd.com>; Nikhil Agarwal <nikhil.agarwal@amd.com>;
> Hemant Agrawal <hemant.agrawal@nxp.com>; Sachin Saxena
> <sachin.saxena@nxp.com>; Anatoly Burakov <anatoly.burakov@intel.com>;
> Chenbo Xia <chenbox@nvidia.com>; Tomasz Duszynski
> <tduszynski@marvell.com>; Kai Ji <kai.ji@intel.com>; Ajit Khaparde
> <ajit.khaparde@broadcom.com>; Vikas Gupta
> <vikas.gupta@broadcom.com>; Dengdui Huang
> <huangdengdui@huawei.com>; Xu, Rosen <rosen.xu@altera.com>;
> Chaoyong He <chaoyong.he@corigine.com>; Vijay Kumar Srivastava
> <vsrivast@xilinx.com>; Tyler Retzlaff <roretzla@linux.microsoft.com>;
> Harman Kalra <hkalra@marvell.com>
> Subject: [RFC 6/8] vfio: stop including Linux kernel header in public and driver
> API
>
> [CAUTION: This email is from outside your organization. Unless you trust the
> sender, do not click on links or open attachments as it may be a fraudulent
> email attempting to steal your information and/or compromise your
> computer.]
>
> 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 <david.marchand@redhat.com>
> ---
> 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/common/qat/dev/qat_dev_gen_lce.c | 3 ++-
> drivers/crypto/bcmfs/bcmfs_vfio.c | 2 ++
> drivers/net/hns3/hns3_ethdev_vf.c | 1 -
> drivers/raw/ifpga/afu_pmd_he_hssi.c | 1 -
> drivers/raw/ifpga/afu_pmd_he_lpbk.c | 1 -
> drivers/raw/ifpga/afu_pmd_he_mem.c | 1 -
> 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 | 8 --------
> lib/eal/linux/eal_interrupts.c | 3 ++-
> lib/eal/linux/eal_vfio.c | 1 +
> 22 files changed, 29 insertions(+), 19 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 <sys/socket.h>
> #include <sys/ioctl.h>
> #include <sys/mman.h>
> +
> +#include <linux/vfio.h>
> +
> #include <eal_export.h>
> #include <rte_eal_paging.h>
> #include <rte_malloc.h>
> 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 <sys/queue.h>
> #include <stdint.h>
> #include <inttypes.h>
> -#include <linux/vfio.h>
>
> #include <rte_compat.h>
> #include <rte_debug.h>
> @@ -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 <rte_memcpy.h>
> #include <ethdev_driver.h>
> #include <rte_mbuf_dyn.h>
> +#include <rte_vfio.h>
>
> #include "private.h"
> #include <fslmc_vfio.h>
> diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
> index c08c316c94..3f041f447c 100644
> --- a/drivers/bus/fslmc/fslmc_vfio.c
> +++ b/drivers/bus/fslmc/fslmc_vfio.c
> @@ -20,6 +20,7 @@
> #include <dirent.h>
> #include <sys/eventfd.h>
> #include <ctype.h>
> +#include <linux/vfio.h>
>
> #include <eal_export.h>
> #include <eal_filesystem.h>
> @@ -32,6 +33,7 @@
> #include <rte_kvargs.h>
> #include <dev_driver.h>
> #include <rte_eal_memconfig.h>
> +#include <rte_vfio.h>
> #include <eal_vfio.h>
>
> #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 <rte_compat.h>
> -#include <rte_vfio.h>
>
> /* 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 <sys/epoll.h>
> #include <sys/eventfd.h>
> #include <sys/syscall.h>
> +#include <linux/vfio.h>
>
> #include <eal_export.h>
> #include <rte_mbuf.h>
> 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 <sys/mman.h>
> #include <stdbool.h>
>
> +#include <linux/vfio.h>
> +
> #include <rte_log.h>
> #include <rte_pci.h>
> #include <rte_bus_pci.h>
> 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 <sys/queue.h>
> #include <unistd.h>
>
> +#include <linux/vfio.h>
> +
> #include <bus_driver.h>
> #include <bus_platform_driver.h>
> #include <eal_export.h>
> diff --git a/drivers/common/qat/dev/qat_dev_gen_lce.c
> b/drivers/common/qat/dev/qat_dev_gen_lce.c
> index 6514321c32..466878bf76 100644
> --- a/drivers/common/qat/dev/qat_dev_gen_lce.c
> +++ b/drivers/common/qat/dev/qat_dev_gen_lce.c
> @@ -3,7 +3,8 @@
> */
>
> #include <rte_pci.h>
> -#include <rte_vfio.h>
> +
> +#include <linux/vfio.h>
>
> #include "qat_device.h"
> #include "qat_qp.h"
> 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 <sys/mman.h>
> #include <sys/ioctl.h>
>
> +#include <linux/vfio.h>
> +
> #include <rte_vfio.h>
>
> #include "bcmfs_device.h"
> diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
> b/drivers/net/hns3/hns3_ethdev_vf.c
> index f9ef3dbb06..59fb790240 100644
> --- a/drivers/net/hns3/hns3_ethdev_vf.c
> +++ b/drivers/net/hns3/hns3_ethdev_vf.c
> @@ -5,7 +5,6 @@
> #include <rte_alarm.h>
> #include <ethdev_pci.h>
> #include <rte_io.h>
> -#include <rte_vfio.h>
>
> #include "hns3_ethdev.h"
> #include "hns3_common.h"
> diff --git a/drivers/raw/ifpga/afu_pmd_he_hssi.c
> b/drivers/raw/ifpga/afu_pmd_he_hssi.c
> index 859f28dcc1..bcb952935a 100644
> --- a/drivers/raw/ifpga/afu_pmd_he_hssi.c
> +++ b/drivers/raw/ifpga/afu_pmd_he_hssi.c
> @@ -17,7 +17,6 @@
> #include <rte_malloc.h>
> #include <rte_memcpy.h>
> #include <rte_io.h>
> -#include <rte_vfio.h>
> #include <bus_pci_driver.h>
> #include <bus_ifpga_driver.h>
> #include <rte_rawdev.h>
> diff --git a/drivers/raw/ifpga/afu_pmd_he_lpbk.c
> b/drivers/raw/ifpga/afu_pmd_he_lpbk.c
> index c7c5cda48c..df3b093157 100644
> --- a/drivers/raw/ifpga/afu_pmd_he_lpbk.c
> +++ b/drivers/raw/ifpga/afu_pmd_he_lpbk.c
> @@ -17,7 +17,6 @@
> #include <rte_malloc.h>
> #include <rte_memcpy.h>
> #include <rte_io.h>
> -#include <rte_vfio.h>
> #include <bus_pci_driver.h>
> #include <bus_ifpga_driver.h>
> #include <rte_rawdev.h>
> diff --git a/drivers/raw/ifpga/afu_pmd_he_mem.c
> b/drivers/raw/ifpga/afu_pmd_he_mem.c
> index a1db533eeb..b595cd729c 100644
> --- a/drivers/raw/ifpga/afu_pmd_he_mem.c
> +++ b/drivers/raw/ifpga/afu_pmd_he_mem.c
> @@ -16,7 +16,6 @@
> #include <rte_malloc.h>
> #include <rte_memcpy.h>
> #include <rte_io.h>
> -#include <rte_vfio.h>
> #include <bus_pci_driver.h>
> #include <bus_ifpga_driver.h>
> #include <rte_rawdev.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 <sys/eventfd.h>
> #include <sys/ioctl.h>
>
> +#include <linux/vfio.h>
> +
> #include <rte_eal.h>
> #include <rte_malloc.h>
> #include <rte_memcpy.h>
> #include <rte_io.h>
> -#include <rte_vfio.h>
> #include <bus_pci_driver.h>
> #include <bus_ifpga_driver.h>
> #include <rte_rawdev.h>
> 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 <sys/ioctl.h>
> -#include <rte_vfio.h>
> +#include <linux/vfio.h>
>
> #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 <linux/virtio_net.h>
> #include <stdbool.h>
>
> +#include <linux/vfio.h>
> +
> #include <rte_eal_paging.h>
> #include <rte_malloc.h>
> #include <rte_memory.h>
> 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 <sys/ioctl.h>
> #include <unistd.h>
>
> +#include <linux/vfio.h>
> +
> #include <nfp_common_pci.h>
> #include <nfp_dev.h>
> #include <rte_vfio.h>
> 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 <unistd.h>
> #include <sys/ioctl.h>
>
> +#include <linux/vfio.h>
> +
> #include <rte_errno.h>
> #include <rte_malloc.h>
> #include <rte_vdpa.h>
> -#include <rte_vfio.h>
> #include <rte_vhost.h>
>
> #include <vdpa_driver.h>
> diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h index
> 509ffec80c..683affa933 100644
> --- a/lib/eal/include/rte_vfio.h
> +++ b/lib/eal/include/rte_vfio.h
> @@ -19,17 +19,9 @@
> extern "C" {
> #endif
>
> -#ifdef RTE_EXEC_ENV_LINUX
> -
> -#include <linux/vfio.h>
> -
> -#else /* ! 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 <assert.h>
> #include <stdbool.h>
>
> +#include <linux/vfio.h>
> +
> #include <eal_export.h>
> #include <eal_trace_internal.h>
> #include <rte_common.h>
> @@ -28,7 +30,6 @@
> #include <rte_errno.h>
> #include <rte_spinlock.h>
> #include <rte_pause.h>
> -#include <rte_vfio.h>
>
> #include "eal_private.h"
>
> diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c index
> c6aed44946..62f9d05e63 100644
> --- a/lib/eal/linux/eal_vfio.c
> +++ b/lib/eal/linux/eal_vfio.c
> @@ -8,6 +8,7 @@
> #include <unistd.h>
> #include <sys/ioctl.h>
> #include <dirent.h>
> +#include <linux/vfio.h>
>
> #include <rte_errno.h>
> #include <rte_log.h>
> --
> 2.51.0
Reviewed-by: Rosen Xu <rosen.xu@altera.com>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [RFC 7/8] uapi: import VFIO header
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (5 preceding siblings ...)
2025-09-03 7:28 ` [RFC 6/8] vfio: stop including Linux kernel header in public and driver API David Marchand
@ 2025-09-03 7:28 ` David Marchand
2025-09-03 7:28 ` [RFC 8/8] vfio: use imported uAPI header David Marchand
` (4 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:28 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin
Import VFIO header (from v6.16) to be included in many parts of DPDK.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
kernel/linux/uapi/linux/vfio.h | 1836 ++++++++++++++++++++++++++++++++
kernel/linux/uapi/version | 2 +-
2 files changed, 1837 insertions(+), 1 deletion(-)
create mode 100644 kernel/linux/uapi/linux/vfio.h
diff --git a/kernel/linux/uapi/linux/vfio.h b/kernel/linux/uapi/linux/vfio.h
new file mode 100644
index 0000000000..4413783940
--- /dev/null
+++ b/kernel/linux/uapi/linux/vfio.h
@@ -0,0 +1,1836 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * VFIO API definition
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All rights reserved.
+ * Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPIVFIO_H
+#define _UAPIVFIO_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define VFIO_API_VERSION 0
+
+
+/* Kernel & User level defines for VFIO IOCTLs. */
+
+/* Extensions */
+
+#define VFIO_TYPE1_IOMMU 1
+#define VFIO_SPAPR_TCE_IOMMU 2
+#define VFIO_TYPE1v2_IOMMU 3
+/*
+ * IOMMU enforces DMA cache coherence (ex. PCIe NoSnoop stripping). This
+ * capability is subject to change as groups are added or removed.
+ */
+#define VFIO_DMA_CC_IOMMU 4
+
+/* Check if EEH is supported */
+#define VFIO_EEH 5
+
+/* Two-stage IOMMU */
+#define __VFIO_RESERVED_TYPE1_NESTING_IOMMU 6 /* Implies v2 */
+
+#define VFIO_SPAPR_TCE_v2_IOMMU 7
+
+/*
+ * The No-IOMMU IOMMU offers no translation or isolation for devices and
+ * supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU
+ * code will taint the host kernel and should be used with extreme caution.
+ */
+#define VFIO_NOIOMMU_IOMMU 8
+
+/* Supports VFIO_DMA_UNMAP_FLAG_ALL */
+#define VFIO_UNMAP_ALL 9
+
+/*
+ * Supports the vaddr flag for DMA map and unmap. Not supported for mediated
+ * devices, so this capability is subject to change as groups are added or
+ * removed.
+ */
+#define VFIO_UPDATE_VADDR 10
+
+/*
+ * The IOCTL interface is designed for extensibility by embedding the
+ * structure length (argsz) and flags into structures passed between
+ * kernel and userspace. We therefore use the _IO() macro for these
+ * defines to avoid implicitly embedding a size into the ioctl request.
+ * As structure fields are added, argsz will increase to match and flag
+ * bits will be defined to indicate additional fields with valid data.
+ * It's *always* the caller's responsibility to indicate the size of
+ * the structure passed by setting argsz appropriately.
+ */
+
+#define VFIO_TYPE (';')
+#define VFIO_BASE 100
+
+/*
+ * For extension of INFO ioctls, VFIO makes use of a capability chain
+ * designed after PCI/e capabilities. A flag bit indicates whether
+ * this capability chain is supported and a field defined in the fixed
+ * structure defines the offset of the first capability in the chain.
+ * This field is only valid when the corresponding bit in the flags
+ * bitmap is set. This offset field is relative to the start of the
+ * INFO buffer, as is the next field within each capability header.
+ * The id within the header is a shared address space per INFO ioctl,
+ * while the version field is specific to the capability id. The
+ * contents following the header are specific to the capability id.
+ */
+struct vfio_info_cap_header {
+ __u16 id; /* Identifies capability */
+ __u16 version; /* Version specific to the capability ID */
+ __u32 next; /* Offset of next capability */
+};
+
+/*
+ * Callers of INFO ioctls passing insufficiently sized buffers will see
+ * the capability chain flag bit set, a zero value for the first capability
+ * offset (if available within the provided argsz), and argsz will be
+ * updated to report the necessary buffer size. For compatibility, the
+ * INFO ioctl will not report error in this case, but the capability chain
+ * will not be available.
+ */
+
+/* -------- IOCTLs for VFIO file descriptor (/dev/vfio/vfio) -------- */
+
+/**
+ * VFIO_GET_API_VERSION - _IO(VFIO_TYPE, VFIO_BASE + 0)
+ *
+ * Report the version of the VFIO API. This allows us to bump the entire
+ * API version should we later need to add or change features in incompatible
+ * ways.
+ * Return: VFIO_API_VERSION
+ * Availability: Always
+ */
+#define VFIO_GET_API_VERSION _IO(VFIO_TYPE, VFIO_BASE + 0)
+
+/**
+ * VFIO_CHECK_EXTENSION - _IOW(VFIO_TYPE, VFIO_BASE + 1, __u32)
+ *
+ * Check whether an extension is supported.
+ * Return: 0 if not supported, 1 (or some other positive integer) if supported.
+ * Availability: Always
+ */
+#define VFIO_CHECK_EXTENSION _IO(VFIO_TYPE, VFIO_BASE + 1)
+
+/**
+ * VFIO_SET_IOMMU - _IOW(VFIO_TYPE, VFIO_BASE + 2, __s32)
+ *
+ * Set the iommu to the given type. The type must be supported by an
+ * iommu driver as verified by calling CHECK_EXTENSION using the same
+ * type. A group must be set to this file descriptor before this
+ * ioctl is available. The IOMMU interfaces enabled by this call are
+ * specific to the value set.
+ * Return: 0 on success, -errno on failure
+ * Availability: When VFIO group attached
+ */
+#define VFIO_SET_IOMMU _IO(VFIO_TYPE, VFIO_BASE + 2)
+
+/* -------- IOCTLs for GROUP file descriptors (/dev/vfio/$GROUP) -------- */
+
+/**
+ * VFIO_GROUP_GET_STATUS - _IOR(VFIO_TYPE, VFIO_BASE + 3,
+ * struct vfio_group_status)
+ *
+ * Retrieve information about the group. Fills in provided
+ * struct vfio_group_info. Caller sets argsz.
+ * Return: 0 on succes, -errno on failure.
+ * Availability: Always
+ */
+struct vfio_group_status {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_GROUP_FLAGS_VIABLE (1 << 0)
+#define VFIO_GROUP_FLAGS_CONTAINER_SET (1 << 1)
+};
+#define VFIO_GROUP_GET_STATUS _IO(VFIO_TYPE, VFIO_BASE + 3)
+
+/**
+ * VFIO_GROUP_SET_CONTAINER - _IOW(VFIO_TYPE, VFIO_BASE + 4, __s32)
+ *
+ * Set the container for the VFIO group to the open VFIO file
+ * descriptor provided. Groups may only belong to a single
+ * container. Containers may, at their discretion, support multiple
+ * groups. Only when a container is set are all of the interfaces
+ * of the VFIO file descriptor and the VFIO group file descriptor
+ * available to the user.
+ * Return: 0 on success, -errno on failure.
+ * Availability: Always
+ */
+#define VFIO_GROUP_SET_CONTAINER _IO(VFIO_TYPE, VFIO_BASE + 4)
+
+/**
+ * VFIO_GROUP_UNSET_CONTAINER - _IO(VFIO_TYPE, VFIO_BASE + 5)
+ *
+ * Remove the group from the attached container. This is the
+ * opposite of the SET_CONTAINER call and returns the group to
+ * an initial state. All device file descriptors must be released
+ * prior to calling this interface. When removing the last group
+ * from a container, the IOMMU will be disabled and all state lost,
+ * effectively also returning the VFIO file descriptor to an initial
+ * state.
+ * Return: 0 on success, -errno on failure.
+ * Availability: When attached to container
+ */
+#define VFIO_GROUP_UNSET_CONTAINER _IO(VFIO_TYPE, VFIO_BASE + 5)
+
+/**
+ * VFIO_GROUP_GET_DEVICE_FD - _IOW(VFIO_TYPE, VFIO_BASE + 6, char)
+ *
+ * Return a new file descriptor for the device object described by
+ * the provided string. The string should match a device listed in
+ * the devices subdirectory of the IOMMU group sysfs entry. The
+ * group containing the device must already be added to this context.
+ * Return: new file descriptor on success, -errno on failure.
+ * Availability: When attached to container
+ */
+#define VFIO_GROUP_GET_DEVICE_FD _IO(VFIO_TYPE, VFIO_BASE + 6)
+
+/* --------------- IOCTLs for DEVICE file descriptors --------------- */
+
+/**
+ * VFIO_DEVICE_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 7,
+ * struct vfio_device_info)
+ *
+ * Retrieve information about the device. Fills in provided
+ * struct vfio_device_info. Caller sets argsz.
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DEVICE_FLAGS_RESET (1 << 0) /* Device supports reset */
+#define VFIO_DEVICE_FLAGS_PCI (1 << 1) /* vfio-pci device */
+#define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2) /* vfio-platform device */
+#define VFIO_DEVICE_FLAGS_AMBA (1 << 3) /* vfio-amba device */
+#define VFIO_DEVICE_FLAGS_CCW (1 << 4) /* vfio-ccw device */
+#define VFIO_DEVICE_FLAGS_AP (1 << 5) /* vfio-ap device */
+#define VFIO_DEVICE_FLAGS_FSL_MC (1 << 6) /* vfio-fsl-mc device */
+#define VFIO_DEVICE_FLAGS_CAPS (1 << 7) /* Info supports caps */
+#define VFIO_DEVICE_FLAGS_CDX (1 << 8) /* vfio-cdx device */
+ __u32 num_regions; /* Max region index + 1 */
+ __u32 num_irqs; /* Max IRQ index + 1 */
+ __u32 cap_offset; /* Offset within info struct of first cap */
+ __u32 pad;
+};
+#define VFIO_DEVICE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 7)
+
+/*
+ * Vendor driver using Mediated device framework should provide device_api
+ * attribute in supported type attribute groups. Device API string should be one
+ * of the following corresponding to device flags in vfio_device_info structure.
+ */
+
+#define VFIO_DEVICE_API_PCI_STRING "vfio-pci"
+#define VFIO_DEVICE_API_PLATFORM_STRING "vfio-platform"
+#define VFIO_DEVICE_API_AMBA_STRING "vfio-amba"
+#define VFIO_DEVICE_API_CCW_STRING "vfio-ccw"
+#define VFIO_DEVICE_API_AP_STRING "vfio-ap"
+
+/*
+ * The following capabilities are unique to s390 zPCI devices. Their contents
+ * are further-defined in vfio_zdev.h
+ */
+#define VFIO_DEVICE_INFO_CAP_ZPCI_BASE 1
+#define VFIO_DEVICE_INFO_CAP_ZPCI_GROUP 2
+#define VFIO_DEVICE_INFO_CAP_ZPCI_UTIL 3
+#define VFIO_DEVICE_INFO_CAP_ZPCI_PFIP 4
+
+/*
+ * The following VFIO_DEVICE_INFO capability reports support for PCIe AtomicOp
+ * completion to the root bus with supported widths provided via flags.
+ */
+#define VFIO_DEVICE_INFO_CAP_PCI_ATOMIC_COMP 5
+struct vfio_device_info_cap_pci_atomic_comp {
+ struct vfio_info_cap_header header;
+ __u32 flags;
+#define VFIO_PCI_ATOMIC_COMP32 (1 << 0)
+#define VFIO_PCI_ATOMIC_COMP64 (1 << 1)
+#define VFIO_PCI_ATOMIC_COMP128 (1 << 2)
+ __u32 reserved;
+};
+
+/**
+ * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
+ * struct vfio_region_info)
+ *
+ * Retrieve information about a device region. Caller provides
+ * struct vfio_region_info with index value set. Caller sets argsz.
+ * Implementation of region mapping is bus driver specific. This is
+ * intended to describe MMIO, I/O port, as well as bus specific
+ * regions (ex. PCI config space). Zero sized regions may be used
+ * to describe unimplemented regions (ex. unimplemented PCI BARs).
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_region_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_REGION_INFO_FLAG_READ (1 << 0) /* Region supports read */
+#define VFIO_REGION_INFO_FLAG_WRITE (1 << 1) /* Region supports write */
+#define VFIO_REGION_INFO_FLAG_MMAP (1 << 2) /* Region supports mmap */
+#define VFIO_REGION_INFO_FLAG_CAPS (1 << 3) /* Info supports caps */
+ __u32 index; /* Region index */
+ __u32 cap_offset; /* Offset within info struct of first cap */
+ __aligned_u64 size; /* Region size (bytes) */
+ __aligned_u64 offset; /* Region offset from start of device fd */
+};
+#define VFIO_DEVICE_GET_REGION_INFO _IO(VFIO_TYPE, VFIO_BASE + 8)
+
+/*
+ * The sparse mmap capability allows finer granularity of specifying areas
+ * within a region with mmap support. When specified, the user should only
+ * mmap the offset ranges specified by the areas array. mmaps outside of the
+ * areas specified may fail (such as the range covering a PCI MSI-X table) or
+ * may result in improper device behavior.
+ *
+ * The structures below define version 1 of this capability.
+ */
+#define VFIO_REGION_INFO_CAP_SPARSE_MMAP 1
+
+struct vfio_region_sparse_mmap_area {
+ __aligned_u64 offset; /* Offset of mmap'able area within region */
+ __aligned_u64 size; /* Size of mmap'able area */
+};
+
+struct vfio_region_info_cap_sparse_mmap {
+ struct vfio_info_cap_header header;
+ __u32 nr_areas;
+ __u32 reserved;
+ struct vfio_region_sparse_mmap_area areas[];
+};
+
+/*
+ * The device specific type capability allows regions unique to a specific
+ * device or class of devices to be exposed. This helps solve the problem for
+ * vfio bus drivers of defining which region indexes correspond to which region
+ * on the device, without needing to resort to static indexes, as done by
+ * vfio-pci. For instance, if we were to go back in time, we might remove
+ * VFIO_PCI_VGA_REGION_INDEX and let vfio-pci simply define that all indexes
+ * greater than or equal to VFIO_PCI_NUM_REGIONS are device specific and we'd
+ * make a "VGA" device specific type to describe the VGA access space. This
+ * means that non-VGA devices wouldn't need to waste this index, and thus the
+ * address space associated with it due to implementation of device file
+ * descriptor offsets in vfio-pci.
+ *
+ * The current implementation is now part of the user ABI, so we can't use this
+ * for VGA, but there are other upcoming use cases, such as opregions for Intel
+ * IGD devices and framebuffers for vGPU devices. We missed VGA, but we'll
+ * use this for future additions.
+ *
+ * The structure below defines version 1 of this capability.
+ */
+#define VFIO_REGION_INFO_CAP_TYPE 2
+
+struct vfio_region_info_cap_type {
+ struct vfio_info_cap_header header;
+ __u32 type; /* global per bus driver */
+ __u32 subtype; /* type specific */
+};
+
+/*
+ * List of region types, global per bus driver.
+ * If you introduce a new type, please add it here.
+ */
+
+/* PCI region type containing a PCI vendor part */
+#define VFIO_REGION_TYPE_PCI_VENDOR_TYPE (1 << 31)
+#define VFIO_REGION_TYPE_PCI_VENDOR_MASK (0xffff)
+#define VFIO_REGION_TYPE_GFX (1)
+#define VFIO_REGION_TYPE_CCW (2)
+#define VFIO_REGION_TYPE_MIGRATION_DEPRECATED (3)
+
+/* sub-types for VFIO_REGION_TYPE_PCI_* */
+
+/* 8086 vendor PCI sub-types */
+#define VFIO_REGION_SUBTYPE_INTEL_IGD_OPREGION (1)
+#define VFIO_REGION_SUBTYPE_INTEL_IGD_HOST_CFG (2)
+#define VFIO_REGION_SUBTYPE_INTEL_IGD_LPC_CFG (3)
+
+/* 10de vendor PCI sub-types */
+/*
+ * NVIDIA GPU NVlink2 RAM is coherent RAM mapped onto the host address space.
+ *
+ * Deprecated, region no longer provided
+ */
+#define VFIO_REGION_SUBTYPE_NVIDIA_NVLINK2_RAM (1)
+
+/* 1014 vendor PCI sub-types */
+/*
+ * IBM NPU NVlink2 ATSD (Address Translation Shootdown) register of NPU
+ * to do TLB invalidation on a GPU.
+ *
+ * Deprecated, region no longer provided
+ */
+#define VFIO_REGION_SUBTYPE_IBM_NVLINK2_ATSD (1)
+
+/* sub-types for VFIO_REGION_TYPE_GFX */
+#define VFIO_REGION_SUBTYPE_GFX_EDID (1)
+
+/**
+ * struct vfio_region_gfx_edid - EDID region layout.
+ *
+ * Set display link state and EDID blob.
+ *
+ * The EDID blob has monitor information such as brand, name, serial
+ * number, physical size, supported video modes and more.
+ *
+ * This special region allows userspace (typically qemu) set a virtual
+ * EDID for the virtual monitor, which allows a flexible display
+ * configuration.
+ *
+ * For the edid blob spec look here:
+ * https://en.wikipedia.org/wiki/Extended_Display_Identification_Data
+ *
+ * On linux systems you can find the EDID blob in sysfs:
+ * /sys/class/drm/${card}/${connector}/edid
+ *
+ * You can use the edid-decode ulility (comes with xorg-x11-utils) to
+ * decode the EDID blob.
+ *
+ * @edid_offset: location of the edid blob, relative to the
+ * start of the region (readonly).
+ * @edid_max_size: max size of the edid blob (readonly).
+ * @edid_size: actual edid size (read/write).
+ * @link_state: display link state (read/write).
+ * VFIO_DEVICE_GFX_LINK_STATE_UP: Monitor is turned on.
+ * VFIO_DEVICE_GFX_LINK_STATE_DOWN: Monitor is turned off.
+ * @max_xres: max display width (0 == no limitation, readonly).
+ * @max_yres: max display height (0 == no limitation, readonly).
+ *
+ * EDID update protocol:
+ * (1) set link-state to down.
+ * (2) update edid blob and size.
+ * (3) set link-state to up.
+ */
+struct vfio_region_gfx_edid {
+ __u32 edid_offset;
+ __u32 edid_max_size;
+ __u32 edid_size;
+ __u32 max_xres;
+ __u32 max_yres;
+ __u32 link_state;
+#define VFIO_DEVICE_GFX_LINK_STATE_UP 1
+#define VFIO_DEVICE_GFX_LINK_STATE_DOWN 2
+};
+
+/* sub-types for VFIO_REGION_TYPE_CCW */
+#define VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD (1)
+#define VFIO_REGION_SUBTYPE_CCW_SCHIB (2)
+#define VFIO_REGION_SUBTYPE_CCW_CRW (3)
+
+/* sub-types for VFIO_REGION_TYPE_MIGRATION */
+#define VFIO_REGION_SUBTYPE_MIGRATION_DEPRECATED (1)
+
+struct vfio_device_migration_info {
+ __u32 device_state; /* VFIO device state */
+#define VFIO_DEVICE_STATE_V1_STOP (0)
+#define VFIO_DEVICE_STATE_V1_RUNNING (1 << 0)
+#define VFIO_DEVICE_STATE_V1_SAVING (1 << 1)
+#define VFIO_DEVICE_STATE_V1_RESUMING (1 << 2)
+#define VFIO_DEVICE_STATE_MASK (VFIO_DEVICE_STATE_V1_RUNNING | \
+ VFIO_DEVICE_STATE_V1_SAVING | \
+ VFIO_DEVICE_STATE_V1_RESUMING)
+
+#define VFIO_DEVICE_STATE_VALID(state) \
+ (state & VFIO_DEVICE_STATE_V1_RESUMING ? \
+ (state & VFIO_DEVICE_STATE_MASK) == VFIO_DEVICE_STATE_V1_RESUMING : 1)
+
+#define VFIO_DEVICE_STATE_IS_ERROR(state) \
+ ((state & VFIO_DEVICE_STATE_MASK) == (VFIO_DEVICE_STATE_V1_SAVING | \
+ VFIO_DEVICE_STATE_V1_RESUMING))
+
+#define VFIO_DEVICE_STATE_SET_ERROR(state) \
+ ((state & ~VFIO_DEVICE_STATE_MASK) | VFIO_DEVICE_STATE_V1_SAVING | \
+ VFIO_DEVICE_STATE_V1_RESUMING)
+
+ __u32 reserved;
+ __aligned_u64 pending_bytes;
+ __aligned_u64 data_offset;
+ __aligned_u64 data_size;
+};
+
+/*
+ * The MSIX mappable capability informs that MSIX data of a BAR can be mmapped
+ * which allows direct access to non-MSIX registers which happened to be within
+ * the same system page.
+ *
+ * Even though the userspace gets direct access to the MSIX data, the existing
+ * VFIO_DEVICE_SET_IRQS interface must still be used for MSIX configuration.
+ */
+#define VFIO_REGION_INFO_CAP_MSIX_MAPPABLE 3
+
+/*
+ * Capability with compressed real address (aka SSA - small system address)
+ * where GPU RAM is mapped on a system bus. Used by a GPU for DMA routing
+ * and by the userspace to associate a NVLink bridge with a GPU.
+ *
+ * Deprecated, capability no longer provided
+ */
+#define VFIO_REGION_INFO_CAP_NVLINK2_SSATGT 4
+
+struct vfio_region_info_cap_nvlink2_ssatgt {
+ struct vfio_info_cap_header header;
+ __aligned_u64 tgt;
+};
+
+/*
+ * Capability with an NVLink link speed. The value is read by
+ * the NVlink2 bridge driver from the bridge's "ibm,nvlink-speed"
+ * property in the device tree. The value is fixed in the hardware
+ * and failing to provide the correct value results in the link
+ * not working with no indication from the driver why.
+ *
+ * Deprecated, capability no longer provided
+ */
+#define VFIO_REGION_INFO_CAP_NVLINK2_LNKSPD 5
+
+struct vfio_region_info_cap_nvlink2_lnkspd {
+ struct vfio_info_cap_header header;
+ __u32 link_speed;
+ __u32 __pad;
+};
+
+/**
+ * VFIO_DEVICE_GET_IRQ_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 9,
+ * struct vfio_irq_info)
+ *
+ * Retrieve information about a device IRQ. Caller provides
+ * struct vfio_irq_info with index value set. Caller sets argsz.
+ * Implementation of IRQ mapping is bus driver specific. Indexes
+ * using multiple IRQs are primarily intended to support MSI-like
+ * interrupt blocks. Zero count irq blocks may be used to describe
+ * unimplemented interrupt types.
+ *
+ * The EVENTFD flag indicates the interrupt index supports eventfd based
+ * signaling.
+ *
+ * The MASKABLE flags indicates the index supports MASK and UNMASK
+ * actions described below.
+ *
+ * AUTOMASKED indicates that after signaling, the interrupt line is
+ * automatically masked by VFIO and the user needs to unmask the line
+ * to receive new interrupts. This is primarily intended to distinguish
+ * level triggered interrupts.
+ *
+ * The NORESIZE flag indicates that the interrupt lines within the index
+ * are setup as a set and new subindexes cannot be enabled without first
+ * disabling the entire index. This is used for interrupts like PCI MSI
+ * and MSI-X where the driver may only use a subset of the available
+ * indexes, but VFIO needs to enable a specific number of vectors
+ * upfront. In the case of MSI-X, where the user can enable MSI-X and
+ * then add and unmask vectors, it's up to userspace to make the decision
+ * whether to allocate the maximum supported number of vectors or tear
+ * down setup and incrementally increase the vectors as each is enabled.
+ * Absence of the NORESIZE flag indicates that vectors can be enabled
+ * and disabled dynamically without impacting other vectors within the
+ * index.
+ */
+struct vfio_irq_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IRQ_INFO_EVENTFD (1 << 0)
+#define VFIO_IRQ_INFO_MASKABLE (1 << 1)
+#define VFIO_IRQ_INFO_AUTOMASKED (1 << 2)
+#define VFIO_IRQ_INFO_NORESIZE (1 << 3)
+ __u32 index; /* IRQ index */
+ __u32 count; /* Number of IRQs within this index */
+};
+#define VFIO_DEVICE_GET_IRQ_INFO _IO(VFIO_TYPE, VFIO_BASE + 9)
+
+/**
+ * VFIO_DEVICE_SET_IRQS - _IOW(VFIO_TYPE, VFIO_BASE + 10, struct vfio_irq_set)
+ *
+ * Set signaling, masking, and unmasking of interrupts. Caller provides
+ * struct vfio_irq_set with all fields set. 'start' and 'count' indicate
+ * the range of subindexes being specified.
+ *
+ * The DATA flags specify the type of data provided. If DATA_NONE, the
+ * operation performs the specified action immediately on the specified
+ * interrupt(s). For example, to unmask AUTOMASKED interrupt [0,0]:
+ * flags = (DATA_NONE|ACTION_UNMASK), index = 0, start = 0, count = 1.
+ *
+ * DATA_BOOL allows sparse support for the same on arrays of interrupts.
+ * For example, to mask interrupts [0,1] and [0,3] (but not [0,2]):
+ * flags = (DATA_BOOL|ACTION_MASK), index = 0, start = 1, count = 3,
+ * data = {1,0,1}
+ *
+ * DATA_EVENTFD binds the specified ACTION to the provided __s32 eventfd.
+ * A value of -1 can be used to either de-assign interrupts if already
+ * assigned or skip un-assigned interrupts. For example, to set an eventfd
+ * to be trigger for interrupts [0,0] and [0,2]:
+ * flags = (DATA_EVENTFD|ACTION_TRIGGER), index = 0, start = 0, count = 3,
+ * data = {fd1, -1, fd2}
+ * If index [0,1] is previously set, two count = 1 ioctls calls would be
+ * required to set [0,0] and [0,2] without changing [0,1].
+ *
+ * Once a signaling mechanism is set, DATA_BOOL or DATA_NONE can be used
+ * with ACTION_TRIGGER to perform kernel level interrupt loopback testing
+ * from userspace (ie. simulate hardware triggering).
+ *
+ * Setting of an event triggering mechanism to userspace for ACTION_TRIGGER
+ * enables the interrupt index for the device. Individual subindex interrupts
+ * can be disabled using the -1 value for DATA_EVENTFD or the index can be
+ * disabled as a whole with: flags = (DATA_NONE|ACTION_TRIGGER), count = 0.
+ *
+ * Note that ACTION_[UN]MASK specify user->kernel signaling (irqfds) while
+ * ACTION_TRIGGER specifies kernel->user signaling.
+ */
+struct vfio_irq_set {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IRQ_SET_DATA_NONE (1 << 0) /* Data not present */
+#define VFIO_IRQ_SET_DATA_BOOL (1 << 1) /* Data is bool (u8) */
+#define VFIO_IRQ_SET_DATA_EVENTFD (1 << 2) /* Data is eventfd (s32) */
+#define VFIO_IRQ_SET_ACTION_MASK (1 << 3) /* Mask interrupt */
+#define VFIO_IRQ_SET_ACTION_UNMASK (1 << 4) /* Unmask interrupt */
+#define VFIO_IRQ_SET_ACTION_TRIGGER (1 << 5) /* Trigger interrupt */
+ __u32 index;
+ __u32 start;
+ __u32 count;
+ __u8 data[];
+};
+#define VFIO_DEVICE_SET_IRQS _IO(VFIO_TYPE, VFIO_BASE + 10)
+
+#define VFIO_IRQ_SET_DATA_TYPE_MASK (VFIO_IRQ_SET_DATA_NONE | \
+ VFIO_IRQ_SET_DATA_BOOL | \
+ VFIO_IRQ_SET_DATA_EVENTFD)
+#define VFIO_IRQ_SET_ACTION_TYPE_MASK (VFIO_IRQ_SET_ACTION_MASK | \
+ VFIO_IRQ_SET_ACTION_UNMASK | \
+ VFIO_IRQ_SET_ACTION_TRIGGER)
+/**
+ * VFIO_DEVICE_RESET - _IO(VFIO_TYPE, VFIO_BASE + 11)
+ *
+ * Reset a device.
+ */
+#define VFIO_DEVICE_RESET _IO(VFIO_TYPE, VFIO_BASE + 11)
+
+/*
+ * The VFIO-PCI bus driver makes use of the following fixed region and
+ * IRQ index mapping. Unimplemented regions return a size of zero.
+ * Unimplemented IRQ types return a count of zero.
+ */
+
+enum {
+ VFIO_PCI_BAR0_REGION_INDEX,
+ VFIO_PCI_BAR1_REGION_INDEX,
+ VFIO_PCI_BAR2_REGION_INDEX,
+ VFIO_PCI_BAR3_REGION_INDEX,
+ VFIO_PCI_BAR4_REGION_INDEX,
+ VFIO_PCI_BAR5_REGION_INDEX,
+ VFIO_PCI_ROM_REGION_INDEX,
+ VFIO_PCI_CONFIG_REGION_INDEX,
+ /*
+ * Expose VGA regions defined for PCI base class 03, subclass 00.
+ * This includes I/O port ranges 0x3b0 to 0x3bb and 0x3c0 to 0x3df
+ * as well as the MMIO range 0xa0000 to 0xbffff. Each implemented
+ * range is found at it's identity mapped offset from the region
+ * offset, for example 0x3b0 is region_info.offset + 0x3b0. Areas
+ * between described ranges are unimplemented.
+ */
+ VFIO_PCI_VGA_REGION_INDEX,
+ VFIO_PCI_NUM_REGIONS = 9 /* Fixed user ABI, region indexes >=9 use */
+ /* device specific cap to define content. */
+};
+
+enum {
+ VFIO_PCI_INTX_IRQ_INDEX,
+ VFIO_PCI_MSI_IRQ_INDEX,
+ VFIO_PCI_MSIX_IRQ_INDEX,
+ VFIO_PCI_ERR_IRQ_INDEX,
+ VFIO_PCI_REQ_IRQ_INDEX,
+ VFIO_PCI_NUM_IRQS
+};
+
+/*
+ * The vfio-ccw bus driver makes use of the following fixed region and
+ * IRQ index mapping. Unimplemented regions return a size of zero.
+ * Unimplemented IRQ types return a count of zero.
+ */
+
+enum {
+ VFIO_CCW_CONFIG_REGION_INDEX,
+ VFIO_CCW_NUM_REGIONS
+};
+
+enum {
+ VFIO_CCW_IO_IRQ_INDEX,
+ VFIO_CCW_CRW_IRQ_INDEX,
+ VFIO_CCW_REQ_IRQ_INDEX,
+ VFIO_CCW_NUM_IRQS
+};
+
+/*
+ * The vfio-ap bus driver makes use of the following IRQ index mapping.
+ * Unimplemented IRQ types return a count of zero.
+ */
+enum {
+ VFIO_AP_REQ_IRQ_INDEX,
+ VFIO_AP_CFG_CHG_IRQ_INDEX,
+ VFIO_AP_NUM_IRQS
+};
+
+/**
+ * VFIO_DEVICE_GET_PCI_HOT_RESET_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 12,
+ * struct vfio_pci_hot_reset_info)
+ *
+ * This command is used to query the affected devices in the hot reset for
+ * a given device.
+ *
+ * This command always reports the segment, bus, and devfn information for
+ * each affected device, and selectively reports the group_id or devid per
+ * the way how the calling device is opened.
+ *
+ * - If the calling device is opened via the traditional group/container
+ * API, group_id is reported. User should check if it has owned all
+ * the affected devices and provides a set of group fds to prove the
+ * ownership in VFIO_DEVICE_PCI_HOT_RESET ioctl.
+ *
+ * - If the calling device is opened as a cdev, devid is reported.
+ * Flag VFIO_PCI_HOT_RESET_FLAG_DEV_ID is set to indicate this
+ * data type. All the affected devices should be represented in
+ * the dev_set, ex. bound to a vfio driver, and also be owned by
+ * this interface which is determined by the following conditions:
+ * 1) Has a valid devid within the iommufd_ctx of the calling device.
+ * Ownership cannot be determined across separate iommufd_ctx and
+ * the cdev calling conventions do not support a proof-of-ownership
+ * model as provided in the legacy group interface. In this case
+ * valid devid with value greater than zero is provided in the return
+ * structure.
+ * 2) Does not have a valid devid within the iommufd_ctx of the calling
+ * device, but belongs to the same IOMMU group as the calling device
+ * or another opened device that has a valid devid within the
+ * iommufd_ctx of the calling device. This provides implicit ownership
+ * for devices within the same DMA isolation context. In this case
+ * the devid value of VFIO_PCI_DEVID_OWNED is provided in the return
+ * structure.
+ *
+ * A devid value of VFIO_PCI_DEVID_NOT_OWNED is provided in the return
+ * structure for affected devices where device is NOT represented in the
+ * dev_set or ownership is not available. Such devices prevent the use
+ * of VFIO_DEVICE_PCI_HOT_RESET ioctl outside of the proof-of-ownership
+ * calling conventions (ie. via legacy group accessed devices). Flag
+ * VFIO_PCI_HOT_RESET_FLAG_DEV_ID_OWNED would be set when all the
+ * affected devices are represented in the dev_set and also owned by
+ * the user. This flag is available only when
+ * flag VFIO_PCI_HOT_RESET_FLAG_DEV_ID is set, otherwise reserved.
+ * When set, user could invoke VFIO_DEVICE_PCI_HOT_RESET with a zero
+ * length fd array on the calling device as the ownership is validated
+ * by iommufd_ctx.
+ *
+ * Return: 0 on success, -errno on failure:
+ * -enospc = insufficient buffer, -enodev = unsupported for device.
+ */
+struct vfio_pci_dependent_device {
+ union {
+ __u32 group_id;
+ __u32 devid;
+#define VFIO_PCI_DEVID_OWNED 0
+#define VFIO_PCI_DEVID_NOT_OWNED -1
+ };
+ __u16 segment;
+ __u8 bus;
+ __u8 devfn; /* Use PCI_SLOT/PCI_FUNC */
+};
+
+struct vfio_pci_hot_reset_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_PCI_HOT_RESET_FLAG_DEV_ID (1 << 0)
+#define VFIO_PCI_HOT_RESET_FLAG_DEV_ID_OWNED (1 << 1)
+ __u32 count;
+ struct vfio_pci_dependent_device devices[];
+};
+
+#define VFIO_DEVICE_GET_PCI_HOT_RESET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
+/**
+ * VFIO_DEVICE_PCI_HOT_RESET - _IOW(VFIO_TYPE, VFIO_BASE + 13,
+ * struct vfio_pci_hot_reset)
+ *
+ * A PCI hot reset results in either a bus or slot reset which may affect
+ * other devices sharing the bus/slot. The calling user must have
+ * ownership of the full set of affected devices as determined by the
+ * VFIO_DEVICE_GET_PCI_HOT_RESET_INFO ioctl.
+ *
+ * When called on a device file descriptor acquired through the vfio
+ * group interface, the user is required to provide proof of ownership
+ * of those affected devices via the group_fds array in struct
+ * vfio_pci_hot_reset.
+ *
+ * When called on a direct cdev opened vfio device, the flags field of
+ * struct vfio_pci_hot_reset_info reports the ownership status of the
+ * affected devices and this ioctl must be called with an empty group_fds
+ * array. See above INFO ioctl definition for ownership requirements.
+ *
+ * Mixed usage of legacy groups and cdevs across the set of affected
+ * devices is not supported.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_pci_hot_reset {
+ __u32 argsz;
+ __u32 flags;
+ __u32 count;
+ __s32 group_fds[];
+};
+
+#define VFIO_DEVICE_PCI_HOT_RESET _IO(VFIO_TYPE, VFIO_BASE + 13)
+
+/**
+ * VFIO_DEVICE_QUERY_GFX_PLANE - _IOW(VFIO_TYPE, VFIO_BASE + 14,
+ * struct vfio_device_query_gfx_plane)
+ *
+ * Set the drm_plane_type and flags, then retrieve the gfx plane info.
+ *
+ * flags supported:
+ * - VFIO_GFX_PLANE_TYPE_PROBE and VFIO_GFX_PLANE_TYPE_DMABUF are set
+ * to ask if the mdev supports dma-buf. 0 on support, -EINVAL on no
+ * support for dma-buf.
+ * - VFIO_GFX_PLANE_TYPE_PROBE and VFIO_GFX_PLANE_TYPE_REGION are set
+ * to ask if the mdev supports region. 0 on support, -EINVAL on no
+ * support for region.
+ * - VFIO_GFX_PLANE_TYPE_DMABUF or VFIO_GFX_PLANE_TYPE_REGION is set
+ * with each call to query the plane info.
+ * - Others are invalid and return -EINVAL.
+ *
+ * Note:
+ * 1. Plane could be disabled by guest. In that case, success will be
+ * returned with zero-initialized drm_format, size, width and height
+ * fields.
+ * 2. x_hot/y_hot is set to 0xFFFFFFFF if no hotspot information available
+ *
+ * Return: 0 on success, -errno on other failure.
+ */
+struct vfio_device_gfx_plane_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_GFX_PLANE_TYPE_PROBE (1 << 0)
+#define VFIO_GFX_PLANE_TYPE_DMABUF (1 << 1)
+#define VFIO_GFX_PLANE_TYPE_REGION (1 << 2)
+ /* in */
+ __u32 drm_plane_type; /* type of plane: DRM_PLANE_TYPE_* */
+ /* out */
+ __u32 drm_format; /* drm format of plane */
+ __aligned_u64 drm_format_mod; /* tiled mode */
+ __u32 width; /* width of plane */
+ __u32 height; /* height of plane */
+ __u32 stride; /* stride of plane */
+ __u32 size; /* size of plane in bytes, align on page*/
+ __u32 x_pos; /* horizontal position of cursor plane */
+ __u32 y_pos; /* vertical position of cursor plane*/
+ __u32 x_hot; /* horizontal position of cursor hotspot */
+ __u32 y_hot; /* vertical position of cursor hotspot */
+ union {
+ __u32 region_index; /* region index */
+ __u32 dmabuf_id; /* dma-buf id */
+ };
+ __u32 reserved;
+};
+
+#define VFIO_DEVICE_QUERY_GFX_PLANE _IO(VFIO_TYPE, VFIO_BASE + 14)
+
+/**
+ * VFIO_DEVICE_GET_GFX_DMABUF - _IOW(VFIO_TYPE, VFIO_BASE + 15, __u32)
+ *
+ * Return a new dma-buf file descriptor for an exposed guest framebuffer
+ * described by the provided dmabuf_id. The dmabuf_id is returned from VFIO_
+ * DEVICE_QUERY_GFX_PLANE as a token of the exposed guest framebuffer.
+ */
+
+#define VFIO_DEVICE_GET_GFX_DMABUF _IO(VFIO_TYPE, VFIO_BASE + 15)
+
+/**
+ * VFIO_DEVICE_IOEVENTFD - _IOW(VFIO_TYPE, VFIO_BASE + 16,
+ * struct vfio_device_ioeventfd)
+ *
+ * Perform a write to the device at the specified device fd offset, with
+ * the specified data and width when the provided eventfd is triggered.
+ * vfio bus drivers may not support this for all regions, for all widths,
+ * or at all. vfio-pci currently only enables support for BAR regions,
+ * excluding the MSI-X vector table.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_ioeventfd {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DEVICE_IOEVENTFD_8 (1 << 0) /* 1-byte write */
+#define VFIO_DEVICE_IOEVENTFD_16 (1 << 1) /* 2-byte write */
+#define VFIO_DEVICE_IOEVENTFD_32 (1 << 2) /* 4-byte write */
+#define VFIO_DEVICE_IOEVENTFD_64 (1 << 3) /* 8-byte write */
+#define VFIO_DEVICE_IOEVENTFD_SIZE_MASK (0xf)
+ __aligned_u64 offset; /* device fd offset of write */
+ __aligned_u64 data; /* data to be written */
+ __s32 fd; /* -1 for de-assignment */
+ __u32 reserved;
+};
+
+#define VFIO_DEVICE_IOEVENTFD _IO(VFIO_TYPE, VFIO_BASE + 16)
+
+/**
+ * VFIO_DEVICE_FEATURE - _IOWR(VFIO_TYPE, VFIO_BASE + 17,
+ * struct vfio_device_feature)
+ *
+ * Get, set, or probe feature data of the device. The feature is selected
+ * using the FEATURE_MASK portion of the flags field. Support for a feature
+ * can be probed by setting both the FEATURE_MASK and PROBE bits. A probe
+ * may optionally include the GET and/or SET bits to determine read vs write
+ * access of the feature respectively. Probing a feature will return success
+ * if the feature is supported and all of the optionally indicated GET/SET
+ * methods are supported. The format of the data portion of the structure is
+ * specific to the given feature. The data portion is not required for
+ * probing. GET and SET are mutually exclusive, except for use with PROBE.
+ *
+ * Return 0 on success, -errno on failure.
+ */
+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[];
+};
+
+#define VFIO_DEVICE_FEATURE _IO(VFIO_TYPE, VFIO_BASE + 17)
+
+/*
+ * VFIO_DEVICE_BIND_IOMMUFD - _IOR(VFIO_TYPE, VFIO_BASE + 18,
+ * struct vfio_device_bind_iommufd)
+ * @argsz: User filled size of this data.
+ * @flags: Must be 0.
+ * @iommufd: iommufd to bind.
+ * @out_devid: The device id generated by this bind. devid is a handle for
+ * this device/iommufd bond and can be used in IOMMUFD commands.
+ *
+ * Bind a vfio_device to the specified iommufd.
+ *
+ * User is restricted from accessing the device before the binding operation
+ * is completed. Only allowed on cdev fds.
+ *
+ * Unbind is automatically conducted when device fd is closed.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_bind_iommufd {
+ __u32 argsz;
+ __u32 flags;
+ __s32 iommufd;
+ __u32 out_devid;
+};
+
+#define VFIO_DEVICE_BIND_IOMMUFD _IO(VFIO_TYPE, VFIO_BASE + 18)
+
+/*
+ * VFIO_DEVICE_ATTACH_IOMMUFD_PT - _IOW(VFIO_TYPE, VFIO_BASE + 19,
+ * struct vfio_device_attach_iommufd_pt)
+ * @argsz: User filled size of this data.
+ * @flags: Flags for attach.
+ * @pt_id: Input the target id which can represent an ioas or a hwpt
+ * allocated via iommufd subsystem.
+ * Output the input ioas id or the attached hwpt id which could
+ * be the specified hwpt itself or a hwpt automatically created
+ * for the specified ioas by kernel during the attachment.
+ * @pasid: The pasid to be attached, only meaningful when
+ * VFIO_DEVICE_ATTACH_PASID is set in @flags
+ *
+ * Associate the device with an address space within the bound iommufd.
+ * Undo by VFIO_DEVICE_DETACH_IOMMUFD_PT or device fd close. This is only
+ * allowed on cdev fds.
+ *
+ * If a vfio device or a pasid of this device is currently attached to a valid
+ * hw_pagetable (hwpt), without doing a VFIO_DEVICE_DETACH_IOMMUFD_PT, a second
+ * VFIO_DEVICE_ATTACH_IOMMUFD_PT ioctl passing in another hwpt id is allowed.
+ * This action, also known as a hw_pagetable replacement, will replace the
+ * currently attached hwpt of the device or the pasid of this device with a new
+ * hwpt corresponding to the given pt_id.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_attach_iommufd_pt {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DEVICE_ATTACH_PASID (1 << 0)
+ __u32 pt_id;
+ __u32 pasid;
+};
+
+#define VFIO_DEVICE_ATTACH_IOMMUFD_PT _IO(VFIO_TYPE, VFIO_BASE + 19)
+
+/*
+ * VFIO_DEVICE_DETACH_IOMMUFD_PT - _IOW(VFIO_TYPE, VFIO_BASE + 20,
+ * struct vfio_device_detach_iommufd_pt)
+ * @argsz: User filled size of this data.
+ * @flags: Flags for detach.
+ * @pasid: The pasid to be detached, only meaningful when
+ * VFIO_DEVICE_DETACH_PASID is set in @flags
+ *
+ * Remove the association of the device or a pasid of the device and its current
+ * associated address space. After it, the device or the pasid should be in a
+ * blocking DMA state. This is only allowed on cdev fds.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_detach_iommufd_pt {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DEVICE_DETACH_PASID (1 << 0)
+ __u32 pasid;
+};
+
+#define VFIO_DEVICE_DETACH_IOMMUFD_PT _IO(VFIO_TYPE, VFIO_BASE + 20)
+
+/*
+ * Provide support for setting a PCI VF Token, which is used as a shared
+ * secret between PF and VF drivers. This feature may only be set on a
+ * PCI SR-IOV PF when SR-IOV is enabled on the PF and there are no existing
+ * open VFs. Data provided when setting this feature is a 16-byte array
+ * (__u8 b[16]), representing a UUID.
+ */
+#define VFIO_DEVICE_FEATURE_PCI_VF_TOKEN (0)
+
+/*
+ * Indicates the device can support the migration API through
+ * VFIO_DEVICE_FEATURE_MIG_DEVICE_STATE. If this GET succeeds, the RUNNING and
+ * ERROR states are always supported. Support for additional states is
+ * indicated via the flags field; at least VFIO_MIGRATION_STOP_COPY must be
+ * set.
+ *
+ * VFIO_MIGRATION_STOP_COPY means that STOP, STOP_COPY and
+ * RESUMING are supported.
+ *
+ * VFIO_MIGRATION_STOP_COPY | VFIO_MIGRATION_P2P means that RUNNING_P2P
+ * is supported in addition to the STOP_COPY states.
+ *
+ * VFIO_MIGRATION_STOP_COPY | VFIO_MIGRATION_PRE_COPY means that
+ * PRE_COPY is supported in addition to the STOP_COPY states.
+ *
+ * VFIO_MIGRATION_STOP_COPY | VFIO_MIGRATION_P2P | VFIO_MIGRATION_PRE_COPY
+ * means that RUNNING_P2P, PRE_COPY and PRE_COPY_P2P are supported
+ * in addition to the STOP_COPY states.
+ *
+ * Other combinations of flags have behavior to be defined in the future.
+ */
+struct vfio_device_feature_migration {
+ __aligned_u64 flags;
+#define VFIO_MIGRATION_STOP_COPY (1 << 0)
+#define VFIO_MIGRATION_P2P (1 << 1)
+#define VFIO_MIGRATION_PRE_COPY (1 << 2)
+};
+#define VFIO_DEVICE_FEATURE_MIGRATION 1
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET, execute a migration state change on the VFIO
+ * device. The new state is supplied in device_state, see enum
+ * vfio_device_mig_state for details
+ *
+ * The kernel migration driver must fully transition the device to the new state
+ * value before the operation returns to the user.
+ *
+ * The kernel migration driver must not generate asynchronous device state
+ * transitions outside of manipulation by the user or the VFIO_DEVICE_RESET
+ * ioctl as described above.
+ *
+ * If this function fails then current device_state may be the original
+ * operating state or some other state along the combination transition path.
+ * The user can then decide if it should execute a VFIO_DEVICE_RESET, attempt
+ * to return to the original state, or attempt to return to some other state
+ * such as RUNNING or STOP.
+ *
+ * If the new_state starts a new data transfer session then the FD associated
+ * with that session is returned in data_fd. The user is responsible to close
+ * this FD when it is finished. The user must consider the migration data stream
+ * carried over the FD to be opaque and must preserve the byte order of the
+ * stream. The user is not required to preserve buffer segmentation when writing
+ * the data stream during the RESUMING operation.
+ *
+ * Upon VFIO_DEVICE_FEATURE_GET, get the current migration state of the VFIO
+ * device, data_fd will be -1.
+ */
+struct vfio_device_feature_mig_state {
+ __u32 device_state; /* From enum vfio_device_mig_state */
+ __s32 data_fd;
+};
+#define VFIO_DEVICE_FEATURE_MIG_DEVICE_STATE 2
+
+/*
+ * The device migration Finite State Machine is described by the enum
+ * vfio_device_mig_state. Some of the FSM arcs will create a migration data
+ * transfer session by returning a FD, in this case the migration data will
+ * flow over the FD using read() and write() as discussed below.
+ *
+ * There are 5 states to support VFIO_MIGRATION_STOP_COPY:
+ * RUNNING - The device is running normally
+ * STOP - The device does not change the internal or external state
+ * STOP_COPY - The device internal state can be read out
+ * RESUMING - The device is stopped and is loading a new internal state
+ * ERROR - The device has failed and must be reset
+ *
+ * And optional states to support VFIO_MIGRATION_P2P:
+ * RUNNING_P2P - RUNNING, except the device cannot do peer to peer DMA
+ * And VFIO_MIGRATION_PRE_COPY:
+ * PRE_COPY - The device is running normally but tracking internal state
+ * changes
+ * And VFIO_MIGRATION_P2P | VFIO_MIGRATION_PRE_COPY:
+ * PRE_COPY_P2P - PRE_COPY, except the device cannot do peer to peer DMA
+ *
+ * The FSM takes actions on the arcs between FSM states. The driver implements
+ * the following behavior for the FSM arcs:
+ *
+ * RUNNING_P2P -> STOP
+ * STOP_COPY -> STOP
+ * While in STOP the device must stop the operation of the device. The device
+ * must not generate interrupts, DMA, or any other change to external state.
+ * It must not change its internal state. When stopped the device and kernel
+ * migration driver must accept and respond to interaction to support external
+ * subsystems in the STOP state, for example PCI MSI-X and PCI config space.
+ * Failure by the user to restrict device access while in STOP must not result
+ * in error conditions outside the user context (ex. host system faults).
+ *
+ * The STOP_COPY arc will terminate a data transfer session.
+ *
+ * RESUMING -> STOP
+ * Leaving RESUMING terminates a data transfer session and indicates the
+ * device should complete processing of the data delivered by write(). The
+ * kernel migration driver should complete the incorporation of data written
+ * to the data transfer FD into the device internal state and perform
+ * final validity and consistency checking of the new device state. If the
+ * user provided data is found to be incomplete, inconsistent, or otherwise
+ * invalid, the migration driver must fail the SET_STATE ioctl and
+ * optionally go to the ERROR state as described below.
+ *
+ * While in STOP the device has the same behavior as other STOP states
+ * described above.
+ *
+ * To abort a RESUMING session the device must be reset.
+ *
+ * PRE_COPY -> RUNNING
+ * RUNNING_P2P -> RUNNING
+ * While in RUNNING the device is fully operational, the device may generate
+ * interrupts, DMA, respond to MMIO, all vfio device regions are functional,
+ * and the device may advance its internal state.
+ *
+ * The PRE_COPY arc will terminate a data transfer session.
+ *
+ * PRE_COPY_P2P -> RUNNING_P2P
+ * RUNNING -> RUNNING_P2P
+ * STOP -> RUNNING_P2P
+ * While in RUNNING_P2P the device is partially running in the P2P quiescent
+ * state defined below.
+ *
+ * The PRE_COPY_P2P arc will terminate a data transfer session.
+ *
+ * RUNNING -> PRE_COPY
+ * RUNNING_P2P -> PRE_COPY_P2P
+ * STOP -> STOP_COPY
+ * PRE_COPY, PRE_COPY_P2P and STOP_COPY form the "saving group" of states
+ * which share a data transfer session. Moving between these states alters
+ * what is streamed in session, but does not terminate or otherwise affect
+ * the associated fd.
+ *
+ * These arcs begin the process of saving the device state and will return a
+ * new data_fd. The migration driver may perform actions such as enabling
+ * dirty logging of device state when entering PRE_COPY or PER_COPY_P2P.
+ *
+ * Each arc does not change the device operation, the device remains
+ * RUNNING, P2P quiesced or in STOP. The STOP_COPY state is described below
+ * in PRE_COPY_P2P -> STOP_COPY.
+ *
+ * PRE_COPY -> PRE_COPY_P2P
+ * Entering PRE_COPY_P2P continues all the behaviors of PRE_COPY above.
+ * However, while in the PRE_COPY_P2P state, the device is partially running
+ * in the P2P quiescent state defined below, like RUNNING_P2P.
+ *
+ * PRE_COPY_P2P -> PRE_COPY
+ * This arc allows returning the device to a full RUNNING behavior while
+ * continuing all the behaviors of PRE_COPY.
+ *
+ * PRE_COPY_P2P -> STOP_COPY
+ * While in the STOP_COPY state the device has the same behavior as STOP
+ * with the addition that the data transfers session continues to stream the
+ * migration state. End of stream on the FD indicates the entire device
+ * state has been transferred.
+ *
+ * The user should take steps to restrict access to vfio device regions while
+ * the device is in STOP_COPY or risk corruption of the device migration data
+ * stream.
+ *
+ * STOP -> RESUMING
+ * Entering the RESUMING state starts a process of restoring the device state
+ * and will return a new data_fd. The data stream fed into the data_fd should
+ * be taken from the data transfer output of a single FD during saving from
+ * a compatible device. The migration driver may alter/reset the internal
+ * device state for this arc if required to prepare the device to receive the
+ * migration data.
+ *
+ * STOP_COPY -> PRE_COPY
+ * STOP_COPY -> PRE_COPY_P2P
+ * These arcs are not permitted and return error if requested. Future
+ * revisions of this API may define behaviors for these arcs, in this case
+ * support will be discoverable by a new flag in
+ * VFIO_DEVICE_FEATURE_MIGRATION.
+ *
+ * any -> ERROR
+ * ERROR cannot be specified as a device state, however any transition request
+ * can be failed with an errno return and may then move the device_state into
+ * ERROR. In this case the device was unable to execute the requested arc and
+ * was also unable to restore the device to any valid device_state.
+ * To recover from ERROR VFIO_DEVICE_RESET must be used to return the
+ * device_state back to RUNNING.
+ *
+ * The optional peer to peer (P2P) quiescent state is intended to be a quiescent
+ * state for the device for the purposes of managing multiple devices within a
+ * user context where peer-to-peer DMA between devices may be active. The
+ * RUNNING_P2P and PRE_COPY_P2P states must prevent the device from initiating
+ * any new P2P DMA transactions. If the device can identify P2P transactions
+ * then it can stop only P2P DMA, otherwise it must stop all DMA. The migration
+ * driver must complete any such outstanding operations prior to completing the
+ * FSM arc into a P2P state. For the purpose of specification the states
+ * behave as though the device was fully running if not supported. Like while in
+ * STOP or STOP_COPY the user must not touch the device, otherwise the state
+ * can be exited.
+ *
+ * The remaining possible transitions are interpreted as combinations of the
+ * above FSM arcs. As there are multiple paths through the FSM arcs the path
+ * should be selected based on the following rules:
+ * - Select the shortest path.
+ * - The path cannot have saving group states as interior arcs, only
+ * starting/end states.
+ * Refer to vfio_mig_get_next_state() for the result of the algorithm.
+ *
+ * The automatic transit through the FSM arcs that make up the combination
+ * transition is invisible to the user. When working with combination arcs the
+ * user may see any step along the path in the device_state if SET_STATE
+ * fails. When handling these types of errors users should anticipate future
+ * revisions of this protocol using new states and those states becoming
+ * visible in this case.
+ *
+ * The optional states cannot be used with SET_STATE if the device does not
+ * support them. The user can discover if these states are supported by using
+ * VFIO_DEVICE_FEATURE_MIGRATION. By using combination transitions the user can
+ * avoid knowing about these optional states if the kernel driver supports them.
+ *
+ * Arcs touching PRE_COPY and PRE_COPY_P2P are removed if support for PRE_COPY
+ * is not present.
+ */
+enum vfio_device_mig_state {
+ VFIO_DEVICE_STATE_ERROR = 0,
+ VFIO_DEVICE_STATE_STOP = 1,
+ VFIO_DEVICE_STATE_RUNNING = 2,
+ VFIO_DEVICE_STATE_STOP_COPY = 3,
+ VFIO_DEVICE_STATE_RESUMING = 4,
+ VFIO_DEVICE_STATE_RUNNING_P2P = 5,
+ VFIO_DEVICE_STATE_PRE_COPY = 6,
+ VFIO_DEVICE_STATE_PRE_COPY_P2P = 7,
+ VFIO_DEVICE_STATE_NR,
+};
+
+/**
+ * VFIO_MIG_GET_PRECOPY_INFO - _IO(VFIO_TYPE, VFIO_BASE + 21)
+ *
+ * This ioctl is used on the migration data FD in the precopy phase of the
+ * migration data transfer. It returns an estimate of the current data sizes
+ * remaining to be transferred. It allows the user to judge when it is
+ * appropriate to leave PRE_COPY for STOP_COPY.
+ *
+ * This ioctl is valid only in PRE_COPY states and kernel driver should
+ * return -EINVAL from any other migration state.
+ *
+ * The vfio_precopy_info data structure returned by this ioctl provides
+ * estimates of data available from the device during the PRE_COPY states.
+ * This estimate is split into two categories, initial_bytes and
+ * dirty_bytes.
+ *
+ * The initial_bytes field indicates the amount of initial precopy
+ * data available from the device. This field should have a non-zero initial
+ * value and decrease as migration data is read from the device.
+ * It is recommended to leave PRE_COPY for STOP_COPY only after this field
+ * reaches zero. Leaving PRE_COPY earlier might make things slower.
+ *
+ * The dirty_bytes field tracks device state changes relative to data
+ * previously retrieved. This field starts at zero and may increase as
+ * the internal device state is modified or decrease as that modified
+ * state is read from the device.
+ *
+ * Userspace may use the combination of these fields to estimate the
+ * potential data size available during the PRE_COPY phases, as well as
+ * trends relative to the rate the device is dirtying its internal
+ * state, but these fields are not required to have any bearing relative
+ * to the data size available during the STOP_COPY phase.
+ *
+ * Drivers have a lot of flexibility in when and what they transfer during the
+ * PRE_COPY phase, and how they report this from VFIO_MIG_GET_PRECOPY_INFO.
+ *
+ * During pre-copy the migration data FD has a temporary "end of stream" that is
+ * reached when both initial_bytes and dirty_byte are zero. For instance, this
+ * may indicate that the device is idle and not currently dirtying any internal
+ * state. When read() is done on this temporary end of stream the kernel driver
+ * should return ENOMSG from read(). Userspace can wait for more data (which may
+ * never come) by using poll.
+ *
+ * Once in STOP_COPY the migration data FD has a permanent end of stream
+ * signaled in the usual way by read() always returning 0 and poll always
+ * returning readable. ENOMSG may not be returned in STOP_COPY.
+ * Support for this ioctl is mandatory if a driver claims to support
+ * VFIO_MIGRATION_PRE_COPY.
+ *
+ * Return: 0 on success, -1 and errno set on failure.
+ */
+struct vfio_precopy_info {
+ __u32 argsz;
+ __u32 flags;
+ __aligned_u64 initial_bytes;
+ __aligned_u64 dirty_bytes;
+};
+
+#define VFIO_MIG_GET_PRECOPY_INFO _IO(VFIO_TYPE, VFIO_BASE + 21)
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET, allow the device to be moved into a low power
+ * state with the platform-based power management. Device use of lower power
+ * states depends on factors managed by the runtime power management core,
+ * including system level support and coordinating support among dependent
+ * devices. Enabling device low power entry does not guarantee lower power
+ * usage by the device, nor is a mechanism provided through this feature to
+ * know the current power state of the device. If any device access happens
+ * (either from the host or through the vfio uAPI) when the device is in the
+ * low power state, then the host will move the device out of the low power
+ * state as necessary prior to the access. Once the access is completed, the
+ * device may re-enter the low power state. For single shot low power support
+ * with wake-up notification, see
+ * VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY_WITH_WAKEUP below. Access to mmap'd
+ * device regions is disabled on LOW_POWER_ENTRY and may only be resumed after
+ * calling LOW_POWER_EXIT.
+ */
+#define VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY 3
+
+/*
+ * This device feature has the same behavior as
+ * VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY with the exception that the user
+ * provides an eventfd for wake-up notification. When the device moves out of
+ * the low power state for the wake-up, the host will not allow the device to
+ * re-enter a low power state without a subsequent user call to one of the low
+ * power entry device feature IOCTLs. Access to mmap'd device regions is
+ * disabled on LOW_POWER_ENTRY_WITH_WAKEUP and may only be resumed after the
+ * low power exit. The low power exit can happen either through LOW_POWER_EXIT
+ * or through any other access (where the wake-up notification has been
+ * generated). The access to mmap'd device regions will not trigger low power
+ * exit.
+ *
+ * The notification through the provided eventfd will be generated only when
+ * the device has entered and is resumed from a low power state after
+ * calling this device feature IOCTL. A device that has not entered low power
+ * state, as managed through the runtime power management core, will not
+ * generate a notification through the provided eventfd on access. Calling the
+ * LOW_POWER_EXIT feature is optional in the case where notification has been
+ * signaled on the provided eventfd that a resume from low power has occurred.
+ */
+struct vfio_device_low_power_entry_with_wakeup {
+ __s32 wakeup_eventfd;
+ __u32 reserved;
+};
+
+#define VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY_WITH_WAKEUP 4
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET, disallow use of device low power states as
+ * previously enabled via VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY or
+ * VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY_WITH_WAKEUP device features.
+ * This device feature IOCTL may itself generate a wakeup eventfd notification
+ * in the latter case if the device had previously entered a low power state.
+ */
+#define VFIO_DEVICE_FEATURE_LOW_POWER_EXIT 5
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET start/stop device DMA logging.
+ * VFIO_DEVICE_FEATURE_PROBE can be used to detect if the device supports
+ * DMA logging.
+ *
+ * DMA logging allows a device to internally record what DMAs the device is
+ * initiating and report them back to userspace. It is part of the VFIO
+ * migration infrastructure that allows implementing dirty page tracking
+ * during the pre copy phase of live migration. Only DMA WRITEs are logged,
+ * and this API is not connected to VFIO_DEVICE_FEATURE_MIG_DEVICE_STATE.
+ *
+ * When DMA logging is started a range of IOVAs to monitor is provided and the
+ * device can optimize its logging to cover only the IOVA range given. Each
+ * DMA that the device initiates inside the range will be logged by the device
+ * for later retrieval.
+ *
+ * page_size is an input that hints what tracking granularity the device
+ * should try to achieve. If the device cannot do the hinted page size then
+ * it's the driver choice which page size to pick based on its support.
+ * On output the device will return the page size it selected.
+ *
+ * ranges is a pointer to an array of
+ * struct vfio_device_feature_dma_logging_range.
+ *
+ * The core kernel code guarantees to support by minimum num_ranges that fit
+ * into a single kernel page. User space can try higher values but should give
+ * up if the above can't be achieved as of some driver limitations.
+ *
+ * A single call to start device DMA logging can be issued and a matching stop
+ * should follow at the end. Another start is not allowed in the meantime.
+ */
+struct vfio_device_feature_dma_logging_control {
+ __aligned_u64 page_size;
+ __u32 num_ranges;
+ __u32 __reserved;
+ __aligned_u64 ranges;
+};
+
+struct vfio_device_feature_dma_logging_range {
+ __aligned_u64 iova;
+ __aligned_u64 length;
+};
+
+#define VFIO_DEVICE_FEATURE_DMA_LOGGING_START 6
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET stop device DMA logging that was started
+ * by VFIO_DEVICE_FEATURE_DMA_LOGGING_START
+ */
+#define VFIO_DEVICE_FEATURE_DMA_LOGGING_STOP 7
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_GET read back and clear the device DMA log
+ *
+ * Query the device's DMA log for written pages within the given IOVA range.
+ * During querying the log is cleared for the IOVA range.
+ *
+ * bitmap is a pointer to an array of u64s that will hold the output bitmap
+ * with 1 bit reporting a page_size unit of IOVA. The mapping of IOVA to bits
+ * is given by:
+ * bitmap[(addr - iova)/page_size] & (1ULL << (addr % 64))
+ *
+ * The input page_size can be any power of two value and does not have to
+ * match the value given to VFIO_DEVICE_FEATURE_DMA_LOGGING_START. The driver
+ * will format its internal logging to match the reporting page size, possibly
+ * by replicating bits if the internal page size is lower than requested.
+ *
+ * The LOGGING_REPORT will only set bits in the bitmap and never clear or
+ * perform any initialization of the user provided bitmap.
+ *
+ * If any error is returned userspace should assume that the dirty log is
+ * corrupted. Error recovery is to consider all memory dirty and try to
+ * restart the dirty tracking, or to abort/restart the whole migration.
+ *
+ * If DMA logging is not enabled, an error will be returned.
+ *
+ */
+struct vfio_device_feature_dma_logging_report {
+ __aligned_u64 iova;
+ __aligned_u64 length;
+ __aligned_u64 page_size;
+ __aligned_u64 bitmap;
+};
+
+#define VFIO_DEVICE_FEATURE_DMA_LOGGING_REPORT 8
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_GET read back the estimated data length that will
+ * be required to complete stop copy.
+ *
+ * Note: Can be called on each device state.
+ */
+
+struct vfio_device_feature_mig_data_size {
+ __aligned_u64 stop_copy_length;
+};
+
+#define VFIO_DEVICE_FEATURE_MIG_DATA_SIZE 9
+
+/**
+ * Upon VFIO_DEVICE_FEATURE_SET, set or clear the BUS mastering for the device
+ * based on the operation specified in op flag.
+ *
+ * The functionality is incorporated for devices that needs bus master control,
+ * but the in-band device interface lacks the support. Consequently, it is not
+ * applicable to PCI devices, as bus master control for PCI devices is managed
+ * in-band through the configuration space. At present, this feature is supported
+ * only for CDX devices.
+ * When the device's BUS MASTER setting is configured as CLEAR, it will result in
+ * blocking all incoming DMA requests from the device. On the other hand, configuring
+ * the device's BUS MASTER setting as SET (enable) will grant the device the
+ * capability to perform DMA to the host memory.
+ */
+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 */
+};
+#define VFIO_DEVICE_FEATURE_BUS_MASTER 10
+
+/* -------- API for Type1 VFIO IOMMU -------- */
+
+/**
+ * VFIO_IOMMU_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 12, struct vfio_iommu_info)
+ *
+ * Retrieve information about the IOMMU object. Fills in provided
+ * struct vfio_iommu_info. Caller sets argsz.
+ *
+ * XXX Should we do these by CHECK_EXTENSION too?
+ */
+struct vfio_iommu_type1_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IOMMU_INFO_PGSIZES (1 << 0) /* supported page sizes info */
+#define VFIO_IOMMU_INFO_CAPS (1 << 1) /* Info supports caps */
+ __aligned_u64 iova_pgsizes; /* Bitmap of supported page sizes */
+ __u32 cap_offset; /* Offset within info struct of first cap */
+ __u32 pad;
+};
+
+/*
+ * The IOVA capability allows to report the valid IOVA range(s)
+ * excluding any non-relaxable reserved regions exposed by
+ * devices attached to the container. Any DMA map attempt
+ * outside the valid iova range will return error.
+ *
+ * The structures below define version 1 of this capability.
+ */
+#define VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE 1
+
+struct vfio_iova_range {
+ __u64 start;
+ __u64 end;
+};
+
+struct vfio_iommu_type1_info_cap_iova_range {
+ struct vfio_info_cap_header header;
+ __u32 nr_iovas;
+ __u32 reserved;
+ struct vfio_iova_range iova_ranges[];
+};
+
+/*
+ * The migration capability allows to report supported features for migration.
+ *
+ * The structures below define version 1 of this capability.
+ *
+ * The existence of this capability indicates that IOMMU kernel driver supports
+ * dirty page logging.
+ *
+ * pgsize_bitmap: Kernel driver returns bitmap of supported page sizes for dirty
+ * page logging.
+ * max_dirty_bitmap_size: Kernel driver returns maximum supported dirty bitmap
+ * size in bytes that can be used by user applications when getting the dirty
+ * bitmap.
+ */
+#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 2
+
+struct vfio_iommu_type1_info_cap_migration {
+ struct vfio_info_cap_header header;
+ __u32 flags;
+ __u64 pgsize_bitmap;
+ __u64 max_dirty_bitmap_size; /* in bytes */
+};
+
+/*
+ * The DMA available capability allows to report the current number of
+ * simultaneously outstanding DMA mappings that are allowed.
+ *
+ * The structure below defines version 1 of this capability.
+ *
+ * avail: specifies the current number of outstanding DMA mappings allowed.
+ */
+#define VFIO_IOMMU_TYPE1_INFO_DMA_AVAIL 3
+
+struct vfio_iommu_type1_info_dma_avail {
+ struct vfio_info_cap_header header;
+ __u32 avail;
+};
+
+#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
+/**
+ * VFIO_IOMMU_MAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 13, struct vfio_dma_map)
+ *
+ * Map process virtual addresses to IO virtual addresses using the
+ * provided struct vfio_dma_map. Caller sets argsz. READ &/ WRITE required.
+ *
+ * If flags & VFIO_DMA_MAP_FLAG_VADDR, update the base vaddr for iova. The vaddr
+ * must have previously been invalidated with VFIO_DMA_UNMAP_FLAG_VADDR. To
+ * maintain memory consistency within the user application, the updated vaddr
+ * must address the same memory object as originally mapped. Failure to do so
+ * will result in user memory corruption and/or device misbehavior. iova and
+ * size must match those in the original MAP_DMA call. Protection is not
+ * changed, and the READ & WRITE flags must be 0.
+ */
+struct vfio_iommu_type1_dma_map {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DMA_MAP_FLAG_READ (1 << 0) /* readable from device */
+#define VFIO_DMA_MAP_FLAG_WRITE (1 << 1) /* writable from device */
+#define VFIO_DMA_MAP_FLAG_VADDR (1 << 2)
+ __u64 vaddr; /* Process virtual address */
+ __u64 iova; /* IO virtual address */
+ __u64 size; /* Size of mapping (bytes) */
+};
+
+#define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)
+
+struct vfio_bitmap {
+ __u64 pgsize; /* page size for bitmap in bytes */
+ __u64 size; /* in bytes */
+ __u64 *data; /* one bit per page */
+};
+
+/**
+ * VFIO_IOMMU_UNMAP_DMA - _IOWR(VFIO_TYPE, VFIO_BASE + 14,
+ * struct vfio_dma_unmap)
+ *
+ * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.
+ * Caller sets argsz. The actual unmapped size is returned in the size
+ * field. No guarantee is made to the user that arbitrary unmaps of iova
+ * or size different from those used in the original mapping call will
+ * succeed.
+ *
+ * VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP should be set to get the dirty bitmap
+ * before unmapping IO virtual addresses. When this flag is set, the user must
+ * provide a struct vfio_bitmap in data[]. User must provide zero-allocated
+ * memory via vfio_bitmap.data and its size in the vfio_bitmap.size field.
+ * A bit in the bitmap represents one page, of user provided page size in
+ * vfio_bitmap.pgsize field, consecutively starting from iova offset. Bit set
+ * indicates that the page at that offset from iova is dirty. A Bitmap of the
+ * pages in the range of unmapped size is returned in the user-provided
+ * vfio_bitmap.data.
+ *
+ * If flags & VFIO_DMA_UNMAP_FLAG_ALL, unmap all addresses. iova and size
+ * must be 0. This cannot be combined with the get-dirty-bitmap flag.
+ *
+ * If flags & VFIO_DMA_UNMAP_FLAG_VADDR, do not unmap, but invalidate host
+ * virtual addresses in the iova range. DMA to already-mapped pages continues.
+ * Groups may not be added to the container while any addresses are invalid.
+ * This cannot be combined with the get-dirty-bitmap flag.
+ */
+struct vfio_iommu_type1_dma_unmap {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP (1 << 0)
+#define VFIO_DMA_UNMAP_FLAG_ALL (1 << 1)
+#define VFIO_DMA_UNMAP_FLAG_VADDR (1 << 2)
+ __u64 iova; /* IO virtual address */
+ __u64 size; /* Size of mapping (bytes) */
+ __u8 data[];
+};
+
+#define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14)
+
+/*
+ * IOCTLs to enable/disable IOMMU container usage.
+ * No parameters are supported.
+ */
+#define VFIO_IOMMU_ENABLE _IO(VFIO_TYPE, VFIO_BASE + 15)
+#define VFIO_IOMMU_DISABLE _IO(VFIO_TYPE, VFIO_BASE + 16)
+
+/**
+ * VFIO_IOMMU_DIRTY_PAGES - _IOWR(VFIO_TYPE, VFIO_BASE + 17,
+ * struct vfio_iommu_type1_dirty_bitmap)
+ * IOCTL is used for dirty pages logging.
+ * Caller should set flag depending on which operation to perform, details as
+ * below:
+ *
+ * Calling the IOCTL with VFIO_IOMMU_DIRTY_PAGES_FLAG_START flag set, instructs
+ * the IOMMU driver to log pages that are dirtied or potentially dirtied by
+ * the device; designed to be used when a migration is in progress. Dirty pages
+ * are logged until logging is disabled by user application by calling the IOCTL
+ * with VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP flag.
+ *
+ * Calling the IOCTL with VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP flag set, instructs
+ * the IOMMU driver to stop logging dirtied pages.
+ *
+ * Calling the IOCTL with VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP flag set
+ * returns the dirty pages bitmap for IOMMU container for a given IOVA range.
+ * The user must specify the IOVA range and the pgsize through the structure
+ * vfio_iommu_type1_dirty_bitmap_get in the data[] portion. This interface
+ * supports getting a bitmap of the smallest supported pgsize only and can be
+ * modified in future to get a bitmap of any specified supported pgsize. The
+ * user must provide a zeroed memory area for the bitmap memory and specify its
+ * size in bitmap.size. One bit is used to represent one page consecutively
+ * starting from iova offset. The user should provide page size in bitmap.pgsize
+ * field. A bit set in the bitmap indicates that the page at that offset from
+ * iova is dirty. The caller must set argsz to a value including the size of
+ * structure vfio_iommu_type1_dirty_bitmap_get, but excluding the size of the
+ * actual bitmap. If dirty pages logging is not enabled, an error will be
+ * returned.
+ *
+ * Only one of the flags _START, _STOP and _GET may be specified at a time.
+ *
+ */
+struct vfio_iommu_type1_dirty_bitmap {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IOMMU_DIRTY_PAGES_FLAG_START (1 << 0)
+#define VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP (1 << 1)
+#define VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP (1 << 2)
+ __u8 data[];
+};
+
+struct vfio_iommu_type1_dirty_bitmap_get {
+ __u64 iova; /* IO virtual address */
+ __u64 size; /* Size of iova range */
+ struct vfio_bitmap bitmap;
+};
+
+#define VFIO_IOMMU_DIRTY_PAGES _IO(VFIO_TYPE, VFIO_BASE + 17)
+
+/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */
+
+/*
+ * The SPAPR TCE DDW info struct provides the information about
+ * the details of Dynamic DMA window capability.
+ *
+ * @pgsizes contains a page size bitmask, 4K/64K/16M are supported.
+ * @max_dynamic_windows_supported tells the maximum number of windows
+ * which the platform can create.
+ * @levels tells the maximum number of levels in multi-level IOMMU tables;
+ * this allows splitting a table into smaller chunks which reduces
+ * the amount of physically contiguous memory required for the table.
+ */
+struct vfio_iommu_spapr_tce_ddw_info {
+ __u64 pgsizes; /* Bitmap of supported page sizes */
+ __u32 max_dynamic_windows_supported;
+ __u32 levels;
+};
+
+/*
+ * The SPAPR TCE info struct provides the information about the PCI bus
+ * address ranges available for DMA, these values are programmed into
+ * the hardware so the guest has to know that information.
+ *
+ * The DMA 32 bit window start is an absolute PCI bus address.
+ * The IOVA address passed via map/unmap ioctls are absolute PCI bus
+ * addresses too so the window works as a filter rather than an offset
+ * for IOVA addresses.
+ *
+ * Flags supported:
+ * - VFIO_IOMMU_SPAPR_INFO_DDW: informs the userspace that dynamic DMA windows
+ * (DDW) support is present. @ddw is only supported when DDW is present.
+ */
+struct vfio_iommu_spapr_tce_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IOMMU_SPAPR_INFO_DDW (1 << 0) /* DDW supported */
+ __u32 dma32_window_start; /* 32 bit window start (bytes) */
+ __u32 dma32_window_size; /* 32 bit window size (bytes) */
+ struct vfio_iommu_spapr_tce_ddw_info ddw;
+};
+
+#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
+/*
+ * EEH PE operation struct provides ways to:
+ * - enable/disable EEH functionality;
+ * - unfreeze IO/DMA for frozen PE;
+ * - read PE state;
+ * - reset PE;
+ * - configure PE;
+ * - inject EEH error.
+ */
+struct vfio_eeh_pe_err {
+ __u32 type;
+ __u32 func;
+ __u64 addr;
+ __u64 mask;
+};
+
+struct vfio_eeh_pe_op {
+ __u32 argsz;
+ __u32 flags;
+ __u32 op;
+ union {
+ struct vfio_eeh_pe_err err;
+ };
+};
+
+#define VFIO_EEH_PE_DISABLE 0 /* Disable EEH functionality */
+#define VFIO_EEH_PE_ENABLE 1 /* Enable EEH functionality */
+#define VFIO_EEH_PE_UNFREEZE_IO 2 /* Enable IO for frozen PE */
+#define VFIO_EEH_PE_UNFREEZE_DMA 3 /* Enable DMA for frozen PE */
+#define VFIO_EEH_PE_GET_STATE 4 /* PE state retrieval */
+#define VFIO_EEH_PE_STATE_NORMAL 0 /* PE in functional state */
+#define VFIO_EEH_PE_STATE_RESET 1 /* PE reset in progress */
+#define VFIO_EEH_PE_STATE_STOPPED 2 /* Stopped DMA and IO */
+#define VFIO_EEH_PE_STATE_STOPPED_DMA 4 /* Stopped DMA only */
+#define VFIO_EEH_PE_STATE_UNAVAIL 5 /* State unavailable */
+#define VFIO_EEH_PE_RESET_DEACTIVATE 5 /* Deassert PE reset */
+#define VFIO_EEH_PE_RESET_HOT 6 /* Assert hot reset */
+#define VFIO_EEH_PE_RESET_FUNDAMENTAL 7 /* Assert fundamental reset */
+#define VFIO_EEH_PE_CONFIGURE 8 /* PE configuration */
+#define VFIO_EEH_PE_INJECT_ERR 9 /* Inject EEH error */
+
+#define VFIO_EEH_PE_OP _IO(VFIO_TYPE, VFIO_BASE + 21)
+
+/**
+ * VFIO_IOMMU_SPAPR_REGISTER_MEMORY - _IOW(VFIO_TYPE, VFIO_BASE + 17, struct vfio_iommu_spapr_register_memory)
+ *
+ * Registers user space memory where DMA is allowed. It pins
+ * user pages and does the locked memory accounting so
+ * subsequent VFIO_IOMMU_MAP_DMA/VFIO_IOMMU_UNMAP_DMA calls
+ * get faster.
+ */
+struct vfio_iommu_spapr_register_memory {
+ __u32 argsz;
+ __u32 flags;
+ __u64 vaddr; /* Process virtual address */
+ __u64 size; /* Size of mapping (bytes) */
+};
+#define VFIO_IOMMU_SPAPR_REGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 17)
+
+/**
+ * VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY - _IOW(VFIO_TYPE, VFIO_BASE + 18, struct vfio_iommu_spapr_register_memory)
+ *
+ * Unregisters user space memory registered with
+ * VFIO_IOMMU_SPAPR_REGISTER_MEMORY.
+ * Uses vfio_iommu_spapr_register_memory for parameters.
+ */
+#define VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 18)
+
+/**
+ * VFIO_IOMMU_SPAPR_TCE_CREATE - _IOWR(VFIO_TYPE, VFIO_BASE + 19, struct vfio_iommu_spapr_tce_create)
+ *
+ * Creates an additional TCE table and programs it (sets a new DMA window)
+ * to every IOMMU group in the container. It receives page shift, window
+ * size and number of levels in the TCE table being created.
+ *
+ * It allocates and returns an offset on a PCI bus of the new DMA window.
+ */
+struct vfio_iommu_spapr_tce_create {
+ __u32 argsz;
+ __u32 flags;
+ /* in */
+ __u32 page_shift;
+ __u32 __resv1;
+ __u64 window_size;
+ __u32 levels;
+ __u32 __resv2;
+ /* out */
+ __u64 start_addr;
+};
+#define VFIO_IOMMU_SPAPR_TCE_CREATE _IO(VFIO_TYPE, VFIO_BASE + 19)
+
+/**
+ * VFIO_IOMMU_SPAPR_TCE_REMOVE - _IOW(VFIO_TYPE, VFIO_BASE + 20, struct vfio_iommu_spapr_tce_remove)
+ *
+ * Unprograms a TCE table from all groups in the container and destroys it.
+ * It receives a PCI bus offset as a window id.
+ */
+struct vfio_iommu_spapr_tce_remove {
+ __u32 argsz;
+ __u32 flags;
+ /* in */
+ __u64 start_addr;
+};
+#define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20)
+
+/* ***************************************************************** */
+
+#endif /* _UAPIVFIO_H */
diff --git a/kernel/linux/uapi/version b/kernel/linux/uapi/version
index 3c68968f92..966a998301 100644
--- a/kernel/linux/uapi/version
+++ b/kernel/linux/uapi/version
@@ -1 +1 @@
-v6.14
+v6.16
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC 8/8] vfio: use imported uAPI header
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (6 preceding siblings ...)
2025-09-03 7:28 ` [RFC 7/8] uapi: import VFIO header David Marchand
@ 2025-09-03 7:28 ` David Marchand
2025-09-03 9:38 ` Xu, Rosen
2025-09-03 7:50 ` [RFC 0/8] Cleanup VFIO API and import Linux " David Marchand
` (3 subsequent siblings)
11 siblings, 1 reply; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:28 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, Nipun Gupta, Nikhil Agarwal,
Hemant Agrawal, Sachin Saxena, Anatoly Burakov, Chenbo Xia,
Tomasz Duszynski, Kai Ji, Ajit Khaparde, Vikas Gupta, Rosen Xu,
Chaoyong He, Vijay Kumar Srivastava, Harman Kalra
Now that we have a v6.16 header in DPDK, we can remove all remaining
wrappers around VFIO uapi.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
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/qat/dev/qat_dev_gen_lce.c | 2 +-
drivers/crypto/bcmfs/bcmfs_vfio.c | 2 +-
drivers/raw/ifpga/afu_pmd_n3000.c | 2 +-
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 +-
13 files changed, 24 insertions(+), 48 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 <sys/ioctl.h>
#include <sys/mman.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <eal_export.h>
#include <rte_eal_paging.h>
@@ -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 <dirent.h>
#include <sys/eventfd.h>
#include <ctype.h>
-#include <linux/vfio.h>
+
+#include <uapi/linux/vfio.h>
#include <eal_export.h>
#include <eal_filesystem.h>
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 <sys/epoll.h>
#include <sys/eventfd.h>
#include <sys/syscall.h>
-#include <linux/vfio.h>
+
+#include <uapi/linux/vfio.h>
#include <eal_export.h>
#include <rte_mbuf.h>
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 <sys/mman.h>
#include <stdbool.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_log.h>
#include <rte_pci.h>
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 <sys/queue.h>
#include <unistd.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <bus_driver.h>
#include <bus_platform_driver.h>
diff --git a/drivers/common/qat/dev/qat_dev_gen_lce.c b/drivers/common/qat/dev/qat_dev_gen_lce.c
index 466878bf76..8486dfa384 100644
--- a/drivers/common/qat/dev/qat_dev_gen_lce.c
+++ b/drivers/common/qat/dev/qat_dev_gen_lce.c
@@ -4,7 +4,7 @@
#include <rte_pci.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include "qat_device.h"
#include "qat_qp.h"
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 <sys/mman.h>
#include <sys/ioctl.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_vfio.h>
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 <sys/eventfd.h>
#include <sys/ioctl.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_eal.h>
#include <rte_malloc.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 <linux/virtio_net.h>
#include <stdbool.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_eal_paging.h>
#include <rte_malloc.h>
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 <sys/ioctl.h>
#include <unistd.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <nfp_common_pci.h>
#include <nfp_dev.h>
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 <unistd.h>
#include <sys/ioctl.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_errno.h>
#include <rte_malloc.h>
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 <assert.h>
#include <stdbool.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <eal_export.h>
#include <eal_trace_internal.h>
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 <unistd.h>
#include <sys/ioctl.h>
#include <dirent.h>
-#include <linux/vfio.h>
+
+#include <uapi/linux/vfio.h>
#include <rte_errno.h>
#include <rte_log.h>
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* RE: [RFC 8/8] vfio: use imported uAPI header
2025-09-03 7:28 ` [RFC 8/8] vfio: use imported uAPI header David Marchand
@ 2025-09-03 9:38 ` Xu, Rosen
0 siblings, 0 replies; 35+ messages in thread
From: Xu, Rosen @ 2025-09-03 9:38 UTC (permalink / raw)
To: David Marchand, dev
Cc: thomas, maxime.coquelin, Nipun Gupta, Nikhil Agarwal,
Hemant Agrawal, Sachin Saxena, Anatoly Burakov, Chenbo Xia,
Tomasz Duszynski, Kai Ji, Ajit Khaparde, Vikas Gupta,
Chaoyong He, Vijay Kumar Srivastava, Harman Kalra
Hi,
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Wednesday, September 3, 2025 3:28 PM
> To: dev@dpdk.org
> Cc: thomas@monjalon.net; maxime.coquelin@redhat.com; Nipun Gupta
> <nipun.gupta@amd.com>; Nikhil Agarwal <nikhil.agarwal@amd.com>;
> Hemant Agrawal <hemant.agrawal@nxp.com>; Sachin Saxena
> <sachin.saxena@nxp.com>; Anatoly Burakov <anatoly.burakov@intel.com>;
> Chenbo Xia <chenbox@nvidia.com>; Tomasz Duszynski
> <tduszynski@marvell.com>; Kai Ji <kai.ji@intel.com>; Ajit Khaparde
> <ajit.khaparde@broadcom.com>; Vikas Gupta
> <vikas.gupta@broadcom.com>; Xu, Rosen <rosen.xu@altera.com>;
> Chaoyong He <chaoyong.he@corigine.com>; Vijay Kumar Srivastava
> <vsrivast@xilinx.com>; Harman Kalra <hkalra@marvell.com>
> Subject: [RFC 8/8] vfio: use imported uAPI header
>
> [CAUTION: This email is from outside your organization. Unless you trust the
> sender, do not click on links or open attachments as it may be a fraudulent
> email attempting to steal your information and/or compromise your
> computer.]
>
> Now that we have a v6.16 header in DPDK, we can remove all remaining
> wrappers around VFIO uapi.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> 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/qat/dev/qat_dev_gen_lce.c | 2 +-
> drivers/crypto/bcmfs/bcmfs_vfio.c | 2 +-
> drivers/raw/ifpga/afu_pmd_n3000.c | 2 +-
> 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 +-
> 13 files changed, 24 insertions(+), 48 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 <sys/ioctl.h>
> #include <sys/mman.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <eal_export.h>
> #include <rte_eal_paging.h>
> @@ -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 <dirent.h>
> #include <sys/eventfd.h>
> #include <ctype.h>
> -#include <linux/vfio.h>
> +
> +#include <uapi/linux/vfio.h>
>
> #include <eal_export.h>
> #include <eal_filesystem.h>
> 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 <sys/epoll.h>
> #include <sys/eventfd.h>
> #include <sys/syscall.h>
> -#include <linux/vfio.h>
> +
> +#include <uapi/linux/vfio.h>
>
> #include <eal_export.h>
> #include <rte_mbuf.h>
> 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 <sys/mman.h>
> #include <stdbool.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <rte_log.h>
> #include <rte_pci.h>
> 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 <sys/queue.h>
> #include <unistd.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <bus_driver.h>
> #include <bus_platform_driver.h>
> diff --git a/drivers/common/qat/dev/qat_dev_gen_lce.c
> b/drivers/common/qat/dev/qat_dev_gen_lce.c
> index 466878bf76..8486dfa384 100644
> --- a/drivers/common/qat/dev/qat_dev_gen_lce.c
> +++ b/drivers/common/qat/dev/qat_dev_gen_lce.c
> @@ -4,7 +4,7 @@
>
> #include <rte_pci.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include "qat_device.h"
> #include "qat_qp.h"
> 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 <sys/mman.h>
> #include <sys/ioctl.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <rte_vfio.h>
>
> 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 <sys/eventfd.h>
> #include <sys/ioctl.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <rte_eal.h>
> #include <rte_malloc.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 <linux/virtio_net.h>
> #include <stdbool.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <rte_eal_paging.h>
> #include <rte_malloc.h>
> 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 <sys/ioctl.h>
> #include <unistd.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <nfp_common_pci.h>
> #include <nfp_dev.h>
> 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 <unistd.h>
> #include <sys/ioctl.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <rte_errno.h>
> #include <rte_malloc.h>
> 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 <assert.h>
> #include <stdbool.h>
>
> -#include <linux/vfio.h>
> +#include <uapi/linux/vfio.h>
>
> #include <eal_export.h>
> #include <eal_trace_internal.h>
> 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 <unistd.h>
> #include <sys/ioctl.h>
> #include <dirent.h>
> -#include <linux/vfio.h>
> +
> +#include <uapi/linux/vfio.h>
>
> #include <rte_errno.h>
> #include <rte_log.h>
> --
> 2.51.0
Reviewed-by: Rosen Xu <rosen.xu@altera.com>
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [RFC 0/8] Cleanup VFIO API and import Linux uAPI header
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (7 preceding siblings ...)
2025-09-03 7:28 ` [RFC 8/8] vfio: use imported uAPI header David Marchand
@ 2025-09-03 7:50 ` David Marchand
2025-09-03 9:29 ` Burakov, Anatoly
` (2 subsequent siblings)
11 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 7:50 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin
On Wed, 3 Sept 2025 at 09:28, David Marchand <david.marchand@redhat.com> wrote:
>
> The VFIO headers have a number of issues:
> - showing to the world a lot of internal considerations,
> - defining macros with the VFIO_ namespace (confusing, and a source of
> conflicts with the VFIO official uAPI),
> - wrapping around VFIO uAPI in case the kernel headers do not contain the
> expected API (putting the burden on DPDK developers to find the right
> way to detect the presence of a VFIO feature),
> - (somehow related to the previous point) supporting old version of the
> Linux kernel while DPDK now requires a v5.4 Linux kernel at least,
For people who would like to test this series, compilation may be
broken in the middle of the series (probably at the 3rd patch and
fixed at the last patch) if your toolchain provides old linux kernel
headers.
This is an issue I hit myself when testing cross compilation on ppc
with a 2022 toolchain provided by bootlin.
Upgrading the toolchain solved this.
--
David Marchand
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [RFC 0/8] Cleanup VFIO API and import Linux uAPI header
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (8 preceding siblings ...)
2025-09-03 7:50 ` [RFC 0/8] Cleanup VFIO API and import Linux " David Marchand
@ 2025-09-03 9:29 ` Burakov, Anatoly
2025-09-03 9:52 ` David Marchand
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
2025-09-03 15:17 ` David Marchand
11 siblings, 1 reply; 35+ messages in thread
From: Burakov, Anatoly @ 2025-09-03 9:29 UTC (permalink / raw)
To: David Marchand, dev; +Cc: thomas, maxime.coquelin
On 9/3/2025 9:28 AM, David Marchand wrote:
> The VFIO headers have a number of issues:
> - showing to the world a lot of internal considerations,
> - defining macros with the VFIO_ namespace (confusing, and a source of
> conflicts with the VFIO official uAPI),
> - wrapping around VFIO uAPI in case the kernel headers do not contain the
> expected API (putting the burden on DPDK developers to find the right
> way to detect the presence of a VFIO feature),
> - (somehow related to the previous point) supporting old version of the
> Linux kernel while DPDK now requires a v5.4 Linux kernel at least,
>
> This series proposes to cleanup those headers by hiding as much as
> possible internal macros and structures, then removing the explicit
> inclusion of linux/vfio.h from rte_vfio.h (pushing this inclusion to the
> application which may want to do some funny stuff with VFIO and should
> already include this header on its own) and finally importing the VFIO
> uAPI header from Linux v6.15 for internal consumption by DPDK
> components.
>
>
I've been working on something like this myself, so it'll be interesting
to compare notes! I too found that refactoring VFIO is a nightmare due
to how much stuff is exposed to external headers.
--
Thanks,
Anatoly
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [RFC 0/8] Cleanup VFIO API and import Linux uAPI header
2025-09-03 9:29 ` Burakov, Anatoly
@ 2025-09-03 9:52 ` David Marchand
2025-09-03 14:25 ` Burakov, Anatoly
0 siblings, 1 reply; 35+ messages in thread
From: David Marchand @ 2025-09-03 9:52 UTC (permalink / raw)
To: Burakov, Anatoly; +Cc: dev, thomas, maxime.coquelin
Hello,
On Wed, 3 Sept 2025 at 11:30, Burakov, Anatoly
<anatoly.burakov@intel.com> wrote:
>
> On 9/3/2025 9:28 AM, David Marchand wrote:
> > The VFIO headers have a number of issues:
> > - showing to the world a lot of internal considerations,
> > - defining macros with the VFIO_ namespace (confusing, and a source of
> > conflicts with the VFIO official uAPI),
> > - wrapping around VFIO uAPI in case the kernel headers do not contain the
> > expected API (putting the burden on DPDK developers to find the right
> > way to detect the presence of a VFIO feature),
> > - (somehow related to the previous point) supporting old version of the
> > Linux kernel while DPDK now requires a v5.4 Linux kernel at least,
> >
> > This series proposes to cleanup those headers by hiding as much as
> > possible internal macros and structures, then removing the explicit
> > inclusion of linux/vfio.h from rte_vfio.h (pushing this inclusion to the
> > application which may want to do some funny stuff with VFIO and should
> > already include this header on its own) and finally importing the VFIO
> > uAPI header from Linux v6.15 for internal consumption by DPDK
> > components.
> >
> >
>
> I've been working on something like this myself, so it'll be interesting
> to compare notes! I too found that refactoring VFIO is a nightmare due
> to how much stuff is exposed to external headers.
Oh cool.
A v2 is neeed, as this series breaks FreeBSD compilation.
I'll wait for comments before sending.
--
David Marchand
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [RFC 0/8] Cleanup VFIO API and import Linux uAPI header
2025-09-03 9:52 ` David Marchand
@ 2025-09-03 14:25 ` Burakov, Anatoly
0 siblings, 0 replies; 35+ messages in thread
From: Burakov, Anatoly @ 2025-09-03 14:25 UTC (permalink / raw)
To: David Marchand; +Cc: dev, thomas, maxime.coquelin
On 9/3/2025 11:52 AM, David Marchand wrote:
> Hello,
>
> On Wed, 3 Sept 2025 at 11:30, Burakov, Anatoly
> <anatoly.burakov@intel.com> wrote:
>>
>> On 9/3/2025 9:28 AM, David Marchand wrote:
>>> The VFIO headers have a number of issues:
>>> - showing to the world a lot of internal considerations,
>>> - defining macros with the VFIO_ namespace (confusing, and a source of
>>> conflicts with the VFIO official uAPI),
>>> - wrapping around VFIO uAPI in case the kernel headers do not contain the
>>> expected API (putting the burden on DPDK developers to find the right
>>> way to detect the presence of a VFIO feature),
>>> - (somehow related to the previous point) supporting old version of the
>>> Linux kernel while DPDK now requires a v5.4 Linux kernel at least,
>>>
>>> This series proposes to cleanup those headers by hiding as much as
>>> possible internal macros and structures, then removing the explicit
>>> inclusion of linux/vfio.h from rte_vfio.h (pushing this inclusion to the
>>> application which may want to do some funny stuff with VFIO and should
>>> already include this header on its own) and finally importing the VFIO
>>> uAPI header from Linux v6.15 for internal consumption by DPDK
>>> components.
>>>
>>>
>>
>> I've been working on something like this myself, so it'll be interesting
>> to compare notes! I too found that refactoring VFIO is a nightmare due
>> to how much stuff is exposed to external headers.
>
> Oh cool.
>
> A v2 is neeed, as this series breaks FreeBSD compilation.
> I'll wait for comments before sending.
>
>
Feel free to submit v2 at your own pace, as it might take a few days
before I can get to review this properly. I must say including uAPI in
DPDK is not something I thought of as I would've considered this to be a
very bold step, but it actually fixes a lot of problems in a really neat
way, so I like this idea.
--
Thanks,
Anatoly
^ permalink raw reply [flat|nested] 35+ messages in thread
* [RFC v2 0/9] Cleanup VFIO API and import Linux uAPI header
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (9 preceding siblings ...)
2025-09-03 9:29 ` Burakov, Anatoly
@ 2025-09-03 15:13 ` David Marchand
2025-09-03 15:13 ` [RFC v2 1/9] drivers: remove unneeded VFIO header inclusion David Marchand
` (6 more replies)
2025-09-03 15:17 ` David Marchand
11 siblings, 7 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:13 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin, anatoly.burakov
The VFIO headers have a number of issues:
- showing to the world a lot of internal considerations,
- defining macros with the VFIO_ namespace (confusing, and a source of
conflicts with the VFIO official uAPI),
- wrapping around VFIO uAPI in case the kernel headers do not contain the
expected API (putting the burden on DPDK developers to find the right
way to detect the presence of a VFIO feature),
- (somehow related to the previous point) supporting old version of the
Linux kernel while DPDK now requires a v5.4 Linux kernel at least,
This series proposes to cleanup those headers by hiding as much as
possible internal macros and structures, then removing the explicit
inclusion of linux/vfio.h from rte_vfio.h (pushing this inclusion to the
application which may want to do some funny stuff with VFIO and should
already include this header on its own) and finally importing the VFIO
uAPI header from Linux v6.15 for internal consumption by DPDK
components.
--
David Marchand
Changes since RFC v1:
- fixed FreeBSD compilation,
- fixed some inclusion of linux/vfio.h in common/cnxk and raw/ifpga,
David Marchand (9):
drivers: remove unneeded VFIO header inclusion
vfio: remove confusing check on VFIO presence
vfio: assume VFIO is always and only present on Linux
vfio: remove public wrappers
eal/linux: remove more internal VFIO macros
eal/linux: remove internal VFIO wrappers for old Linux
vfio: stop including Linux kernel header in public and driver API
uapi: import VFIO header
vfio: use imported uAPI header
config/meson.build | 3 -
doc/api/doxy-api.conf.in | 1 -
doc/guides/cryptodevs/bcmfs.rst | 4 -
drivers/bus/cdx/cdx_vfio.c | 19 +-
drivers/bus/fslmc/bus_fslmc_driver.h | 3 +-
drivers/bus/fslmc/fslmc_bus.c | 13 +-
drivers/bus/fslmc/fslmc_vfio.c | 22 +-
drivers/bus/fslmc/fslmc_vfio.h | 1 -
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +
drivers/bus/pci/linux/pci.c | 22 -
drivers/bus/pci/linux/pci_init.h | 6 -
drivers/bus/pci/linux/pci_vfio.c | 37 +-
drivers/bus/pci/pci_common.c | 2 -
drivers/bus/platform/bus_platform_driver.h | 20 +-
drivers/bus/platform/platform.c | 6 +-
drivers/bus/platform/platform_params.c | 5 -
drivers/common/cnxk/roc_platform.c | 3 +-
drivers/common/qat/dev/qat_dev_gen_lce.c | 4 -
drivers/crypto/bcmfs/bcmfs_vfio.c | 15 +-
drivers/crypto/bcmfs/meson.build | 4 +-
drivers/net/hns3/hns3_ethdev_vf.c | 1 -
drivers/raw/ifpga/afu_pmd_he_hssi.c | 1 -
drivers/raw/ifpga/afu_pmd_he_lpbk.c | 1 -
drivers/raw/ifpga/afu_pmd_he_mem.c | 1 -
drivers/raw/ifpga/afu_pmd_n3000.c | 7 +-
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 | 3 +-
kernel/linux/uapi/linux/vfio.h | 1836 ++++++++++++++++++++
kernel/linux/uapi/version | 2 +-
lib/eal/include/rte_vfio.h | 87 -
lib/eal/linux/eal.c | 4 -
lib/eal/linux/eal_interrupts.c | 28 +-
lib/eal/linux/eal_vfio.c | 126 +-
lib/eal/linux/eal_vfio.h | 79 -
lib/eal/linux/eal_vfio_mp_sync.c | 10 -
37 files changed, 1957 insertions(+), 428 deletions(-)
create mode 100644 kernel/linux/uapi/linux/vfio.h
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 1/9] drivers: remove unneeded VFIO header inclusion
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
@ 2025-09-03 15:13 ` David Marchand
2025-09-03 15:13 ` [RFC v2 2/9] vfio: remove confusing check on VFIO presence David Marchand
` (5 subsequent siblings)
6 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:13 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Kai Ji, Dengdui Huang,
Rosen Xu
Those drivers sources do nothing related to VFIO.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/common/qat/dev/qat_dev_gen_lce.c | 4 ----
drivers/net/hns3/hns3_ethdev_vf.c | 1 -
drivers/raw/ifpga/afu_pmd_he_hssi.c | 1 -
drivers/raw/ifpga/afu_pmd_he_lpbk.c | 1 -
drivers/raw/ifpga/afu_pmd_he_mem.c | 1 -
5 files changed, 8 deletions(-)
diff --git a/drivers/common/qat/dev/qat_dev_gen_lce.c b/drivers/common/qat/dev/qat_dev_gen_lce.c
index 6514321c32..9173b6c681 100644
--- a/drivers/common/qat/dev/qat_dev_gen_lce.c
+++ b/drivers/common/qat/dev/qat_dev_gen_lce.c
@@ -3,7 +3,6 @@
*/
#include <rte_pci.h>
-#include <rte_vfio.h>
#include "qat_device.h"
#include "qat_qp.h"
@@ -17,9 +16,6 @@
#define BITS_PER_ULONG (sizeof(unsigned long) * 8)
-#define VFIO_PCI_LCE_DEVICE_CFG_REGION_INDEX VFIO_PCI_NUM_REGIONS
-#define VFIO_PCI_LCE_CY_CFG_REGION_INDEX (VFIO_PCI_NUM_REGIONS + 2)
-#define VFIO_PCI_LCE_RING_CFG_REGION_INDEX (VFIO_PCI_NUM_REGIONS + 4)
#define LCE_DEVICE_NAME_SIZE 64
#define LCE_DEVICE_MAX_BANKS 2080
#define LCE_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index f9ef3dbb06..59fb790240 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -5,7 +5,6 @@
#include <rte_alarm.h>
#include <ethdev_pci.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include "hns3_ethdev.h"
#include "hns3_common.h"
diff --git a/drivers/raw/ifpga/afu_pmd_he_hssi.c b/drivers/raw/ifpga/afu_pmd_he_hssi.c
index 859f28dcc1..bcb952935a 100644
--- a/drivers/raw/ifpga/afu_pmd_he_hssi.c
+++ b/drivers/raw/ifpga/afu_pmd_he_hssi.c
@@ -17,7 +17,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
diff --git a/drivers/raw/ifpga/afu_pmd_he_lpbk.c b/drivers/raw/ifpga/afu_pmd_he_lpbk.c
index c7c5cda48c..df3b093157 100644
--- a/drivers/raw/ifpga/afu_pmd_he_lpbk.c
+++ b/drivers/raw/ifpga/afu_pmd_he_lpbk.c
@@ -17,7 +17,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
diff --git a/drivers/raw/ifpga/afu_pmd_he_mem.c b/drivers/raw/ifpga/afu_pmd_he_mem.c
index a1db533eeb..b595cd729c 100644
--- a/drivers/raw/ifpga/afu_pmd_he_mem.c
+++ b/drivers/raw/ifpga/afu_pmd_he_mem.c
@@ -16,7 +16,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 2/9] vfio: remove confusing check on VFIO presence
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
2025-09-03 15:13 ` [RFC v2 1/9] drivers: remove unneeded VFIO header inclusion David Marchand
@ 2025-09-03 15:13 ` David Marchand
2025-09-03 15:13 ` [RFC v2 3/9] vfio: assume VFIO is always and only present on Linux David Marchand
` (4 subsequent siblings)
6 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:13 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Rosen Xu,
Ajit Khaparde, Vikas Gupta, Hemant Agrawal, Sachin Saxena,
Chenbo Xia, Nipun Gupta, Tomasz Duszynski, Tyler Retzlaff,
Harman Kalra
Contrary to what the VFIO_PRESENT macro may suggest, there is no check on
whether VFIO is enabled in the (build system) Linux kernel configuration.
Replace check on VFIO_PRESENT with RTE_EAL_VFIO (for components built on
FreeBSD or Windows), or simply remove it otherwise.
Then remove inclusion of rte_vfio.h when the only purpose was checking
VFIO_PRESENT.
Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Rosen Xu <rosen.xu@altera.com>
---
doc/api/doxy-api.conf.in | 1 -
doc/guides/cryptodevs/bcmfs.rst | 4 ----
drivers/bus/fslmc/fslmc_bus.c | 12 +----------
drivers/bus/pci/linux/pci.c | 22 --------------------
drivers/bus/pci/linux/pci_init.h | 6 ------
drivers/bus/pci/linux/pci_vfio.c | 12 -----------
drivers/bus/platform/bus_platform_driver.h | 20 +-----------------
drivers/bus/platform/platform.c | 4 ----
drivers/bus/platform/platform_params.c | 5 -----
drivers/crypto/bcmfs/bcmfs_vfio.c | 11 +++++-----
drivers/raw/ifpga/afu_pmd_n3000.c | 4 ----
lib/eal/include/rte_vfio.h | 24 ++++++++--------------
lib/eal/linux/eal.c | 4 ----
lib/eal/linux/eal_interrupts.c | 15 --------------
lib/eal/linux/eal_vfio.h | 16 ---------------
lib/eal/linux/eal_vfio_mp_sync.c | 10 ---------
16 files changed, 16 insertions(+), 154 deletions(-)
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 28cec3232f..bedd944681 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -92,7 +92,6 @@ FILE_PATTERNS = rte_*.h \
PREDEFINED = __DOXYGEN__ \
RTE_ATOMIC \
RTE_HAS_CPUSET \
- VFIO_PRESENT \
__rte_lockable= \
__rte_guarded_by(x)= \
__rte_exclusive_locks_required(x)= \
diff --git a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst
index d18a253913..049808a49c 100644
--- a/doc/guides/cryptodevs/bcmfs.rst
+++ b/doc/guides/cryptodevs/bcmfs.rst
@@ -59,10 +59,6 @@ Information about kernel, rootfs and toolchain can be found at
`Broadcom Official Website <https://www.broadcom.com/products/ethernet-connectivity
/network-adapters/smartnic/stingray-software>`__.
- .. Note::
- To execute BCMFS PMD, it must be compiled with VFIO_PRESENT flag on the
- compiling platform and same gets enabled in rte_vfio.h.
-
The BCMFS PMD may be compiled natively on a Stingray platform or
cross-compiled on an x86 platform. For example, below commands can be executed
for cross compiling on x86 platform.
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index ebc0c1fb4f..20458d5030 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -574,9 +574,6 @@ fslmc_all_device_support_iova(void)
static enum rte_iova_mode
rte_dpaa2_get_iommu_class(void)
{
- bool is_vfio_noiommu_enabled = 1;
- bool has_iova_va;
-
if (rte_eal_iova_mode() == RTE_IOVA_PA)
return RTE_IOVA_PA;
@@ -584,14 +581,7 @@ rte_dpaa2_get_iommu_class(void)
return RTE_IOVA_DC;
/* check if all devices on the bus support Virtual addressing or not */
- has_iova_va = fslmc_all_device_support_iova();
-
-#ifdef VFIO_PRESENT
- is_vfio_noiommu_enabled = rte_vfio_noiommu_is_enabled() == true ?
- true : false;
-#endif
-
- if (has_iova_va && !is_vfio_noiommu_enabled)
+ if (fslmc_all_device_support_iova() != 0 && rte_vfio_noiommu_is_enabled() == 0)
return RTE_IOVA_VA;
return RTE_IOVA_PA;
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index c20d159218..66d7e09a6e 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -64,10 +64,8 @@ rte_pci_map_device(struct rte_pci_device *dev)
/* try mapping the NIC resources using VFIO if it exists */
switch (dev->kdrv) {
case RTE_PCI_KDRV_VFIO:
-#ifdef VFIO_PRESENT
if (pci_vfio_is_enabled())
ret = pci_vfio_map_resource(dev);
-#endif
break;
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
@@ -93,10 +91,8 @@ rte_pci_unmap_device(struct rte_pci_device *dev)
/* try unmapping the NIC resources using VFIO if it exists */
switch (dev->kdrv) {
case RTE_PCI_KDRV_VFIO:
-#ifdef VFIO_PRESENT
if (pci_vfio_is_enabled())
pci_vfio_unmap_resource(dev);
-#endif
break;
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
@@ -599,7 +595,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv,
switch (pdev->kdrv) {
case RTE_PCI_KDRV_VFIO: {
-#ifdef VFIO_PRESENT
static int is_vfio_noiommu_enabled = -1;
if (is_vfio_noiommu_enabled == -1) {
@@ -612,7 +607,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv,
iova_mode = RTE_IOVA_PA;
else if ((pdrv->drv_flags & RTE_PCI_DRV_NEED_IOVA_AS_VA) != 0)
iova_mode = RTE_IOVA_VA;
-#endif
break;
}
@@ -641,10 +635,8 @@ int rte_pci_read_config(const struct rte_pci_device *device,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_read_config(intr_handle, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_read_config(device, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -665,10 +657,8 @@ int rte_pci_write_config(const struct rte_pci_device *device,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_write_config(intr_handle, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_write_config(device, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -688,10 +678,8 @@ int rte_pci_mmio_read(const struct rte_pci_device *device, int bar,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_mmio_read(device, bar, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_mmio_read(device, bar, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -711,10 +699,8 @@ int rte_pci_mmio_write(const struct rte_pci_device *device, int bar,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_mmio_write(device, bar, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_mmio_write(device, bar, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -731,12 +717,10 @@ rte_pci_ioport_map(struct rte_pci_device *dev, int bar,
int ret = -1;
switch (dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
if (pci_vfio_is_enabled())
ret = pci_vfio_ioport_map(dev, bar, p);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
ret = pci_uio_ioport_map(dev, bar, p);
@@ -757,11 +741,9 @@ rte_pci_ioport_read(struct rte_pci_ioport *p,
void *data, size_t len, off_t offset)
{
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
pci_vfio_ioport_read(p, data, len, offset);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
pci_uio_ioport_read(p, data, len, offset);
@@ -777,11 +759,9 @@ rte_pci_ioport_write(struct rte_pci_ioport *p,
const void *data, size_t len, off_t offset)
{
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
pci_vfio_ioport_write(p, data, len, offset);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
pci_uio_ioport_write(p, data, len, offset);
@@ -798,12 +778,10 @@ rte_pci_ioport_unmap(struct rte_pci_ioport *p)
int ret = -1;
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
if (pci_vfio_is_enabled())
ret = pci_vfio_ioport_unmap(p);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
ret = pci_uio_ioport_unmap(p);
diff --git a/drivers/bus/pci/linux/pci_init.h b/drivers/bus/pci/linux/pci_init.h
index a4d37c0d0a..6949dd57d9 100644
--- a/drivers/bus/pci/linux/pci_init.h
+++ b/drivers/bus/pci/linux/pci_init.h
@@ -5,8 +5,6 @@
#ifndef EAL_PCI_INIT_H_
#define EAL_PCI_INIT_H_
-#include <rte_vfio.h>
-
#include "private.h"
/** IO resource type: */
@@ -50,8 +48,6 @@ void pci_uio_ioport_write(struct rte_pci_ioport *p,
const void *data, size_t len, off_t offset);
int pci_uio_ioport_unmap(struct rte_pci_ioport *p);
-#ifdef VFIO_PRESENT
-
/* access config space */
int pci_vfio_read_config(const struct rte_pci_device *dev,
void *buf, size_t len, off_t offs);
@@ -77,6 +73,4 @@ int pci_vfio_unmap_resource(struct rte_pci_device *dev);
int pci_vfio_is_enabled(void);
-#endif
-
#endif /* EAL_PCI_INIT_H_ */
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 5317170231..d0844585fe 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -27,17 +27,6 @@
#include "pci_init.h"
#include "private.h"
-/**
- * @file
- * PCI probing using Linux VFIO.
- *
- * This code tries to determine if the PCI device is bound to VFIO driver,
- * and initialize it (map BARs, set up interrupts) if that's the case.
- *
- */
-
-#ifdef VFIO_PRESENT
-
static struct rte_tailq_elem rte_vfio_tailq = {
.name = "VFIO_RESOURCE_LIST",
};
@@ -1327,4 +1316,3 @@ pci_vfio_is_enabled(void)
}
return status;
}
-#endif
diff --git a/drivers/bus/platform/bus_platform_driver.h b/drivers/bus/platform/bus_platform_driver.h
index ef4b27c0c0..76403043c1 100644
--- a/drivers/bus/platform/bus_platform_driver.h
+++ b/drivers/bus/platform/bus_platform_driver.h
@@ -15,9 +15,9 @@
#include <dev_driver.h>
#include <rte_common.h>
+#include <rte_compat.h>
#include <rte_dev.h>
#include <rte_os.h>
-#include <rte_vfio.h>
#ifdef __cplusplus
extern "C" {
@@ -144,8 +144,6 @@ RTE_PMD_EXPORT_NAME(nm)
#define RTE_PMD_REGISTER_ALIAS(nm, alias) \
static const char *pdrvinit_ ## nm ## _alias = RTE_STR(alias)
-#ifdef VFIO_PRESENT
-
/**
* Register a platform device driver.
*
@@ -170,22 +168,6 @@ void rte_platform_register(struct rte_platform_driver *pdrv);
__rte_internal
void rte_platform_unregister(struct rte_platform_driver *pdrv);
-#else
-
-__rte_internal
-static inline void
-rte_platform_register(struct rte_platform_driver *pdrv __rte_unused)
-{
-}
-
-__rte_internal
-static inline void
-rte_platform_unregister(struct rte_platform_driver *pdrv __rte_unused)
-{
-}
-
-#endif /* VFIO_PRESENT */
-
#ifdef __cplusplus
}
#endif
diff --git a/drivers/bus/platform/platform.c b/drivers/bus/platform/platform.c
index 0f50027236..90524fd961 100644
--- a/drivers/bus/platform/platform.c
+++ b/drivers/bus/platform/platform.c
@@ -25,8 +25,6 @@
#include "private.h"
-#ifdef VFIO_PRESENT
-
#define PLATFORM_BUS_DEVICES_PATH "/sys/bus/platform/devices"
RTE_EXPORT_INTERNAL_SYMBOL(rte_platform_register)
@@ -647,5 +645,3 @@ struct rte_platform_bus platform_bus = {
RTE_REGISTER_BUS(platform, platform_bus.bus);
RTE_LOG_REGISTER_DEFAULT(platform_bus_logtype, NOTICE);
-
-#endif /* VFIO_PRESENT */
diff --git a/drivers/bus/platform/platform_params.c b/drivers/bus/platform/platform_params.c
index 8a6214b97c..65b20d121f 100644
--- a/drivers/bus/platform/platform_params.c
+++ b/drivers/bus/platform/platform_params.c
@@ -10,13 +10,10 @@
#include <rte_dev.h>
#include <rte_errno.h>
#include <rte_kvargs.h>
-#include <rte_vfio.h>
#include "bus_platform_driver.h"
#include "private.h"
-#ifdef VFIO_PRESENT
-
enum platform_params {
RTE_PLATFORM_PARAM_NAME,
};
@@ -73,5 +70,3 @@ platform_bus_dev_iterate(const void *start, const char *str,
return dev;
}
-
-#endif /* VFIO_PRESENT */
diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c b/drivers/crypto/bcmfs/bcmfs_vfio.c
index dc2def580f..8d6ea16544 100644
--- a/drivers/crypto/bcmfs/bcmfs_vfio.c
+++ b/drivers/crypto/bcmfs/bcmfs_vfio.c
@@ -7,13 +7,14 @@
#include <sys/mman.h>
#include <sys/ioctl.h>
-#include <rte_vfio.h>
-
#include "bcmfs_device.h"
#include "bcmfs_logs.h"
#include "bcmfs_vfio.h"
-#ifdef VFIO_PRESENT
+#ifdef RTE_EAL_VFIO
+
+#include <rte_vfio.h>
+
static int
vfio_map_dev_obj(const char *path, const char *dev_obj,
uint32_t *size, void **addr, int *dev_fd)
@@ -93,7 +94,7 @@ bcmfs_release_vfio(struct bcmfs_device *dev)
return;
}
}
-#else
+#else /* ! RTE_EAL_VFIO */
int
bcmfs_attach_vfio(struct bcmfs_device *dev __rte_unused)
{
@@ -104,4 +105,4 @@ void
bcmfs_release_vfio(struct bcmfs_device *dev __rte_unused)
{
}
-#endif
+#endif /* RTE_EAL_VFIO */
diff --git a/drivers/raw/ifpga/afu_pmd_n3000.c b/drivers/raw/ifpga/afu_pmd_n3000.c
index 6aae1b224e..0882a27701 100644
--- a/drivers/raw/ifpga/afu_pmd_n3000.c
+++ b/drivers/raw/ifpga/afu_pmd_n3000.c
@@ -1473,7 +1473,6 @@ static struct rte_pci_device *n3000_afu_get_pci_dev(struct afu_rawdev *dev)
return RTE_DEV_TO_PCI(afudev->rawdev->device);
}
-#ifdef VFIO_PRESENT
static int dma_afu_set_irqs(struct afu_rawdev *dev, uint32_t vec_start,
uint32_t count, int *efds)
{
@@ -1511,7 +1510,6 @@ static int dma_afu_set_irqs(struct afu_rawdev *dev, uint32_t vec_start,
rte_free(irq_set);
return ret;
}
-#endif
static void *n3000_afu_get_port_addr(struct afu_rawdev *dev)
{
@@ -1724,10 +1722,8 @@ static int dma_afu_ctx_init(struct afu_rawdev *dev, int index, uint8_t *addr)
IFPGA_RAWDEV_PMD_ERR("eventfd create failed");
return -EBADF;
}
-#ifdef VFIO_PRESENT
if (dma_afu_set_irqs(dev, vec_start, 1, efds))
IFPGA_RAWDEV_PMD_ERR("DMA interrupt setup failed");
-#endif
}
ctx->event_fd = efds[0];
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 923293040b..594d504c56 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -15,24 +15,16 @@
#include <rte_compat.h>
-/*
- * determine if VFIO is present on the system
- */
-#if !defined(VFIO_PRESENT) && defined(RTE_EAL_VFIO)
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-#define VFIO_PRESENT
-#endif /* kernel version >= 3.6.0 */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-#define HAVE_VFIO_DEV_REQ_INTERFACE
-#endif /* kernel version >= 4.0.0 */
-#endif /* RTE_EAL_VFIO */
-
#ifdef __cplusplus
extern "C" {
#endif
-#ifdef VFIO_PRESENT
+#ifdef RTE_EAL_VFIO
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
+#define HAVE_VFIO_DEV_REQ_INTERFACE
+#endif /* kernel version >= 4.0.0 */
#include <linux/vfio.h>
@@ -102,12 +94,12 @@ struct vfio_device_feature_bus_master {
};
#endif
-#else /* not VFIO_PRESENT */
+#else /* ! RTE_EAL_VFIO */
/* we don't need an actual definition, only pointer is used */
struct vfio_device_info;
-#endif /* VFIO_PRESENT */
+#endif /* RTE_EAL_VFIO */
#define RTE_VFIO_DEFAULT_CONTAINER_FD (-1)
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 52efb8626b..708a387265 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -1121,14 +1121,12 @@ rte_eal_init(int argc, char **argv)
#endif
}
-#ifdef VFIO_PRESENT
if (rte_vfio_enable("vfio")) {
rte_eal_init_alert("Cannot init VFIO");
rte_errno = EAGAIN;
rte_atomic_store_explicit(&run_once, 0, rte_memory_order_relaxed);
return -1;
}
-#endif
/* in secondary processes, memory init may allocate additional fbarrays
* not present in primary processes, so to avoid any potential issues,
* initialize memzones first.
@@ -1330,9 +1328,7 @@ rte_eal_cleanup(void)
rte_memseg_walk(mark_freeable, NULL);
rte_service_finalize();
-#ifdef VFIO_PRESENT
vfio_mp_sync_cleanup();
-#endif
rte_mp_channel_cleanup();
eal_bus_cleanup();
rte_eal_alarm_cleanup();
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index 4ec78de82c..d420ecf947 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -57,9 +57,7 @@ union intr_pipefds{
*/
union rte_intr_read_buffer {
int uio_intr_count; /* for uio device */
-#ifdef VFIO_PRESENT
uint64_t vfio_intr_count; /* for vfio device */
-#endif
uint64_t timerfd_num; /* for timerfd */
char charbuf[16]; /* for others */
};
@@ -95,8 +93,6 @@ static struct rte_intr_source_list intr_sources;
static rte_thread_t intr_thread;
/* VFIO interrupts */
-#ifdef VFIO_PRESENT
-
#define IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + sizeof(int))
/* irq set buffer length for queue interrupts and LSC interrupt */
#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \
@@ -401,7 +397,6 @@ vfio_disable_req(const struct rte_intr_handle *intr_handle)
return ret;
}
#endif
-#endif
static int
uio_intx_intr_disable(const struct rte_intr_handle *intr_handle)
@@ -734,7 +729,6 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_ALARM:
rc = -1;
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
if (vfio_enable_msix(intr_handle))
rc = -1;
@@ -752,7 +746,6 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
if (vfio_enable_req(intr_handle))
rc = -1;
break;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -807,7 +800,6 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
/* not used at this moment */
case RTE_INTR_HANDLE_ALARM:
return -1;
-#ifdef VFIO_PRESENT
/* VFIO MSI* is implicitly acked unlike INTx, nothing to do */
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
@@ -819,7 +811,6 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
return -1;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -868,7 +859,6 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_ALARM:
rc = -1;
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
if (vfio_disable_msix(intr_handle))
rc = -1;
@@ -886,7 +876,6 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
if (vfio_disable_req(intr_handle))
rc = -1;
break;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -948,7 +937,6 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_ALARM:
bytes_read = sizeof(buf.timerfd_num);
break;
-#ifdef VFIO_PRESENT
#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
#endif
@@ -957,7 +945,6 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_VFIO_LEGACY:
bytes_read = sizeof(buf.vfio_intr_count);
break;
-#endif
case RTE_INTR_HANDLE_VDEV:
case RTE_INTR_HANDLE_EXT:
bytes_read = 0;
@@ -1221,13 +1208,11 @@ eal_intr_proc_rxtx_intr(int fd, const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_UIO_INTX:
bytes_read = sizeof(buf.uio_intr_count);
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
case RTE_INTR_HANDLE_VFIO_LEGACY:
bytes_read = sizeof(buf.vfio_intr_count);
break;
-#endif
case RTE_INTR_HANDLE_VDEV:
bytes_read = rte_intr_efd_counter_size_get(intr_handle);
/* For vdev, number of bytes to read is set by driver */
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index 23a787ad20..e7d855c032 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -7,20 +7,6 @@
#include <rte_common.h>
-/*
- * determine if VFIO is present on the system
- */
-#if !defined(VFIO_PRESENT) && defined(RTE_EAL_VFIO)
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-#define VFIO_PRESENT
-#else
-#pragma message("VFIO configured but not supported by this kernel, disabling.")
-#endif /* kernel version >= 3.6.0 */
-#endif /* RTE_EAL_VFIO */
-
-#ifdef VFIO_PRESENT
-
#include <stdint.h>
#include <linux/vfio.h>
@@ -154,6 +140,4 @@ struct vfio_mp_param {
};
};
-#endif /* VFIO_PRESENT */
-
#endif /* EAL_VFIO_H_ */
diff --git a/lib/eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c
index ce14e260fe..8230f3d24d 100644
--- a/lib/eal/linux/eal_vfio_mp_sync.c
+++ b/lib/eal/linux/eal_vfio_mp_sync.c
@@ -14,15 +14,6 @@
#include "eal_private.h"
#include "eal_vfio.h"
-/**
- * @file
- * VFIO socket for communication between primary and secondary processes.
- *
- * This file is only compiled if RTE_EAL_VFIO is set.
- */
-
-#ifdef VFIO_PRESENT
-
static int
vfio_mp_primary(const struct rte_mp_msg *msg, const void *peer)
{
@@ -129,4 +120,3 @@ vfio_mp_sync_cleanup(void)
rte_mp_action_unregister(EAL_VFIO_MP);
}
-#endif
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 3/9] vfio: assume VFIO is always and only present on Linux
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
2025-09-03 15:13 ` [RFC v2 1/9] drivers: remove unneeded VFIO header inclusion David Marchand
2025-09-03 15:13 ` [RFC v2 2/9] vfio: remove confusing check on VFIO presence David Marchand
@ 2025-09-03 15:13 ` David Marchand
2025-09-03 15:13 ` [RFC v2 4/9] vfio: remove public wrappers David Marchand
` (3 subsequent siblings)
6 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:13 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Bruce Richardson,
Ajit Khaparde, Vikas Gupta, Tyler Retzlaff
RTE_EAL_VFIO is directly mapped to is_linux in meson.
Replace this intermediate build knob with RTE_EXEC_ENV_LINUX.
This is an intermediate state before importing the VFIO uapi header.
Note: crypto/bcmfs was functional only for OSes supporting VFIO iow
Linux. Stop compiling it on other OSes.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
config/meson.build | 3 ---
drivers/crypto/bcmfs/bcmfs_vfio.c | 18 ++----------------
drivers/crypto/bcmfs/meson.build | 4 ++--
lib/eal/include/rte_vfio.h | 6 +++---
4 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 55497f0bf5..b5e894de3c 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -459,9 +459,6 @@ dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
install_headers(['rte_config.h'],
subdir: get_option('include_subdir_arch'))
-# enable VFIO only if it is linux OS
-dpdk_conf.set('RTE_EAL_VFIO', is_linux)
-
# specify -D_GNU_SOURCE unconditionally
add_project_arguments('-D_GNU_SOURCE', language: 'c')
diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c b/drivers/crypto/bcmfs/bcmfs_vfio.c
index 8d6ea16544..9138f96eb0 100644
--- a/drivers/crypto/bcmfs/bcmfs_vfio.c
+++ b/drivers/crypto/bcmfs/bcmfs_vfio.c
@@ -7,14 +7,12 @@
#include <sys/mman.h>
#include <sys/ioctl.h>
+#include <rte_vfio.h>
+
#include "bcmfs_device.h"
#include "bcmfs_logs.h"
#include "bcmfs_vfio.h"
-#ifdef RTE_EAL_VFIO
-
-#include <rte_vfio.h>
-
static int
vfio_map_dev_obj(const char *path, const char *dev_obj,
uint32_t *size, void **addr, int *dev_fd)
@@ -94,15 +92,3 @@ bcmfs_release_vfio(struct bcmfs_device *dev)
return;
}
}
-#else /* ! RTE_EAL_VFIO */
-int
-bcmfs_attach_vfio(struct bcmfs_device *dev __rte_unused)
-{
- return -1;
-}
-
-void
-bcmfs_release_vfio(struct bcmfs_device *dev __rte_unused)
-{
-}
-#endif /* RTE_EAL_VFIO */
diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index 5842f83a3b..925dde2ee2 100644
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build
@@ -3,9 +3,9 @@
# All rights reserved.
#
-if is_windows
+if not is_linux
build = false
- reason = 'not supported on Windows'
+ reason = 'only supported on Linux'
subdir_done()
endif
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 594d504c56..035b727dd0 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -19,7 +19,7 @@
extern "C" {
#endif
-#ifdef RTE_EAL_VFIO
+#ifdef RTE_EXEC_ENV_LINUX
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
@@ -94,12 +94,12 @@ struct vfio_device_feature_bus_master {
};
#endif
-#else /* ! RTE_EAL_VFIO */
+#else /* ! RTE_EXEC_ENV_LINUX */
/* we don't need an actual definition, only pointer is used */
struct vfio_device_info;
-#endif /* RTE_EAL_VFIO */
+#endif /* RTE_EXEC_ENV_LINUX */
#define RTE_VFIO_DEFAULT_CONTAINER_FD (-1)
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 4/9] vfio: remove public wrappers
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
` (2 preceding siblings ...)
2025-09-03 15:13 ` [RFC v2 3/9] vfio: assume VFIO is always and only present on Linux David Marchand
@ 2025-09-03 15:13 ` David Marchand
2025-09-03 15:13 ` [RFC v2 5/9] eal/linux: remove more internal VFIO macros David Marchand
` (2 subsequent siblings)
6 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:13 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Nipun Gupta,
Nikhil Agarwal, Hemant Agrawal, Sachin Saxena, Chenbo Xia,
Tyler Retzlaff, Harman Kalra
The public header defines a number of wrappers that can be removed or
hidden internally.
Either, those concern old Linux kernel versions that are not supported by
dpdk anymore (DPDK now requires Linux v5.4 at least), like:
- the request notifier feature, present since Linux v4.0,
- the noiommu mode, present since Linux v4.5,
- the capability support, present since Linux v4.6,
- the msix mapping feature, present since Linux v4.16,
Or, those wrappers can be made private as only consumed internally.
- VFIO_GET_REGION_IDX() has no equivalent in the Linux uapi, but
is only used by the Linux PCI bus code,
- VFIO_DEVICE_FEATURE is only used by the CDX bus code,
- the various macros around /dev/vfio/ or the noiommu kmod parameter are
only used by eal_vfio.c,
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/bus/cdx/cdx_vfio.c | 27 ++++++++++++
drivers/bus/fslmc/fslmc_vfio.c | 17 ++++----
drivers/bus/pci/linux/pci_vfio.c | 23 +++--------
drivers/bus/pci/pci_common.c | 2 -
lib/eal/include/rte_vfio.h | 71 --------------------------------
lib/eal/linux/eal_interrupts.c | 10 -----
lib/eal/linux/eal_vfio.c | 23 ++++-------
7 files changed, 50 insertions(+), 123 deletions(-)
diff --git a/drivers/bus/cdx/cdx_vfio.c b/drivers/bus/cdx/cdx_vfio.c
index 37e0c424d4..03d156388e 100644
--- a/drivers/bus/cdx/cdx_vfio.c
+++ b/drivers/bus/cdx/cdx_vfio.c
@@ -613,6 +613,33 @@ 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
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 68439cbd8c..cc4311989b 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -190,7 +190,7 @@ fslmc_vfio_add_group(int 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)
- group->iommu_type = RTE_VFIO_NOIOMMU;
+ group->iommu_type = VFIO_NOIOMMU_IOMMU;
else
group->iommu_type = VFIO_TYPE1_IOMMU;
LIST_INSERT_HEAD(&s_vfio_container.groups, group, next);
@@ -396,8 +396,7 @@ fslmc_vfio_open_group_fd(const char *group_name)
/* if primary, try to open the group */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
/* try regular group format */
- snprintf(filename, sizeof(filename),
- VFIO_GROUP_FMT, iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/%u", iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
goto add_vfio_group;
@@ -451,7 +450,7 @@ fslmc_vfio_check_extensions(int vfio_container_fd)
int ret;
uint32_t idx, n_extensions = 0;
static const int type_id[] = {RTE_VFIO_TYPE1, RTE_VFIO_SPAPR,
- RTE_VFIO_NOIOMMU};
+ VFIO_NOIOMMU_IOMMU};
static const char * const type_id_nm[] = {"Type 1",
"sPAPR", "No-IOMMU"};
@@ -495,10 +494,10 @@ fslmc_vfio_open_container_fd(void)
/* if we're in a primary process, try to open the container */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- vfio_container_fd = open(VFIO_CONTAINER_PATH, O_RDWR);
+ vfio_container_fd = open("/dev/vfio/vfio", O_RDWR);
if (vfio_container_fd < 0) {
- DPAA2_BUS_ERR("Open VFIO container(%s), err(%d)",
- VFIO_CONTAINER_PATH, vfio_container_fd);
+ DPAA2_BUS_ERR("Open VFIO container, err(%d)",
+ vfio_container_fd);
ret = vfio_container_fd;
goto err_exit;
}
@@ -851,7 +850,7 @@ fslmc_map_dma(uint64_t vaddr, rte_iova_t iovaddr, size_t len)
return fd;
return -EIO;
}
- if (fslmc_vfio_iommu_type(fd) == RTE_VFIO_NOIOMMU) {
+ if (fslmc_vfio_iommu_type(fd) == VFIO_NOIOMMU_IOMMU) {
DPAA2_BUS_DEBUG("Running in NOIOMMU mode");
if (phy != iovaddr) {
DPAA2_BUS_ERR("IOVA should support with IOMMU");
@@ -951,7 +950,7 @@ fslmc_unmap_dma(uint64_t vaddr, uint64_t iovaddr, size_t len)
return fd;
return -EIO;
}
- if (fslmc_vfio_iommu_type(fd) == RTE_VFIO_NOIOMMU) {
+ if (fslmc_vfio_iommu_type(fd) == VFIO_NOIOMMU_IOMMU) {
DPAA2_BUS_DEBUG("Running in NOIOMMU mode");
return 0;
}
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index d0844585fe..9e5776ce3c 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -273,7 +273,6 @@ pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)
return -1;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
/*
* Spinlock for device hot-unplug failure handling.
* If it tries to access bus or device, such as handle sigbus on bus
@@ -390,7 +389,6 @@ pci_vfio_disable_notifier(struct rte_pci_device *dev)
return 0;
}
-#endif
static int
pci_vfio_is_ioport_bar(const struct rte_pci_device *dev, int vfio_dev_fd,
@@ -665,12 +663,12 @@ pci_vfio_info_cap(struct vfio_region_info *info, int cap)
struct vfio_info_cap_header *h;
size_t offset;
- if ((info->flags & RTE_VFIO_INFO_FLAG_CAPS) == 0) {
+ if ((info->flags & VFIO_REGION_INFO_FLAG_CAPS) == 0) {
/* VFIO info does not advertise capabilities */
return NULL;
}
- offset = VFIO_CAP_OFFSET(info);
+ offset = info->cap_offset;
while (offset != 0) {
h = RTE_PTR_ADD(info, offset);
if (h->id == cap)
@@ -690,7 +688,7 @@ pci_vfio_msix_is_mappable(int vfio_dev_fd, int msix_region)
if (ret < 0)
return -1;
- ret = pci_vfio_info_cap(info, RTE_VFIO_CAP_MSIX_MAPPABLE) != NULL;
+ ret = pci_vfio_info_cap(info, VFIO_REGION_INFO_CAP_MSIX_MAPPABLE) != NULL;
/* cleanup */
free(info);
@@ -745,10 +743,8 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
if (rte_intr_fd_set(dev->intr_handle, -1))
return -1;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_fd_set(dev->vfio_req_intr_handle, -1))
return -1;
-#endif
/* store PCI address string */
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
@@ -904,13 +900,11 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
goto err_map;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (pci_vfio_enable_notifier(dev, vfio_dev_fd) != 0) {
PCI_LOG(ERR, "Error setting up notifier!");
goto err_map;
}
-#endif
TAILQ_INSERT_TAIL(vfio_res_list, vfio_res, next);
return 0;
@@ -945,10 +939,8 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
if (rte_intr_fd_set(dev->intr_handle, -1))
return -1;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_fd_set(dev->vfio_req_intr_handle, -1))
return -1;
-#endif
/* store PCI address string */
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
@@ -1002,10 +994,8 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
/* we need save vfio_dev_fd, so it can be used during release */
if (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd))
goto err_vfio_dev_fd;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_dev_fd_set(dev->vfio_req_intr_handle, vfio_dev_fd))
goto err_vfio_dev_fd;
-#endif
return 0;
err_vfio_dev_fd:
@@ -1085,14 +1075,12 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
loc->domain, loc->bus, loc->devid, loc->function);
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
ret = pci_vfio_disable_notifier(dev);
if (ret) {
PCI_LOG(ERR, "fail to disable req notifier.");
return -1;
}
-#endif
if (rte_intr_fd_get(dev->intr_handle) < 0)
return -1;
@@ -1226,6 +1214,7 @@ pci_vfio_ioport_map(struct rte_pci_device *dev, int bar,
return 0;
}
+#define PCI_VFIO_GET_REGION_IDX(x) (x >> 40)
void
pci_vfio_ioport_read(struct rte_pci_ioport *p,
void *data, size_t len, off_t offset)
@@ -1239,7 +1228,7 @@ pci_vfio_ioport_read(struct rte_pci_ioport *p,
if (pread(vfio_dev_fd, data,
len, p->base + offset) <= 0)
PCI_LOG(ERR, "Can't read from PCI bar (%" PRIu64 ") : offset (%x)",
- VFIO_GET_REGION_IDX(p->base), (int)offset);
+ PCI_VFIO_GET_REGION_IDX(p->base), (int)offset);
}
void
@@ -1255,7 +1244,7 @@ pci_vfio_ioport_write(struct rte_pci_ioport *p,
if (pwrite(vfio_dev_fd, data,
len, p->base + offset) <= 0)
PCI_LOG(ERR, "Can't write to PCI bar (%" PRIu64 ") : offset (%x)",
- VFIO_GET_REGION_IDX(p->base), (int)offset);
+ PCI_VFIO_GET_REGION_IDX(p->base), (int)offset);
}
int
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index c88634f790..bf5df3d94e 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -603,7 +603,6 @@ pci_hot_unplug_handler(struct rte_device *dev)
return -1;
switch (pdev->kdrv) {
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_PCI_KDRV_VFIO:
/*
* vfio kernel module guaranty the pci device would not be
@@ -614,7 +613,6 @@ pci_hot_unplug_handler(struct rte_device *dev)
rte_dev_event_callback_process(dev->name,
RTE_DEV_EVENT_REMOVE);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
case RTE_PCI_KDRV_NIC_UIO:
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 035b727dd0..509ffec80c 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -21,79 +21,8 @@ extern "C" {
#ifdef RTE_EXEC_ENV_LINUX
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-#define HAVE_VFIO_DEV_REQ_INTERFACE
-#endif /* kernel version >= 4.0.0 */
-
#include <linux/vfio.h>
-#define VFIO_DIR "/dev/vfio"
-#define VFIO_CONTAINER_PATH "/dev/vfio/vfio"
-#define VFIO_GROUP_FMT "/dev/vfio/%u"
-#define VFIO_NOIOMMU_GROUP_FMT "/dev/vfio/noiommu-%u"
-#define VFIO_GET_REGION_IDX(x) (x >> 40)
-#define VFIO_NOIOMMU_MODE \
- "/sys/module/vfio/parameters/enable_unsafe_noiommu_mode"
-
-/* NOIOMMU is defined from kernel version 4.5 onwards */
-#ifdef VFIO_NOIOMMU_IOMMU
-#define RTE_VFIO_NOIOMMU VFIO_NOIOMMU_IOMMU
-#else
-#define RTE_VFIO_NOIOMMU 8
-#endif
-
-/*
- * capabilities are only supported on kernel 4.6+. there were also some API
- * changes as well, so add a macro to get cap offset.
- */
-#ifdef VFIO_REGION_INFO_FLAG_CAPS
-#define RTE_VFIO_INFO_FLAG_CAPS VFIO_REGION_INFO_FLAG_CAPS
-#define VFIO_CAP_OFFSET(x) (x->cap_offset)
-#else
-#define RTE_VFIO_INFO_FLAG_CAPS (1 << 3)
-#define VFIO_CAP_OFFSET(x) (x->resv)
-struct vfio_info_cap_header {
- uint16_t id;
- uint16_t version;
- uint32_t next;
-};
-#endif
-
-/* kernels 4.16+ can map BAR containing MSI-X table */
-#ifdef VFIO_REGION_INFO_CAP_MSIX_MAPPABLE
-#define RTE_VFIO_CAP_MSIX_MAPPABLE VFIO_REGION_INFO_CAP_MSIX_MAPPABLE
-#else
-#define RTE_VFIO_CAP_MSIX_MAPPABLE 3
-#endif
-
-/* 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
-
#else /* ! RTE_EXEC_ENV_LINUX */
/* we don't need an actual definition, only pointer is used */
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index d420ecf947..43e05c86a2 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -336,7 +336,6 @@ vfio_disable_msix(const struct rte_intr_handle *intr_handle) {
return ret;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
/* enable req notifier */
static int
vfio_enable_req(const struct rte_intr_handle *intr_handle)
@@ -396,7 +395,6 @@ vfio_disable_req(const struct rte_intr_handle *intr_handle)
return ret;
}
-#endif
static int
uio_intx_intr_disable(const struct rte_intr_handle *intr_handle)
@@ -741,12 +739,10 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
if (vfio_enable_intx(intr_handle))
rc = -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
if (vfio_enable_req(intr_handle))
rc = -1;
break;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
rc = -1;
@@ -808,10 +804,8 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
if (vfio_ack_intx(intr_handle))
return -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
return -1;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
return -1;
@@ -871,12 +865,10 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
if (vfio_disable_intx(intr_handle))
rc = -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
if (vfio_disable_req(intr_handle))
rc = -1;
break;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
rc = -1;
@@ -937,9 +929,7 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_ALARM:
bytes_read = sizeof(buf.timerfd_num);
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
-#endif
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
case RTE_INTR_HANDLE_VFIO_LEGACY:
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index 805f0ff92c..dfc3bd6e62 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -85,7 +85,7 @@ static const struct vfio_iommu_type iommu_types[] = {
},
/* IOMMU-less mode */
{
- .type_id = RTE_VFIO_NOIOMMU,
+ .type_id = VFIO_NOIOMMU_IOMMU,
.name = "No-IOMMU",
.partial_unmap = true,
.dma_map_func = &vfio_noiommu_dma_map,
@@ -363,8 +363,7 @@ vfio_open_group_fd(int iommu_group_num)
/* if primary, try to open the group */
if (internal_conf->process_type == RTE_PROC_PRIMARY) {
/* try regular group format */
- snprintf(filename, sizeof(filename),
- VFIO_GROUP_FMT, iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/%u", iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
if (vfio_group_fd < 0) {
/* if file not found, it's not an error */
@@ -375,9 +374,8 @@ vfio_open_group_fd(int iommu_group_num)
}
/* special case: try no-IOMMU path as well */
- snprintf(filename, sizeof(filename),
- VFIO_NOIOMMU_GROUP_FMT,
- iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/noiommu-%u",
+ iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
if (vfio_group_fd < 0) {
if (errno != ENOENT) {
@@ -1128,7 +1126,7 @@ rte_vfio_enable(const char *modname)
}
/* VFIO directory might not exist (e.g., unprivileged containers) */
- dir = opendir(VFIO_DIR);
+ dir = opendir("/dev/vfio");
if (dir == NULL) {
EAL_LOG(DEBUG,
"VFIO directory does not exist, skipping VFIO support...");
@@ -1315,15 +1313,12 @@ rte_vfio_get_container_fd(void)
const struct internal_config *internal_conf =
eal_get_internal_configuration();
-
/* if we're in a primary process, try to open the container */
if (internal_conf->process_type == RTE_PROC_PRIMARY) {
- vfio_container_fd = open(VFIO_CONTAINER_PATH, O_RDWR);
+ vfio_container_fd = open("/dev/vfio/vfio", O_RDWR);
if (vfio_container_fd < 0) {
- EAL_LOG(ERR,
- "Cannot open VFIO container %s, error "
- "%i (%s)", VFIO_CONTAINER_PATH,
- errno, strerror(errno));
+ EAL_LOG(ERR, "Cannot open VFIO container, error %i (%s)",
+ errno, strerror(errno));
return -1;
}
@@ -2053,7 +2048,7 @@ rte_vfio_noiommu_is_enabled(void)
ssize_t cnt;
char c;
- fd = open(VFIO_NOIOMMU_MODE, O_RDONLY);
+ fd = open("/sys/module/vfio/parameters/enable_unsafe_noiommu_mode", O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
EAL_LOG(ERR, "Cannot open VFIO noiommu file "
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 5/9] eal/linux: remove more internal VFIO macros
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
` (3 preceding siblings ...)
2025-09-03 15:13 ` [RFC v2 4/9] vfio: remove public wrappers David Marchand
@ 2025-09-03 15:13 ` David Marchand
2025-09-03 15:13 ` [RFC v2 6/9] eal/linux: remove internal VFIO wrappers for old Linux David Marchand
2025-09-03 15:22 ` [RFC v2 0/9] Cleanup VFIO API and import Linux uAPI header David Marchand
6 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:13 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin, anatoly.burakov
No need to redefine some VFIO_* macros that look like a define coming
from standard linux/vfio.h header.
Use RTE_DIM() and remove unneeded checks (like in get_vfio_group_idx()
where j can't be >= RTE_DIM(vfio_cfg->vfio_groups)).
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/eal/linux/eal_vfio.c | 97 ++++++++++++++++++++--------------------
lib/eal/linux/eal_vfio.h | 3 --
2 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index dfc3bd6e62..1eab90a261 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -29,7 +29,7 @@
* was registered by the user themselves, so we need to store the user mappings
* somewhere, to recreate them later.
*/
-#define VFIO_MAX_USER_MEM_MAPS 256
+#define EAL_VFIO_MAX_USER_MEM_MAPS 256
struct user_mem_map {
uint64_t addr; /**< start VA */
uint64_t iova; /**< start IOVA */
@@ -40,7 +40,7 @@ struct user_mem_map {
struct user_mem_maps {
rte_spinlock_recursive_t lock;
int n_maps;
- struct user_mem_map maps[VFIO_MAX_USER_MEM_MAPS];
+ struct user_mem_map maps[EAL_VFIO_MAX_USER_MEM_MAPS];
};
struct vfio_config {
@@ -48,12 +48,12 @@ struct vfio_config {
int vfio_container_fd;
int vfio_active_groups;
const struct vfio_iommu_type *vfio_iommu_type;
- struct vfio_group vfio_groups[VFIO_MAX_GROUPS];
+ struct vfio_group vfio_groups[RTE_MAX_VFIO_GROUPS];
struct user_mem_maps mem_maps;
};
/* per-process VFIO config */
-static struct vfio_config vfio_cfgs[VFIO_MAX_CONTAINERS];
+static struct vfio_config vfio_cfgs[RTE_MAX_VFIO_CONTAINERS];
static struct vfio_config *default_vfio_cfg = &vfio_cfgs[0];
static int vfio_type1_dma_map(int);
@@ -183,10 +183,10 @@ static void
delete_maps(struct user_mem_maps *user_mem_maps, struct user_mem_map *del_maps,
size_t n_del)
{
- int i;
+ unsigned int i;
size_t j;
- for (i = 0, j = 0; i < VFIO_MAX_USER_MEM_MAPS && j < n_del; i++) {
+ for (i = 0, j = 0; i < RTE_DIM(user_mem_maps->maps) && j < n_del; i++) {
struct user_mem_map *left = &user_mem_maps->maps[i];
struct user_mem_map *right = &del_maps[j];
@@ -202,10 +202,10 @@ static void
copy_maps(struct user_mem_maps *user_mem_maps, struct user_mem_map *add_maps,
size_t n_add)
{
- int i;
+ unsigned int i;
size_t j;
- for (i = 0, j = 0; i < VFIO_MAX_USER_MEM_MAPS && j < n_add; i++) {
+ for (i = 0, j = 0; i < RTE_DIM(user_mem_maps->maps) && j < n_add; i++) {
struct user_mem_map *left = &user_mem_maps->maps[i];
struct user_mem_map *right = &add_maps[j];
@@ -321,13 +321,13 @@ find_user_mem_maps(struct user_mem_maps *user_mem_maps, uint64_t addr,
static void
compact_user_maps(struct user_mem_maps *user_mem_maps)
{
- int i;
+ unsigned int i;
- qsort(user_mem_maps->maps, VFIO_MAX_USER_MEM_MAPS,
+ qsort(user_mem_maps->maps, RTE_DIM(user_mem_maps->maps),
sizeof(user_mem_maps->maps[0]), user_mem_map_cmp);
/* we'll go over the list backwards when merging */
- for (i = VFIO_MAX_USER_MEM_MAPS - 2; i >= 0; i--) {
+ for (i = RTE_DIM(user_mem_maps->maps) - 2; i != 0; i--) {
struct user_mem_map *l, *r;
l = &user_mem_maps->maps[i];
@@ -344,7 +344,7 @@ compact_user_maps(struct user_mem_maps *user_mem_maps)
/* the entries are still sorted, but now they have holes in them, so
* sort the list again.
*/
- qsort(user_mem_maps->maps, VFIO_MAX_USER_MEM_MAPS,
+ qsort(user_mem_maps->maps, RTE_DIM(user_mem_maps->maps),
sizeof(user_mem_maps->maps[0]), user_mem_map_cmp);
}
@@ -423,11 +423,11 @@ static struct vfio_config *
get_vfio_cfg_by_group_num(int iommu_group_num)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++) {
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++) {
if (vfio_cfg->vfio_groups[j].group_num ==
iommu_group_num)
return vfio_cfg;
@@ -441,30 +441,30 @@ static int
vfio_get_group_fd(struct vfio_config *vfio_cfg,
int iommu_group_num)
{
- int i;
+ struct vfio_group *cur_grp = NULL;
int vfio_group_fd;
- struct vfio_group *cur_grp;
+ unsigned int i;
/* check if we already have the group descriptor open */
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num == iommu_group_num)
return vfio_cfg->vfio_groups[i].fd;
/* Lets see first if there is room for a new group */
- if (vfio_cfg->vfio_active_groups == VFIO_MAX_GROUPS) {
+ if (vfio_cfg->vfio_active_groups == RTE_DIM(vfio_cfg->vfio_groups)) {
EAL_LOG(ERR, "Maximum number of VFIO groups reached!");
return -1;
}
/* Now lets get an index for the new group */
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num == -1) {
cur_grp = &vfio_cfg->vfio_groups[i];
break;
}
/* This should not happen */
- if (i == VFIO_MAX_GROUPS) {
+ if (cur_grp == NULL) {
EAL_LOG(ERR, "No VFIO group free slot found");
return -1;
}
@@ -487,11 +487,11 @@ static struct vfio_config *
get_vfio_cfg_by_group_fd(int vfio_group_fd)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++)
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++)
if (vfio_cfg->vfio_groups[j].fd == vfio_group_fd)
return vfio_cfg;
}
@@ -502,12 +502,12 @@ get_vfio_cfg_by_group_fd(int vfio_group_fd)
static struct vfio_config *
get_vfio_cfg_by_container_fd(int container_fd)
{
- int i;
+ unsigned int i;
if (container_fd == RTE_VFIO_DEFAULT_CONTAINER_FD)
return default_vfio_cfg;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
if (vfio_cfgs[i].vfio_container_fd == container_fd)
return &vfio_cfgs[i];
}
@@ -532,11 +532,11 @@ static int
get_vfio_group_idx(int vfio_group_fd)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++)
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++)
if (vfio_cfg->vfio_groups[j].fd == vfio_group_fd)
return j;
}
@@ -557,7 +557,7 @@ vfio_group_device_get(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1))
+ if (i < 0)
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
else
vfio_cfg->vfio_groups[i].devices++;
@@ -576,7 +576,7 @@ vfio_group_device_put(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1))
+ if (i < 0)
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
else
vfio_cfg->vfio_groups[i].devices--;
@@ -595,7 +595,7 @@ vfio_group_device_count(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1)) {
+ if (i < 0) {
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
return -1;
}
@@ -1086,7 +1086,7 @@ int
rte_vfio_enable(const char *modname)
{
/* initialize group list */
- int i, j;
+ unsigned int i, j;
int vfio_available;
DIR *dir;
const struct internal_config *internal_conf =
@@ -1094,13 +1094,13 @@ rte_vfio_enable(const char *modname)
rte_spinlock_recursive_t lock = RTE_SPINLOCK_RECURSIVE_INITIALIZER;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfgs[i].vfio_container_fd = -1;
vfio_cfgs[i].vfio_active_groups = 0;
vfio_cfgs[i].vfio_iommu_type = NULL;
vfio_cfgs[i].mem_maps.lock = lock;
- for (j = 0; j < VFIO_MAX_GROUPS; j++) {
+ for (j = 0; j < RTE_DIM(vfio_cfgs[i].vfio_groups); j++) {
vfio_cfgs[i].vfio_groups[j].fd = -1;
vfio_cfgs[i].vfio_groups[j].group_num = -1;
vfio_cfgs[i].vfio_groups[j].devices = 0;
@@ -1895,7 +1895,7 @@ container_dma_map(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
user_mem_maps = &vfio_cfg->mem_maps;
rte_spinlock_recursive_lock(&user_mem_maps->lock);
- if (user_mem_maps->n_maps == VFIO_MAX_USER_MEM_MAPS) {
+ if (user_mem_maps->n_maps == RTE_DIM(user_mem_maps->maps)) {
EAL_LOG(ERR, "No more space for user mem maps");
rte_errno = ENOMEM;
ret = -1;
@@ -1935,11 +1935,12 @@ static int
container_dma_unmap(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
uint64_t len)
{
- struct user_mem_map orig_maps[VFIO_MAX_USER_MEM_MAPS];
+ struct user_mem_map orig_maps[RTE_DIM(vfio_cfg->mem_maps.maps)];
struct user_mem_map new_maps[2]; /* can be at most 2 */
struct user_mem_maps *user_mem_maps;
- int n_orig, n_new, newlen, ret = 0;
+ int n_orig, n_new, ret = 0;
bool has_partial_unmap;
+ unsigned int newlen;
user_mem_maps = &vfio_cfg->mem_maps;
rte_spinlock_recursive_lock(&user_mem_maps->lock);
@@ -2005,7 +2006,7 @@ container_dma_unmap(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
/* can we store the new maps in our list? */
newlen = (user_mem_maps->n_maps - n_orig) + n_new;
- if (newlen >= VFIO_MAX_USER_MEM_MAPS) {
+ if (newlen >= RTE_DIM(user_mem_maps->maps)) {
EAL_LOG(ERR, "Not enough space to store partial mapping");
rte_errno = ENOMEM;
ret = -1;
@@ -2077,15 +2078,15 @@ RTE_EXPORT_SYMBOL(rte_vfio_container_create)
int
rte_vfio_container_create(void)
{
- int i;
+ unsigned int i;
/* Find an empty slot to store new vfio config */
- for (i = 1; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 1; i < RTE_DIM(vfio_cfgs); i++) {
if (vfio_cfgs[i].vfio_container_fd == -1)
break;
}
- if (i == VFIO_MAX_CONTAINERS) {
+ if (i == RTE_DIM(vfio_cfgs)) {
EAL_LOG(ERR, "Exceed max VFIO container limit");
return -1;
}
@@ -2104,7 +2105,7 @@ int
rte_vfio_container_destroy(int container_fd)
{
struct vfio_config *vfio_cfg;
- int i;
+ unsigned int i;
vfio_cfg = get_vfio_cfg_by_container_fd(container_fd);
if (vfio_cfg == NULL) {
@@ -2112,7 +2113,7 @@ rte_vfio_container_destroy(int container_fd)
return -1;
}
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num != -1)
rte_vfio_container_group_unbind(container_fd,
vfio_cfg->vfio_groups[i].group_num);
@@ -2144,9 +2145,9 @@ RTE_EXPORT_SYMBOL(rte_vfio_container_group_unbind)
int
rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
{
- struct vfio_config *vfio_cfg;
struct vfio_group *cur_grp = NULL;
- int i;
+ struct vfio_config *vfio_cfg;
+ unsigned int i;
vfio_cfg = get_vfio_cfg_by_container_fd(container_fd);
if (vfio_cfg == NULL) {
@@ -2154,7 +2155,7 @@ rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
return -1;
}
- for (i = 0; i < VFIO_MAX_GROUPS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++) {
if (vfio_cfg->vfio_groups[i].group_num == iommu_group_num) {
cur_grp = &vfio_cfg->vfio_groups[i];
break;
@@ -2162,7 +2163,7 @@ rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
}
/* This should not happen */
- if (i == VFIO_MAX_GROUPS || cur_grp == NULL) {
+ if (cur_grp == NULL) {
EAL_LOG(ERR, "Specified VFIO group number not found");
return -1;
}
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index e7d855c032..413c8f18df 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -69,9 +69,6 @@ struct vfio_iommu_spapr_tce_info {
#define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU
#endif
-#define VFIO_MAX_GROUPS RTE_MAX_VFIO_GROUPS
-#define VFIO_MAX_CONTAINERS RTE_MAX_VFIO_CONTAINERS
-
/*
* we don't need to store device fd's anywhere since they can be obtained from
* the group fd via an ioctl() call.
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 6/9] eal/linux: remove internal VFIO wrappers for old Linux
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
` (4 preceding siblings ...)
2025-09-03 15:13 ` [RFC v2 5/9] eal/linux: remove more internal VFIO macros David Marchand
@ 2025-09-03 15:13 ` David Marchand
2025-09-03 15:22 ` [RFC v2 0/9] Cleanup VFIO API and import Linux uAPI header David Marchand
6 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:13 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Hemant Agrawal, Sachin Saxena
DPDK now requires Linux v5.4 at least.
VFIO_SPAPR_TCE_IOMMU is present in Linux since v3.11.
VFIO_SPAPR_TCE_v2_IOMMU is present in Linux since v4.2.
Remove wrappers accordingly.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/bus/fslmc/fslmc_vfio.c | 2 +-
lib/eal/linux/eal_vfio.c | 4 +--
lib/eal/linux/eal_vfio.h | 60 ----------------------------------
3 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index cc4311989b..c08c316c94 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -449,7 +449,7 @@ fslmc_vfio_check_extensions(int vfio_container_fd)
{
int ret;
uint32_t idx, n_extensions = 0;
- static const int type_id[] = {RTE_VFIO_TYPE1, RTE_VFIO_SPAPR,
+ static const int type_id[] = {VFIO_TYPE1_IOMMU, VFIO_SPAPR_TCE_v2_IOMMU,
VFIO_NOIOMMU_IOMMU};
static const char * const type_id_nm[] = {"Type 1",
"sPAPR", "No-IOMMU"};
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index 1eab90a261..c6aed44946 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -69,7 +69,7 @@ static int vfio_dma_mem_map(struct vfio_config *vfio_cfg, uint64_t vaddr,
static const struct vfio_iommu_type iommu_types[] = {
/* x86 IOMMU, otherwise known as type 1 */
{
- .type_id = RTE_VFIO_TYPE1,
+ .type_id = VFIO_TYPE1_IOMMU,
.name = "Type 1",
.partial_unmap = false,
.dma_map_func = &vfio_type1_dma_map,
@@ -77,7 +77,7 @@ static const struct vfio_iommu_type iommu_types[] = {
},
/* ppc64 IOMMU, otherwise known as spapr */
{
- .type_id = RTE_VFIO_SPAPR,
+ .type_id = VFIO_SPAPR_TCE_v2_IOMMU,
.name = "sPAPR",
.partial_unmap = true,
.dma_map_func = &vfio_spapr_dma_map,
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index 413c8f18df..5c5742b429 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -8,66 +8,6 @@
#include <rte_common.h>
#include <stdint.h>
-#include <linux/vfio.h>
-
-#define RTE_VFIO_TYPE1 VFIO_TYPE1_IOMMU
-
-#ifndef VFIO_SPAPR_TCE_v2_IOMMU
-#define RTE_VFIO_SPAPR 7
-#define VFIO_IOMMU_SPAPR_REGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 17)
-#define VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 18)
-#define VFIO_IOMMU_SPAPR_TCE_CREATE _IO(VFIO_TYPE, VFIO_BASE + 19)
-#define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20)
-
-struct vfio_iommu_spapr_register_memory {
- uint32_t argsz;
- uint32_t flags;
- uint64_t vaddr;
- uint64_t size;
-};
-
-struct vfio_iommu_spapr_tce_create {
- uint32_t argsz;
- uint32_t flags;
- /* in */
- uint32_t page_shift;
- uint32_t __resv1;
- uint64_t window_size;
- uint32_t levels;
- uint32_t __resv2;
- /* out */
- uint64_t start_addr;
-};
-
-struct vfio_iommu_spapr_tce_remove {
- uint32_t argsz;
- uint32_t flags;
- /* in */
- uint64_t start_addr;
-};
-
-struct vfio_iommu_spapr_tce_ddw_info {
- uint64_t pgsizes;
- uint32_t max_dynamic_windows_supported;
- uint32_t levels;
-};
-
-/* SPAPR_v2 is not present, but SPAPR might be */
-#ifndef VFIO_SPAPR_TCE_IOMMU
-#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
-
-struct vfio_iommu_spapr_tce_info {
- uint32_t argsz;
- uint32_t flags;
- uint32_t dma32_window_start;
- uint32_t dma32_window_size;
- struct vfio_iommu_spapr_tce_ddw_info ddw;
-};
-#endif /* VFIO_SPAPR_TCE_IOMMU */
-
-#else /* VFIO_SPAPR_TCE_v2_IOMMU */
-#define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU
-#endif
/*
* we don't need to store device fd's anywhere since they can be obtained from
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [RFC v2 0/9] Cleanup VFIO API and import Linux uAPI header
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
` (5 preceding siblings ...)
2025-09-03 15:13 ` [RFC v2 6/9] eal/linux: remove internal VFIO wrappers for old Linux David Marchand
@ 2025-09-03 15:22 ` David Marchand
6 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:22 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin, anatoly.burakov
On Wed, 3 Sept 2025 at 17:13, David Marchand <david.marchand@redhat.com> wrote:
>
> The VFIO headers have a number of issues:
> - showing to the world a lot of internal considerations,
> - defining macros with the VFIO_ namespace (confusing, and a source of
> conflicts with the VFIO official uAPI),
> - wrapping around VFIO uAPI in case the kernel headers do not contain the
> expected API (putting the burden on DPDK developers to find the right
> way to detect the presence of a VFIO feature),
> - (somehow related to the previous point) supporting old version of the
> Linux kernel while DPDK now requires a v5.4 Linux kernel at least,
>
> This series proposes to cleanup those headers by hiding as much as
> possible internal macros and structures, then removing the explicit
> inclusion of linux/vfio.h from rte_vfio.h (pushing this inclusion to the
> application which may want to do some funny stuff with VFIO and should
> already include this header on its own) and finally importing the VFIO
> uAPI header from Linux v6.15 for internal consumption by DPDK
> components.
Sorry, please ignore this thread, sending the v2 series got
interrupted by an error from my smtp.
I resent the whole series.
--
David Marchand
^ permalink raw reply [flat|nested] 35+ messages in thread
* [RFC v2 0/9] Cleanup VFIO API and import Linux uAPI header
2025-09-03 7:28 [RFC 0/8] Cleanup VFIO API and import Linux uAPI header David Marchand
` (10 preceding siblings ...)
2025-09-03 15:13 ` [RFC v2 0/9] " David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 1/9] drivers: remove unneeded VFIO header inclusion David Marchand
` (9 more replies)
11 siblings, 10 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin, anatoly.burakov
The VFIO headers have a number of issues:
- showing to the world a lot of internal considerations,
- defining macros with the VFIO_ namespace (confusing, and a source of
conflicts with the VFIO official uAPI),
- wrapping around VFIO uAPI in case the kernel headers do not contain the
expected API (putting the burden on DPDK developers to find the right
way to detect the presence of a VFIO feature),
- (somehow related to the previous point) supporting old version of the
Linux kernel while DPDK now requires a v5.4 Linux kernel at least,
This series proposes to cleanup those headers by hiding as much as
possible internal macros and structures, then removing the explicit
inclusion of linux/vfio.h from rte_vfio.h (pushing this inclusion to the
application which may want to do some funny stuff with VFIO and should
already include this header on its own) and finally importing the VFIO
uAPI header from Linux v6.15 for internal consumption by DPDK
components.
--
David Marchand
Changes since RFC v1:
- fixed FreeBSD compilation,
- fixed some inclusion of linux/vfio.h in common/cnxk and raw/ifpga,
David Marchand (9):
drivers: remove unneeded VFIO header inclusion
vfio: remove confusing check on VFIO presence
vfio: assume VFIO is always and only present on Linux
vfio: remove public wrappers
eal/linux: remove more internal VFIO macros
eal/linux: remove internal VFIO wrappers for old Linux
vfio: stop including Linux kernel header in public and driver API
uapi: import VFIO header
vfio: use imported uAPI header
config/meson.build | 3 -
doc/api/doxy-api.conf.in | 1 -
doc/guides/cryptodevs/bcmfs.rst | 4 -
drivers/bus/cdx/cdx_vfio.c | 19 +-
drivers/bus/fslmc/bus_fslmc_driver.h | 3 +-
drivers/bus/fslmc/fslmc_bus.c | 13 +-
drivers/bus/fslmc/fslmc_vfio.c | 22 +-
drivers/bus/fslmc/fslmc_vfio.h | 1 -
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +
drivers/bus/pci/linux/pci.c | 22 -
drivers/bus/pci/linux/pci_init.h | 6 -
drivers/bus/pci/linux/pci_vfio.c | 37 +-
drivers/bus/pci/pci_common.c | 2 -
drivers/bus/platform/bus_platform_driver.h | 20 +-
drivers/bus/platform/platform.c | 6 +-
drivers/bus/platform/platform_params.c | 5 -
drivers/common/cnxk/roc_platform.c | 3 +-
drivers/common/qat/dev/qat_dev_gen_lce.c | 4 -
drivers/crypto/bcmfs/bcmfs_vfio.c | 15 +-
drivers/crypto/bcmfs/meson.build | 4 +-
drivers/net/hns3/hns3_ethdev_vf.c | 1 -
drivers/raw/ifpga/afu_pmd_he_hssi.c | 1 -
drivers/raw/ifpga/afu_pmd_he_lpbk.c | 1 -
drivers/raw/ifpga/afu_pmd_he_mem.c | 1 -
drivers/raw/ifpga/afu_pmd_n3000.c | 7 +-
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 | 3 +-
kernel/linux/uapi/linux/vfio.h | 1836 ++++++++++++++++++++
kernel/linux/uapi/version | 2 +-
lib/eal/include/rte_vfio.h | 87 -
lib/eal/linux/eal.c | 4 -
lib/eal/linux/eal_interrupts.c | 28 +-
lib/eal/linux/eal_vfio.c | 126 +-
lib/eal/linux/eal_vfio.h | 79 -
lib/eal/linux/eal_vfio_mp_sync.c | 10 -
37 files changed, 1957 insertions(+), 428 deletions(-)
create mode 100644 kernel/linux/uapi/linux/vfio.h
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 1/9] drivers: remove unneeded VFIO header inclusion
2025-09-03 15:17 ` David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 2/9] vfio: remove confusing check on VFIO presence David Marchand
` (8 subsequent siblings)
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Kai Ji, Dengdui Huang,
Rosen Xu
Those drivers sources do nothing related to VFIO.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/common/qat/dev/qat_dev_gen_lce.c | 4 ----
drivers/net/hns3/hns3_ethdev_vf.c | 1 -
drivers/raw/ifpga/afu_pmd_he_hssi.c | 1 -
drivers/raw/ifpga/afu_pmd_he_lpbk.c | 1 -
drivers/raw/ifpga/afu_pmd_he_mem.c | 1 -
5 files changed, 8 deletions(-)
diff --git a/drivers/common/qat/dev/qat_dev_gen_lce.c b/drivers/common/qat/dev/qat_dev_gen_lce.c
index 6514321c32..9173b6c681 100644
--- a/drivers/common/qat/dev/qat_dev_gen_lce.c
+++ b/drivers/common/qat/dev/qat_dev_gen_lce.c
@@ -3,7 +3,6 @@
*/
#include <rte_pci.h>
-#include <rte_vfio.h>
#include "qat_device.h"
#include "qat_qp.h"
@@ -17,9 +16,6 @@
#define BITS_PER_ULONG (sizeof(unsigned long) * 8)
-#define VFIO_PCI_LCE_DEVICE_CFG_REGION_INDEX VFIO_PCI_NUM_REGIONS
-#define VFIO_PCI_LCE_CY_CFG_REGION_INDEX (VFIO_PCI_NUM_REGIONS + 2)
-#define VFIO_PCI_LCE_RING_CFG_REGION_INDEX (VFIO_PCI_NUM_REGIONS + 4)
#define LCE_DEVICE_NAME_SIZE 64
#define LCE_DEVICE_MAX_BANKS 2080
#define LCE_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index f9ef3dbb06..59fb790240 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -5,7 +5,6 @@
#include <rte_alarm.h>
#include <ethdev_pci.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include "hns3_ethdev.h"
#include "hns3_common.h"
diff --git a/drivers/raw/ifpga/afu_pmd_he_hssi.c b/drivers/raw/ifpga/afu_pmd_he_hssi.c
index 859f28dcc1..bcb952935a 100644
--- a/drivers/raw/ifpga/afu_pmd_he_hssi.c
+++ b/drivers/raw/ifpga/afu_pmd_he_hssi.c
@@ -17,7 +17,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
diff --git a/drivers/raw/ifpga/afu_pmd_he_lpbk.c b/drivers/raw/ifpga/afu_pmd_he_lpbk.c
index c7c5cda48c..df3b093157 100644
--- a/drivers/raw/ifpga/afu_pmd_he_lpbk.c
+++ b/drivers/raw/ifpga/afu_pmd_he_lpbk.c
@@ -17,7 +17,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
diff --git a/drivers/raw/ifpga/afu_pmd_he_mem.c b/drivers/raw/ifpga/afu_pmd_he_mem.c
index a1db533eeb..b595cd729c 100644
--- a/drivers/raw/ifpga/afu_pmd_he_mem.c
+++ b/drivers/raw/ifpga/afu_pmd_he_mem.c
@@ -16,7 +16,6 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 2/9] vfio: remove confusing check on VFIO presence
2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 1/9] drivers: remove unneeded VFIO header inclusion David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 3/9] vfio: assume VFIO is always and only present on Linux David Marchand
` (7 subsequent siblings)
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Rosen Xu,
Ajit Khaparde, Vikas Gupta, Hemant Agrawal, Sachin Saxena,
Chenbo Xia, Nipun Gupta, Tomasz Duszynski, Tyler Retzlaff,
Harman Kalra
Contrary to what the VFIO_PRESENT macro may suggest, there is no check on
whether VFIO is enabled in the (build system) Linux kernel configuration.
Replace check on VFIO_PRESENT with RTE_EAL_VFIO (for components built on
FreeBSD or Windows), or simply remove it otherwise.
Then remove inclusion of rte_vfio.h when the only purpose was checking
VFIO_PRESENT.
Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Rosen Xu <rosen.xu@altera.com>
---
doc/api/doxy-api.conf.in | 1 -
doc/guides/cryptodevs/bcmfs.rst | 4 ----
drivers/bus/fslmc/fslmc_bus.c | 12 +----------
drivers/bus/pci/linux/pci.c | 22 --------------------
drivers/bus/pci/linux/pci_init.h | 6 ------
drivers/bus/pci/linux/pci_vfio.c | 12 -----------
drivers/bus/platform/bus_platform_driver.h | 20 +-----------------
drivers/bus/platform/platform.c | 4 ----
drivers/bus/platform/platform_params.c | 5 -----
drivers/crypto/bcmfs/bcmfs_vfio.c | 11 +++++-----
drivers/raw/ifpga/afu_pmd_n3000.c | 4 ----
lib/eal/include/rte_vfio.h | 24 ++++++++--------------
lib/eal/linux/eal.c | 4 ----
lib/eal/linux/eal_interrupts.c | 15 --------------
lib/eal/linux/eal_vfio.h | 16 ---------------
lib/eal/linux/eal_vfio_mp_sync.c | 10 ---------
16 files changed, 16 insertions(+), 154 deletions(-)
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 28cec3232f..bedd944681 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -92,7 +92,6 @@ FILE_PATTERNS = rte_*.h \
PREDEFINED = __DOXYGEN__ \
RTE_ATOMIC \
RTE_HAS_CPUSET \
- VFIO_PRESENT \
__rte_lockable= \
__rte_guarded_by(x)= \
__rte_exclusive_locks_required(x)= \
diff --git a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst
index d18a253913..049808a49c 100644
--- a/doc/guides/cryptodevs/bcmfs.rst
+++ b/doc/guides/cryptodevs/bcmfs.rst
@@ -59,10 +59,6 @@ Information about kernel, rootfs and toolchain can be found at
`Broadcom Official Website <https://www.broadcom.com/products/ethernet-connectivity
/network-adapters/smartnic/stingray-software>`__.
- .. Note::
- To execute BCMFS PMD, it must be compiled with VFIO_PRESENT flag on the
- compiling platform and same gets enabled in rte_vfio.h.
-
The BCMFS PMD may be compiled natively on a Stingray platform or
cross-compiled on an x86 platform. For example, below commands can be executed
for cross compiling on x86 platform.
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index ebc0c1fb4f..20458d5030 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -574,9 +574,6 @@ fslmc_all_device_support_iova(void)
static enum rte_iova_mode
rte_dpaa2_get_iommu_class(void)
{
- bool is_vfio_noiommu_enabled = 1;
- bool has_iova_va;
-
if (rte_eal_iova_mode() == RTE_IOVA_PA)
return RTE_IOVA_PA;
@@ -584,14 +581,7 @@ rte_dpaa2_get_iommu_class(void)
return RTE_IOVA_DC;
/* check if all devices on the bus support Virtual addressing or not */
- has_iova_va = fslmc_all_device_support_iova();
-
-#ifdef VFIO_PRESENT
- is_vfio_noiommu_enabled = rte_vfio_noiommu_is_enabled() == true ?
- true : false;
-#endif
-
- if (has_iova_va && !is_vfio_noiommu_enabled)
+ if (fslmc_all_device_support_iova() != 0 && rte_vfio_noiommu_is_enabled() == 0)
return RTE_IOVA_VA;
return RTE_IOVA_PA;
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index c20d159218..66d7e09a6e 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -64,10 +64,8 @@ rte_pci_map_device(struct rte_pci_device *dev)
/* try mapping the NIC resources using VFIO if it exists */
switch (dev->kdrv) {
case RTE_PCI_KDRV_VFIO:
-#ifdef VFIO_PRESENT
if (pci_vfio_is_enabled())
ret = pci_vfio_map_resource(dev);
-#endif
break;
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
@@ -93,10 +91,8 @@ rte_pci_unmap_device(struct rte_pci_device *dev)
/* try unmapping the NIC resources using VFIO if it exists */
switch (dev->kdrv) {
case RTE_PCI_KDRV_VFIO:
-#ifdef VFIO_PRESENT
if (pci_vfio_is_enabled())
pci_vfio_unmap_resource(dev);
-#endif
break;
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
@@ -599,7 +595,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv,
switch (pdev->kdrv) {
case RTE_PCI_KDRV_VFIO: {
-#ifdef VFIO_PRESENT
static int is_vfio_noiommu_enabled = -1;
if (is_vfio_noiommu_enabled == -1) {
@@ -612,7 +607,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv,
iova_mode = RTE_IOVA_PA;
else if ((pdrv->drv_flags & RTE_PCI_DRV_NEED_IOVA_AS_VA) != 0)
iova_mode = RTE_IOVA_VA;
-#endif
break;
}
@@ -641,10 +635,8 @@ int rte_pci_read_config(const struct rte_pci_device *device,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_read_config(intr_handle, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_read_config(device, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -665,10 +657,8 @@ int rte_pci_write_config(const struct rte_pci_device *device,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_write_config(intr_handle, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_write_config(device, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -688,10 +678,8 @@ int rte_pci_mmio_read(const struct rte_pci_device *device, int bar,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_mmio_read(device, bar, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_mmio_read(device, bar, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -711,10 +699,8 @@ int rte_pci_mmio_write(const struct rte_pci_device *device, int bar,
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
return pci_uio_mmio_write(device, bar, buf, len, offset);
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
return pci_vfio_mmio_write(device, bar, buf, len, offset);
-#endif
default:
rte_pci_device_name(&device->addr, devname,
RTE_DEV_NAME_MAX_LEN);
@@ -731,12 +717,10 @@ rte_pci_ioport_map(struct rte_pci_device *dev, int bar,
int ret = -1;
switch (dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
if (pci_vfio_is_enabled())
ret = pci_vfio_ioport_map(dev, bar, p);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
ret = pci_uio_ioport_map(dev, bar, p);
@@ -757,11 +741,9 @@ rte_pci_ioport_read(struct rte_pci_ioport *p,
void *data, size_t len, off_t offset)
{
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
pci_vfio_ioport_read(p, data, len, offset);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
pci_uio_ioport_read(p, data, len, offset);
@@ -777,11 +759,9 @@ rte_pci_ioport_write(struct rte_pci_ioport *p,
const void *data, size_t len, off_t offset)
{
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
pci_vfio_ioport_write(p, data, len, offset);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
pci_uio_ioport_write(p, data, len, offset);
@@ -798,12 +778,10 @@ rte_pci_ioport_unmap(struct rte_pci_ioport *p)
int ret = -1;
switch (p->dev->kdrv) {
-#ifdef VFIO_PRESENT
case RTE_PCI_KDRV_VFIO:
if (pci_vfio_is_enabled())
ret = pci_vfio_ioport_unmap(p);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
ret = pci_uio_ioport_unmap(p);
diff --git a/drivers/bus/pci/linux/pci_init.h b/drivers/bus/pci/linux/pci_init.h
index a4d37c0d0a..6949dd57d9 100644
--- a/drivers/bus/pci/linux/pci_init.h
+++ b/drivers/bus/pci/linux/pci_init.h
@@ -5,8 +5,6 @@
#ifndef EAL_PCI_INIT_H_
#define EAL_PCI_INIT_H_
-#include <rte_vfio.h>
-
#include "private.h"
/** IO resource type: */
@@ -50,8 +48,6 @@ void pci_uio_ioport_write(struct rte_pci_ioport *p,
const void *data, size_t len, off_t offset);
int pci_uio_ioport_unmap(struct rte_pci_ioport *p);
-#ifdef VFIO_PRESENT
-
/* access config space */
int pci_vfio_read_config(const struct rte_pci_device *dev,
void *buf, size_t len, off_t offs);
@@ -77,6 +73,4 @@ int pci_vfio_unmap_resource(struct rte_pci_device *dev);
int pci_vfio_is_enabled(void);
-#endif
-
#endif /* EAL_PCI_INIT_H_ */
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 5317170231..d0844585fe 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -27,17 +27,6 @@
#include "pci_init.h"
#include "private.h"
-/**
- * @file
- * PCI probing using Linux VFIO.
- *
- * This code tries to determine if the PCI device is bound to VFIO driver,
- * and initialize it (map BARs, set up interrupts) if that's the case.
- *
- */
-
-#ifdef VFIO_PRESENT
-
static struct rte_tailq_elem rte_vfio_tailq = {
.name = "VFIO_RESOURCE_LIST",
};
@@ -1327,4 +1316,3 @@ pci_vfio_is_enabled(void)
}
return status;
}
-#endif
diff --git a/drivers/bus/platform/bus_platform_driver.h b/drivers/bus/platform/bus_platform_driver.h
index ef4b27c0c0..76403043c1 100644
--- a/drivers/bus/platform/bus_platform_driver.h
+++ b/drivers/bus/platform/bus_platform_driver.h
@@ -15,9 +15,9 @@
#include <dev_driver.h>
#include <rte_common.h>
+#include <rte_compat.h>
#include <rte_dev.h>
#include <rte_os.h>
-#include <rte_vfio.h>
#ifdef __cplusplus
extern "C" {
@@ -144,8 +144,6 @@ RTE_PMD_EXPORT_NAME(nm)
#define RTE_PMD_REGISTER_ALIAS(nm, alias) \
static const char *pdrvinit_ ## nm ## _alias = RTE_STR(alias)
-#ifdef VFIO_PRESENT
-
/**
* Register a platform device driver.
*
@@ -170,22 +168,6 @@ void rte_platform_register(struct rte_platform_driver *pdrv);
__rte_internal
void rte_platform_unregister(struct rte_platform_driver *pdrv);
-#else
-
-__rte_internal
-static inline void
-rte_platform_register(struct rte_platform_driver *pdrv __rte_unused)
-{
-}
-
-__rte_internal
-static inline void
-rte_platform_unregister(struct rte_platform_driver *pdrv __rte_unused)
-{
-}
-
-#endif /* VFIO_PRESENT */
-
#ifdef __cplusplus
}
#endif
diff --git a/drivers/bus/platform/platform.c b/drivers/bus/platform/platform.c
index 0f50027236..90524fd961 100644
--- a/drivers/bus/platform/platform.c
+++ b/drivers/bus/platform/platform.c
@@ -25,8 +25,6 @@
#include "private.h"
-#ifdef VFIO_PRESENT
-
#define PLATFORM_BUS_DEVICES_PATH "/sys/bus/platform/devices"
RTE_EXPORT_INTERNAL_SYMBOL(rte_platform_register)
@@ -647,5 +645,3 @@ struct rte_platform_bus platform_bus = {
RTE_REGISTER_BUS(platform, platform_bus.bus);
RTE_LOG_REGISTER_DEFAULT(platform_bus_logtype, NOTICE);
-
-#endif /* VFIO_PRESENT */
diff --git a/drivers/bus/platform/platform_params.c b/drivers/bus/platform/platform_params.c
index 8a6214b97c..65b20d121f 100644
--- a/drivers/bus/platform/platform_params.c
+++ b/drivers/bus/platform/platform_params.c
@@ -10,13 +10,10 @@
#include <rte_dev.h>
#include <rte_errno.h>
#include <rte_kvargs.h>
-#include <rte_vfio.h>
#include "bus_platform_driver.h"
#include "private.h"
-#ifdef VFIO_PRESENT
-
enum platform_params {
RTE_PLATFORM_PARAM_NAME,
};
@@ -73,5 +70,3 @@ platform_bus_dev_iterate(const void *start, const char *str,
return dev;
}
-
-#endif /* VFIO_PRESENT */
diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c b/drivers/crypto/bcmfs/bcmfs_vfio.c
index dc2def580f..8d6ea16544 100644
--- a/drivers/crypto/bcmfs/bcmfs_vfio.c
+++ b/drivers/crypto/bcmfs/bcmfs_vfio.c
@@ -7,13 +7,14 @@
#include <sys/mman.h>
#include <sys/ioctl.h>
-#include <rte_vfio.h>
-
#include "bcmfs_device.h"
#include "bcmfs_logs.h"
#include "bcmfs_vfio.h"
-#ifdef VFIO_PRESENT
+#ifdef RTE_EAL_VFIO
+
+#include <rte_vfio.h>
+
static int
vfio_map_dev_obj(const char *path, const char *dev_obj,
uint32_t *size, void **addr, int *dev_fd)
@@ -93,7 +94,7 @@ bcmfs_release_vfio(struct bcmfs_device *dev)
return;
}
}
-#else
+#else /* ! RTE_EAL_VFIO */
int
bcmfs_attach_vfio(struct bcmfs_device *dev __rte_unused)
{
@@ -104,4 +105,4 @@ void
bcmfs_release_vfio(struct bcmfs_device *dev __rte_unused)
{
}
-#endif
+#endif /* RTE_EAL_VFIO */
diff --git a/drivers/raw/ifpga/afu_pmd_n3000.c b/drivers/raw/ifpga/afu_pmd_n3000.c
index 6aae1b224e..0882a27701 100644
--- a/drivers/raw/ifpga/afu_pmd_n3000.c
+++ b/drivers/raw/ifpga/afu_pmd_n3000.c
@@ -1473,7 +1473,6 @@ static struct rte_pci_device *n3000_afu_get_pci_dev(struct afu_rawdev *dev)
return RTE_DEV_TO_PCI(afudev->rawdev->device);
}
-#ifdef VFIO_PRESENT
static int dma_afu_set_irqs(struct afu_rawdev *dev, uint32_t vec_start,
uint32_t count, int *efds)
{
@@ -1511,7 +1510,6 @@ static int dma_afu_set_irqs(struct afu_rawdev *dev, uint32_t vec_start,
rte_free(irq_set);
return ret;
}
-#endif
static void *n3000_afu_get_port_addr(struct afu_rawdev *dev)
{
@@ -1724,10 +1722,8 @@ static int dma_afu_ctx_init(struct afu_rawdev *dev, int index, uint8_t *addr)
IFPGA_RAWDEV_PMD_ERR("eventfd create failed");
return -EBADF;
}
-#ifdef VFIO_PRESENT
if (dma_afu_set_irqs(dev, vec_start, 1, efds))
IFPGA_RAWDEV_PMD_ERR("DMA interrupt setup failed");
-#endif
}
ctx->event_fd = efds[0];
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 923293040b..594d504c56 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -15,24 +15,16 @@
#include <rte_compat.h>
-/*
- * determine if VFIO is present on the system
- */
-#if !defined(VFIO_PRESENT) && defined(RTE_EAL_VFIO)
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-#define VFIO_PRESENT
-#endif /* kernel version >= 3.6.0 */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-#define HAVE_VFIO_DEV_REQ_INTERFACE
-#endif /* kernel version >= 4.0.0 */
-#endif /* RTE_EAL_VFIO */
-
#ifdef __cplusplus
extern "C" {
#endif
-#ifdef VFIO_PRESENT
+#ifdef RTE_EAL_VFIO
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
+#define HAVE_VFIO_DEV_REQ_INTERFACE
+#endif /* kernel version >= 4.0.0 */
#include <linux/vfio.h>
@@ -102,12 +94,12 @@ struct vfio_device_feature_bus_master {
};
#endif
-#else /* not VFIO_PRESENT */
+#else /* ! RTE_EAL_VFIO */
/* we don't need an actual definition, only pointer is used */
struct vfio_device_info;
-#endif /* VFIO_PRESENT */
+#endif /* RTE_EAL_VFIO */
#define RTE_VFIO_DEFAULT_CONTAINER_FD (-1)
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 52efb8626b..708a387265 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -1121,14 +1121,12 @@ rte_eal_init(int argc, char **argv)
#endif
}
-#ifdef VFIO_PRESENT
if (rte_vfio_enable("vfio")) {
rte_eal_init_alert("Cannot init VFIO");
rte_errno = EAGAIN;
rte_atomic_store_explicit(&run_once, 0, rte_memory_order_relaxed);
return -1;
}
-#endif
/* in secondary processes, memory init may allocate additional fbarrays
* not present in primary processes, so to avoid any potential issues,
* initialize memzones first.
@@ -1330,9 +1328,7 @@ rte_eal_cleanup(void)
rte_memseg_walk(mark_freeable, NULL);
rte_service_finalize();
-#ifdef VFIO_PRESENT
vfio_mp_sync_cleanup();
-#endif
rte_mp_channel_cleanup();
eal_bus_cleanup();
rte_eal_alarm_cleanup();
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index 4ec78de82c..d420ecf947 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -57,9 +57,7 @@ union intr_pipefds{
*/
union rte_intr_read_buffer {
int uio_intr_count; /* for uio device */
-#ifdef VFIO_PRESENT
uint64_t vfio_intr_count; /* for vfio device */
-#endif
uint64_t timerfd_num; /* for timerfd */
char charbuf[16]; /* for others */
};
@@ -95,8 +93,6 @@ static struct rte_intr_source_list intr_sources;
static rte_thread_t intr_thread;
/* VFIO interrupts */
-#ifdef VFIO_PRESENT
-
#define IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + sizeof(int))
/* irq set buffer length for queue interrupts and LSC interrupt */
#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \
@@ -401,7 +397,6 @@ vfio_disable_req(const struct rte_intr_handle *intr_handle)
return ret;
}
#endif
-#endif
static int
uio_intx_intr_disable(const struct rte_intr_handle *intr_handle)
@@ -734,7 +729,6 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_ALARM:
rc = -1;
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
if (vfio_enable_msix(intr_handle))
rc = -1;
@@ -752,7 +746,6 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
if (vfio_enable_req(intr_handle))
rc = -1;
break;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -807,7 +800,6 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
/* not used at this moment */
case RTE_INTR_HANDLE_ALARM:
return -1;
-#ifdef VFIO_PRESENT
/* VFIO MSI* is implicitly acked unlike INTx, nothing to do */
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
@@ -819,7 +811,6 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
return -1;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -868,7 +859,6 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_ALARM:
rc = -1;
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
if (vfio_disable_msix(intr_handle))
rc = -1;
@@ -886,7 +876,6 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
if (vfio_disable_req(intr_handle))
rc = -1;
break;
-#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
@@ -948,7 +937,6 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_ALARM:
bytes_read = sizeof(buf.timerfd_num);
break;
-#ifdef VFIO_PRESENT
#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
#endif
@@ -957,7 +945,6 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_VFIO_LEGACY:
bytes_read = sizeof(buf.vfio_intr_count);
break;
-#endif
case RTE_INTR_HANDLE_VDEV:
case RTE_INTR_HANDLE_EXT:
bytes_read = 0;
@@ -1221,13 +1208,11 @@ eal_intr_proc_rxtx_intr(int fd, const struct rte_intr_handle *intr_handle)
case RTE_INTR_HANDLE_UIO_INTX:
bytes_read = sizeof(buf.uio_intr_count);
break;
-#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
case RTE_INTR_HANDLE_VFIO_LEGACY:
bytes_read = sizeof(buf.vfio_intr_count);
break;
-#endif
case RTE_INTR_HANDLE_VDEV:
bytes_read = rte_intr_efd_counter_size_get(intr_handle);
/* For vdev, number of bytes to read is set by driver */
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index 23a787ad20..e7d855c032 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -7,20 +7,6 @@
#include <rte_common.h>
-/*
- * determine if VFIO is present on the system
- */
-#if !defined(VFIO_PRESENT) && defined(RTE_EAL_VFIO)
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-#define VFIO_PRESENT
-#else
-#pragma message("VFIO configured but not supported by this kernel, disabling.")
-#endif /* kernel version >= 3.6.0 */
-#endif /* RTE_EAL_VFIO */
-
-#ifdef VFIO_PRESENT
-
#include <stdint.h>
#include <linux/vfio.h>
@@ -154,6 +140,4 @@ struct vfio_mp_param {
};
};
-#endif /* VFIO_PRESENT */
-
#endif /* EAL_VFIO_H_ */
diff --git a/lib/eal/linux/eal_vfio_mp_sync.c b/lib/eal/linux/eal_vfio_mp_sync.c
index ce14e260fe..8230f3d24d 100644
--- a/lib/eal/linux/eal_vfio_mp_sync.c
+++ b/lib/eal/linux/eal_vfio_mp_sync.c
@@ -14,15 +14,6 @@
#include "eal_private.h"
#include "eal_vfio.h"
-/**
- * @file
- * VFIO socket for communication between primary and secondary processes.
- *
- * This file is only compiled if RTE_EAL_VFIO is set.
- */
-
-#ifdef VFIO_PRESENT
-
static int
vfio_mp_primary(const struct rte_mp_msg *msg, const void *peer)
{
@@ -129,4 +120,3 @@ vfio_mp_sync_cleanup(void)
rte_mp_action_unregister(EAL_VFIO_MP);
}
-#endif
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 3/9] vfio: assume VFIO is always and only present on Linux
2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 1/9] drivers: remove unneeded VFIO header inclusion David Marchand
2025-09-03 15:17 ` [RFC v2 2/9] vfio: remove confusing check on VFIO presence David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 4/9] vfio: remove public wrappers David Marchand
` (6 subsequent siblings)
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Bruce Richardson,
Ajit Khaparde, Vikas Gupta, Tyler Retzlaff
RTE_EAL_VFIO is directly mapped to is_linux in meson.
Replace this intermediate build knob with RTE_EXEC_ENV_LINUX.
This is an intermediate state before importing the VFIO uapi header.
Note: crypto/bcmfs was functional only for OSes supporting VFIO iow
Linux. Stop compiling it on other OSes.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
config/meson.build | 3 ---
drivers/crypto/bcmfs/bcmfs_vfio.c | 18 ++----------------
drivers/crypto/bcmfs/meson.build | 4 ++--
lib/eal/include/rte_vfio.h | 6 +++---
4 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 55497f0bf5..b5e894de3c 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -459,9 +459,6 @@ dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
install_headers(['rte_config.h'],
subdir: get_option('include_subdir_arch'))
-# enable VFIO only if it is linux OS
-dpdk_conf.set('RTE_EAL_VFIO', is_linux)
-
# specify -D_GNU_SOURCE unconditionally
add_project_arguments('-D_GNU_SOURCE', language: 'c')
diff --git a/drivers/crypto/bcmfs/bcmfs_vfio.c b/drivers/crypto/bcmfs/bcmfs_vfio.c
index 8d6ea16544..9138f96eb0 100644
--- a/drivers/crypto/bcmfs/bcmfs_vfio.c
+++ b/drivers/crypto/bcmfs/bcmfs_vfio.c
@@ -7,14 +7,12 @@
#include <sys/mman.h>
#include <sys/ioctl.h>
+#include <rte_vfio.h>
+
#include "bcmfs_device.h"
#include "bcmfs_logs.h"
#include "bcmfs_vfio.h"
-#ifdef RTE_EAL_VFIO
-
-#include <rte_vfio.h>
-
static int
vfio_map_dev_obj(const char *path, const char *dev_obj,
uint32_t *size, void **addr, int *dev_fd)
@@ -94,15 +92,3 @@ bcmfs_release_vfio(struct bcmfs_device *dev)
return;
}
}
-#else /* ! RTE_EAL_VFIO */
-int
-bcmfs_attach_vfio(struct bcmfs_device *dev __rte_unused)
-{
- return -1;
-}
-
-void
-bcmfs_release_vfio(struct bcmfs_device *dev __rte_unused)
-{
-}
-#endif /* RTE_EAL_VFIO */
diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index 5842f83a3b..925dde2ee2 100644
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build
@@ -3,9 +3,9 @@
# All rights reserved.
#
-if is_windows
+if not is_linux
build = false
- reason = 'not supported on Windows'
+ reason = 'only supported on Linux'
subdir_done()
endif
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 594d504c56..035b727dd0 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -19,7 +19,7 @@
extern "C" {
#endif
-#ifdef RTE_EAL_VFIO
+#ifdef RTE_EXEC_ENV_LINUX
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
@@ -94,12 +94,12 @@ struct vfio_device_feature_bus_master {
};
#endif
-#else /* ! RTE_EAL_VFIO */
+#else /* ! RTE_EXEC_ENV_LINUX */
/* we don't need an actual definition, only pointer is used */
struct vfio_device_info;
-#endif /* RTE_EAL_VFIO */
+#endif /* RTE_EXEC_ENV_LINUX */
#define RTE_VFIO_DEFAULT_CONTAINER_FD (-1)
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 4/9] vfio: remove public wrappers
2025-09-03 15:17 ` David Marchand
` (2 preceding siblings ...)
2025-09-03 15:17 ` [RFC v2 3/9] vfio: assume VFIO is always and only present on Linux David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 5/9] eal/linux: remove more internal VFIO macros David Marchand
` (5 subsequent siblings)
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Nipun Gupta,
Nikhil Agarwal, Hemant Agrawal, Sachin Saxena, Chenbo Xia,
Tyler Retzlaff, Harman Kalra
The public header defines a number of wrappers that can be removed or
hidden internally.
Either, those concern old Linux kernel versions that are not supported by
dpdk anymore (DPDK now requires Linux v5.4 at least), like:
- the request notifier feature, present since Linux v4.0,
- the noiommu mode, present since Linux v4.5,
- the capability support, present since Linux v4.6,
- the msix mapping feature, present since Linux v4.16,
Or, those wrappers can be made private as only consumed internally.
- VFIO_GET_REGION_IDX() has no equivalent in the Linux uapi, but
is only used by the Linux PCI bus code,
- VFIO_DEVICE_FEATURE is only used by the CDX bus code,
- the various macros around /dev/vfio/ or the noiommu kmod parameter are
only used by eal_vfio.c,
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/bus/cdx/cdx_vfio.c | 27 ++++++++++++
drivers/bus/fslmc/fslmc_vfio.c | 17 ++++----
drivers/bus/pci/linux/pci_vfio.c | 23 +++--------
drivers/bus/pci/pci_common.c | 2 -
lib/eal/include/rte_vfio.h | 71 --------------------------------
lib/eal/linux/eal_interrupts.c | 10 -----
lib/eal/linux/eal_vfio.c | 23 ++++-------
7 files changed, 50 insertions(+), 123 deletions(-)
diff --git a/drivers/bus/cdx/cdx_vfio.c b/drivers/bus/cdx/cdx_vfio.c
index 37e0c424d4..03d156388e 100644
--- a/drivers/bus/cdx/cdx_vfio.c
+++ b/drivers/bus/cdx/cdx_vfio.c
@@ -613,6 +613,33 @@ 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
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 68439cbd8c..cc4311989b 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -190,7 +190,7 @@ fslmc_vfio_add_group(int 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)
- group->iommu_type = RTE_VFIO_NOIOMMU;
+ group->iommu_type = VFIO_NOIOMMU_IOMMU;
else
group->iommu_type = VFIO_TYPE1_IOMMU;
LIST_INSERT_HEAD(&s_vfio_container.groups, group, next);
@@ -396,8 +396,7 @@ fslmc_vfio_open_group_fd(const char *group_name)
/* if primary, try to open the group */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
/* try regular group format */
- snprintf(filename, sizeof(filename),
- VFIO_GROUP_FMT, iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/%u", iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
goto add_vfio_group;
@@ -451,7 +450,7 @@ fslmc_vfio_check_extensions(int vfio_container_fd)
int ret;
uint32_t idx, n_extensions = 0;
static const int type_id[] = {RTE_VFIO_TYPE1, RTE_VFIO_SPAPR,
- RTE_VFIO_NOIOMMU};
+ VFIO_NOIOMMU_IOMMU};
static const char * const type_id_nm[] = {"Type 1",
"sPAPR", "No-IOMMU"};
@@ -495,10 +494,10 @@ fslmc_vfio_open_container_fd(void)
/* if we're in a primary process, try to open the container */
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- vfio_container_fd = open(VFIO_CONTAINER_PATH, O_RDWR);
+ vfio_container_fd = open("/dev/vfio/vfio", O_RDWR);
if (vfio_container_fd < 0) {
- DPAA2_BUS_ERR("Open VFIO container(%s), err(%d)",
- VFIO_CONTAINER_PATH, vfio_container_fd);
+ DPAA2_BUS_ERR("Open VFIO container, err(%d)",
+ vfio_container_fd);
ret = vfio_container_fd;
goto err_exit;
}
@@ -851,7 +850,7 @@ fslmc_map_dma(uint64_t vaddr, rte_iova_t iovaddr, size_t len)
return fd;
return -EIO;
}
- if (fslmc_vfio_iommu_type(fd) == RTE_VFIO_NOIOMMU) {
+ if (fslmc_vfio_iommu_type(fd) == VFIO_NOIOMMU_IOMMU) {
DPAA2_BUS_DEBUG("Running in NOIOMMU mode");
if (phy != iovaddr) {
DPAA2_BUS_ERR("IOVA should support with IOMMU");
@@ -951,7 +950,7 @@ fslmc_unmap_dma(uint64_t vaddr, uint64_t iovaddr, size_t len)
return fd;
return -EIO;
}
- if (fslmc_vfio_iommu_type(fd) == RTE_VFIO_NOIOMMU) {
+ if (fslmc_vfio_iommu_type(fd) == VFIO_NOIOMMU_IOMMU) {
DPAA2_BUS_DEBUG("Running in NOIOMMU mode");
return 0;
}
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index d0844585fe..9e5776ce3c 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -273,7 +273,6 @@ pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)
return -1;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
/*
* Spinlock for device hot-unplug failure handling.
* If it tries to access bus or device, such as handle sigbus on bus
@@ -390,7 +389,6 @@ pci_vfio_disable_notifier(struct rte_pci_device *dev)
return 0;
}
-#endif
static int
pci_vfio_is_ioport_bar(const struct rte_pci_device *dev, int vfio_dev_fd,
@@ -665,12 +663,12 @@ pci_vfio_info_cap(struct vfio_region_info *info, int cap)
struct vfio_info_cap_header *h;
size_t offset;
- if ((info->flags & RTE_VFIO_INFO_FLAG_CAPS) == 0) {
+ if ((info->flags & VFIO_REGION_INFO_FLAG_CAPS) == 0) {
/* VFIO info does not advertise capabilities */
return NULL;
}
- offset = VFIO_CAP_OFFSET(info);
+ offset = info->cap_offset;
while (offset != 0) {
h = RTE_PTR_ADD(info, offset);
if (h->id == cap)
@@ -690,7 +688,7 @@ pci_vfio_msix_is_mappable(int vfio_dev_fd, int msix_region)
if (ret < 0)
return -1;
- ret = pci_vfio_info_cap(info, RTE_VFIO_CAP_MSIX_MAPPABLE) != NULL;
+ ret = pci_vfio_info_cap(info, VFIO_REGION_INFO_CAP_MSIX_MAPPABLE) != NULL;
/* cleanup */
free(info);
@@ -745,10 +743,8 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
if (rte_intr_fd_set(dev->intr_handle, -1))
return -1;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_fd_set(dev->vfio_req_intr_handle, -1))
return -1;
-#endif
/* store PCI address string */
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
@@ -904,13 +900,11 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
goto err_map;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (pci_vfio_enable_notifier(dev, vfio_dev_fd) != 0) {
PCI_LOG(ERR, "Error setting up notifier!");
goto err_map;
}
-#endif
TAILQ_INSERT_TAIL(vfio_res_list, vfio_res, next);
return 0;
@@ -945,10 +939,8 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
if (rte_intr_fd_set(dev->intr_handle, -1))
return -1;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_fd_set(dev->vfio_req_intr_handle, -1))
return -1;
-#endif
/* store PCI address string */
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
@@ -1002,10 +994,8 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
/* we need save vfio_dev_fd, so it can be used during release */
if (rte_intr_dev_fd_set(dev->intr_handle, vfio_dev_fd))
goto err_vfio_dev_fd;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
if (rte_intr_dev_fd_set(dev->vfio_req_intr_handle, vfio_dev_fd))
goto err_vfio_dev_fd;
-#endif
return 0;
err_vfio_dev_fd:
@@ -1085,14 +1075,12 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
loc->domain, loc->bus, loc->devid, loc->function);
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
ret = pci_vfio_disable_notifier(dev);
if (ret) {
PCI_LOG(ERR, "fail to disable req notifier.");
return -1;
}
-#endif
if (rte_intr_fd_get(dev->intr_handle) < 0)
return -1;
@@ -1226,6 +1214,7 @@ pci_vfio_ioport_map(struct rte_pci_device *dev, int bar,
return 0;
}
+#define PCI_VFIO_GET_REGION_IDX(x) (x >> 40)
void
pci_vfio_ioport_read(struct rte_pci_ioport *p,
void *data, size_t len, off_t offset)
@@ -1239,7 +1228,7 @@ pci_vfio_ioport_read(struct rte_pci_ioport *p,
if (pread(vfio_dev_fd, data,
len, p->base + offset) <= 0)
PCI_LOG(ERR, "Can't read from PCI bar (%" PRIu64 ") : offset (%x)",
- VFIO_GET_REGION_IDX(p->base), (int)offset);
+ PCI_VFIO_GET_REGION_IDX(p->base), (int)offset);
}
void
@@ -1255,7 +1244,7 @@ pci_vfio_ioport_write(struct rte_pci_ioport *p,
if (pwrite(vfio_dev_fd, data,
len, p->base + offset) <= 0)
PCI_LOG(ERR, "Can't write to PCI bar (%" PRIu64 ") : offset (%x)",
- VFIO_GET_REGION_IDX(p->base), (int)offset);
+ PCI_VFIO_GET_REGION_IDX(p->base), (int)offset);
}
int
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index c88634f790..bf5df3d94e 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -603,7 +603,6 @@ pci_hot_unplug_handler(struct rte_device *dev)
return -1;
switch (pdev->kdrv) {
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_PCI_KDRV_VFIO:
/*
* vfio kernel module guaranty the pci device would not be
@@ -614,7 +613,6 @@ pci_hot_unplug_handler(struct rte_device *dev)
rte_dev_event_callback_process(dev->name,
RTE_DEV_EVENT_REMOVE);
break;
-#endif
case RTE_PCI_KDRV_IGB_UIO:
case RTE_PCI_KDRV_UIO_GENERIC:
case RTE_PCI_KDRV_NIC_UIO:
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 035b727dd0..509ffec80c 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -21,79 +21,8 @@ extern "C" {
#ifdef RTE_EXEC_ENV_LINUX
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-#define HAVE_VFIO_DEV_REQ_INTERFACE
-#endif /* kernel version >= 4.0.0 */
-
#include <linux/vfio.h>
-#define VFIO_DIR "/dev/vfio"
-#define VFIO_CONTAINER_PATH "/dev/vfio/vfio"
-#define VFIO_GROUP_FMT "/dev/vfio/%u"
-#define VFIO_NOIOMMU_GROUP_FMT "/dev/vfio/noiommu-%u"
-#define VFIO_GET_REGION_IDX(x) (x >> 40)
-#define VFIO_NOIOMMU_MODE \
- "/sys/module/vfio/parameters/enable_unsafe_noiommu_mode"
-
-/* NOIOMMU is defined from kernel version 4.5 onwards */
-#ifdef VFIO_NOIOMMU_IOMMU
-#define RTE_VFIO_NOIOMMU VFIO_NOIOMMU_IOMMU
-#else
-#define RTE_VFIO_NOIOMMU 8
-#endif
-
-/*
- * capabilities are only supported on kernel 4.6+. there were also some API
- * changes as well, so add a macro to get cap offset.
- */
-#ifdef VFIO_REGION_INFO_FLAG_CAPS
-#define RTE_VFIO_INFO_FLAG_CAPS VFIO_REGION_INFO_FLAG_CAPS
-#define VFIO_CAP_OFFSET(x) (x->cap_offset)
-#else
-#define RTE_VFIO_INFO_FLAG_CAPS (1 << 3)
-#define VFIO_CAP_OFFSET(x) (x->resv)
-struct vfio_info_cap_header {
- uint16_t id;
- uint16_t version;
- uint32_t next;
-};
-#endif
-
-/* kernels 4.16+ can map BAR containing MSI-X table */
-#ifdef VFIO_REGION_INFO_CAP_MSIX_MAPPABLE
-#define RTE_VFIO_CAP_MSIX_MAPPABLE VFIO_REGION_INFO_CAP_MSIX_MAPPABLE
-#else
-#define RTE_VFIO_CAP_MSIX_MAPPABLE 3
-#endif
-
-/* 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
-
#else /* ! RTE_EXEC_ENV_LINUX */
/* we don't need an actual definition, only pointer is used */
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index d420ecf947..43e05c86a2 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -336,7 +336,6 @@ vfio_disable_msix(const struct rte_intr_handle *intr_handle) {
return ret;
}
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
/* enable req notifier */
static int
vfio_enable_req(const struct rte_intr_handle *intr_handle)
@@ -396,7 +395,6 @@ vfio_disable_req(const struct rte_intr_handle *intr_handle)
return ret;
}
-#endif
static int
uio_intx_intr_disable(const struct rte_intr_handle *intr_handle)
@@ -741,12 +739,10 @@ rte_intr_enable(const struct rte_intr_handle *intr_handle)
if (vfio_enable_intx(intr_handle))
rc = -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
if (vfio_enable_req(intr_handle))
rc = -1;
break;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
rc = -1;
@@ -808,10 +804,8 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
if (vfio_ack_intx(intr_handle))
return -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
return -1;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
return -1;
@@ -871,12 +865,10 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle)
if (vfio_disable_intx(intr_handle))
rc = -1;
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
if (vfio_disable_req(intr_handle))
rc = -1;
break;
-#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
rc = -1;
@@ -937,9 +929,7 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)
case RTE_INTR_HANDLE_ALARM:
bytes_read = sizeof(buf.timerfd_num);
break;
-#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
-#endif
case RTE_INTR_HANDLE_VFIO_MSIX:
case RTE_INTR_HANDLE_VFIO_MSI:
case RTE_INTR_HANDLE_VFIO_LEGACY:
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index 805f0ff92c..dfc3bd6e62 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -85,7 +85,7 @@ static const struct vfio_iommu_type iommu_types[] = {
},
/* IOMMU-less mode */
{
- .type_id = RTE_VFIO_NOIOMMU,
+ .type_id = VFIO_NOIOMMU_IOMMU,
.name = "No-IOMMU",
.partial_unmap = true,
.dma_map_func = &vfio_noiommu_dma_map,
@@ -363,8 +363,7 @@ vfio_open_group_fd(int iommu_group_num)
/* if primary, try to open the group */
if (internal_conf->process_type == RTE_PROC_PRIMARY) {
/* try regular group format */
- snprintf(filename, sizeof(filename),
- VFIO_GROUP_FMT, iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/%u", iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
if (vfio_group_fd < 0) {
/* if file not found, it's not an error */
@@ -375,9 +374,8 @@ vfio_open_group_fd(int iommu_group_num)
}
/* special case: try no-IOMMU path as well */
- snprintf(filename, sizeof(filename),
- VFIO_NOIOMMU_GROUP_FMT,
- iommu_group_num);
+ snprintf(filename, sizeof(filename), "/dev/vfio/noiommu-%u",
+ iommu_group_num);
vfio_group_fd = open(filename, O_RDWR);
if (vfio_group_fd < 0) {
if (errno != ENOENT) {
@@ -1128,7 +1126,7 @@ rte_vfio_enable(const char *modname)
}
/* VFIO directory might not exist (e.g., unprivileged containers) */
- dir = opendir(VFIO_DIR);
+ dir = opendir("/dev/vfio");
if (dir == NULL) {
EAL_LOG(DEBUG,
"VFIO directory does not exist, skipping VFIO support...");
@@ -1315,15 +1313,12 @@ rte_vfio_get_container_fd(void)
const struct internal_config *internal_conf =
eal_get_internal_configuration();
-
/* if we're in a primary process, try to open the container */
if (internal_conf->process_type == RTE_PROC_PRIMARY) {
- vfio_container_fd = open(VFIO_CONTAINER_PATH, O_RDWR);
+ vfio_container_fd = open("/dev/vfio/vfio", O_RDWR);
if (vfio_container_fd < 0) {
- EAL_LOG(ERR,
- "Cannot open VFIO container %s, error "
- "%i (%s)", VFIO_CONTAINER_PATH,
- errno, strerror(errno));
+ EAL_LOG(ERR, "Cannot open VFIO container, error %i (%s)",
+ errno, strerror(errno));
return -1;
}
@@ -2053,7 +2048,7 @@ rte_vfio_noiommu_is_enabled(void)
ssize_t cnt;
char c;
- fd = open(VFIO_NOIOMMU_MODE, O_RDONLY);
+ fd = open("/sys/module/vfio/parameters/enable_unsafe_noiommu_mode", O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
EAL_LOG(ERR, "Cannot open VFIO noiommu file "
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 5/9] eal/linux: remove more internal VFIO macros
2025-09-03 15:17 ` David Marchand
` (3 preceding siblings ...)
2025-09-03 15:17 ` [RFC v2 4/9] vfio: remove public wrappers David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 6/9] eal/linux: remove internal VFIO wrappers for old Linux David Marchand
` (4 subsequent siblings)
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin, anatoly.burakov
No need to redefine some VFIO_* macros that look like a define coming
from standard linux/vfio.h header.
Use RTE_DIM() and remove unneeded checks (like in get_vfio_group_idx()
where j can't be >= RTE_DIM(vfio_cfg->vfio_groups)).
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/eal/linux/eal_vfio.c | 97 ++++++++++++++++++++--------------------
lib/eal/linux/eal_vfio.h | 3 --
2 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index dfc3bd6e62..1eab90a261 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -29,7 +29,7 @@
* was registered by the user themselves, so we need to store the user mappings
* somewhere, to recreate them later.
*/
-#define VFIO_MAX_USER_MEM_MAPS 256
+#define EAL_VFIO_MAX_USER_MEM_MAPS 256
struct user_mem_map {
uint64_t addr; /**< start VA */
uint64_t iova; /**< start IOVA */
@@ -40,7 +40,7 @@ struct user_mem_map {
struct user_mem_maps {
rte_spinlock_recursive_t lock;
int n_maps;
- struct user_mem_map maps[VFIO_MAX_USER_MEM_MAPS];
+ struct user_mem_map maps[EAL_VFIO_MAX_USER_MEM_MAPS];
};
struct vfio_config {
@@ -48,12 +48,12 @@ struct vfio_config {
int vfio_container_fd;
int vfio_active_groups;
const struct vfio_iommu_type *vfio_iommu_type;
- struct vfio_group vfio_groups[VFIO_MAX_GROUPS];
+ struct vfio_group vfio_groups[RTE_MAX_VFIO_GROUPS];
struct user_mem_maps mem_maps;
};
/* per-process VFIO config */
-static struct vfio_config vfio_cfgs[VFIO_MAX_CONTAINERS];
+static struct vfio_config vfio_cfgs[RTE_MAX_VFIO_CONTAINERS];
static struct vfio_config *default_vfio_cfg = &vfio_cfgs[0];
static int vfio_type1_dma_map(int);
@@ -183,10 +183,10 @@ static void
delete_maps(struct user_mem_maps *user_mem_maps, struct user_mem_map *del_maps,
size_t n_del)
{
- int i;
+ unsigned int i;
size_t j;
- for (i = 0, j = 0; i < VFIO_MAX_USER_MEM_MAPS && j < n_del; i++) {
+ for (i = 0, j = 0; i < RTE_DIM(user_mem_maps->maps) && j < n_del; i++) {
struct user_mem_map *left = &user_mem_maps->maps[i];
struct user_mem_map *right = &del_maps[j];
@@ -202,10 +202,10 @@ static void
copy_maps(struct user_mem_maps *user_mem_maps, struct user_mem_map *add_maps,
size_t n_add)
{
- int i;
+ unsigned int i;
size_t j;
- for (i = 0, j = 0; i < VFIO_MAX_USER_MEM_MAPS && j < n_add; i++) {
+ for (i = 0, j = 0; i < RTE_DIM(user_mem_maps->maps) && j < n_add; i++) {
struct user_mem_map *left = &user_mem_maps->maps[i];
struct user_mem_map *right = &add_maps[j];
@@ -321,13 +321,13 @@ find_user_mem_maps(struct user_mem_maps *user_mem_maps, uint64_t addr,
static void
compact_user_maps(struct user_mem_maps *user_mem_maps)
{
- int i;
+ unsigned int i;
- qsort(user_mem_maps->maps, VFIO_MAX_USER_MEM_MAPS,
+ qsort(user_mem_maps->maps, RTE_DIM(user_mem_maps->maps),
sizeof(user_mem_maps->maps[0]), user_mem_map_cmp);
/* we'll go over the list backwards when merging */
- for (i = VFIO_MAX_USER_MEM_MAPS - 2; i >= 0; i--) {
+ for (i = RTE_DIM(user_mem_maps->maps) - 2; i != 0; i--) {
struct user_mem_map *l, *r;
l = &user_mem_maps->maps[i];
@@ -344,7 +344,7 @@ compact_user_maps(struct user_mem_maps *user_mem_maps)
/* the entries are still sorted, but now they have holes in them, so
* sort the list again.
*/
- qsort(user_mem_maps->maps, VFIO_MAX_USER_MEM_MAPS,
+ qsort(user_mem_maps->maps, RTE_DIM(user_mem_maps->maps),
sizeof(user_mem_maps->maps[0]), user_mem_map_cmp);
}
@@ -423,11 +423,11 @@ static struct vfio_config *
get_vfio_cfg_by_group_num(int iommu_group_num)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++) {
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++) {
if (vfio_cfg->vfio_groups[j].group_num ==
iommu_group_num)
return vfio_cfg;
@@ -441,30 +441,30 @@ static int
vfio_get_group_fd(struct vfio_config *vfio_cfg,
int iommu_group_num)
{
- int i;
+ struct vfio_group *cur_grp = NULL;
int vfio_group_fd;
- struct vfio_group *cur_grp;
+ unsigned int i;
/* check if we already have the group descriptor open */
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num == iommu_group_num)
return vfio_cfg->vfio_groups[i].fd;
/* Lets see first if there is room for a new group */
- if (vfio_cfg->vfio_active_groups == VFIO_MAX_GROUPS) {
+ if (vfio_cfg->vfio_active_groups == RTE_DIM(vfio_cfg->vfio_groups)) {
EAL_LOG(ERR, "Maximum number of VFIO groups reached!");
return -1;
}
/* Now lets get an index for the new group */
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num == -1) {
cur_grp = &vfio_cfg->vfio_groups[i];
break;
}
/* This should not happen */
- if (i == VFIO_MAX_GROUPS) {
+ if (cur_grp == NULL) {
EAL_LOG(ERR, "No VFIO group free slot found");
return -1;
}
@@ -487,11 +487,11 @@ static struct vfio_config *
get_vfio_cfg_by_group_fd(int vfio_group_fd)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++)
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++)
if (vfio_cfg->vfio_groups[j].fd == vfio_group_fd)
return vfio_cfg;
}
@@ -502,12 +502,12 @@ get_vfio_cfg_by_group_fd(int vfio_group_fd)
static struct vfio_config *
get_vfio_cfg_by_container_fd(int container_fd)
{
- int i;
+ unsigned int i;
if (container_fd == RTE_VFIO_DEFAULT_CONTAINER_FD)
return default_vfio_cfg;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
if (vfio_cfgs[i].vfio_container_fd == container_fd)
return &vfio_cfgs[i];
}
@@ -532,11 +532,11 @@ static int
get_vfio_group_idx(int vfio_group_fd)
{
struct vfio_config *vfio_cfg;
- int i, j;
+ unsigned int i, j;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfg = &vfio_cfgs[i];
- for (j = 0; j < VFIO_MAX_GROUPS; j++)
+ for (j = 0; j < RTE_DIM(vfio_cfg->vfio_groups); j++)
if (vfio_cfg->vfio_groups[j].fd == vfio_group_fd)
return j;
}
@@ -557,7 +557,7 @@ vfio_group_device_get(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1))
+ if (i < 0)
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
else
vfio_cfg->vfio_groups[i].devices++;
@@ -576,7 +576,7 @@ vfio_group_device_put(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1))
+ if (i < 0)
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
else
vfio_cfg->vfio_groups[i].devices--;
@@ -595,7 +595,7 @@ vfio_group_device_count(int vfio_group_fd)
}
i = get_vfio_group_idx(vfio_group_fd);
- if (i < 0 || i > (VFIO_MAX_GROUPS - 1)) {
+ if (i < 0) {
EAL_LOG(ERR, "Wrong VFIO group index (%d)", i);
return -1;
}
@@ -1086,7 +1086,7 @@ int
rte_vfio_enable(const char *modname)
{
/* initialize group list */
- int i, j;
+ unsigned int i, j;
int vfio_available;
DIR *dir;
const struct internal_config *internal_conf =
@@ -1094,13 +1094,13 @@ rte_vfio_enable(const char *modname)
rte_spinlock_recursive_t lock = RTE_SPINLOCK_RECURSIVE_INITIALIZER;
- for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfgs); i++) {
vfio_cfgs[i].vfio_container_fd = -1;
vfio_cfgs[i].vfio_active_groups = 0;
vfio_cfgs[i].vfio_iommu_type = NULL;
vfio_cfgs[i].mem_maps.lock = lock;
- for (j = 0; j < VFIO_MAX_GROUPS; j++) {
+ for (j = 0; j < RTE_DIM(vfio_cfgs[i].vfio_groups); j++) {
vfio_cfgs[i].vfio_groups[j].fd = -1;
vfio_cfgs[i].vfio_groups[j].group_num = -1;
vfio_cfgs[i].vfio_groups[j].devices = 0;
@@ -1895,7 +1895,7 @@ container_dma_map(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
user_mem_maps = &vfio_cfg->mem_maps;
rte_spinlock_recursive_lock(&user_mem_maps->lock);
- if (user_mem_maps->n_maps == VFIO_MAX_USER_MEM_MAPS) {
+ if (user_mem_maps->n_maps == RTE_DIM(user_mem_maps->maps)) {
EAL_LOG(ERR, "No more space for user mem maps");
rte_errno = ENOMEM;
ret = -1;
@@ -1935,11 +1935,12 @@ static int
container_dma_unmap(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
uint64_t len)
{
- struct user_mem_map orig_maps[VFIO_MAX_USER_MEM_MAPS];
+ struct user_mem_map orig_maps[RTE_DIM(vfio_cfg->mem_maps.maps)];
struct user_mem_map new_maps[2]; /* can be at most 2 */
struct user_mem_maps *user_mem_maps;
- int n_orig, n_new, newlen, ret = 0;
+ int n_orig, n_new, ret = 0;
bool has_partial_unmap;
+ unsigned int newlen;
user_mem_maps = &vfio_cfg->mem_maps;
rte_spinlock_recursive_lock(&user_mem_maps->lock);
@@ -2005,7 +2006,7 @@ container_dma_unmap(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
/* can we store the new maps in our list? */
newlen = (user_mem_maps->n_maps - n_orig) + n_new;
- if (newlen >= VFIO_MAX_USER_MEM_MAPS) {
+ if (newlen >= RTE_DIM(user_mem_maps->maps)) {
EAL_LOG(ERR, "Not enough space to store partial mapping");
rte_errno = ENOMEM;
ret = -1;
@@ -2077,15 +2078,15 @@ RTE_EXPORT_SYMBOL(rte_vfio_container_create)
int
rte_vfio_container_create(void)
{
- int i;
+ unsigned int i;
/* Find an empty slot to store new vfio config */
- for (i = 1; i < VFIO_MAX_CONTAINERS; i++) {
+ for (i = 1; i < RTE_DIM(vfio_cfgs); i++) {
if (vfio_cfgs[i].vfio_container_fd == -1)
break;
}
- if (i == VFIO_MAX_CONTAINERS) {
+ if (i == RTE_DIM(vfio_cfgs)) {
EAL_LOG(ERR, "Exceed max VFIO container limit");
return -1;
}
@@ -2104,7 +2105,7 @@ int
rte_vfio_container_destroy(int container_fd)
{
struct vfio_config *vfio_cfg;
- int i;
+ unsigned int i;
vfio_cfg = get_vfio_cfg_by_container_fd(container_fd);
if (vfio_cfg == NULL) {
@@ -2112,7 +2113,7 @@ rte_vfio_container_destroy(int container_fd)
return -1;
}
- for (i = 0; i < VFIO_MAX_GROUPS; i++)
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++)
if (vfio_cfg->vfio_groups[i].group_num != -1)
rte_vfio_container_group_unbind(container_fd,
vfio_cfg->vfio_groups[i].group_num);
@@ -2144,9 +2145,9 @@ RTE_EXPORT_SYMBOL(rte_vfio_container_group_unbind)
int
rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
{
- struct vfio_config *vfio_cfg;
struct vfio_group *cur_grp = NULL;
- int i;
+ struct vfio_config *vfio_cfg;
+ unsigned int i;
vfio_cfg = get_vfio_cfg_by_container_fd(container_fd);
if (vfio_cfg == NULL) {
@@ -2154,7 +2155,7 @@ rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
return -1;
}
- for (i = 0; i < VFIO_MAX_GROUPS; i++) {
+ for (i = 0; i < RTE_DIM(vfio_cfg->vfio_groups); i++) {
if (vfio_cfg->vfio_groups[i].group_num == iommu_group_num) {
cur_grp = &vfio_cfg->vfio_groups[i];
break;
@@ -2162,7 +2163,7 @@ rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)
}
/* This should not happen */
- if (i == VFIO_MAX_GROUPS || cur_grp == NULL) {
+ if (cur_grp == NULL) {
EAL_LOG(ERR, "Specified VFIO group number not found");
return -1;
}
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index e7d855c032..413c8f18df 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -69,9 +69,6 @@ struct vfio_iommu_spapr_tce_info {
#define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU
#endif
-#define VFIO_MAX_GROUPS RTE_MAX_VFIO_GROUPS
-#define VFIO_MAX_CONTAINERS RTE_MAX_VFIO_CONTAINERS
-
/*
* we don't need to store device fd's anywhere since they can be obtained from
* the group fd via an ioctl() call.
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 6/9] eal/linux: remove internal VFIO wrappers for old Linux
2025-09-03 15:17 ` David Marchand
` (4 preceding siblings ...)
2025-09-03 15:17 ` [RFC v2 5/9] eal/linux: remove more internal VFIO macros David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 7/9] vfio: stop including Linux kernel header in public and driver API David Marchand
` (3 subsequent siblings)
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, Hemant Agrawal, Sachin Saxena
DPDK now requires Linux v5.4 at least.
VFIO_SPAPR_TCE_IOMMU is present in Linux since v3.11.
VFIO_SPAPR_TCE_v2_IOMMU is present in Linux since v4.2.
Remove wrappers accordingly.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/bus/fslmc/fslmc_vfio.c | 2 +-
lib/eal/linux/eal_vfio.c | 4 +--
lib/eal/linux/eal_vfio.h | 60 ----------------------------------
3 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index cc4311989b..c08c316c94 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -449,7 +449,7 @@ fslmc_vfio_check_extensions(int vfio_container_fd)
{
int ret;
uint32_t idx, n_extensions = 0;
- static const int type_id[] = {RTE_VFIO_TYPE1, RTE_VFIO_SPAPR,
+ static const int type_id[] = {VFIO_TYPE1_IOMMU, VFIO_SPAPR_TCE_v2_IOMMU,
VFIO_NOIOMMU_IOMMU};
static const char * const type_id_nm[] = {"Type 1",
"sPAPR", "No-IOMMU"};
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index 1eab90a261..c6aed44946 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -69,7 +69,7 @@ static int vfio_dma_mem_map(struct vfio_config *vfio_cfg, uint64_t vaddr,
static const struct vfio_iommu_type iommu_types[] = {
/* x86 IOMMU, otherwise known as type 1 */
{
- .type_id = RTE_VFIO_TYPE1,
+ .type_id = VFIO_TYPE1_IOMMU,
.name = "Type 1",
.partial_unmap = false,
.dma_map_func = &vfio_type1_dma_map,
@@ -77,7 +77,7 @@ static const struct vfio_iommu_type iommu_types[] = {
},
/* ppc64 IOMMU, otherwise known as spapr */
{
- .type_id = RTE_VFIO_SPAPR,
+ .type_id = VFIO_SPAPR_TCE_v2_IOMMU,
.name = "sPAPR",
.partial_unmap = true,
.dma_map_func = &vfio_spapr_dma_map,
diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h
index 413c8f18df..5c5742b429 100644
--- a/lib/eal/linux/eal_vfio.h
+++ b/lib/eal/linux/eal_vfio.h
@@ -8,66 +8,6 @@
#include <rte_common.h>
#include <stdint.h>
-#include <linux/vfio.h>
-
-#define RTE_VFIO_TYPE1 VFIO_TYPE1_IOMMU
-
-#ifndef VFIO_SPAPR_TCE_v2_IOMMU
-#define RTE_VFIO_SPAPR 7
-#define VFIO_IOMMU_SPAPR_REGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 17)
-#define VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 18)
-#define VFIO_IOMMU_SPAPR_TCE_CREATE _IO(VFIO_TYPE, VFIO_BASE + 19)
-#define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20)
-
-struct vfio_iommu_spapr_register_memory {
- uint32_t argsz;
- uint32_t flags;
- uint64_t vaddr;
- uint64_t size;
-};
-
-struct vfio_iommu_spapr_tce_create {
- uint32_t argsz;
- uint32_t flags;
- /* in */
- uint32_t page_shift;
- uint32_t __resv1;
- uint64_t window_size;
- uint32_t levels;
- uint32_t __resv2;
- /* out */
- uint64_t start_addr;
-};
-
-struct vfio_iommu_spapr_tce_remove {
- uint32_t argsz;
- uint32_t flags;
- /* in */
- uint64_t start_addr;
-};
-
-struct vfio_iommu_spapr_tce_ddw_info {
- uint64_t pgsizes;
- uint32_t max_dynamic_windows_supported;
- uint32_t levels;
-};
-
-/* SPAPR_v2 is not present, but SPAPR might be */
-#ifndef VFIO_SPAPR_TCE_IOMMU
-#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
-
-struct vfio_iommu_spapr_tce_info {
- uint32_t argsz;
- uint32_t flags;
- uint32_t dma32_window_start;
- uint32_t dma32_window_size;
- struct vfio_iommu_spapr_tce_ddw_info ddw;
-};
-#endif /* VFIO_SPAPR_TCE_IOMMU */
-
-#else /* VFIO_SPAPR_TCE_v2_IOMMU */
-#define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU
-#endif
/*
* we don't need to store device fd's anywhere since they can be obtained from
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 7/9] vfio: stop including Linux kernel header in public and driver API
2025-09-03 15:17 ` David Marchand
` (5 preceding siblings ...)
2025-09-03 15:17 ` [RFC v2 6/9] eal/linux: remove internal VFIO wrappers for old Linux David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 8/9] uapi: import VFIO header David Marchand
` (2 subsequent siblings)
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, 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
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 <david.marchand@redhat.com>
Reviewed-by: Rosen Xu <rosen.xu@altera.com>
---
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 | 8 --------
lib/eal/linux/eal_interrupts.c | 3 ++-
lib/eal/linux/eal_vfio.c | 1 +
17 files changed, 27 insertions(+), 14 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 <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
+
+#include <linux/vfio.h>
+
#include <eal_export.h>
#include <rte_eal_paging.h>
#include <rte_malloc.h>
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 <sys/queue.h>
#include <stdint.h>
#include <inttypes.h>
-#include <linux/vfio.h>
#include <rte_compat.h>
#include <rte_debug.h>
@@ -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 <rte_memcpy.h>
#include <ethdev_driver.h>
#include <rte_mbuf_dyn.h>
+#include <rte_vfio.h>
#include "private.h"
#include <fslmc_vfio.h>
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index c08c316c94..3f041f447c 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -20,6 +20,7 @@
#include <dirent.h>
#include <sys/eventfd.h>
#include <ctype.h>
+#include <linux/vfio.h>
#include <eal_export.h>
#include <eal_filesystem.h>
@@ -32,6 +33,7 @@
#include <rte_kvargs.h>
#include <dev_driver.h>
#include <rte_eal_memconfig.h>
+#include <rte_vfio.h>
#include <eal_vfio.h>
#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 <rte_compat.h>
-#include <rte_vfio.h>
/* 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 <sys/epoll.h>
#include <sys/eventfd.h>
#include <sys/syscall.h>
+#include <linux/vfio.h>
#include <eal_export.h>
#include <rte_mbuf.h>
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 <sys/mman.h>
#include <stdbool.h>
+#include <linux/vfio.h>
+
#include <rte_log.h>
#include <rte_pci.h>
#include <rte_bus_pci.h>
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 <sys/queue.h>
#include <unistd.h>
+#include <linux/vfio.h>
+
#include <bus_driver.h>
#include <bus_platform_driver.h>
#include <eal_export.h>
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 <sys/mman.h>
#include <sys/ioctl.h>
+#include <linux/vfio.h>
+
#include <rte_vfio.h>
#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 <sys/eventfd.h>
#include <sys/ioctl.h>
+#include <linux/vfio.h>
+
#include <rte_eal.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_io.h>
-#include <rte_vfio.h>
#include <bus_pci_driver.h>
#include <bus_ifpga_driver.h>
#include <rte_rawdev.h>
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 <sys/ioctl.h>
-#include <rte_vfio.h>
+#include <linux/vfio.h>
#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 <linux/virtio_net.h>
#include <stdbool.h>
+#include <linux/vfio.h>
+
#include <rte_eal_paging.h>
#include <rte_malloc.h>
#include <rte_memory.h>
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 <sys/ioctl.h>
#include <unistd.h>
+#include <linux/vfio.h>
+
#include <nfp_common_pci.h>
#include <nfp_dev.h>
#include <rte_vfio.h>
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 <unistd.h>
#include <sys/ioctl.h>
+#include <linux/vfio.h>
+
#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
-#include <rte_vfio.h>
#include <rte_vhost.h>
#include <vdpa_driver.h>
diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 509ffec80c..683affa933 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -19,17 +19,9 @@
extern "C" {
#endif
-#ifdef RTE_EXEC_ENV_LINUX
-
-#include <linux/vfio.h>
-
-#else /* ! 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 <assert.h>
#include <stdbool.h>
+#include <linux/vfio.h>
+
#include <eal_export.h>
#include <eal_trace_internal.h>
#include <rte_common.h>
@@ -28,7 +30,6 @@
#include <rte_errno.h>
#include <rte_spinlock.h>
#include <rte_pause.h>
-#include <rte_vfio.h>
#include "eal_private.h"
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index c6aed44946..62f9d05e63 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -8,6 +8,7 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <dirent.h>
+#include <linux/vfio.h>
#include <rte_errno.h>
#include <rte_log.h>
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 8/9] uapi: import VFIO header
2025-09-03 15:17 ` David Marchand
` (6 preceding siblings ...)
2025-09-03 15:17 ` [RFC v2 7/9] vfio: stop including Linux kernel header in public and driver API David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-03 15:17 ` [RFC v2 9/9] vfio: use imported uAPI header David Marchand
2025-09-04 7:08 ` [RFC v2 0/9] Cleanup VFIO API and import Linux " David Marchand
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev; +Cc: thomas, maxime.coquelin, anatoly.burakov
Import VFIO header (from v6.16) to be included in many parts of DPDK.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
kernel/linux/uapi/linux/vfio.h | 1836 ++++++++++++++++++++++++++++++++
kernel/linux/uapi/version | 2 +-
2 files changed, 1837 insertions(+), 1 deletion(-)
create mode 100644 kernel/linux/uapi/linux/vfio.h
diff --git a/kernel/linux/uapi/linux/vfio.h b/kernel/linux/uapi/linux/vfio.h
new file mode 100644
index 0000000000..4413783940
--- /dev/null
+++ b/kernel/linux/uapi/linux/vfio.h
@@ -0,0 +1,1836 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * VFIO API definition
+ *
+ * Copyright (C) 2012 Red Hat, Inc. All rights reserved.
+ * Author: Alex Williamson <alex.williamson@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPIVFIO_H
+#define _UAPIVFIO_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define VFIO_API_VERSION 0
+
+
+/* Kernel & User level defines for VFIO IOCTLs. */
+
+/* Extensions */
+
+#define VFIO_TYPE1_IOMMU 1
+#define VFIO_SPAPR_TCE_IOMMU 2
+#define VFIO_TYPE1v2_IOMMU 3
+/*
+ * IOMMU enforces DMA cache coherence (ex. PCIe NoSnoop stripping). This
+ * capability is subject to change as groups are added or removed.
+ */
+#define VFIO_DMA_CC_IOMMU 4
+
+/* Check if EEH is supported */
+#define VFIO_EEH 5
+
+/* Two-stage IOMMU */
+#define __VFIO_RESERVED_TYPE1_NESTING_IOMMU 6 /* Implies v2 */
+
+#define VFIO_SPAPR_TCE_v2_IOMMU 7
+
+/*
+ * The No-IOMMU IOMMU offers no translation or isolation for devices and
+ * supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU
+ * code will taint the host kernel and should be used with extreme caution.
+ */
+#define VFIO_NOIOMMU_IOMMU 8
+
+/* Supports VFIO_DMA_UNMAP_FLAG_ALL */
+#define VFIO_UNMAP_ALL 9
+
+/*
+ * Supports the vaddr flag for DMA map and unmap. Not supported for mediated
+ * devices, so this capability is subject to change as groups are added or
+ * removed.
+ */
+#define VFIO_UPDATE_VADDR 10
+
+/*
+ * The IOCTL interface is designed for extensibility by embedding the
+ * structure length (argsz) and flags into structures passed between
+ * kernel and userspace. We therefore use the _IO() macro for these
+ * defines to avoid implicitly embedding a size into the ioctl request.
+ * As structure fields are added, argsz will increase to match and flag
+ * bits will be defined to indicate additional fields with valid data.
+ * It's *always* the caller's responsibility to indicate the size of
+ * the structure passed by setting argsz appropriately.
+ */
+
+#define VFIO_TYPE (';')
+#define VFIO_BASE 100
+
+/*
+ * For extension of INFO ioctls, VFIO makes use of a capability chain
+ * designed after PCI/e capabilities. A flag bit indicates whether
+ * this capability chain is supported and a field defined in the fixed
+ * structure defines the offset of the first capability in the chain.
+ * This field is only valid when the corresponding bit in the flags
+ * bitmap is set. This offset field is relative to the start of the
+ * INFO buffer, as is the next field within each capability header.
+ * The id within the header is a shared address space per INFO ioctl,
+ * while the version field is specific to the capability id. The
+ * contents following the header are specific to the capability id.
+ */
+struct vfio_info_cap_header {
+ __u16 id; /* Identifies capability */
+ __u16 version; /* Version specific to the capability ID */
+ __u32 next; /* Offset of next capability */
+};
+
+/*
+ * Callers of INFO ioctls passing insufficiently sized buffers will see
+ * the capability chain flag bit set, a zero value for the first capability
+ * offset (if available within the provided argsz), and argsz will be
+ * updated to report the necessary buffer size. For compatibility, the
+ * INFO ioctl will not report error in this case, but the capability chain
+ * will not be available.
+ */
+
+/* -------- IOCTLs for VFIO file descriptor (/dev/vfio/vfio) -------- */
+
+/**
+ * VFIO_GET_API_VERSION - _IO(VFIO_TYPE, VFIO_BASE + 0)
+ *
+ * Report the version of the VFIO API. This allows us to bump the entire
+ * API version should we later need to add or change features in incompatible
+ * ways.
+ * Return: VFIO_API_VERSION
+ * Availability: Always
+ */
+#define VFIO_GET_API_VERSION _IO(VFIO_TYPE, VFIO_BASE + 0)
+
+/**
+ * VFIO_CHECK_EXTENSION - _IOW(VFIO_TYPE, VFIO_BASE + 1, __u32)
+ *
+ * Check whether an extension is supported.
+ * Return: 0 if not supported, 1 (or some other positive integer) if supported.
+ * Availability: Always
+ */
+#define VFIO_CHECK_EXTENSION _IO(VFIO_TYPE, VFIO_BASE + 1)
+
+/**
+ * VFIO_SET_IOMMU - _IOW(VFIO_TYPE, VFIO_BASE + 2, __s32)
+ *
+ * Set the iommu to the given type. The type must be supported by an
+ * iommu driver as verified by calling CHECK_EXTENSION using the same
+ * type. A group must be set to this file descriptor before this
+ * ioctl is available. The IOMMU interfaces enabled by this call are
+ * specific to the value set.
+ * Return: 0 on success, -errno on failure
+ * Availability: When VFIO group attached
+ */
+#define VFIO_SET_IOMMU _IO(VFIO_TYPE, VFIO_BASE + 2)
+
+/* -------- IOCTLs for GROUP file descriptors (/dev/vfio/$GROUP) -------- */
+
+/**
+ * VFIO_GROUP_GET_STATUS - _IOR(VFIO_TYPE, VFIO_BASE + 3,
+ * struct vfio_group_status)
+ *
+ * Retrieve information about the group. Fills in provided
+ * struct vfio_group_info. Caller sets argsz.
+ * Return: 0 on succes, -errno on failure.
+ * Availability: Always
+ */
+struct vfio_group_status {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_GROUP_FLAGS_VIABLE (1 << 0)
+#define VFIO_GROUP_FLAGS_CONTAINER_SET (1 << 1)
+};
+#define VFIO_GROUP_GET_STATUS _IO(VFIO_TYPE, VFIO_BASE + 3)
+
+/**
+ * VFIO_GROUP_SET_CONTAINER - _IOW(VFIO_TYPE, VFIO_BASE + 4, __s32)
+ *
+ * Set the container for the VFIO group to the open VFIO file
+ * descriptor provided. Groups may only belong to a single
+ * container. Containers may, at their discretion, support multiple
+ * groups. Only when a container is set are all of the interfaces
+ * of the VFIO file descriptor and the VFIO group file descriptor
+ * available to the user.
+ * Return: 0 on success, -errno on failure.
+ * Availability: Always
+ */
+#define VFIO_GROUP_SET_CONTAINER _IO(VFIO_TYPE, VFIO_BASE + 4)
+
+/**
+ * VFIO_GROUP_UNSET_CONTAINER - _IO(VFIO_TYPE, VFIO_BASE + 5)
+ *
+ * Remove the group from the attached container. This is the
+ * opposite of the SET_CONTAINER call and returns the group to
+ * an initial state. All device file descriptors must be released
+ * prior to calling this interface. When removing the last group
+ * from a container, the IOMMU will be disabled and all state lost,
+ * effectively also returning the VFIO file descriptor to an initial
+ * state.
+ * Return: 0 on success, -errno on failure.
+ * Availability: When attached to container
+ */
+#define VFIO_GROUP_UNSET_CONTAINER _IO(VFIO_TYPE, VFIO_BASE + 5)
+
+/**
+ * VFIO_GROUP_GET_DEVICE_FD - _IOW(VFIO_TYPE, VFIO_BASE + 6, char)
+ *
+ * Return a new file descriptor for the device object described by
+ * the provided string. The string should match a device listed in
+ * the devices subdirectory of the IOMMU group sysfs entry. The
+ * group containing the device must already be added to this context.
+ * Return: new file descriptor on success, -errno on failure.
+ * Availability: When attached to container
+ */
+#define VFIO_GROUP_GET_DEVICE_FD _IO(VFIO_TYPE, VFIO_BASE + 6)
+
+/* --------------- IOCTLs for DEVICE file descriptors --------------- */
+
+/**
+ * VFIO_DEVICE_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 7,
+ * struct vfio_device_info)
+ *
+ * Retrieve information about the device. Fills in provided
+ * struct vfio_device_info. Caller sets argsz.
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DEVICE_FLAGS_RESET (1 << 0) /* Device supports reset */
+#define VFIO_DEVICE_FLAGS_PCI (1 << 1) /* vfio-pci device */
+#define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2) /* vfio-platform device */
+#define VFIO_DEVICE_FLAGS_AMBA (1 << 3) /* vfio-amba device */
+#define VFIO_DEVICE_FLAGS_CCW (1 << 4) /* vfio-ccw device */
+#define VFIO_DEVICE_FLAGS_AP (1 << 5) /* vfio-ap device */
+#define VFIO_DEVICE_FLAGS_FSL_MC (1 << 6) /* vfio-fsl-mc device */
+#define VFIO_DEVICE_FLAGS_CAPS (1 << 7) /* Info supports caps */
+#define VFIO_DEVICE_FLAGS_CDX (1 << 8) /* vfio-cdx device */
+ __u32 num_regions; /* Max region index + 1 */
+ __u32 num_irqs; /* Max IRQ index + 1 */
+ __u32 cap_offset; /* Offset within info struct of first cap */
+ __u32 pad;
+};
+#define VFIO_DEVICE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 7)
+
+/*
+ * Vendor driver using Mediated device framework should provide device_api
+ * attribute in supported type attribute groups. Device API string should be one
+ * of the following corresponding to device flags in vfio_device_info structure.
+ */
+
+#define VFIO_DEVICE_API_PCI_STRING "vfio-pci"
+#define VFIO_DEVICE_API_PLATFORM_STRING "vfio-platform"
+#define VFIO_DEVICE_API_AMBA_STRING "vfio-amba"
+#define VFIO_DEVICE_API_CCW_STRING "vfio-ccw"
+#define VFIO_DEVICE_API_AP_STRING "vfio-ap"
+
+/*
+ * The following capabilities are unique to s390 zPCI devices. Their contents
+ * are further-defined in vfio_zdev.h
+ */
+#define VFIO_DEVICE_INFO_CAP_ZPCI_BASE 1
+#define VFIO_DEVICE_INFO_CAP_ZPCI_GROUP 2
+#define VFIO_DEVICE_INFO_CAP_ZPCI_UTIL 3
+#define VFIO_DEVICE_INFO_CAP_ZPCI_PFIP 4
+
+/*
+ * The following VFIO_DEVICE_INFO capability reports support for PCIe AtomicOp
+ * completion to the root bus with supported widths provided via flags.
+ */
+#define VFIO_DEVICE_INFO_CAP_PCI_ATOMIC_COMP 5
+struct vfio_device_info_cap_pci_atomic_comp {
+ struct vfio_info_cap_header header;
+ __u32 flags;
+#define VFIO_PCI_ATOMIC_COMP32 (1 << 0)
+#define VFIO_PCI_ATOMIC_COMP64 (1 << 1)
+#define VFIO_PCI_ATOMIC_COMP128 (1 << 2)
+ __u32 reserved;
+};
+
+/**
+ * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
+ * struct vfio_region_info)
+ *
+ * Retrieve information about a device region. Caller provides
+ * struct vfio_region_info with index value set. Caller sets argsz.
+ * Implementation of region mapping is bus driver specific. This is
+ * intended to describe MMIO, I/O port, as well as bus specific
+ * regions (ex. PCI config space). Zero sized regions may be used
+ * to describe unimplemented regions (ex. unimplemented PCI BARs).
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_region_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_REGION_INFO_FLAG_READ (1 << 0) /* Region supports read */
+#define VFIO_REGION_INFO_FLAG_WRITE (1 << 1) /* Region supports write */
+#define VFIO_REGION_INFO_FLAG_MMAP (1 << 2) /* Region supports mmap */
+#define VFIO_REGION_INFO_FLAG_CAPS (1 << 3) /* Info supports caps */
+ __u32 index; /* Region index */
+ __u32 cap_offset; /* Offset within info struct of first cap */
+ __aligned_u64 size; /* Region size (bytes) */
+ __aligned_u64 offset; /* Region offset from start of device fd */
+};
+#define VFIO_DEVICE_GET_REGION_INFO _IO(VFIO_TYPE, VFIO_BASE + 8)
+
+/*
+ * The sparse mmap capability allows finer granularity of specifying areas
+ * within a region with mmap support. When specified, the user should only
+ * mmap the offset ranges specified by the areas array. mmaps outside of the
+ * areas specified may fail (such as the range covering a PCI MSI-X table) or
+ * may result in improper device behavior.
+ *
+ * The structures below define version 1 of this capability.
+ */
+#define VFIO_REGION_INFO_CAP_SPARSE_MMAP 1
+
+struct vfio_region_sparse_mmap_area {
+ __aligned_u64 offset; /* Offset of mmap'able area within region */
+ __aligned_u64 size; /* Size of mmap'able area */
+};
+
+struct vfio_region_info_cap_sparse_mmap {
+ struct vfio_info_cap_header header;
+ __u32 nr_areas;
+ __u32 reserved;
+ struct vfio_region_sparse_mmap_area areas[];
+};
+
+/*
+ * The device specific type capability allows regions unique to a specific
+ * device or class of devices to be exposed. This helps solve the problem for
+ * vfio bus drivers of defining which region indexes correspond to which region
+ * on the device, without needing to resort to static indexes, as done by
+ * vfio-pci. For instance, if we were to go back in time, we might remove
+ * VFIO_PCI_VGA_REGION_INDEX and let vfio-pci simply define that all indexes
+ * greater than or equal to VFIO_PCI_NUM_REGIONS are device specific and we'd
+ * make a "VGA" device specific type to describe the VGA access space. This
+ * means that non-VGA devices wouldn't need to waste this index, and thus the
+ * address space associated with it due to implementation of device file
+ * descriptor offsets in vfio-pci.
+ *
+ * The current implementation is now part of the user ABI, so we can't use this
+ * for VGA, but there are other upcoming use cases, such as opregions for Intel
+ * IGD devices and framebuffers for vGPU devices. We missed VGA, but we'll
+ * use this for future additions.
+ *
+ * The structure below defines version 1 of this capability.
+ */
+#define VFIO_REGION_INFO_CAP_TYPE 2
+
+struct vfio_region_info_cap_type {
+ struct vfio_info_cap_header header;
+ __u32 type; /* global per bus driver */
+ __u32 subtype; /* type specific */
+};
+
+/*
+ * List of region types, global per bus driver.
+ * If you introduce a new type, please add it here.
+ */
+
+/* PCI region type containing a PCI vendor part */
+#define VFIO_REGION_TYPE_PCI_VENDOR_TYPE (1 << 31)
+#define VFIO_REGION_TYPE_PCI_VENDOR_MASK (0xffff)
+#define VFIO_REGION_TYPE_GFX (1)
+#define VFIO_REGION_TYPE_CCW (2)
+#define VFIO_REGION_TYPE_MIGRATION_DEPRECATED (3)
+
+/* sub-types for VFIO_REGION_TYPE_PCI_* */
+
+/* 8086 vendor PCI sub-types */
+#define VFIO_REGION_SUBTYPE_INTEL_IGD_OPREGION (1)
+#define VFIO_REGION_SUBTYPE_INTEL_IGD_HOST_CFG (2)
+#define VFIO_REGION_SUBTYPE_INTEL_IGD_LPC_CFG (3)
+
+/* 10de vendor PCI sub-types */
+/*
+ * NVIDIA GPU NVlink2 RAM is coherent RAM mapped onto the host address space.
+ *
+ * Deprecated, region no longer provided
+ */
+#define VFIO_REGION_SUBTYPE_NVIDIA_NVLINK2_RAM (1)
+
+/* 1014 vendor PCI sub-types */
+/*
+ * IBM NPU NVlink2 ATSD (Address Translation Shootdown) register of NPU
+ * to do TLB invalidation on a GPU.
+ *
+ * Deprecated, region no longer provided
+ */
+#define VFIO_REGION_SUBTYPE_IBM_NVLINK2_ATSD (1)
+
+/* sub-types for VFIO_REGION_TYPE_GFX */
+#define VFIO_REGION_SUBTYPE_GFX_EDID (1)
+
+/**
+ * struct vfio_region_gfx_edid - EDID region layout.
+ *
+ * Set display link state and EDID blob.
+ *
+ * The EDID blob has monitor information such as brand, name, serial
+ * number, physical size, supported video modes and more.
+ *
+ * This special region allows userspace (typically qemu) set a virtual
+ * EDID for the virtual monitor, which allows a flexible display
+ * configuration.
+ *
+ * For the edid blob spec look here:
+ * https://en.wikipedia.org/wiki/Extended_Display_Identification_Data
+ *
+ * On linux systems you can find the EDID blob in sysfs:
+ * /sys/class/drm/${card}/${connector}/edid
+ *
+ * You can use the edid-decode ulility (comes with xorg-x11-utils) to
+ * decode the EDID blob.
+ *
+ * @edid_offset: location of the edid blob, relative to the
+ * start of the region (readonly).
+ * @edid_max_size: max size of the edid blob (readonly).
+ * @edid_size: actual edid size (read/write).
+ * @link_state: display link state (read/write).
+ * VFIO_DEVICE_GFX_LINK_STATE_UP: Monitor is turned on.
+ * VFIO_DEVICE_GFX_LINK_STATE_DOWN: Monitor is turned off.
+ * @max_xres: max display width (0 == no limitation, readonly).
+ * @max_yres: max display height (0 == no limitation, readonly).
+ *
+ * EDID update protocol:
+ * (1) set link-state to down.
+ * (2) update edid blob and size.
+ * (3) set link-state to up.
+ */
+struct vfio_region_gfx_edid {
+ __u32 edid_offset;
+ __u32 edid_max_size;
+ __u32 edid_size;
+ __u32 max_xres;
+ __u32 max_yres;
+ __u32 link_state;
+#define VFIO_DEVICE_GFX_LINK_STATE_UP 1
+#define VFIO_DEVICE_GFX_LINK_STATE_DOWN 2
+};
+
+/* sub-types for VFIO_REGION_TYPE_CCW */
+#define VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD (1)
+#define VFIO_REGION_SUBTYPE_CCW_SCHIB (2)
+#define VFIO_REGION_SUBTYPE_CCW_CRW (3)
+
+/* sub-types for VFIO_REGION_TYPE_MIGRATION */
+#define VFIO_REGION_SUBTYPE_MIGRATION_DEPRECATED (1)
+
+struct vfio_device_migration_info {
+ __u32 device_state; /* VFIO device state */
+#define VFIO_DEVICE_STATE_V1_STOP (0)
+#define VFIO_DEVICE_STATE_V1_RUNNING (1 << 0)
+#define VFIO_DEVICE_STATE_V1_SAVING (1 << 1)
+#define VFIO_DEVICE_STATE_V1_RESUMING (1 << 2)
+#define VFIO_DEVICE_STATE_MASK (VFIO_DEVICE_STATE_V1_RUNNING | \
+ VFIO_DEVICE_STATE_V1_SAVING | \
+ VFIO_DEVICE_STATE_V1_RESUMING)
+
+#define VFIO_DEVICE_STATE_VALID(state) \
+ (state & VFIO_DEVICE_STATE_V1_RESUMING ? \
+ (state & VFIO_DEVICE_STATE_MASK) == VFIO_DEVICE_STATE_V1_RESUMING : 1)
+
+#define VFIO_DEVICE_STATE_IS_ERROR(state) \
+ ((state & VFIO_DEVICE_STATE_MASK) == (VFIO_DEVICE_STATE_V1_SAVING | \
+ VFIO_DEVICE_STATE_V1_RESUMING))
+
+#define VFIO_DEVICE_STATE_SET_ERROR(state) \
+ ((state & ~VFIO_DEVICE_STATE_MASK) | VFIO_DEVICE_STATE_V1_SAVING | \
+ VFIO_DEVICE_STATE_V1_RESUMING)
+
+ __u32 reserved;
+ __aligned_u64 pending_bytes;
+ __aligned_u64 data_offset;
+ __aligned_u64 data_size;
+};
+
+/*
+ * The MSIX mappable capability informs that MSIX data of a BAR can be mmapped
+ * which allows direct access to non-MSIX registers which happened to be within
+ * the same system page.
+ *
+ * Even though the userspace gets direct access to the MSIX data, the existing
+ * VFIO_DEVICE_SET_IRQS interface must still be used for MSIX configuration.
+ */
+#define VFIO_REGION_INFO_CAP_MSIX_MAPPABLE 3
+
+/*
+ * Capability with compressed real address (aka SSA - small system address)
+ * where GPU RAM is mapped on a system bus. Used by a GPU for DMA routing
+ * and by the userspace to associate a NVLink bridge with a GPU.
+ *
+ * Deprecated, capability no longer provided
+ */
+#define VFIO_REGION_INFO_CAP_NVLINK2_SSATGT 4
+
+struct vfio_region_info_cap_nvlink2_ssatgt {
+ struct vfio_info_cap_header header;
+ __aligned_u64 tgt;
+};
+
+/*
+ * Capability with an NVLink link speed. The value is read by
+ * the NVlink2 bridge driver from the bridge's "ibm,nvlink-speed"
+ * property in the device tree. The value is fixed in the hardware
+ * and failing to provide the correct value results in the link
+ * not working with no indication from the driver why.
+ *
+ * Deprecated, capability no longer provided
+ */
+#define VFIO_REGION_INFO_CAP_NVLINK2_LNKSPD 5
+
+struct vfio_region_info_cap_nvlink2_lnkspd {
+ struct vfio_info_cap_header header;
+ __u32 link_speed;
+ __u32 __pad;
+};
+
+/**
+ * VFIO_DEVICE_GET_IRQ_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 9,
+ * struct vfio_irq_info)
+ *
+ * Retrieve information about a device IRQ. Caller provides
+ * struct vfio_irq_info with index value set. Caller sets argsz.
+ * Implementation of IRQ mapping is bus driver specific. Indexes
+ * using multiple IRQs are primarily intended to support MSI-like
+ * interrupt blocks. Zero count irq blocks may be used to describe
+ * unimplemented interrupt types.
+ *
+ * The EVENTFD flag indicates the interrupt index supports eventfd based
+ * signaling.
+ *
+ * The MASKABLE flags indicates the index supports MASK and UNMASK
+ * actions described below.
+ *
+ * AUTOMASKED indicates that after signaling, the interrupt line is
+ * automatically masked by VFIO and the user needs to unmask the line
+ * to receive new interrupts. This is primarily intended to distinguish
+ * level triggered interrupts.
+ *
+ * The NORESIZE flag indicates that the interrupt lines within the index
+ * are setup as a set and new subindexes cannot be enabled without first
+ * disabling the entire index. This is used for interrupts like PCI MSI
+ * and MSI-X where the driver may only use a subset of the available
+ * indexes, but VFIO needs to enable a specific number of vectors
+ * upfront. In the case of MSI-X, where the user can enable MSI-X and
+ * then add and unmask vectors, it's up to userspace to make the decision
+ * whether to allocate the maximum supported number of vectors or tear
+ * down setup and incrementally increase the vectors as each is enabled.
+ * Absence of the NORESIZE flag indicates that vectors can be enabled
+ * and disabled dynamically without impacting other vectors within the
+ * index.
+ */
+struct vfio_irq_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IRQ_INFO_EVENTFD (1 << 0)
+#define VFIO_IRQ_INFO_MASKABLE (1 << 1)
+#define VFIO_IRQ_INFO_AUTOMASKED (1 << 2)
+#define VFIO_IRQ_INFO_NORESIZE (1 << 3)
+ __u32 index; /* IRQ index */
+ __u32 count; /* Number of IRQs within this index */
+};
+#define VFIO_DEVICE_GET_IRQ_INFO _IO(VFIO_TYPE, VFIO_BASE + 9)
+
+/**
+ * VFIO_DEVICE_SET_IRQS - _IOW(VFIO_TYPE, VFIO_BASE + 10, struct vfio_irq_set)
+ *
+ * Set signaling, masking, and unmasking of interrupts. Caller provides
+ * struct vfio_irq_set with all fields set. 'start' and 'count' indicate
+ * the range of subindexes being specified.
+ *
+ * The DATA flags specify the type of data provided. If DATA_NONE, the
+ * operation performs the specified action immediately on the specified
+ * interrupt(s). For example, to unmask AUTOMASKED interrupt [0,0]:
+ * flags = (DATA_NONE|ACTION_UNMASK), index = 0, start = 0, count = 1.
+ *
+ * DATA_BOOL allows sparse support for the same on arrays of interrupts.
+ * For example, to mask interrupts [0,1] and [0,3] (but not [0,2]):
+ * flags = (DATA_BOOL|ACTION_MASK), index = 0, start = 1, count = 3,
+ * data = {1,0,1}
+ *
+ * DATA_EVENTFD binds the specified ACTION to the provided __s32 eventfd.
+ * A value of -1 can be used to either de-assign interrupts if already
+ * assigned or skip un-assigned interrupts. For example, to set an eventfd
+ * to be trigger for interrupts [0,0] and [0,2]:
+ * flags = (DATA_EVENTFD|ACTION_TRIGGER), index = 0, start = 0, count = 3,
+ * data = {fd1, -1, fd2}
+ * If index [0,1] is previously set, two count = 1 ioctls calls would be
+ * required to set [0,0] and [0,2] without changing [0,1].
+ *
+ * Once a signaling mechanism is set, DATA_BOOL or DATA_NONE can be used
+ * with ACTION_TRIGGER to perform kernel level interrupt loopback testing
+ * from userspace (ie. simulate hardware triggering).
+ *
+ * Setting of an event triggering mechanism to userspace for ACTION_TRIGGER
+ * enables the interrupt index for the device. Individual subindex interrupts
+ * can be disabled using the -1 value for DATA_EVENTFD or the index can be
+ * disabled as a whole with: flags = (DATA_NONE|ACTION_TRIGGER), count = 0.
+ *
+ * Note that ACTION_[UN]MASK specify user->kernel signaling (irqfds) while
+ * ACTION_TRIGGER specifies kernel->user signaling.
+ */
+struct vfio_irq_set {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IRQ_SET_DATA_NONE (1 << 0) /* Data not present */
+#define VFIO_IRQ_SET_DATA_BOOL (1 << 1) /* Data is bool (u8) */
+#define VFIO_IRQ_SET_DATA_EVENTFD (1 << 2) /* Data is eventfd (s32) */
+#define VFIO_IRQ_SET_ACTION_MASK (1 << 3) /* Mask interrupt */
+#define VFIO_IRQ_SET_ACTION_UNMASK (1 << 4) /* Unmask interrupt */
+#define VFIO_IRQ_SET_ACTION_TRIGGER (1 << 5) /* Trigger interrupt */
+ __u32 index;
+ __u32 start;
+ __u32 count;
+ __u8 data[];
+};
+#define VFIO_DEVICE_SET_IRQS _IO(VFIO_TYPE, VFIO_BASE + 10)
+
+#define VFIO_IRQ_SET_DATA_TYPE_MASK (VFIO_IRQ_SET_DATA_NONE | \
+ VFIO_IRQ_SET_DATA_BOOL | \
+ VFIO_IRQ_SET_DATA_EVENTFD)
+#define VFIO_IRQ_SET_ACTION_TYPE_MASK (VFIO_IRQ_SET_ACTION_MASK | \
+ VFIO_IRQ_SET_ACTION_UNMASK | \
+ VFIO_IRQ_SET_ACTION_TRIGGER)
+/**
+ * VFIO_DEVICE_RESET - _IO(VFIO_TYPE, VFIO_BASE + 11)
+ *
+ * Reset a device.
+ */
+#define VFIO_DEVICE_RESET _IO(VFIO_TYPE, VFIO_BASE + 11)
+
+/*
+ * The VFIO-PCI bus driver makes use of the following fixed region and
+ * IRQ index mapping. Unimplemented regions return a size of zero.
+ * Unimplemented IRQ types return a count of zero.
+ */
+
+enum {
+ VFIO_PCI_BAR0_REGION_INDEX,
+ VFIO_PCI_BAR1_REGION_INDEX,
+ VFIO_PCI_BAR2_REGION_INDEX,
+ VFIO_PCI_BAR3_REGION_INDEX,
+ VFIO_PCI_BAR4_REGION_INDEX,
+ VFIO_PCI_BAR5_REGION_INDEX,
+ VFIO_PCI_ROM_REGION_INDEX,
+ VFIO_PCI_CONFIG_REGION_INDEX,
+ /*
+ * Expose VGA regions defined for PCI base class 03, subclass 00.
+ * This includes I/O port ranges 0x3b0 to 0x3bb and 0x3c0 to 0x3df
+ * as well as the MMIO range 0xa0000 to 0xbffff. Each implemented
+ * range is found at it's identity mapped offset from the region
+ * offset, for example 0x3b0 is region_info.offset + 0x3b0. Areas
+ * between described ranges are unimplemented.
+ */
+ VFIO_PCI_VGA_REGION_INDEX,
+ VFIO_PCI_NUM_REGIONS = 9 /* Fixed user ABI, region indexes >=9 use */
+ /* device specific cap to define content. */
+};
+
+enum {
+ VFIO_PCI_INTX_IRQ_INDEX,
+ VFIO_PCI_MSI_IRQ_INDEX,
+ VFIO_PCI_MSIX_IRQ_INDEX,
+ VFIO_PCI_ERR_IRQ_INDEX,
+ VFIO_PCI_REQ_IRQ_INDEX,
+ VFIO_PCI_NUM_IRQS
+};
+
+/*
+ * The vfio-ccw bus driver makes use of the following fixed region and
+ * IRQ index mapping. Unimplemented regions return a size of zero.
+ * Unimplemented IRQ types return a count of zero.
+ */
+
+enum {
+ VFIO_CCW_CONFIG_REGION_INDEX,
+ VFIO_CCW_NUM_REGIONS
+};
+
+enum {
+ VFIO_CCW_IO_IRQ_INDEX,
+ VFIO_CCW_CRW_IRQ_INDEX,
+ VFIO_CCW_REQ_IRQ_INDEX,
+ VFIO_CCW_NUM_IRQS
+};
+
+/*
+ * The vfio-ap bus driver makes use of the following IRQ index mapping.
+ * Unimplemented IRQ types return a count of zero.
+ */
+enum {
+ VFIO_AP_REQ_IRQ_INDEX,
+ VFIO_AP_CFG_CHG_IRQ_INDEX,
+ VFIO_AP_NUM_IRQS
+};
+
+/**
+ * VFIO_DEVICE_GET_PCI_HOT_RESET_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 12,
+ * struct vfio_pci_hot_reset_info)
+ *
+ * This command is used to query the affected devices in the hot reset for
+ * a given device.
+ *
+ * This command always reports the segment, bus, and devfn information for
+ * each affected device, and selectively reports the group_id or devid per
+ * the way how the calling device is opened.
+ *
+ * - If the calling device is opened via the traditional group/container
+ * API, group_id is reported. User should check if it has owned all
+ * the affected devices and provides a set of group fds to prove the
+ * ownership in VFIO_DEVICE_PCI_HOT_RESET ioctl.
+ *
+ * - If the calling device is opened as a cdev, devid is reported.
+ * Flag VFIO_PCI_HOT_RESET_FLAG_DEV_ID is set to indicate this
+ * data type. All the affected devices should be represented in
+ * the dev_set, ex. bound to a vfio driver, and also be owned by
+ * this interface which is determined by the following conditions:
+ * 1) Has a valid devid within the iommufd_ctx of the calling device.
+ * Ownership cannot be determined across separate iommufd_ctx and
+ * the cdev calling conventions do not support a proof-of-ownership
+ * model as provided in the legacy group interface. In this case
+ * valid devid with value greater than zero is provided in the return
+ * structure.
+ * 2) Does not have a valid devid within the iommufd_ctx of the calling
+ * device, but belongs to the same IOMMU group as the calling device
+ * or another opened device that has a valid devid within the
+ * iommufd_ctx of the calling device. This provides implicit ownership
+ * for devices within the same DMA isolation context. In this case
+ * the devid value of VFIO_PCI_DEVID_OWNED is provided in the return
+ * structure.
+ *
+ * A devid value of VFIO_PCI_DEVID_NOT_OWNED is provided in the return
+ * structure for affected devices where device is NOT represented in the
+ * dev_set or ownership is not available. Such devices prevent the use
+ * of VFIO_DEVICE_PCI_HOT_RESET ioctl outside of the proof-of-ownership
+ * calling conventions (ie. via legacy group accessed devices). Flag
+ * VFIO_PCI_HOT_RESET_FLAG_DEV_ID_OWNED would be set when all the
+ * affected devices are represented in the dev_set and also owned by
+ * the user. This flag is available only when
+ * flag VFIO_PCI_HOT_RESET_FLAG_DEV_ID is set, otherwise reserved.
+ * When set, user could invoke VFIO_DEVICE_PCI_HOT_RESET with a zero
+ * length fd array on the calling device as the ownership is validated
+ * by iommufd_ctx.
+ *
+ * Return: 0 on success, -errno on failure:
+ * -enospc = insufficient buffer, -enodev = unsupported for device.
+ */
+struct vfio_pci_dependent_device {
+ union {
+ __u32 group_id;
+ __u32 devid;
+#define VFIO_PCI_DEVID_OWNED 0
+#define VFIO_PCI_DEVID_NOT_OWNED -1
+ };
+ __u16 segment;
+ __u8 bus;
+ __u8 devfn; /* Use PCI_SLOT/PCI_FUNC */
+};
+
+struct vfio_pci_hot_reset_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_PCI_HOT_RESET_FLAG_DEV_ID (1 << 0)
+#define VFIO_PCI_HOT_RESET_FLAG_DEV_ID_OWNED (1 << 1)
+ __u32 count;
+ struct vfio_pci_dependent_device devices[];
+};
+
+#define VFIO_DEVICE_GET_PCI_HOT_RESET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
+/**
+ * VFIO_DEVICE_PCI_HOT_RESET - _IOW(VFIO_TYPE, VFIO_BASE + 13,
+ * struct vfio_pci_hot_reset)
+ *
+ * A PCI hot reset results in either a bus or slot reset which may affect
+ * other devices sharing the bus/slot. The calling user must have
+ * ownership of the full set of affected devices as determined by the
+ * VFIO_DEVICE_GET_PCI_HOT_RESET_INFO ioctl.
+ *
+ * When called on a device file descriptor acquired through the vfio
+ * group interface, the user is required to provide proof of ownership
+ * of those affected devices via the group_fds array in struct
+ * vfio_pci_hot_reset.
+ *
+ * When called on a direct cdev opened vfio device, the flags field of
+ * struct vfio_pci_hot_reset_info reports the ownership status of the
+ * affected devices and this ioctl must be called with an empty group_fds
+ * array. See above INFO ioctl definition for ownership requirements.
+ *
+ * Mixed usage of legacy groups and cdevs across the set of affected
+ * devices is not supported.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_pci_hot_reset {
+ __u32 argsz;
+ __u32 flags;
+ __u32 count;
+ __s32 group_fds[];
+};
+
+#define VFIO_DEVICE_PCI_HOT_RESET _IO(VFIO_TYPE, VFIO_BASE + 13)
+
+/**
+ * VFIO_DEVICE_QUERY_GFX_PLANE - _IOW(VFIO_TYPE, VFIO_BASE + 14,
+ * struct vfio_device_query_gfx_plane)
+ *
+ * Set the drm_plane_type and flags, then retrieve the gfx plane info.
+ *
+ * flags supported:
+ * - VFIO_GFX_PLANE_TYPE_PROBE and VFIO_GFX_PLANE_TYPE_DMABUF are set
+ * to ask if the mdev supports dma-buf. 0 on support, -EINVAL on no
+ * support for dma-buf.
+ * - VFIO_GFX_PLANE_TYPE_PROBE and VFIO_GFX_PLANE_TYPE_REGION are set
+ * to ask if the mdev supports region. 0 on support, -EINVAL on no
+ * support for region.
+ * - VFIO_GFX_PLANE_TYPE_DMABUF or VFIO_GFX_PLANE_TYPE_REGION is set
+ * with each call to query the plane info.
+ * - Others are invalid and return -EINVAL.
+ *
+ * Note:
+ * 1. Plane could be disabled by guest. In that case, success will be
+ * returned with zero-initialized drm_format, size, width and height
+ * fields.
+ * 2. x_hot/y_hot is set to 0xFFFFFFFF if no hotspot information available
+ *
+ * Return: 0 on success, -errno on other failure.
+ */
+struct vfio_device_gfx_plane_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_GFX_PLANE_TYPE_PROBE (1 << 0)
+#define VFIO_GFX_PLANE_TYPE_DMABUF (1 << 1)
+#define VFIO_GFX_PLANE_TYPE_REGION (1 << 2)
+ /* in */
+ __u32 drm_plane_type; /* type of plane: DRM_PLANE_TYPE_* */
+ /* out */
+ __u32 drm_format; /* drm format of plane */
+ __aligned_u64 drm_format_mod; /* tiled mode */
+ __u32 width; /* width of plane */
+ __u32 height; /* height of plane */
+ __u32 stride; /* stride of plane */
+ __u32 size; /* size of plane in bytes, align on page*/
+ __u32 x_pos; /* horizontal position of cursor plane */
+ __u32 y_pos; /* vertical position of cursor plane*/
+ __u32 x_hot; /* horizontal position of cursor hotspot */
+ __u32 y_hot; /* vertical position of cursor hotspot */
+ union {
+ __u32 region_index; /* region index */
+ __u32 dmabuf_id; /* dma-buf id */
+ };
+ __u32 reserved;
+};
+
+#define VFIO_DEVICE_QUERY_GFX_PLANE _IO(VFIO_TYPE, VFIO_BASE + 14)
+
+/**
+ * VFIO_DEVICE_GET_GFX_DMABUF - _IOW(VFIO_TYPE, VFIO_BASE + 15, __u32)
+ *
+ * Return a new dma-buf file descriptor for an exposed guest framebuffer
+ * described by the provided dmabuf_id. The dmabuf_id is returned from VFIO_
+ * DEVICE_QUERY_GFX_PLANE as a token of the exposed guest framebuffer.
+ */
+
+#define VFIO_DEVICE_GET_GFX_DMABUF _IO(VFIO_TYPE, VFIO_BASE + 15)
+
+/**
+ * VFIO_DEVICE_IOEVENTFD - _IOW(VFIO_TYPE, VFIO_BASE + 16,
+ * struct vfio_device_ioeventfd)
+ *
+ * Perform a write to the device at the specified device fd offset, with
+ * the specified data and width when the provided eventfd is triggered.
+ * vfio bus drivers may not support this for all regions, for all widths,
+ * or at all. vfio-pci currently only enables support for BAR regions,
+ * excluding the MSI-X vector table.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_ioeventfd {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DEVICE_IOEVENTFD_8 (1 << 0) /* 1-byte write */
+#define VFIO_DEVICE_IOEVENTFD_16 (1 << 1) /* 2-byte write */
+#define VFIO_DEVICE_IOEVENTFD_32 (1 << 2) /* 4-byte write */
+#define VFIO_DEVICE_IOEVENTFD_64 (1 << 3) /* 8-byte write */
+#define VFIO_DEVICE_IOEVENTFD_SIZE_MASK (0xf)
+ __aligned_u64 offset; /* device fd offset of write */
+ __aligned_u64 data; /* data to be written */
+ __s32 fd; /* -1 for de-assignment */
+ __u32 reserved;
+};
+
+#define VFIO_DEVICE_IOEVENTFD _IO(VFIO_TYPE, VFIO_BASE + 16)
+
+/**
+ * VFIO_DEVICE_FEATURE - _IOWR(VFIO_TYPE, VFIO_BASE + 17,
+ * struct vfio_device_feature)
+ *
+ * Get, set, or probe feature data of the device. The feature is selected
+ * using the FEATURE_MASK portion of the flags field. Support for a feature
+ * can be probed by setting both the FEATURE_MASK and PROBE bits. A probe
+ * may optionally include the GET and/or SET bits to determine read vs write
+ * access of the feature respectively. Probing a feature will return success
+ * if the feature is supported and all of the optionally indicated GET/SET
+ * methods are supported. The format of the data portion of the structure is
+ * specific to the given feature. The data portion is not required for
+ * probing. GET and SET are mutually exclusive, except for use with PROBE.
+ *
+ * Return 0 on success, -errno on failure.
+ */
+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[];
+};
+
+#define VFIO_DEVICE_FEATURE _IO(VFIO_TYPE, VFIO_BASE + 17)
+
+/*
+ * VFIO_DEVICE_BIND_IOMMUFD - _IOR(VFIO_TYPE, VFIO_BASE + 18,
+ * struct vfio_device_bind_iommufd)
+ * @argsz: User filled size of this data.
+ * @flags: Must be 0.
+ * @iommufd: iommufd to bind.
+ * @out_devid: The device id generated by this bind. devid is a handle for
+ * this device/iommufd bond and can be used in IOMMUFD commands.
+ *
+ * Bind a vfio_device to the specified iommufd.
+ *
+ * User is restricted from accessing the device before the binding operation
+ * is completed. Only allowed on cdev fds.
+ *
+ * Unbind is automatically conducted when device fd is closed.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_bind_iommufd {
+ __u32 argsz;
+ __u32 flags;
+ __s32 iommufd;
+ __u32 out_devid;
+};
+
+#define VFIO_DEVICE_BIND_IOMMUFD _IO(VFIO_TYPE, VFIO_BASE + 18)
+
+/*
+ * VFIO_DEVICE_ATTACH_IOMMUFD_PT - _IOW(VFIO_TYPE, VFIO_BASE + 19,
+ * struct vfio_device_attach_iommufd_pt)
+ * @argsz: User filled size of this data.
+ * @flags: Flags for attach.
+ * @pt_id: Input the target id which can represent an ioas or a hwpt
+ * allocated via iommufd subsystem.
+ * Output the input ioas id or the attached hwpt id which could
+ * be the specified hwpt itself or a hwpt automatically created
+ * for the specified ioas by kernel during the attachment.
+ * @pasid: The pasid to be attached, only meaningful when
+ * VFIO_DEVICE_ATTACH_PASID is set in @flags
+ *
+ * Associate the device with an address space within the bound iommufd.
+ * Undo by VFIO_DEVICE_DETACH_IOMMUFD_PT or device fd close. This is only
+ * allowed on cdev fds.
+ *
+ * If a vfio device or a pasid of this device is currently attached to a valid
+ * hw_pagetable (hwpt), without doing a VFIO_DEVICE_DETACH_IOMMUFD_PT, a second
+ * VFIO_DEVICE_ATTACH_IOMMUFD_PT ioctl passing in another hwpt id is allowed.
+ * This action, also known as a hw_pagetable replacement, will replace the
+ * currently attached hwpt of the device or the pasid of this device with a new
+ * hwpt corresponding to the given pt_id.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_attach_iommufd_pt {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DEVICE_ATTACH_PASID (1 << 0)
+ __u32 pt_id;
+ __u32 pasid;
+};
+
+#define VFIO_DEVICE_ATTACH_IOMMUFD_PT _IO(VFIO_TYPE, VFIO_BASE + 19)
+
+/*
+ * VFIO_DEVICE_DETACH_IOMMUFD_PT - _IOW(VFIO_TYPE, VFIO_BASE + 20,
+ * struct vfio_device_detach_iommufd_pt)
+ * @argsz: User filled size of this data.
+ * @flags: Flags for detach.
+ * @pasid: The pasid to be detached, only meaningful when
+ * VFIO_DEVICE_DETACH_PASID is set in @flags
+ *
+ * Remove the association of the device or a pasid of the device and its current
+ * associated address space. After it, the device or the pasid should be in a
+ * blocking DMA state. This is only allowed on cdev fds.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+struct vfio_device_detach_iommufd_pt {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DEVICE_DETACH_PASID (1 << 0)
+ __u32 pasid;
+};
+
+#define VFIO_DEVICE_DETACH_IOMMUFD_PT _IO(VFIO_TYPE, VFIO_BASE + 20)
+
+/*
+ * Provide support for setting a PCI VF Token, which is used as a shared
+ * secret between PF and VF drivers. This feature may only be set on a
+ * PCI SR-IOV PF when SR-IOV is enabled on the PF and there are no existing
+ * open VFs. Data provided when setting this feature is a 16-byte array
+ * (__u8 b[16]), representing a UUID.
+ */
+#define VFIO_DEVICE_FEATURE_PCI_VF_TOKEN (0)
+
+/*
+ * Indicates the device can support the migration API through
+ * VFIO_DEVICE_FEATURE_MIG_DEVICE_STATE. If this GET succeeds, the RUNNING and
+ * ERROR states are always supported. Support for additional states is
+ * indicated via the flags field; at least VFIO_MIGRATION_STOP_COPY must be
+ * set.
+ *
+ * VFIO_MIGRATION_STOP_COPY means that STOP, STOP_COPY and
+ * RESUMING are supported.
+ *
+ * VFIO_MIGRATION_STOP_COPY | VFIO_MIGRATION_P2P means that RUNNING_P2P
+ * is supported in addition to the STOP_COPY states.
+ *
+ * VFIO_MIGRATION_STOP_COPY | VFIO_MIGRATION_PRE_COPY means that
+ * PRE_COPY is supported in addition to the STOP_COPY states.
+ *
+ * VFIO_MIGRATION_STOP_COPY | VFIO_MIGRATION_P2P | VFIO_MIGRATION_PRE_COPY
+ * means that RUNNING_P2P, PRE_COPY and PRE_COPY_P2P are supported
+ * in addition to the STOP_COPY states.
+ *
+ * Other combinations of flags have behavior to be defined in the future.
+ */
+struct vfio_device_feature_migration {
+ __aligned_u64 flags;
+#define VFIO_MIGRATION_STOP_COPY (1 << 0)
+#define VFIO_MIGRATION_P2P (1 << 1)
+#define VFIO_MIGRATION_PRE_COPY (1 << 2)
+};
+#define VFIO_DEVICE_FEATURE_MIGRATION 1
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET, execute a migration state change on the VFIO
+ * device. The new state is supplied in device_state, see enum
+ * vfio_device_mig_state for details
+ *
+ * The kernel migration driver must fully transition the device to the new state
+ * value before the operation returns to the user.
+ *
+ * The kernel migration driver must not generate asynchronous device state
+ * transitions outside of manipulation by the user or the VFIO_DEVICE_RESET
+ * ioctl as described above.
+ *
+ * If this function fails then current device_state may be the original
+ * operating state or some other state along the combination transition path.
+ * The user can then decide if it should execute a VFIO_DEVICE_RESET, attempt
+ * to return to the original state, or attempt to return to some other state
+ * such as RUNNING or STOP.
+ *
+ * If the new_state starts a new data transfer session then the FD associated
+ * with that session is returned in data_fd. The user is responsible to close
+ * this FD when it is finished. The user must consider the migration data stream
+ * carried over the FD to be opaque and must preserve the byte order of the
+ * stream. The user is not required to preserve buffer segmentation when writing
+ * the data stream during the RESUMING operation.
+ *
+ * Upon VFIO_DEVICE_FEATURE_GET, get the current migration state of the VFIO
+ * device, data_fd will be -1.
+ */
+struct vfio_device_feature_mig_state {
+ __u32 device_state; /* From enum vfio_device_mig_state */
+ __s32 data_fd;
+};
+#define VFIO_DEVICE_FEATURE_MIG_DEVICE_STATE 2
+
+/*
+ * The device migration Finite State Machine is described by the enum
+ * vfio_device_mig_state. Some of the FSM arcs will create a migration data
+ * transfer session by returning a FD, in this case the migration data will
+ * flow over the FD using read() and write() as discussed below.
+ *
+ * There are 5 states to support VFIO_MIGRATION_STOP_COPY:
+ * RUNNING - The device is running normally
+ * STOP - The device does not change the internal or external state
+ * STOP_COPY - The device internal state can be read out
+ * RESUMING - The device is stopped and is loading a new internal state
+ * ERROR - The device has failed and must be reset
+ *
+ * And optional states to support VFIO_MIGRATION_P2P:
+ * RUNNING_P2P - RUNNING, except the device cannot do peer to peer DMA
+ * And VFIO_MIGRATION_PRE_COPY:
+ * PRE_COPY - The device is running normally but tracking internal state
+ * changes
+ * And VFIO_MIGRATION_P2P | VFIO_MIGRATION_PRE_COPY:
+ * PRE_COPY_P2P - PRE_COPY, except the device cannot do peer to peer DMA
+ *
+ * The FSM takes actions on the arcs between FSM states. The driver implements
+ * the following behavior for the FSM arcs:
+ *
+ * RUNNING_P2P -> STOP
+ * STOP_COPY -> STOP
+ * While in STOP the device must stop the operation of the device. The device
+ * must not generate interrupts, DMA, or any other change to external state.
+ * It must not change its internal state. When stopped the device and kernel
+ * migration driver must accept and respond to interaction to support external
+ * subsystems in the STOP state, for example PCI MSI-X and PCI config space.
+ * Failure by the user to restrict device access while in STOP must not result
+ * in error conditions outside the user context (ex. host system faults).
+ *
+ * The STOP_COPY arc will terminate a data transfer session.
+ *
+ * RESUMING -> STOP
+ * Leaving RESUMING terminates a data transfer session and indicates the
+ * device should complete processing of the data delivered by write(). The
+ * kernel migration driver should complete the incorporation of data written
+ * to the data transfer FD into the device internal state and perform
+ * final validity and consistency checking of the new device state. If the
+ * user provided data is found to be incomplete, inconsistent, or otherwise
+ * invalid, the migration driver must fail the SET_STATE ioctl and
+ * optionally go to the ERROR state as described below.
+ *
+ * While in STOP the device has the same behavior as other STOP states
+ * described above.
+ *
+ * To abort a RESUMING session the device must be reset.
+ *
+ * PRE_COPY -> RUNNING
+ * RUNNING_P2P -> RUNNING
+ * While in RUNNING the device is fully operational, the device may generate
+ * interrupts, DMA, respond to MMIO, all vfio device regions are functional,
+ * and the device may advance its internal state.
+ *
+ * The PRE_COPY arc will terminate a data transfer session.
+ *
+ * PRE_COPY_P2P -> RUNNING_P2P
+ * RUNNING -> RUNNING_P2P
+ * STOP -> RUNNING_P2P
+ * While in RUNNING_P2P the device is partially running in the P2P quiescent
+ * state defined below.
+ *
+ * The PRE_COPY_P2P arc will terminate a data transfer session.
+ *
+ * RUNNING -> PRE_COPY
+ * RUNNING_P2P -> PRE_COPY_P2P
+ * STOP -> STOP_COPY
+ * PRE_COPY, PRE_COPY_P2P and STOP_COPY form the "saving group" of states
+ * which share a data transfer session. Moving between these states alters
+ * what is streamed in session, but does not terminate or otherwise affect
+ * the associated fd.
+ *
+ * These arcs begin the process of saving the device state and will return a
+ * new data_fd. The migration driver may perform actions such as enabling
+ * dirty logging of device state when entering PRE_COPY or PER_COPY_P2P.
+ *
+ * Each arc does not change the device operation, the device remains
+ * RUNNING, P2P quiesced or in STOP. The STOP_COPY state is described below
+ * in PRE_COPY_P2P -> STOP_COPY.
+ *
+ * PRE_COPY -> PRE_COPY_P2P
+ * Entering PRE_COPY_P2P continues all the behaviors of PRE_COPY above.
+ * However, while in the PRE_COPY_P2P state, the device is partially running
+ * in the P2P quiescent state defined below, like RUNNING_P2P.
+ *
+ * PRE_COPY_P2P -> PRE_COPY
+ * This arc allows returning the device to a full RUNNING behavior while
+ * continuing all the behaviors of PRE_COPY.
+ *
+ * PRE_COPY_P2P -> STOP_COPY
+ * While in the STOP_COPY state the device has the same behavior as STOP
+ * with the addition that the data transfers session continues to stream the
+ * migration state. End of stream on the FD indicates the entire device
+ * state has been transferred.
+ *
+ * The user should take steps to restrict access to vfio device regions while
+ * the device is in STOP_COPY or risk corruption of the device migration data
+ * stream.
+ *
+ * STOP -> RESUMING
+ * Entering the RESUMING state starts a process of restoring the device state
+ * and will return a new data_fd. The data stream fed into the data_fd should
+ * be taken from the data transfer output of a single FD during saving from
+ * a compatible device. The migration driver may alter/reset the internal
+ * device state for this arc if required to prepare the device to receive the
+ * migration data.
+ *
+ * STOP_COPY -> PRE_COPY
+ * STOP_COPY -> PRE_COPY_P2P
+ * These arcs are not permitted and return error if requested. Future
+ * revisions of this API may define behaviors for these arcs, in this case
+ * support will be discoverable by a new flag in
+ * VFIO_DEVICE_FEATURE_MIGRATION.
+ *
+ * any -> ERROR
+ * ERROR cannot be specified as a device state, however any transition request
+ * can be failed with an errno return and may then move the device_state into
+ * ERROR. In this case the device was unable to execute the requested arc and
+ * was also unable to restore the device to any valid device_state.
+ * To recover from ERROR VFIO_DEVICE_RESET must be used to return the
+ * device_state back to RUNNING.
+ *
+ * The optional peer to peer (P2P) quiescent state is intended to be a quiescent
+ * state for the device for the purposes of managing multiple devices within a
+ * user context where peer-to-peer DMA between devices may be active. The
+ * RUNNING_P2P and PRE_COPY_P2P states must prevent the device from initiating
+ * any new P2P DMA transactions. If the device can identify P2P transactions
+ * then it can stop only P2P DMA, otherwise it must stop all DMA. The migration
+ * driver must complete any such outstanding operations prior to completing the
+ * FSM arc into a P2P state. For the purpose of specification the states
+ * behave as though the device was fully running if not supported. Like while in
+ * STOP or STOP_COPY the user must not touch the device, otherwise the state
+ * can be exited.
+ *
+ * The remaining possible transitions are interpreted as combinations of the
+ * above FSM arcs. As there are multiple paths through the FSM arcs the path
+ * should be selected based on the following rules:
+ * - Select the shortest path.
+ * - The path cannot have saving group states as interior arcs, only
+ * starting/end states.
+ * Refer to vfio_mig_get_next_state() for the result of the algorithm.
+ *
+ * The automatic transit through the FSM arcs that make up the combination
+ * transition is invisible to the user. When working with combination arcs the
+ * user may see any step along the path in the device_state if SET_STATE
+ * fails. When handling these types of errors users should anticipate future
+ * revisions of this protocol using new states and those states becoming
+ * visible in this case.
+ *
+ * The optional states cannot be used with SET_STATE if the device does not
+ * support them. The user can discover if these states are supported by using
+ * VFIO_DEVICE_FEATURE_MIGRATION. By using combination transitions the user can
+ * avoid knowing about these optional states if the kernel driver supports them.
+ *
+ * Arcs touching PRE_COPY and PRE_COPY_P2P are removed if support for PRE_COPY
+ * is not present.
+ */
+enum vfio_device_mig_state {
+ VFIO_DEVICE_STATE_ERROR = 0,
+ VFIO_DEVICE_STATE_STOP = 1,
+ VFIO_DEVICE_STATE_RUNNING = 2,
+ VFIO_DEVICE_STATE_STOP_COPY = 3,
+ VFIO_DEVICE_STATE_RESUMING = 4,
+ VFIO_DEVICE_STATE_RUNNING_P2P = 5,
+ VFIO_DEVICE_STATE_PRE_COPY = 6,
+ VFIO_DEVICE_STATE_PRE_COPY_P2P = 7,
+ VFIO_DEVICE_STATE_NR,
+};
+
+/**
+ * VFIO_MIG_GET_PRECOPY_INFO - _IO(VFIO_TYPE, VFIO_BASE + 21)
+ *
+ * This ioctl is used on the migration data FD in the precopy phase of the
+ * migration data transfer. It returns an estimate of the current data sizes
+ * remaining to be transferred. It allows the user to judge when it is
+ * appropriate to leave PRE_COPY for STOP_COPY.
+ *
+ * This ioctl is valid only in PRE_COPY states and kernel driver should
+ * return -EINVAL from any other migration state.
+ *
+ * The vfio_precopy_info data structure returned by this ioctl provides
+ * estimates of data available from the device during the PRE_COPY states.
+ * This estimate is split into two categories, initial_bytes and
+ * dirty_bytes.
+ *
+ * The initial_bytes field indicates the amount of initial precopy
+ * data available from the device. This field should have a non-zero initial
+ * value and decrease as migration data is read from the device.
+ * It is recommended to leave PRE_COPY for STOP_COPY only after this field
+ * reaches zero. Leaving PRE_COPY earlier might make things slower.
+ *
+ * The dirty_bytes field tracks device state changes relative to data
+ * previously retrieved. This field starts at zero and may increase as
+ * the internal device state is modified or decrease as that modified
+ * state is read from the device.
+ *
+ * Userspace may use the combination of these fields to estimate the
+ * potential data size available during the PRE_COPY phases, as well as
+ * trends relative to the rate the device is dirtying its internal
+ * state, but these fields are not required to have any bearing relative
+ * to the data size available during the STOP_COPY phase.
+ *
+ * Drivers have a lot of flexibility in when and what they transfer during the
+ * PRE_COPY phase, and how they report this from VFIO_MIG_GET_PRECOPY_INFO.
+ *
+ * During pre-copy the migration data FD has a temporary "end of stream" that is
+ * reached when both initial_bytes and dirty_byte are zero. For instance, this
+ * may indicate that the device is idle and not currently dirtying any internal
+ * state. When read() is done on this temporary end of stream the kernel driver
+ * should return ENOMSG from read(). Userspace can wait for more data (which may
+ * never come) by using poll.
+ *
+ * Once in STOP_COPY the migration data FD has a permanent end of stream
+ * signaled in the usual way by read() always returning 0 and poll always
+ * returning readable. ENOMSG may not be returned in STOP_COPY.
+ * Support for this ioctl is mandatory if a driver claims to support
+ * VFIO_MIGRATION_PRE_COPY.
+ *
+ * Return: 0 on success, -1 and errno set on failure.
+ */
+struct vfio_precopy_info {
+ __u32 argsz;
+ __u32 flags;
+ __aligned_u64 initial_bytes;
+ __aligned_u64 dirty_bytes;
+};
+
+#define VFIO_MIG_GET_PRECOPY_INFO _IO(VFIO_TYPE, VFIO_BASE + 21)
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET, allow the device to be moved into a low power
+ * state with the platform-based power management. Device use of lower power
+ * states depends on factors managed by the runtime power management core,
+ * including system level support and coordinating support among dependent
+ * devices. Enabling device low power entry does not guarantee lower power
+ * usage by the device, nor is a mechanism provided through this feature to
+ * know the current power state of the device. If any device access happens
+ * (either from the host or through the vfio uAPI) when the device is in the
+ * low power state, then the host will move the device out of the low power
+ * state as necessary prior to the access. Once the access is completed, the
+ * device may re-enter the low power state. For single shot low power support
+ * with wake-up notification, see
+ * VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY_WITH_WAKEUP below. Access to mmap'd
+ * device regions is disabled on LOW_POWER_ENTRY and may only be resumed after
+ * calling LOW_POWER_EXIT.
+ */
+#define VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY 3
+
+/*
+ * This device feature has the same behavior as
+ * VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY with the exception that the user
+ * provides an eventfd for wake-up notification. When the device moves out of
+ * the low power state for the wake-up, the host will not allow the device to
+ * re-enter a low power state without a subsequent user call to one of the low
+ * power entry device feature IOCTLs. Access to mmap'd device regions is
+ * disabled on LOW_POWER_ENTRY_WITH_WAKEUP and may only be resumed after the
+ * low power exit. The low power exit can happen either through LOW_POWER_EXIT
+ * or through any other access (where the wake-up notification has been
+ * generated). The access to mmap'd device regions will not trigger low power
+ * exit.
+ *
+ * The notification through the provided eventfd will be generated only when
+ * the device has entered and is resumed from a low power state after
+ * calling this device feature IOCTL. A device that has not entered low power
+ * state, as managed through the runtime power management core, will not
+ * generate a notification through the provided eventfd on access. Calling the
+ * LOW_POWER_EXIT feature is optional in the case where notification has been
+ * signaled on the provided eventfd that a resume from low power has occurred.
+ */
+struct vfio_device_low_power_entry_with_wakeup {
+ __s32 wakeup_eventfd;
+ __u32 reserved;
+};
+
+#define VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY_WITH_WAKEUP 4
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET, disallow use of device low power states as
+ * previously enabled via VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY or
+ * VFIO_DEVICE_FEATURE_LOW_POWER_ENTRY_WITH_WAKEUP device features.
+ * This device feature IOCTL may itself generate a wakeup eventfd notification
+ * in the latter case if the device had previously entered a low power state.
+ */
+#define VFIO_DEVICE_FEATURE_LOW_POWER_EXIT 5
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET start/stop device DMA logging.
+ * VFIO_DEVICE_FEATURE_PROBE can be used to detect if the device supports
+ * DMA logging.
+ *
+ * DMA logging allows a device to internally record what DMAs the device is
+ * initiating and report them back to userspace. It is part of the VFIO
+ * migration infrastructure that allows implementing dirty page tracking
+ * during the pre copy phase of live migration. Only DMA WRITEs are logged,
+ * and this API is not connected to VFIO_DEVICE_FEATURE_MIG_DEVICE_STATE.
+ *
+ * When DMA logging is started a range of IOVAs to monitor is provided and the
+ * device can optimize its logging to cover only the IOVA range given. Each
+ * DMA that the device initiates inside the range will be logged by the device
+ * for later retrieval.
+ *
+ * page_size is an input that hints what tracking granularity the device
+ * should try to achieve. If the device cannot do the hinted page size then
+ * it's the driver choice which page size to pick based on its support.
+ * On output the device will return the page size it selected.
+ *
+ * ranges is a pointer to an array of
+ * struct vfio_device_feature_dma_logging_range.
+ *
+ * The core kernel code guarantees to support by minimum num_ranges that fit
+ * into a single kernel page. User space can try higher values but should give
+ * up if the above can't be achieved as of some driver limitations.
+ *
+ * A single call to start device DMA logging can be issued and a matching stop
+ * should follow at the end. Another start is not allowed in the meantime.
+ */
+struct vfio_device_feature_dma_logging_control {
+ __aligned_u64 page_size;
+ __u32 num_ranges;
+ __u32 __reserved;
+ __aligned_u64 ranges;
+};
+
+struct vfio_device_feature_dma_logging_range {
+ __aligned_u64 iova;
+ __aligned_u64 length;
+};
+
+#define VFIO_DEVICE_FEATURE_DMA_LOGGING_START 6
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_SET stop device DMA logging that was started
+ * by VFIO_DEVICE_FEATURE_DMA_LOGGING_START
+ */
+#define VFIO_DEVICE_FEATURE_DMA_LOGGING_STOP 7
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_GET read back and clear the device DMA log
+ *
+ * Query the device's DMA log for written pages within the given IOVA range.
+ * During querying the log is cleared for the IOVA range.
+ *
+ * bitmap is a pointer to an array of u64s that will hold the output bitmap
+ * with 1 bit reporting a page_size unit of IOVA. The mapping of IOVA to bits
+ * is given by:
+ * bitmap[(addr - iova)/page_size] & (1ULL << (addr % 64))
+ *
+ * The input page_size can be any power of two value and does not have to
+ * match the value given to VFIO_DEVICE_FEATURE_DMA_LOGGING_START. The driver
+ * will format its internal logging to match the reporting page size, possibly
+ * by replicating bits if the internal page size is lower than requested.
+ *
+ * The LOGGING_REPORT will only set bits in the bitmap and never clear or
+ * perform any initialization of the user provided bitmap.
+ *
+ * If any error is returned userspace should assume that the dirty log is
+ * corrupted. Error recovery is to consider all memory dirty and try to
+ * restart the dirty tracking, or to abort/restart the whole migration.
+ *
+ * If DMA logging is not enabled, an error will be returned.
+ *
+ */
+struct vfio_device_feature_dma_logging_report {
+ __aligned_u64 iova;
+ __aligned_u64 length;
+ __aligned_u64 page_size;
+ __aligned_u64 bitmap;
+};
+
+#define VFIO_DEVICE_FEATURE_DMA_LOGGING_REPORT 8
+
+/*
+ * Upon VFIO_DEVICE_FEATURE_GET read back the estimated data length that will
+ * be required to complete stop copy.
+ *
+ * Note: Can be called on each device state.
+ */
+
+struct vfio_device_feature_mig_data_size {
+ __aligned_u64 stop_copy_length;
+};
+
+#define VFIO_DEVICE_FEATURE_MIG_DATA_SIZE 9
+
+/**
+ * Upon VFIO_DEVICE_FEATURE_SET, set or clear the BUS mastering for the device
+ * based on the operation specified in op flag.
+ *
+ * The functionality is incorporated for devices that needs bus master control,
+ * but the in-band device interface lacks the support. Consequently, it is not
+ * applicable to PCI devices, as bus master control for PCI devices is managed
+ * in-band through the configuration space. At present, this feature is supported
+ * only for CDX devices.
+ * When the device's BUS MASTER setting is configured as CLEAR, it will result in
+ * blocking all incoming DMA requests from the device. On the other hand, configuring
+ * the device's BUS MASTER setting as SET (enable) will grant the device the
+ * capability to perform DMA to the host memory.
+ */
+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 */
+};
+#define VFIO_DEVICE_FEATURE_BUS_MASTER 10
+
+/* -------- API for Type1 VFIO IOMMU -------- */
+
+/**
+ * VFIO_IOMMU_GET_INFO - _IOR(VFIO_TYPE, VFIO_BASE + 12, struct vfio_iommu_info)
+ *
+ * Retrieve information about the IOMMU object. Fills in provided
+ * struct vfio_iommu_info. Caller sets argsz.
+ *
+ * XXX Should we do these by CHECK_EXTENSION too?
+ */
+struct vfio_iommu_type1_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IOMMU_INFO_PGSIZES (1 << 0) /* supported page sizes info */
+#define VFIO_IOMMU_INFO_CAPS (1 << 1) /* Info supports caps */
+ __aligned_u64 iova_pgsizes; /* Bitmap of supported page sizes */
+ __u32 cap_offset; /* Offset within info struct of first cap */
+ __u32 pad;
+};
+
+/*
+ * The IOVA capability allows to report the valid IOVA range(s)
+ * excluding any non-relaxable reserved regions exposed by
+ * devices attached to the container. Any DMA map attempt
+ * outside the valid iova range will return error.
+ *
+ * The structures below define version 1 of this capability.
+ */
+#define VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE 1
+
+struct vfio_iova_range {
+ __u64 start;
+ __u64 end;
+};
+
+struct vfio_iommu_type1_info_cap_iova_range {
+ struct vfio_info_cap_header header;
+ __u32 nr_iovas;
+ __u32 reserved;
+ struct vfio_iova_range iova_ranges[];
+};
+
+/*
+ * The migration capability allows to report supported features for migration.
+ *
+ * The structures below define version 1 of this capability.
+ *
+ * The existence of this capability indicates that IOMMU kernel driver supports
+ * dirty page logging.
+ *
+ * pgsize_bitmap: Kernel driver returns bitmap of supported page sizes for dirty
+ * page logging.
+ * max_dirty_bitmap_size: Kernel driver returns maximum supported dirty bitmap
+ * size in bytes that can be used by user applications when getting the dirty
+ * bitmap.
+ */
+#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 2
+
+struct vfio_iommu_type1_info_cap_migration {
+ struct vfio_info_cap_header header;
+ __u32 flags;
+ __u64 pgsize_bitmap;
+ __u64 max_dirty_bitmap_size; /* in bytes */
+};
+
+/*
+ * The DMA available capability allows to report the current number of
+ * simultaneously outstanding DMA mappings that are allowed.
+ *
+ * The structure below defines version 1 of this capability.
+ *
+ * avail: specifies the current number of outstanding DMA mappings allowed.
+ */
+#define VFIO_IOMMU_TYPE1_INFO_DMA_AVAIL 3
+
+struct vfio_iommu_type1_info_dma_avail {
+ struct vfio_info_cap_header header;
+ __u32 avail;
+};
+
+#define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
+/**
+ * VFIO_IOMMU_MAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 13, struct vfio_dma_map)
+ *
+ * Map process virtual addresses to IO virtual addresses using the
+ * provided struct vfio_dma_map. Caller sets argsz. READ &/ WRITE required.
+ *
+ * If flags & VFIO_DMA_MAP_FLAG_VADDR, update the base vaddr for iova. The vaddr
+ * must have previously been invalidated with VFIO_DMA_UNMAP_FLAG_VADDR. To
+ * maintain memory consistency within the user application, the updated vaddr
+ * must address the same memory object as originally mapped. Failure to do so
+ * will result in user memory corruption and/or device misbehavior. iova and
+ * size must match those in the original MAP_DMA call. Protection is not
+ * changed, and the READ & WRITE flags must be 0.
+ */
+struct vfio_iommu_type1_dma_map {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DMA_MAP_FLAG_READ (1 << 0) /* readable from device */
+#define VFIO_DMA_MAP_FLAG_WRITE (1 << 1) /* writable from device */
+#define VFIO_DMA_MAP_FLAG_VADDR (1 << 2)
+ __u64 vaddr; /* Process virtual address */
+ __u64 iova; /* IO virtual address */
+ __u64 size; /* Size of mapping (bytes) */
+};
+
+#define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)
+
+struct vfio_bitmap {
+ __u64 pgsize; /* page size for bitmap in bytes */
+ __u64 size; /* in bytes */
+ __u64 *data; /* one bit per page */
+};
+
+/**
+ * VFIO_IOMMU_UNMAP_DMA - _IOWR(VFIO_TYPE, VFIO_BASE + 14,
+ * struct vfio_dma_unmap)
+ *
+ * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.
+ * Caller sets argsz. The actual unmapped size is returned in the size
+ * field. No guarantee is made to the user that arbitrary unmaps of iova
+ * or size different from those used in the original mapping call will
+ * succeed.
+ *
+ * VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP should be set to get the dirty bitmap
+ * before unmapping IO virtual addresses. When this flag is set, the user must
+ * provide a struct vfio_bitmap in data[]. User must provide zero-allocated
+ * memory via vfio_bitmap.data and its size in the vfio_bitmap.size field.
+ * A bit in the bitmap represents one page, of user provided page size in
+ * vfio_bitmap.pgsize field, consecutively starting from iova offset. Bit set
+ * indicates that the page at that offset from iova is dirty. A Bitmap of the
+ * pages in the range of unmapped size is returned in the user-provided
+ * vfio_bitmap.data.
+ *
+ * If flags & VFIO_DMA_UNMAP_FLAG_ALL, unmap all addresses. iova and size
+ * must be 0. This cannot be combined with the get-dirty-bitmap flag.
+ *
+ * If flags & VFIO_DMA_UNMAP_FLAG_VADDR, do not unmap, but invalidate host
+ * virtual addresses in the iova range. DMA to already-mapped pages continues.
+ * Groups may not be added to the container while any addresses are invalid.
+ * This cannot be combined with the get-dirty-bitmap flag.
+ */
+struct vfio_iommu_type1_dma_unmap {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP (1 << 0)
+#define VFIO_DMA_UNMAP_FLAG_ALL (1 << 1)
+#define VFIO_DMA_UNMAP_FLAG_VADDR (1 << 2)
+ __u64 iova; /* IO virtual address */
+ __u64 size; /* Size of mapping (bytes) */
+ __u8 data[];
+};
+
+#define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14)
+
+/*
+ * IOCTLs to enable/disable IOMMU container usage.
+ * No parameters are supported.
+ */
+#define VFIO_IOMMU_ENABLE _IO(VFIO_TYPE, VFIO_BASE + 15)
+#define VFIO_IOMMU_DISABLE _IO(VFIO_TYPE, VFIO_BASE + 16)
+
+/**
+ * VFIO_IOMMU_DIRTY_PAGES - _IOWR(VFIO_TYPE, VFIO_BASE + 17,
+ * struct vfio_iommu_type1_dirty_bitmap)
+ * IOCTL is used for dirty pages logging.
+ * Caller should set flag depending on which operation to perform, details as
+ * below:
+ *
+ * Calling the IOCTL with VFIO_IOMMU_DIRTY_PAGES_FLAG_START flag set, instructs
+ * the IOMMU driver to log pages that are dirtied or potentially dirtied by
+ * the device; designed to be used when a migration is in progress. Dirty pages
+ * are logged until logging is disabled by user application by calling the IOCTL
+ * with VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP flag.
+ *
+ * Calling the IOCTL with VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP flag set, instructs
+ * the IOMMU driver to stop logging dirtied pages.
+ *
+ * Calling the IOCTL with VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP flag set
+ * returns the dirty pages bitmap for IOMMU container for a given IOVA range.
+ * The user must specify the IOVA range and the pgsize through the structure
+ * vfio_iommu_type1_dirty_bitmap_get in the data[] portion. This interface
+ * supports getting a bitmap of the smallest supported pgsize only and can be
+ * modified in future to get a bitmap of any specified supported pgsize. The
+ * user must provide a zeroed memory area for the bitmap memory and specify its
+ * size in bitmap.size. One bit is used to represent one page consecutively
+ * starting from iova offset. The user should provide page size in bitmap.pgsize
+ * field. A bit set in the bitmap indicates that the page at that offset from
+ * iova is dirty. The caller must set argsz to a value including the size of
+ * structure vfio_iommu_type1_dirty_bitmap_get, but excluding the size of the
+ * actual bitmap. If dirty pages logging is not enabled, an error will be
+ * returned.
+ *
+ * Only one of the flags _START, _STOP and _GET may be specified at a time.
+ *
+ */
+struct vfio_iommu_type1_dirty_bitmap {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IOMMU_DIRTY_PAGES_FLAG_START (1 << 0)
+#define VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP (1 << 1)
+#define VFIO_IOMMU_DIRTY_PAGES_FLAG_GET_BITMAP (1 << 2)
+ __u8 data[];
+};
+
+struct vfio_iommu_type1_dirty_bitmap_get {
+ __u64 iova; /* IO virtual address */
+ __u64 size; /* Size of iova range */
+ struct vfio_bitmap bitmap;
+};
+
+#define VFIO_IOMMU_DIRTY_PAGES _IO(VFIO_TYPE, VFIO_BASE + 17)
+
+/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */
+
+/*
+ * The SPAPR TCE DDW info struct provides the information about
+ * the details of Dynamic DMA window capability.
+ *
+ * @pgsizes contains a page size bitmask, 4K/64K/16M are supported.
+ * @max_dynamic_windows_supported tells the maximum number of windows
+ * which the platform can create.
+ * @levels tells the maximum number of levels in multi-level IOMMU tables;
+ * this allows splitting a table into smaller chunks which reduces
+ * the amount of physically contiguous memory required for the table.
+ */
+struct vfio_iommu_spapr_tce_ddw_info {
+ __u64 pgsizes; /* Bitmap of supported page sizes */
+ __u32 max_dynamic_windows_supported;
+ __u32 levels;
+};
+
+/*
+ * The SPAPR TCE info struct provides the information about the PCI bus
+ * address ranges available for DMA, these values are programmed into
+ * the hardware so the guest has to know that information.
+ *
+ * The DMA 32 bit window start is an absolute PCI bus address.
+ * The IOVA address passed via map/unmap ioctls are absolute PCI bus
+ * addresses too so the window works as a filter rather than an offset
+ * for IOVA addresses.
+ *
+ * Flags supported:
+ * - VFIO_IOMMU_SPAPR_INFO_DDW: informs the userspace that dynamic DMA windows
+ * (DDW) support is present. @ddw is only supported when DDW is present.
+ */
+struct vfio_iommu_spapr_tce_info {
+ __u32 argsz;
+ __u32 flags;
+#define VFIO_IOMMU_SPAPR_INFO_DDW (1 << 0) /* DDW supported */
+ __u32 dma32_window_start; /* 32 bit window start (bytes) */
+ __u32 dma32_window_size; /* 32 bit window size (bytes) */
+ struct vfio_iommu_spapr_tce_ddw_info ddw;
+};
+
+#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
+
+/*
+ * EEH PE operation struct provides ways to:
+ * - enable/disable EEH functionality;
+ * - unfreeze IO/DMA for frozen PE;
+ * - read PE state;
+ * - reset PE;
+ * - configure PE;
+ * - inject EEH error.
+ */
+struct vfio_eeh_pe_err {
+ __u32 type;
+ __u32 func;
+ __u64 addr;
+ __u64 mask;
+};
+
+struct vfio_eeh_pe_op {
+ __u32 argsz;
+ __u32 flags;
+ __u32 op;
+ union {
+ struct vfio_eeh_pe_err err;
+ };
+};
+
+#define VFIO_EEH_PE_DISABLE 0 /* Disable EEH functionality */
+#define VFIO_EEH_PE_ENABLE 1 /* Enable EEH functionality */
+#define VFIO_EEH_PE_UNFREEZE_IO 2 /* Enable IO for frozen PE */
+#define VFIO_EEH_PE_UNFREEZE_DMA 3 /* Enable DMA for frozen PE */
+#define VFIO_EEH_PE_GET_STATE 4 /* PE state retrieval */
+#define VFIO_EEH_PE_STATE_NORMAL 0 /* PE in functional state */
+#define VFIO_EEH_PE_STATE_RESET 1 /* PE reset in progress */
+#define VFIO_EEH_PE_STATE_STOPPED 2 /* Stopped DMA and IO */
+#define VFIO_EEH_PE_STATE_STOPPED_DMA 4 /* Stopped DMA only */
+#define VFIO_EEH_PE_STATE_UNAVAIL 5 /* State unavailable */
+#define VFIO_EEH_PE_RESET_DEACTIVATE 5 /* Deassert PE reset */
+#define VFIO_EEH_PE_RESET_HOT 6 /* Assert hot reset */
+#define VFIO_EEH_PE_RESET_FUNDAMENTAL 7 /* Assert fundamental reset */
+#define VFIO_EEH_PE_CONFIGURE 8 /* PE configuration */
+#define VFIO_EEH_PE_INJECT_ERR 9 /* Inject EEH error */
+
+#define VFIO_EEH_PE_OP _IO(VFIO_TYPE, VFIO_BASE + 21)
+
+/**
+ * VFIO_IOMMU_SPAPR_REGISTER_MEMORY - _IOW(VFIO_TYPE, VFIO_BASE + 17, struct vfio_iommu_spapr_register_memory)
+ *
+ * Registers user space memory where DMA is allowed. It pins
+ * user pages and does the locked memory accounting so
+ * subsequent VFIO_IOMMU_MAP_DMA/VFIO_IOMMU_UNMAP_DMA calls
+ * get faster.
+ */
+struct vfio_iommu_spapr_register_memory {
+ __u32 argsz;
+ __u32 flags;
+ __u64 vaddr; /* Process virtual address */
+ __u64 size; /* Size of mapping (bytes) */
+};
+#define VFIO_IOMMU_SPAPR_REGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 17)
+
+/**
+ * VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY - _IOW(VFIO_TYPE, VFIO_BASE + 18, struct vfio_iommu_spapr_register_memory)
+ *
+ * Unregisters user space memory registered with
+ * VFIO_IOMMU_SPAPR_REGISTER_MEMORY.
+ * Uses vfio_iommu_spapr_register_memory for parameters.
+ */
+#define VFIO_IOMMU_SPAPR_UNREGISTER_MEMORY _IO(VFIO_TYPE, VFIO_BASE + 18)
+
+/**
+ * VFIO_IOMMU_SPAPR_TCE_CREATE - _IOWR(VFIO_TYPE, VFIO_BASE + 19, struct vfio_iommu_spapr_tce_create)
+ *
+ * Creates an additional TCE table and programs it (sets a new DMA window)
+ * to every IOMMU group in the container. It receives page shift, window
+ * size and number of levels in the TCE table being created.
+ *
+ * It allocates and returns an offset on a PCI bus of the new DMA window.
+ */
+struct vfio_iommu_spapr_tce_create {
+ __u32 argsz;
+ __u32 flags;
+ /* in */
+ __u32 page_shift;
+ __u32 __resv1;
+ __u64 window_size;
+ __u32 levels;
+ __u32 __resv2;
+ /* out */
+ __u64 start_addr;
+};
+#define VFIO_IOMMU_SPAPR_TCE_CREATE _IO(VFIO_TYPE, VFIO_BASE + 19)
+
+/**
+ * VFIO_IOMMU_SPAPR_TCE_REMOVE - _IOW(VFIO_TYPE, VFIO_BASE + 20, struct vfio_iommu_spapr_tce_remove)
+ *
+ * Unprograms a TCE table from all groups in the container and destroys it.
+ * It receives a PCI bus offset as a window id.
+ */
+struct vfio_iommu_spapr_tce_remove {
+ __u32 argsz;
+ __u32 flags;
+ /* in */
+ __u64 start_addr;
+};
+#define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20)
+
+/* ***************************************************************** */
+
+#endif /* _UAPIVFIO_H */
diff --git a/kernel/linux/uapi/version b/kernel/linux/uapi/version
index 3c68968f92..966a998301 100644
--- a/kernel/linux/uapi/version
+++ b/kernel/linux/uapi/version
@@ -1 +1 @@
-v6.14
+v6.16
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* [RFC v2 9/9] vfio: use imported uAPI header
2025-09-03 15:17 ` David Marchand
` (7 preceding siblings ...)
2025-09-03 15:17 ` [RFC v2 8/9] uapi: import VFIO header David Marchand
@ 2025-09-03 15:17 ` David Marchand
2025-09-04 7:08 ` [RFC v2 0/9] Cleanup VFIO API and import Linux " David Marchand
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-03 15:17 UTC (permalink / raw)
To: dev
Cc: thomas, maxime.coquelin, anatoly.burakov, 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
Now that we have a v6.16 header in DPDK, we can remove all remaining
wrappers around VFIO uapi.
Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Rosen Xu <rosen.xu@altera.com>
---
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 <sys/ioctl.h>
#include <sys/mman.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <eal_export.h>
#include <rte_eal_paging.h>
@@ -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 <dirent.h>
#include <sys/eventfd.h>
#include <ctype.h>
-#include <linux/vfio.h>
+
+#include <uapi/linux/vfio.h>
#include <eal_export.h>
#include <eal_filesystem.h>
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 <sys/epoll.h>
#include <sys/eventfd.h>
#include <sys/syscall.h>
-#include <linux/vfio.h>
+
+#include <uapi/linux/vfio.h>
#include <eal_export.h>
#include <rte_mbuf.h>
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 <sys/mman.h>
#include <stdbool.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_log.h>
#include <rte_pci.h>
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 <sys/queue.h>
#include <unistd.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <bus_driver.h>
#include <bus_platform_driver.h>
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 <inttypes.h>
-#include <linux/vfio.h>
#include <sys/eventfd.h>
#include <sys/ioctl.h>
#include <unistd.h>
+#include <uapi/linux/vfio.h>
+
#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 <sys/mman.h>
#include <sys/ioctl.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_vfio.h>
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 <sys/eventfd.h>
#include <sys/ioctl.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_eal.h>
#include <rte_malloc.h>
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 <sys/ioctl.h>
-#include <linux/vfio.h>
+
+#include <uapi/linux/vfio.h>
#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 <linux/virtio_net.h>
#include <stdbool.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_eal_paging.h>
#include <rte_malloc.h>
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 <sys/ioctl.h>
#include <unistd.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <nfp_common_pci.h>
#include <nfp_dev.h>
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 <unistd.h>
#include <sys/ioctl.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <rte_errno.h>
#include <rte_malloc.h>
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 <assert.h>
#include <stdbool.h>
-#include <linux/vfio.h>
+#include <uapi/linux/vfio.h>
#include <eal_export.h>
#include <eal_trace_internal.h>
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 <unistd.h>
#include <sys/ioctl.h>
#include <dirent.h>
-#include <linux/vfio.h>
+
+#include <uapi/linux/vfio.h>
#include <rte_errno.h>
#include <rte_log.h>
--
2.51.0
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [RFC v2 0/9] Cleanup VFIO API and import Linux uAPI header
2025-09-03 15:17 ` David Marchand
` (8 preceding siblings ...)
2025-09-03 15:17 ` [RFC v2 9/9] vfio: use imported uAPI header David Marchand
@ 2025-09-04 7:08 ` David Marchand
9 siblings, 0 replies; 35+ messages in thread
From: David Marchand @ 2025-09-04 7:08 UTC (permalink / raw)
To: David Marchand; +Cc: dev, thomas, maxime.coquelin, anatoly.burakov
On Wed, 3 Sept 2025 at 17:18, David Marchand <david.marchand@redhat.com> wrote:
>
> The VFIO headers have a number of issues:
> - showing to the world a lot of internal considerations,
> - defining macros with the VFIO_ namespace (confusing, and a source of
> conflicts with the VFIO official uAPI),
> - wrapping around VFIO uAPI in case the kernel headers do not contain the
> expected API (putting the burden on DPDK developers to find the right
> way to detect the presence of a VFIO feature),
> - (somehow related to the previous point) supporting old version of the
> Linux kernel while DPDK now requires a v5.4 Linux kernel at least,
>
> This series proposes to cleanup those headers by hiding as much as
> possible internal macros and structures, then removing the explicit
> inclusion of linux/vfio.h from rte_vfio.h (pushing this inclusion to the
> application which may want to do some funny stuff with VFIO and should
> already include this header on its own) and finally importing the VFIO
> uAPI header from Linux v6.15 for internal consumption by DPDK
> components.
There was some hiccup in a clang job in GHA.
Recheck-request: github-robot
--
David Marchand
^ permalink raw reply [flat|nested] 35+ messages in thread