Hi,
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Thursday, July 28, 2022 23:27
> To: dev@dpdk.org
> Cc: Gagandeep Singh <g.singh@nxp.com>; Hemant Agrawal
> <hemant.agrawal@nxp.com>; Chautru, Nicolas <nicolas.chautru@intel.com>;
> Ray Kinsella <mdr@ashroe.eu>; Daly, Lee <lee.daly@intel.com>; Zhang, Roy
> Fan <roy.fan.zhang@intel.com>; Ashish Gupta <ashish.gupta@marvell.com>;
> Sunila Sahu <ssahu@marvell.com>; Ruifeng Wang <ruifeng.wang@arm.com>;
> Ajit Khaparde <ajit.khaparde@broadcom.com>; Raveendra Padasalagi
> <raveendra.padasalagi@broadcom.com>; Vikas Gupta
> <vikas.gupta@broadcom.com>; Chandubabu Namburu <chandu@amd.com>;
> De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Michael Shamis
> <michaelsh@marvell.com>; Liron Himi <lironh@marvell.com>; Chengwen
> Feng <fengchengwen@huawei.com>; Laatz, Kevin <kevin.laatz@intel.com>;
> Richardson, Bruce <bruce.richardson@intel.com>; Sachin Saxena
> <sachin.saxena@oss.nxp.com>; Jerin Jacob <jerinj@marvell.com>; Liang Ma
> <liangma@liangbit.com>; Mccarthy, Peter <peter.mccarthy@intel.com>; Van
> Haaren, Harry <harry.van.haaren@intel.com>; John W. Linville
> <linville@tuxdriver.com>; Loftus, Ciara <ciara.loftus@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Chas Williams <chas3@att.com>; Min Hu (Connor)
> <humin29@huawei.com>; Gaetan Rivet <grive@u256.net>; Xu, Rosen
> <rosen.xu@intel.com>; Jakub Grajciar <jgrajcia@cisco.com>; Zyta Szpak
> <zr@semihalf.com>; Tetsuya Mukawa <mtetsuyah@gmail.com>; Harman
> Kalra <hkalra@marvell.com>; Singh, Jasvinder <jasvinder.singh@intel.com>;
> Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Matan Azrad
> <matan@nvidia.com>; Maxime Coquelin <maxime.coquelin@redhat.com>;
> Xia, Chenbo <chenbo.xia@intel.com>; Jakub Palider <jpalider@marvell.com>;
> Tomasz Duszynski <tduszynski@marvell.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; Thomas Monjalon <thomas@monjalon.net>;
> Ferruh Yigit <ferruh.yigit@xilinx.com>; Andrew Rybchenko
> <andrew.rybchenko@oktetlabs.ru>
> Subject: [RFC v3 17/26] bus/vdev: make driver-only headers private
>
> The vdev bus interface is for drivers only.
> Mark as internal and move the header in the driver headers list.
>
> While at it, cleanup the code:
> - fix indentation,
> - remove unneeded reference to bus specific singleton object,
> - remove unneeded list head structure type,
> - reorder the definitions and macro manipulating the bus singleton object,
> - remove inclusion of rte_bus.h and fix the code that relied on implicit
> inclusion,
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> Changes since RFC v2:
> - squashed cleanup for this bus code from other patches,
> - updated release notes,
>
> ---
> app/test/test_vdev.c | 2 +-
> doc/guides/rel_notes/release_22_11.rst | 4 +-
> drivers/baseband/la12xx/bbdev_la12xx.c | 2 +-
> drivers/baseband/null/bbdev_null.c | 2 +-
> .../baseband/turbo_sw/bbdev_turbo_software.c | 2 +-
> drivers/bus/vdev/bus_vdev_driver.h | 151 ++++++++++++++++++
> drivers/bus/vdev/meson.build | 1 +
> drivers/bus/vdev/rte_bus_vdev.h | 134 ----------------
> drivers/bus/vdev/vdev.c | 8 +-
> drivers/bus/vdev/vdev_params.c | 1 -
> drivers/bus/vdev/version.map | 9 +-
> drivers/compress/isal/isal_compress_pmd.c | 2 +-
> drivers/compress/zlib/zlib_pmd.c | 2 +-
> drivers/crypto/armv8/rte_armv8_pmd.c | 2 +-
> drivers/crypto/bcmfs/bcmfs_device.h | 2 +-
> drivers/crypto/caam_jr/caam_jr.c | 2 +-
> drivers/crypto/ccp/rte_ccp_pmd.c | 2 +-
> drivers/crypto/ipsec_mb/ipsec_mb_private.c | 2 +-
> drivers/crypto/ipsec_mb/ipsec_mb_private.h | 2 +-
> drivers/crypto/ipsec_mb/pmd_kasumi.c | 2 +-
> drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +-
> drivers/crypto/null/null_crypto_pmd.c | 2 +-
> drivers/crypto/openssl/rte_openssl_pmd.c | 2 +-
> drivers/crypto/scheduler/scheduler_pmd.c | 2 +-
> drivers/dma/skeleton/skeleton_dmadev.c | 2 +-
> drivers/event/dpaa2/dpaa2_eventdev.c | 2 +-
> drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 2 +-
> drivers/event/octeontx/ssovf_evdev.c | 2 +-
> drivers/event/octeontx/ssovf_evdev_selftest.c | 2 +-
> drivers/event/opdl/opdl_evdev.c | 2 +-
> drivers/event/opdl/opdl_evdev_init.c | 2 +-
> drivers/event/opdl/opdl_test.c | 2 +-
> drivers/event/skeleton/skeleton_eventdev.c | 2 +-
> drivers/event/sw/sw_evdev.c | 2 +-
> drivers/event/sw/sw_evdev_selftest.c | 2 +-
> drivers/net/af_packet/rte_eth_af_packet.c | 2 +-
> drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +-
> drivers/net/bonding/rte_eth_bond_api.c | 2 +-
> drivers/net/bonding/rte_eth_bond_pmd.c | 2 +-
> drivers/net/failsafe/failsafe.c | 3 +-
> drivers/net/ipn3ke/ipn3ke_ethdev.h | 2 +-
> drivers/net/kni/rte_eth_kni.c | 2 +-
> drivers/net/memif/memif_socket.c | 2 +-
> drivers/net/memif/rte_eth_memif.c | 2 +-
> drivers/net/mvneta/mvneta_ethdev.c | 2 +-
> drivers/net/mvpp2/mrvl_ethdev.c | 2 +-
> drivers/net/null/rte_eth_null.c | 2 +-
> drivers/net/octeontx/octeontx_ethdev.c | 2 +-
> drivers/net/pcap/pcap_ethdev.c | 2 +-
> drivers/net/pfe/pfe_ethdev.c | 2 +-
> drivers/net/ring/rte_eth_ring.c | 2 +-
> drivers/net/softnic/rte_eth_softnic.c | 2 +-
> drivers/net/tap/rte_eth_tap.c | 2 +-
> drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +-
> drivers/net/vhost/rte_eth_vhost.c | 2 +-
> drivers/net/virtio/virtio_user_ethdev.c | 2 +-
> drivers/raw/cnxk_gpio/cnxk_gpio.c | 2 +-
> drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 2 +-
> drivers/raw/ifpga/ifpga_rawdev.c | 2 +-
> drivers/raw/skeleton/skeleton_rawdev.c | 2 +-
> drivers/raw/skeleton/skeleton_rawdev_test.c | 2 +-
> lib/ethdev/ethdev_vdev.h | 2 +-
> lib/eventdev/eventdev_pmd_vdev.h | 2 +-
> 63 files changed, 221 insertions(+), 200 deletions(-) create mode 100644
> drivers/bus/vdev/bus_vdev_driver.h
Acked-by: Rosen Xu <rosen.xu@intel.com>
@@ -9,7 +9,7 @@
#include <rte_common.h>
#include <rte_kvargs.h>
#include <rte_bus.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "test.h"
@@ -84,8 +84,8 @@ API Changes
Also, make sure to start the actual text at the margin.
=======================================================
-* drivers: Registering a driver on the ``auxiliary``, ``ifpga``, ``pci``
- buses has been marked as an internal API.
+* drivers: Registering a driver on the ``auxiliary``, ``ifpga``, ``pci``,
+ ``vdev`` buses has been marked as an internal API.
External users may still register their driver using the associated driver
headers (see ``enable_driver_sdk`` meson option).
@@ -10,7 +10,7 @@
#include <dirent.h>
#include <rte_common.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_ring.h>
#include <rte_kvargs.h>
@@ -5,7 +5,7 @@
#include <string.h>
#include <rte_common.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_ring.h>
#include <rte_kvargs.h>
@@ -5,7 +5,7 @@
#include <string.h>
#include <rte_common.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_ring.h>
#include <rte_kvargs.h>
new file mode 100644
@@ -0,0 +1,151 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2016 RehiveTech. All rights reserved.
+ */
+
+#ifndef BUS_VDEV_DRIVER_H
+#define BUS_VDEV_DRIVER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_bus_vdev.h>
+#include <rte_compat.h>
+#include <rte_dev.h>
+#include <rte_devargs.h>
+
+struct rte_vdev_device {
+ RTE_TAILQ_ENTRY(rte_vdev_device) next; /**< Next attached vdev */
+ struct rte_device device; /**< Inherit core device */
+};
+
+/**
+ * @internal
+ * Helper macro for drivers that need to convert to struct rte_vdev_device.
+ */
+#define RTE_DEV_TO_VDEV(ptr) \
+ container_of(ptr, struct rte_vdev_device, device)
+
+#define RTE_DEV_TO_VDEV_CONST(ptr) \
+ container_of(ptr, const struct rte_vdev_device, device)
+
+#define RTE_ETH_DEV_TO_VDEV(eth_dev) RTE_DEV_TO_VDEV((eth_dev)->device)
+
+static inline const char *
+rte_vdev_device_name(const struct rte_vdev_device *dev)
+{
+ if (dev && dev->device.name)
+ return dev->device.name;
+ return NULL;
+}
+
+static inline const char *
+rte_vdev_device_args(const struct rte_vdev_device *dev)
+{
+ if (dev && dev->device.devargs)
+ return dev->device.devargs->args;
+ return "";
+}
+
+/**
+ * Probe function called for each virtual device driver once.
+ */
+typedef int (rte_vdev_probe_t)(struct rte_vdev_device *dev);
+
+/**
+ * Remove function called for each virtual device driver once.
+ */
+typedef int (rte_vdev_remove_t)(struct rte_vdev_device *dev);
+
+/**
+ * Driver-specific DMA mapping. After a successful call the device
+ * will be able to read/write from/to this segment.
+ *
+ * @param dev
+ * Pointer to the Virtual device.
+ * @param addr
+ * Starting virtual address of memory to be mapped.
+ * @param iova
+ * Starting IOVA address of memory to be mapped.
+ * @param len
+ * Length of memory segment being mapped.
+ * @return
+ * - 0 On success.
+ * - Negative value and rte_errno is set otherwise.
+ */
+typedef int (rte_vdev_dma_map_t)(struct rte_vdev_device *dev, void *addr,
+ uint64_t iova, size_t len);
+
+/**
+ * Driver-specific DMA un-mapping. After a successful call the device
+ * will not be able to read/write from/to this segment.
+ *
+ * @param dev
+ * Pointer to the Virtual device.
+ * @param addr
+ * Starting virtual address of memory to be unmapped.
+ * @param iova
+ * Starting IOVA address of memory to be unmapped.
+ * @param len
+ * Length of memory segment being unmapped.
+ * @return
+ * - 0 On success.
+ * - Negative value and rte_errno is set otherwise.
+ */
+typedef int (rte_vdev_dma_unmap_t)(struct rte_vdev_device *dev, void *addr,
+ uint64_t iova, size_t len);
+
+/**
+ * A virtual device driver abstraction.
+ */
+struct rte_vdev_driver {
+ RTE_TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */
+ struct rte_driver driver; /**< Inherited general driver. */
+ rte_vdev_probe_t *probe; /**< Virtual device probe function. */
+ rte_vdev_remove_t *remove; /**< Virtual device remove function. */
+ rte_vdev_dma_map_t *dma_map; /**< Virtual device DMA map function. */
+ rte_vdev_dma_unmap_t *dma_unmap; /**< Virtual device DMA unmap function. */
+ uint32_t drv_flags; /**< Flags RTE_VDEV_DRV_*. */
+};
+
+/** Device driver needs IOVA as VA and cannot work with IOVA as PA */
+#define RTE_VDEV_DRV_NEED_IOVA_AS_VA 0x0001
+
+/**
+ * Register a virtual device driver.
+ *
+ * @param driver
+ * A pointer to a rte_vdev_driver structure describing the driver
+ * to be registered.
+ */
+__rte_internal
+void rte_vdev_register(struct rte_vdev_driver *driver);
+
+/**
+ * Unregister a virtual device driver.
+ *
+ * @param driver
+ * A pointer to a rte_vdev_driver structure describing the driver
+ * to be unregistered.
+ */
+__rte_internal
+void rte_vdev_unregister(struct rte_vdev_driver *driver);
+
+#define RTE_PMD_REGISTER_VDEV(nm, vdrv)\
+static const char *vdrvinit_ ## nm ## _alias;\
+RTE_INIT(vdrvinitfn_ ##vdrv)\
+{\
+ (vdrv).driver.name = RTE_STR(nm);\
+ (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\
+ rte_vdev_register(&vdrv);\
+} \
+RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
+
+#define RTE_PMD_REGISTER_ALIAS(nm, alias)\
+static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BUS_VDEV_DRIVER_H */
@@ -6,5 +6,6 @@ sources = files(
'vdev_params.c',
)
headers = files('rte_bus_vdev.h')
+driver_sdk_headers = files('bus_vdev_driver.h')
deps += ['kvargs']
@@ -15,140 +15,6 @@
extern "C" {
#endif
-#include <rte_dev.h>
-#include <rte_devargs.h>
-
-struct rte_vdev_device {
- RTE_TAILQ_ENTRY(rte_vdev_device) next; /**< Next attached vdev */
- struct rte_device device; /**< Inherit core device */
-};
-
-/**
- * @internal
- * Helper macro for drivers that need to convert to struct rte_vdev_device.
- */
-#define RTE_DEV_TO_VDEV(ptr) \
- container_of(ptr, struct rte_vdev_device, device)
-
-#define RTE_DEV_TO_VDEV_CONST(ptr) \
- container_of(ptr, const struct rte_vdev_device, device)
-
-#define RTE_ETH_DEV_TO_VDEV(eth_dev) RTE_DEV_TO_VDEV((eth_dev)->device)
-
-static inline const char *
-rte_vdev_device_name(const struct rte_vdev_device *dev)
-{
- if (dev && dev->device.name)
- return dev->device.name;
- return NULL;
-}
-
-static inline const char *
-rte_vdev_device_args(const struct rte_vdev_device *dev)
-{
- if (dev && dev->device.devargs)
- return dev->device.devargs->args;
- return "";
-}
-
-/** Double linked list of virtual device drivers. */
-RTE_TAILQ_HEAD(vdev_driver_list, rte_vdev_driver);
-
-/**
- * Probe function called for each virtual device driver once.
- */
-typedef int (rte_vdev_probe_t)(struct rte_vdev_device *dev);
-
-/**
- * Remove function called for each virtual device driver once.
- */
-typedef int (rte_vdev_remove_t)(struct rte_vdev_device *dev);
-
-/**
- * Driver-specific DMA mapping. After a successful call the device
- * will be able to read/write from/to this segment.
- *
- * @param dev
- * Pointer to the Virtual device.
- * @param addr
- * Starting virtual address of memory to be mapped.
- * @param iova
- * Starting IOVA address of memory to be mapped.
- * @param len
- * Length of memory segment being mapped.
- * @return
- * - 0 On success.
- * - Negative value and rte_errno is set otherwise.
- */
-typedef int (rte_vdev_dma_map_t)(struct rte_vdev_device *dev, void *addr,
- uint64_t iova, size_t len);
-
-/**
- * Driver-specific DMA un-mapping. After a successful call the device
- * will not be able to read/write from/to this segment.
- *
- * @param dev
- * Pointer to the Virtual device.
- * @param addr
- * Starting virtual address of memory to be unmapped.
- * @param iova
- * Starting IOVA address of memory to be unmapped.
- * @param len
- * Length of memory segment being unmapped.
- * @return
- * - 0 On success.
- * - Negative value and rte_errno is set otherwise.
- */
-typedef int (rte_vdev_dma_unmap_t)(struct rte_vdev_device *dev, void *addr,
- uint64_t iova, size_t len);
-
-/**
- * A virtual device driver abstraction.
- */
-struct rte_vdev_driver {
- RTE_TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */
- struct rte_driver driver; /**< Inherited general driver. */
- rte_vdev_probe_t *probe; /**< Virtual device probe function. */
- rte_vdev_remove_t *remove; /**< Virtual device remove function. */
- rte_vdev_dma_map_t *dma_map; /**< Virtual device DMA map function. */
- rte_vdev_dma_unmap_t *dma_unmap; /**< Virtual device DMA unmap function. */
- uint32_t drv_flags; /**< Flags RTE_VDEV_DRV_*. */
-};
-
-/** Device driver needs IOVA as VA and cannot work with IOVA as PA */
-#define RTE_VDEV_DRV_NEED_IOVA_AS_VA 0x0001
-
-/**
- * Register a virtual device driver.
- *
- * @param driver
- * A pointer to a rte_vdev_driver structure describing the driver
- * to be registered.
- */
-void rte_vdev_register(struct rte_vdev_driver *driver);
-
-/**
- * Unregister a virtual device driver.
- *
- * @param driver
- * A pointer to a rte_vdev_driver structure describing the driver
- * to be unregistered.
- */
-void rte_vdev_unregister(struct rte_vdev_driver *driver);
-
-#define RTE_PMD_REGISTER_VDEV(nm, vdrv)\
-static const char *vdrvinit_ ## nm ## _alias;\
-RTE_INIT(vdrvinitfn_ ##vdrv)\
-{\
- (vdrv).driver.name = RTE_STR(nm);\
- (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\
- rte_vdev_register(&vdrv);\
-} \
-RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
-
-#define RTE_PMD_REGISTER_ALIAS(nm, alias)\
-static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
-
typedef void (*rte_vdev_scan_callback)(void *user_arg);
/**
@@ -21,7 +21,7 @@
#include <rte_string_fns.h>
#include <rte_errno.h>
-#include "rte_bus_vdev.h"
+#include "bus_vdev_driver.h"
#include "vdev_logs.h"
#include "vdev_private.h"
@@ -30,16 +30,14 @@
/* Forward declare to access virtual bus name */
static struct rte_bus rte_vdev_bus;
-/** Double linked list of virtual device drivers. */
-TAILQ_HEAD(vdev_device_list, rte_vdev_device);
-static struct vdev_device_list vdev_device_list =
+static TAILQ_HEAD(, rte_vdev_device) vdev_device_list =
TAILQ_HEAD_INITIALIZER(vdev_device_list);
/* The lock needs to be recursive because a vdev can manage another vdev. */
static rte_spinlock_recursive_t vdev_device_list_lock =
RTE_SPINLOCK_RECURSIVE_INITIALIZER;
-static struct vdev_driver_list vdev_driver_list =
+static TAILQ_HEAD(, rte_vdev_driver) vdev_driver_list =
TAILQ_HEAD_INITIALIZER(vdev_driver_list);
struct vdev_custom_scan {
@@ -5,7 +5,6 @@
#include <string.h>
#include <rte_dev.h>
-#include <rte_bus.h>
#include <rte_kvargs.h>
#include <rte_errno.h>
@@ -3,10 +3,15 @@ DPDK_23 {
rte_vdev_add_custom_scan;
rte_vdev_init;
- rte_vdev_register;
rte_vdev_remove_custom_scan;
rte_vdev_uninit;
- rte_vdev_unregister;
local: *;
};
+
+INTERNAL {
+ global:
+
+ rte_vdev_register;
+ rte_vdev_unregister;
+};
@@ -3,7 +3,7 @@
*/
#include <isa-l.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_cpuflags.h>
#include <rte_malloc.h>
@@ -2,7 +2,7 @@
* Copyright(c) 2018 Cavium Networks
*/
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include "zlib_pmd_private.h"
@@ -8,7 +8,7 @@
#include <rte_hexdump.h>
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_cpuflags.h>
@@ -9,7 +9,7 @@
#include <sys/queue.h>
#include <rte_spinlock.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "bcmfs_logs.h"
#include "bcmfs_qp.h"
@@ -12,7 +12,7 @@
#include <cryptodev_pmd.h>
#include <rte_crypto.h>
#include <rte_cryptodev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_security_driver.h>
#include <rte_hexdump.h>
@@ -4,7 +4,7 @@
#include <rte_string_fns.h>
#include <bus_pci_driver.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
@@ -2,7 +2,7 @@
* Copyright(c) 2021 Intel Corporation
*/
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_cryptodev.h>
@@ -7,7 +7,7 @@
#include <intel-ipsec-mb.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#if defined(RTE_LIB_SECURITY)
#define IPSEC_MB_DOCSIS_SEC_ENABLED 1
@@ -2,7 +2,7 @@
* Copyright(c) 2016-2021 Intel Corporation
*/
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_cpuflags.h>
#include <rte_cryptodev.h>
@@ -9,7 +9,7 @@
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
#include <rte_security_driver.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_cpuflags.h>
#include <rte_kvargs.h>
@@ -4,7 +4,7 @@
#include <rte_common.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include "null_crypto_pmd_private.h"
@@ -6,7 +6,7 @@
#include <rte_hexdump.h>
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_cpuflags.h>
@@ -5,7 +5,7 @@
#include <rte_hexdump.h>
#include <rte_cryptodev.h>
#include <cryptodev_pmd.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_malloc.h>
#include <rte_cpuflags.h>
#include <rte_reorder.h>
@@ -4,7 +4,7 @@
#include <inttypes.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_cycles.h>
#include <rte_eal.h>
#include <rte_kvargs.h>
@@ -23,7 +23,7 @@
#include <rte_memcpy.h>
#include <rte_memory.h>
#include <rte_pci.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <ethdev_driver.h>
#include <cryptodev_pmd.h>
#include <rte_event_eth_rx_adapter.h>
@@ -17,7 +17,7 @@
#include <rte_lcore.h>
#include <rte_per_lcore.h>
#include <rte_random.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_test.h>
#include <bus_fslmc_driver.h>
@@ -16,7 +16,7 @@
#include <rte_log.h>
#include <rte_malloc.h>
#include <rte_memory.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "ssovf_evdev.h"
#include "timvf_evdev.h"
@@ -17,7 +17,7 @@
#include <rte_lcore.h>
#include <rte_per_lcore.h>
#include <rte_random.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_test.h>
#include "ssovf_evdev.h"
@@ -5,7 +5,7 @@
#include <inttypes.h>
#include <string.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_lcore.h>
#include <rte_memzone.h>
#include <rte_kvargs.h>
@@ -5,7 +5,7 @@
#include <inttypes.h>
#include <string.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_errno.h>
#include <rte_cycles.h>
#include <rte_memzone.h>
@@ -19,7 +19,7 @@
#include <rte_ethdev.h>
#include <rte_cycles.h>
#include <rte_eventdev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_pause.h>
#include "opdl_evdev.h"
@@ -18,7 +18,7 @@
#include <rte_malloc.h>
#include <rte_memory.h>
#include <rte_lcore.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "skeleton_eventdev.h"
@@ -5,7 +5,7 @@
#include <inttypes.h>
#include <string.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_ring.h>
#include <rte_errno.h>
@@ -21,7 +21,7 @@
#include <rte_pause.h>
#include <rte_service.h>
#include <rte_service_component.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "sw_evdev.h"
@@ -12,7 +12,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <errno.h>
#include <linux/if_ether.h>
@@ -20,7 +20,7 @@
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_string_fns.h>
#include <rte_branch_prediction.h>
#include <rte_common.h>
@@ -8,7 +8,7 @@
#include <rte_malloc.h>
#include <ethdev_driver.h>
#include <rte_tcp.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include "rte_eth_bond.h"
@@ -15,7 +15,7 @@
#include <rte_ip_frag.h>
#include <rte_devargs.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_alarm.h>
#include <rte_cycles.h>
#include <rte_string_fns.h>
@@ -11,7 +11,8 @@
#include <ethdev_vdev.h>
#include <rte_devargs.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <rte_bus.h>
+#include <bus_vdev_driver.h>
#include "failsafe_private.h"
@@ -19,7 +19,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_spinlock.h>
@@ -12,7 +12,7 @@
#include <rte_kni.h>
#include <rte_kvargs.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
/* Only single queue supported */
#define KNI_MAX_QUEUE_PER_PORT 1
@@ -17,7 +17,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_hash.h>
#include <rte_jhash.h>
#include <rte_string_fns.h>
@@ -21,7 +21,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_string_fns.h>
#include <rte_errno.h>
#include <rte_memory.h>
@@ -7,7 +7,7 @@
#include <rte_string_fns.h>
#include <ethdev_driver.h>
#include <rte_kvargs.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <stdio.h>
#include <fcntl.h>
@@ -9,7 +9,7 @@
#include <rte_kvargs.h>
#include <rte_log.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <fcntl.h>
#include <linux/ethtool.h>
@@ -8,7 +8,7 @@
#include <ethdev_vdev.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_spinlock.h>
@@ -12,7 +12,7 @@
#include <eventdev_pmd.h>
#include <rte_alarm.h>
#include <rte_branch_prediction.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_cycles.h>
#include <rte_debug.h>
#include <rte_dev.h>
@@ -15,7 +15,7 @@
#include <rte_malloc.h>
#include <rte_mbuf.h>
#include <rte_mbuf_dyn.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_os_shim.h>
#include "pcap_osdep.h"
@@ -6,7 +6,7 @@
#include <sys/epoll.h>
#include <rte_kvargs.h>
#include <ethdev_vdev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_ether.h>
#include <dpaa_of.h>
@@ -8,7 +8,7 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_string_fns.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_errno.h>
@@ -9,7 +9,7 @@
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_errno.h>
#include <rte_ring.h>
@@ -10,7 +10,7 @@
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_net.h>
#include <rte_debug.h>
@@ -25,7 +25,7 @@
#include <rte_alarm.h>
#include <rte_bus.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_common.h>
#include <rte_dev.h>
#include <rte_errno.h>
@@ -13,7 +13,7 @@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_net.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_kvargs.h>
#include <rte_vhost.h>
#include <rte_spinlock.h>
@@ -14,7 +14,7 @@
#include <rte_malloc.h>
#include <rte_kvargs.h>
#include <ethdev_vdev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_alarm.h>
#include <rte_cycles.h>
@@ -6,7 +6,7 @@
#include <string.h>
#include <sys/stat.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_eal.h>
#include <rte_kvargs.h>
#include <rte_lcore.h>
@@ -6,7 +6,7 @@
#include <errno.h>
#include <stdint.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_atomic.h>
#include <rte_interrupts.h>
#include <rte_branch_prediction.h>
@@ -26,7 +26,7 @@
#include <rte_memzone.h>
#include <rte_eal.h>
#include <rte_common.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_string_fns.h>
#include <rte_pmd_i40e.h>
@@ -21,7 +21,7 @@
#include <rte_memory.h>
#include <rte_memcpy.h>
#include <rte_lcore.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_rawdev.h>
#include <rte_rawdev_pmd.h>
@@ -8,7 +8,7 @@
#include <rte_memcpy.h>
#include <rte_dev.h>
#include <rte_rawdev.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <rte_test.h>
/* Using relative path as skeleton_rawdev is not part of exported headers */
@@ -12,7 +12,7 @@ extern "C" {
#include <rte_config.h>
#include <rte_malloc.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include <ethdev_driver.h>
/**
@@ -22,7 +22,7 @@ extern "C" {
#include <rte_config.h>
#include <rte_debug.h>
#include <rte_eal.h>
-#include <rte_bus_vdev.h>
+#include <bus_vdev_driver.h>
#include "eventdev_pmd.h"