Re: [PATCH] vmbus: get current rte_vmbus_bus struct

[David Marchand]

On Thu, Apr 14, 2022 at 11:58 AM Abdelfattah Chehab
 wrote:
>
> The global variable is not accessible from libdpdk.so
> I don't really see how the linker can find it in this case.

Well, the initial mail was missing a description of the problem.
The patch is badly formatted and sent against 20.11, I did not read it.

The code for iterating over a bus specific object is internal.
We will probably remove this iterator macro from the public API in 22.11.


-- 
David Marchand

Re: [RFC PATCH 11/11] bus: hide bus object

[David Marchand]

On Tue, Jun 28, 2022 at 8:23 PM Tyler Retzlaff
 wrote:
>
> On Tue, Jun 28, 2022 at 10:38:27AM -0700, Stephen Hemminger wrote:
> > On Tue, 28 Jun 2022 10:07:12 -0700
> > Tyler Retzlaff  wrote:
> >
> > > > > to avoid people tripping over mishandling pointers in/out of the api
> > > > > surface taking the opaque object you could declare opaque handle for 
> > > > > the
> > > > > api to operate on instead. it would force the use of a cast in the
> > > > > implementation but would avoid accidental void * of the wrong thing 
> > > > > that
> > > > > got cached being passed in. if the cast was really undesirable just
> > > > > whack it under an inline / internal function.
> > > >
> > > > I don't like that because it least to dangerous casts in the internal 
> > > > code.
> > > > Better to keep the the type of the object. As long as the API only 
> > > > passes
> > > > around an pointer to a struct, without exposing the contents of the 
> > > > struct;
> > > > it is safer and easier to debug.
> > >
> > > as i mentioned you can use an inline/internal function or even a macro
> > > to hide the cast, you could provide some additional integrity checks
> > > here if desired as a value add.
> > >
> > > the fact that you expose that it is a struct is an internal
> > > implementation detail, if truly opaque tomorrow you could convert it
> > > to a simple integer that indexes or enumerates something and prevents
> > > any meaningful interpretation in the application.
> > >
> > > when you say it is safer to debug i think you mean for dpdk devs not the
> > > application developer because unless the app developer does something
> > > really gross/dangerous casting they really can't "mishandle" the opaque
> > > object except to use one that isn't initialized at all which we
> > > can detect and handle internally in a general way.
> > >
> > > i will however concede there would be slightly more finger work when
> > > debugging dpdk itself since gdb / debugger doesn't automatically infer
> > > type so you end up having to tell gdb what is in the uintptr_t.
> > >
> > > anyway just drawing from experience in the driver frameworks we maintain
> > > in windows, i think one of our regrets is that we didn't do this from
> > > day 1 and subsequentl that we initially only used one opaque type
> > > instead of defining separate (not implicitly convertable) types to each
> > > opaque type.
> >
> > It seems to be a difference in style/taste.
>
> it's not i've sited at least one example of a mistake that becomes a
> compile time failure where application code is incorrectly authored
> where use of a pointer offers no such protection.
>
> > The Linux/Unix side prefers opaque structure pointers.
> > Windows (and LLVM) uses numeric handles.
> >
> > At this point DPDK should follow the Linux bus.
>
> dpdk is multi-platform and unix does not necessarily standardize on
> pointer to struct for opaque objects. freebsd has many apis notably
> bus_space that does uses handles and as previously mentioned posix
> threads uses handles.
>
> i understand that linux is an important platform but it isn't the only
> platform dpdk targets and just because it is important doesn't mean it
> should always enjoy being the defacto standard.
>
> anyway, i'll leave it for the patch author to decide. i still like the
> patch series either way. i just think this would make applications more
> robust.

Thanks for this feedback Tyler.
I would lean towards Stephen opinion atm, but I am not decided yet.

For now, I'll post a v2, extending the series to other internal objects.
We can conclude on this topic during 22.11.


-- 
David Marchand

[RFC v2 v2 01/29] common/mlx5: rework check on driver registration

[David Marchand]

Rely on a local flag rather than dereference a bus object.
This will help next commits.

Signed-off-by: David Marchand 
---
 drivers/common/mlx5/linux/mlx5_common_auxiliary.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c 
b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
index 6584aeb18e..a182a8bdde 100644
--- a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
+++ b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
@@ -179,14 +179,20 @@ static struct rte_auxiliary_driver mlx5_auxiliary_driver 
= {
.dma_unmap = mlx5_common_auxiliary_dma_unmap,
 };
 
+static bool mlx5_common_auxiliary_initialized;
+
 void mlx5_common_auxiliary_init(void)
 {
-   if (mlx5_auxiliary_driver.bus == NULL)
+   if (!mlx5_common_auxiliary_initialized) {
rte_auxiliary_register(&mlx5_auxiliary_driver);
+   mlx5_common_auxiliary_initialized = true;
+   }
 }
 
 RTE_FINI(mlx5_common_auxiliary_driver_finish)
 {
-   if (mlx5_auxiliary_driver.bus != NULL)
+   if (mlx5_common_auxiliary_initialized) {
rte_auxiliary_unregister(&mlx5_auxiliary_driver);
+   mlx5_common_auxiliary_initialized = false;
+   }
 }
-- 
2.36.1

[RFC v2 v2 00/29] Bus and device cleanup for 22.11

[David Marchand]

This is a PoC for hiding the rte_bus, rte_driver and rte_device objects.
And mark associated driver only API as internal.

A good amount of the patches are preparation work on rte_bus.h,
rte_dev.h, rte_devargs.h and rte_eal.h headers, removing dependencies
between them. This is something I had in store for some time, maybe I
should have dropped it from the PoC, but I think those cleanups are
worth it in any case.

Then PCI bus specific handling are moved from unit tests and examples,
though there is still a special case left in testpmd that may require a
new API, to be discussed.

After this series, driver-only API headers for registering to buses are
not exported anymore, unless the enable_driver_sdk meson option is
selected.

New accessors for rte_bus, rte_driver and rte_device have been added,
marked with an experimental tag though we may declare them as stable
right away so that users can switch to them directly. That's also
something to agree on.

I simplified my series and switched to only update "external" users,
like app/ and examples/ files.
We need some checkpatch new checks to be sure we won't get some
driver-only headers included in these areas. That's something I'll work
on in the non RFC series.

"Internal" users are simply using the internal headers. That helps
greatly reducing the size of the changes.

Disclaimer: again, in this v2, this series is a bit rushed (I brute forced
compilation tests in GHA so that it passes between patches, but there still
may be something broken...).
Not surprisingly, the ABI check in the CI is expected to fail.


Comments welcome.

Changes since RFC v1:
- added two more cleanups (new patch 3 and 4) for unit test and examples
  relying on PCI specific info,
- went on with masking rte_driver and rte_device too,


-- 
David Marchand

David Marchand (29):
  common/mlx5: rework check on driver registration
  raw/ifpga: remove PCI bus accessor
  kni: stop populating PCI info in examples
  examples/ethtool: prefer device name
  dev: hide debug messages in device iterator
  dev: move unrelated macros from header
  devargs: remove dependency on bus header
  bus: remove unneeded inclusion of bus header
  bus: move IOVA definition from header
  drivers/bus: remove back reference to bus objects
  drivers/bus: hide specific structures
  bus: introduce accessors
  bus: hide bus object
  bbdev: mark driver header
  ethdev: mark some headers as driver only
  rawdev: mark driver header
  drivers: export drivers headers
  bus/auxiliary: make driver-only headers private
  bus/dpaa: make driver-only headers private
  bus/fslmc: make driver-only headers private
  bus/ifpga: cleanup exported symbols
  bus/ifpga: make driver-only headers private
  bus/pci: make driver-only headers private
  bus/vdev: make driver-only headers private
  bus/vmbus: make driver-only headers private
  dev: introduce driver name
  dev: hide driver object
  dev: introduce device accessors
  dev: hide device object

 app/proc-info/main.c  |   6 +-
 app/test-compress-perf/comp_perf_options.h|   2 +
 app/test-pmd/config.c |  12 +-
 app/test-pmd/testpmd.c|   4 +-
 app/test-pmd/testpmd.h|   7 +-
 app/test/test_devargs.c   |   6 +-
 app/test/test_kni.c   |  30 --
 app/test/test_vdev.c  |   3 +-
 app/test/virtual_pmd.c|   2 +-
 drivers/baseband/acc100/rte_acc100_pmd.c  |   4 +-
 .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c |   4 +-
 drivers/baseband/fpga_lte_fec/fpga_lte_fec.c  |   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/auxiliary/auxiliary_common.c  |   5 +-
 drivers/bus/auxiliary/auxiliary_params.c  |   5 +-
 ...bus_auxiliary.h => bus_auxiliary_driver.h} |  20 +-
 drivers/bus/auxiliary/linux/auxiliary.c   |   2 -
 drivers/bus/auxiliary/meson.build |   4 +-
 drivers/bus/auxiliary/private.h   |  30 +-
 drivers/bus/auxiliary/version.map |   3 +-
 drivers/bus/dpaa/base/qbman/qman.c|   2 +-
 .../{rte_dpaa_bus.h => bus_dpaa_driver.h} |  25 +-
 drivers/bus/dpaa/dpaa_bus.c   |  24 +-
 .../fslmc/{rte_fslmc.h => bus_fslmc_driver.h} |  30 +-
 drivers/bus/fslmc/fslmc_bus.c |  14 +-
 drivers/bus/fslmc/fslmc_vfio.c|   5 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c  |   4 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpci.c  |   4 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpio.c  |   4 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dprc.c  |   4 +-
 drivers/bus/fslmc/private.h   |  27 ++
 .../{rte_bus_ifpga.h => bus_ifpga_driver.h}   |  19 +-
 drivers/bus/ifpga/ifpga_bus.c |  23 +-
 drivers/bus/ifpga/ifpga_common.c  |  88 --
 drivers/bus/

[RFC v2 v2 02/29] raw/ifpga: remove PCI bus accessor

[David Marchand]

There is no in-tree user for this accessor that returns the PCI bus
object.
On the other hand, a bus object can be retrieved by name using
rte_bus_find_by_name.
We can remove driver specific API.

Signed-off-by: David Marchand 
---
 drivers/raw/ifpga/ifpga_rawdev.c  |  7 +--
 drivers/raw/ifpga/ifpga_rawdev.h  |  1 -
 drivers/raw/ifpga/rte_pmd_ifpga.c |  6 --
 drivers/raw/ifpga/rte_pmd_ifpga.h | 10 --
 drivers/raw/ifpga/version.map |  1 -
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 8c05302a65..78a7123528 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -10,8 +10,8 @@
 #include 
 #include 
 #include 
+
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1888,11 +1888,6 @@ RTE_PMD_REGISTER_PARAM_STRING(ifpga_rawdev_cfg,
"port= "
"afu_bts=");
 
-struct rte_pci_bus *ifpga_get_pci_bus(void)
-{
-   return rte_ifpga_rawdev_pmd.bus;
-}
-
 int ifpga_rawdev_partial_reconfigure(struct rte_rawdev *dev, int port,
const char *file)
 {
diff --git a/drivers/raw/ifpga/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h
index 4c191190ca..0fb66cbaae 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.h
+++ b/drivers/raw/ifpga/ifpga_rawdev.h
@@ -91,7 +91,6 @@ int
 ifpga_unregister_msix_irq(struct ifpga_rawdev *dev, enum ifpga_irq_type type,
int vec_start, rte_intr_callback_fn handler, void *arg);
 
-struct rte_pci_bus *ifpga_get_pci_bus(void);
 int ifpga_rawdev_partial_reconfigure(struct rte_rawdev *dev, int port,
const char *file);
 void ifpga_rawdev_cleanup(void);
diff --git a/drivers/raw/ifpga/rte_pmd_ifpga.c 
b/drivers/raw/ifpga/rte_pmd_ifpga.c
index 23146432c2..1ca248123b 100644
--- a/drivers/raw/ifpga/rte_pmd_ifpga.c
+++ b/drivers/raw/ifpga/rte_pmd_ifpga.c
@@ -402,12 +402,6 @@ rte_pmd_ifpga_reload(uint16_t dev_id, int type, int page)
return opae_mgr_reload(adapter->mgr, type, page);
 }
 
-const struct rte_pci_bus *
-rte_pmd_ifpga_get_pci_bus(void)
-{
-   return ifpga_get_pci_bus();
-}
-
 int
 rte_pmd_ifpga_partial_reconfigure(uint16_t dev_id, int port, const char *file)
 {
diff --git a/drivers/raw/ifpga/rte_pmd_ifpga.h 
b/drivers/raw/ifpga/rte_pmd_ifpga.h
index 3fa5d3435a..791543f2cd 100644
--- a/drivers/raw/ifpga/rte_pmd_ifpga.h
+++ b/drivers/raw/ifpga/rte_pmd_ifpga.h
@@ -220,16 +220,6 @@ rte_pmd_ifpga_reboot_try(uint16_t dev_id);
 int
 rte_pmd_ifpga_reload(uint16_t dev_id, int type, int page);
 
-/**
- * Get PCI bus the Intel FPGA driver register to
- *
- * @return
- *   - (valid pointer) if successful.
- *   - (NULL) if the Intel FPGA driver is not registered to any PCI bus.
- */
-const struct rte_pci_bus *
-rte_pmd_ifpga_get_pci_bus(void);
-
 /**
  * Perform PR (partial reconfiguration) on specified Intel FPGA device
  *
diff --git a/drivers/raw/ifpga/version.map b/drivers/raw/ifpga/version.map
index ff71a453e2..340d8eb3c7 100644
--- a/drivers/raw/ifpga/version.map
+++ b/drivers/raw/ifpga/version.map
@@ -10,7 +10,6 @@ DPDK_22 {
rte_pmd_ifpga_stop_update;
rte_pmd_ifpga_reboot_try;
rte_pmd_ifpga_reload;
-   rte_pmd_ifpga_get_pci_bus;
rte_pmd_ifpga_partial_reconfigure;
rte_pmd_ifpga_cleanup;
 
-- 
2.36.1

[RFC v2 v2 03/29] kni: stop populating PCI info in examples

[David Marchand]

addr and id fields are deprecated and are not used in the kni library.
Stop populating them in in-tree examples.

Signed-off-by: David Marchand 
---
 app/test/test_kni.c| 30 --
 examples/ip_pipeline/kni.c | 10 --
 2 files changed, 40 deletions(-)

diff --git a/app/test/test_kni.c b/app/test/test_kni.c
index 622315c8b1..4039da0b08 100644
--- a/app/test/test_kni.c
+++ b/app/test/test_kni.c
@@ -25,7 +25,6 @@ test_kni(void)
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -426,8 +425,6 @@ test_kni_processing(uint16_t port_id, struct rte_mempool 
*mp)
struct rte_kni_conf conf;
struct rte_eth_dev_info info;
struct rte_kni_ops ops;
-   const struct rte_pci_device *pci_dev;
-   const struct rte_bus *bus = NULL;
 
if (!mp)
return -1;
@@ -443,13 +440,6 @@ test_kni_processing(uint16_t port_id, struct rte_mempool 
*mp)
return -1;
}
 
-   if (info.device)
-   bus = rte_bus_find_by_device(info.device);
-   if (bus && !strcmp(bus->name, "pci")) {
-   pci_dev = RTE_DEV_TO_PCI(info.device);
-   conf.addr = pci_dev->addr;
-   conf.id = pci_dev->id;
-   }
snprintf(conf.name, sizeof(conf.name), TEST_KNI_PORT);
 
/* core id 1 configured for kernel thread */
@@ -545,8 +535,6 @@ test_kni(void)
struct rte_kni_conf conf;
struct rte_eth_dev_info info;
struct rte_kni_ops ops;
-   const struct rte_pci_device *pci_dev;
-   const struct rte_bus *bus;
FILE *fd;
DIR *dir;
char buf[16];
@@ -645,15 +633,6 @@ test_kni(void)
return -1;
}
 
-   if (info.device)
-   bus = rte_bus_find_by_device(info.device);
-   else
-   bus = NULL;
-   if (bus && !strcmp(bus->name, "pci")) {
-   pci_dev = RTE_DEV_TO_PCI(info.device);
-   conf.addr = pci_dev->addr;
-   conf.id = pci_dev->id;
-   }
conf.group_id = port_id;
conf.mbuf_size = MAX_PACKET_SZ;
 
@@ -689,15 +668,6 @@ test_kni(void)
goto fail;
}
 
-   if (info.device)
-   bus = rte_bus_find_by_device(info.device);
-   else
-   bus = NULL;
-   if (bus && !strcmp(bus->name, "pci")) {
-   pci_dev = RTE_DEV_TO_PCI(info.device);
-   conf.addr = pci_dev->addr;
-   conf.id = pci_dev->id;
-   }
conf.group_id = port_id;
conf.mbuf_size = MAX_PACKET_SZ;
 
diff --git a/examples/ip_pipeline/kni.c b/examples/ip_pipeline/kni.c
index a2d3331cb0..cd02c39478 100644
--- a/examples/ip_pipeline/kni.c
+++ b/examples/ip_pipeline/kni.c
@@ -6,7 +6,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 #include "kni.h"
@@ -107,8 +106,6 @@ kni_create(const char *name, struct kni_params *params)
struct mempool *mempool;
struct link *link;
struct rte_kni *k;
-   const struct rte_pci_device *pci_dev;
-   const struct rte_bus *bus = NULL;
int ret;
 
/* Check input params */
@@ -134,13 +131,6 @@ kni_create(const char *name, struct kni_params *params)
kni_conf.core_id = params->thread_id;
kni_conf.group_id = link->port_id;
kni_conf.mbuf_size = mempool->buffer_size;
-   if (dev_info.device)
-   bus = rte_bus_find_by_device(dev_info.device);
-   if (bus && !strcmp(bus->name, "pci")) {
-   pci_dev = RTE_DEV_TO_PCI(dev_info.device);
-   kni_conf.addr = pci_dev->addr;
-   kni_conf.id = pci_dev->id;
-   }
 
memset(&kni_ops, 0, sizeof(kni_ops));
kni_ops.port_id = link->port_id;
-- 
2.36.1

[RFC v2 v2 05/29] dev: hide debug messages in device iterator

[David Marchand]

For any bus that does not support device iteration, rte_dev_iterator_init
both returned an error code and logged an error message.
An application (like testpmd) that only wants to list devices, would have
no choice but to inspect a bus object to avoid spewing error logs.

Make those log messages debug level, and remove the check in testpmd.

Signed-off-by: David Marchand 
---
 app/test-pmd/config.c   | 4 
 lib/eal/common/eal_common_dev.c | 7 +++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 608bec9796..39bce480bf 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -642,10 +642,6 @@ device_infos_display(const char *identifier)
if (identifier && da.bus != next)
continue;
 
-   /* Skip buses that don't have iterate method */
-   if (!next->dev_iterate)
-   continue;
-
snprintf(devstr, sizeof(devstr), "bus=%s", next->name);
RTE_DEV_FOREACH(dev, devstr, &dev_iter) {
 
diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c
index 9d913e5478..b6f0392f30 100644
--- a/lib/eal/common/eal_common_dev.c
+++ b/lib/eal/common/eal_common_dev.c
@@ -592,18 +592,17 @@ rte_dev_iterator_init(struct rte_dev_iterator *it,
 * one layer specified.
 */
if (bus == NULL && cls == NULL) {
-   RTE_LOG(ERR, EAL,
-   "Either bus or class must be specified.\n");
+   RTE_LOG(DEBUG, EAL, "Either bus or class must be specified.\n");
rte_errno = EINVAL;
goto get_out;
}
if (bus != NULL && bus->dev_iterate == NULL) {
-   RTE_LOG(ERR, EAL, "Bus %s not supported\n", bus->name);
+   RTE_LOG(DEBUG, EAL, "Bus %s not supported\n", bus->name);
rte_errno = ENOTSUP;
goto get_out;
}
if (cls != NULL && cls->dev_iterate == NULL) {
-   RTE_LOG(ERR, EAL, "Class %s not supported\n", cls->name);
+   RTE_LOG(DEBUG, EAL, "Class %s not supported\n", cls->name);
rte_errno = ENOTSUP;
goto get_out;
}
-- 
2.36.1

[RFC v2 v2 04/29] examples/ethtool: prefer device name

[David Marchand]

Rely on the generic device name rather than restrict to only supporting
PCI devices.

Signed-off-by: David Marchand 
---
 examples/ethtool/lib/rte_ethtool.c | 17 ++---
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/examples/ethtool/lib/rte_ethtool.c 
b/examples/ethtool/lib/rte_ethtool.c
index ffaad96498..88dc917b73 100644
--- a/examples/ethtool/lib/rte_ethtool.c
+++ b/examples/ethtool/lib/rte_ethtool.c
@@ -8,7 +8,6 @@
 #include 
 #include 
 #include 
-#include 
 #ifdef RTE_NET_IXGBE
 #include 
 #endif
@@ -23,8 +22,6 @@ rte_ethtool_get_drvinfo(uint16_t port_id, struct 
ethtool_drvinfo *drvinfo)
 {
struct rte_eth_dev_info dev_info;
struct rte_dev_reg_info reg_info;
-   const struct rte_pci_device *pci_dev;
-   const struct rte_bus *bus = NULL;
int n;
int ret;
 
@@ -52,18 +49,8 @@ rte_ethtool_get_drvinfo(uint16_t port_id, struct 
ethtool_drvinfo *drvinfo)
strlcpy(drvinfo->driver, dev_info.driver_name,
sizeof(drvinfo->driver));
strlcpy(drvinfo->version, rte_version(), sizeof(drvinfo->version));
-   /* TODO: replace bus_info by rte_devargs.name */
-   if (dev_info.device)
-   bus = rte_bus_find_by_device(dev_info.device);
-   if (bus && !strcmp(bus->name, "pci")) {
-   pci_dev = RTE_DEV_TO_PCI(dev_info.device);
-   snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info),
-   "%04x:%02x:%02x.%x",
-   pci_dev->addr.domain, pci_dev->addr.bus,
-   pci_dev->addr.devid, pci_dev->addr.function);
-   } else {
-   snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info), "N/A");
-   }
+   strlcpy(drvinfo->bus_info, dev_info.device->name,
+   sizeof(drvinfo->bus_info));
 
memset(®_info, 0, sizeof(reg_info));
rte_eth_dev_get_reg_info(port_id, ®_info);
-- 
2.36.1

[RFC v2 v2 07/29] devargs: remove dependency on bus header

[David Marchand]

We don't need to include rte_bus.h.
Only a forward declaration of rte_bus and an inclusion of rte_dev.h are
needed.

Signed-off-by: David Marchand 
---
 app/test/test_vdev.c  | 1 +
 lib/eal/include/rte_devargs.h | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c
index 720722c363..5eeff3106d 100644
--- a/app/test/test_vdev.c
+++ b/app/test/test_vdev.c
@@ -8,6 +8,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include "test.h"
diff --git a/lib/eal/include/rte_devargs.h b/lib/eal/include/rte_devargs.h
index 37a0f042ab..38dee2f288 100644
--- a/lib/eal/include/rte_devargs.h
+++ b/lib/eal/include/rte_devargs.h
@@ -22,7 +22,9 @@ extern "C" {
 
 #include 
 #include 
-#include 
+#include 
+
+struct rte_bus;
 
 /**
  * Bus type key in global devargs syntax.
-- 
2.36.1

[RFC v2 v2 06/29] dev: move unrelated macros from header

[David Marchand]

RTE_FUNC_PTR_OR_* macros have nothing to do with the rte_device object
and associated API.
Move them to rte_common.h and include it where needed.

Signed-off-by: David Marchand 
---
 drivers/common/qat/qat_device.c|  1 +
 drivers/compress/qat/qat_comp_pmd.c|  1 +
 drivers/crypto/scheduler/rte_cryptodev_scheduler.c |  1 +
 drivers/net/ixgbe/rte_pmd_ixgbe.c  |  1 +
 drivers/net/liquidio/lio_ethdev.c  |  1 +
 lib/compressdev/rte_compressdev.c  |  1 +
 lib/dmadev/rte_dmadev.c|  1 +
 lib/eal/include/rte_common.h   | 11 +++
 lib/eal/include/rte_dev.h  | 11 ---
 lib/ethdev/ethdev_driver.c |  1 +
 lib/ethdev/ethdev_pci.h|  1 +
 lib/mempool/rte_mempool_ops.c  |  1 +
 lib/regexdev/rte_regexdev.c|  1 +
 lib/security/rte_security.c|  1 +
 lib/vhost/vdpa.c   |  1 +
 15 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/drivers/common/qat/qat_device.c b/drivers/common/qat/qat_device.c
index db4b087d2b..6583cf0554 100644
--- a/drivers/common/qat/qat_device.c
+++ b/drivers/common/qat/qat_device.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2018-2022 Intel Corporation
  */
 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/compress/qat/qat_comp_pmd.c 
b/drivers/compress/qat/qat_comp_pmd.c
index dc8db84a68..e4cac159be 100644
--- a/drivers/compress/qat/qat_comp_pmd.c
+++ b/drivers/compress/qat/qat_comp_pmd.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2015-2022 Intel Corporation
  */
 
+#include 
 #include 
 
 #include "qat_comp.h"
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c 
b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
index 1e0c4fe464..88c9b21cd8 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2017 Intel Corporation
  */
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.c 
b/drivers/net/ixgbe/rte_pmd_ixgbe.c
index 9729f8575f..8ae4d9b39a 100644
--- a/drivers/net/ixgbe/rte_pmd_ixgbe.c
+++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2010-2017 Intel Corporation
  */
 
+#include 
 #include 
 
 #include "base/ixgbe_api.h"
diff --git a/drivers/net/liquidio/lio_ethdev.c 
b/drivers/net/liquidio/lio_ethdev.c
index 90ffe31b9f..ccbd0ff849 100644
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
+#include 
 #include 
 #include 
 #include 
diff --git a/lib/compressdev/rte_compressdev.c 
b/lib/compressdev/rte_compressdev.c
index 22c438f2dd..12469042f7 100644
--- a/lib/compressdev/rte_compressdev.c
+++ b/lib/compressdev/rte_compressdev.c
@@ -6,6 +6,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
index 174d4c40ae..e199b888c8 100644
--- a/lib/dmadev/rte_dmadev.c
+++ b/lib/dmadev/rte_dmadev.c
@@ -5,6 +5,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h
index a96cc2a138..e2d1271c53 100644
--- a/lib/eal/include/rte_common.h
+++ b/lib/eal/include/rte_common.h
@@ -861,6 +861,17 @@ rte_log2_u64(uint64_t v)
 /** Number of elements in the array. */
 #defineRTE_DIM(a)  (sizeof (a) / sizeof ((a)[0]))
 
+/** Macros to check for invalid function pointers. */
+#define RTE_FUNC_PTR_OR_ERR_RET(func, retval) do { \
+   if ((func) == NULL) \
+   return retval; \
+} while (0)
+
+#define RTE_FUNC_PTR_OR_RET(func) do { \
+   if ((func) == NULL) \
+   return; \
+} while (0)
+
 /**
  * Converts a numeric string to the equivalent uint64_t value.
  * As well as straight number conversion, also recognises the suffixes
diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
index e6ff1218f9..24f9122558 100644
--- a/lib/eal/include/rte_dev.h
+++ b/lib/eal/include/rte_dev.h
@@ -36,17 +36,6 @@ typedef void (*rte_dev_event_cb_fn)(const char *device_name,
enum rte_dev_event_type event,
void *cb_arg);
 
-/* Macros to check for invalid function pointers */
-#define RTE_FUNC_PTR_OR_ERR_RET(func, retval) do { \
-   if ((func) == NULL) \
-   return retval; \
-} while (0)
-
-#define RTE_FUNC_PTR_OR_RET(func) do { \
-   if ((func) == NULL) \
-   return; \
-} while (0)
-
 /**
  * Device policies.
  */
diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
index a285f213f0..86f5a37874 100644
--- a/lib/ethdev/ethdev_driver.c
+++ b/lib/ethdev/ethdev_driver.c
@@ -2,6 +2,7 @@
  * Copyright(

[RFC v2 v2 08/29] bus: remove unneeded inclusion of bus header

[David Marchand]

Those files don't need to include rte_bus.h.

Signed-off-by: David Marchand 
---
 drivers/bus/auxiliary/linux/auxiliary.c | 1 -
 drivers/bus/ifpga/ifpga_common.c| 1 -
 drivers/bus/ifpga/rte_bus_ifpga.h   | 1 -
 drivers/bus/vdev/vdev_params.c  | 1 -
 drivers/bus/vmbus/linux/vmbus_uio.c | 1 -
 drivers/bus/vmbus/vmbus_bufring.c   | 1 -
 drivers/bus/vmbus/vmbus_channel.c   | 1 -
 drivers/bus/vmbus/vmbus_common_uio.c| 1 -
 drivers/crypto/virtio/virtio_pci.c  | 1 -
 drivers/dma/cnxk/cnxk_dmadev.c  | 1 -
 10 files changed, 10 deletions(-)

diff --git a/drivers/bus/auxiliary/linux/auxiliary.c 
b/drivers/bus/auxiliary/linux/auxiliary.c
index 9bd4ee3295..28092e31c4 100644
--- a/drivers/bus/auxiliary/linux/auxiliary.c
+++ b/drivers/bus/auxiliary/linux/auxiliary.c
@@ -6,7 +6,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/ifpga/ifpga_common.c b/drivers/bus/ifpga/ifpga_common.c
index 78e2eaee4e..223660d6ff 100644
--- a/drivers/bus/ifpga/ifpga_common.c
+++ b/drivers/bus/ifpga/ifpga_common.c
@@ -14,7 +14,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/ifpga/rte_bus_ifpga.h 
b/drivers/bus/ifpga/rte_bus_ifpga.h
index 007ad19875..682d565891 100644
--- a/drivers/bus/ifpga/rte_bus_ifpga.h
+++ b/drivers/bus/ifpga/rte_bus_ifpga.h
@@ -15,7 +15,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c
index 3969faf16d..2c72614776 100644
--- a/drivers/bus/vdev/vdev_params.c
+++ b/drivers/bus/vdev/vdev_params.c
@@ -5,7 +5,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c 
b/drivers/bus/vmbus/linux/vmbus_uio.c
index 5db70f8e0d..26edef342d 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -13,7 +13,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/vmbus/vmbus_bufring.c 
b/drivers/bus/vmbus/vmbus_bufring.c
index c4aa07b307..c78619dc44 100644
--- a/drivers/bus/vmbus/vmbus_bufring.c
+++ b/drivers/bus/vmbus/vmbus_bufring.c
@@ -15,7 +15,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/vmbus/vmbus_channel.c 
b/drivers/bus/vmbus/vmbus_channel.c
index 9bd01679c3..5549fd0944 100644
--- a/drivers/bus/vmbus/vmbus_channel.c
+++ b/drivers/bus/vmbus/vmbus_channel.c
@@ -12,7 +12,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/vmbus/vmbus_common_uio.c 
b/drivers/bus/vmbus/vmbus_common_uio.c
index 882a24f869..4d4613513c 100644
--- a/drivers/bus/vmbus/vmbus_common_uio.c
+++ b/drivers/bus/vmbus/vmbus_common_uio.c
@@ -13,7 +13,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "private.h"
diff --git a/drivers/crypto/virtio/virtio_pci.c 
b/drivers/crypto/virtio/virtio_pci.c
index ae069794a6..95a43c8801 100644
--- a/drivers/crypto/virtio/virtio_pci.c
+++ b/drivers/crypto/virtio/virtio_pci.c
@@ -10,7 +10,6 @@
 #endif
 
 #include 
-#include 
 
 #include "virtio_pci.h"
 #include "virtqueue.h"
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 2824c1b44f..3e8c15d617 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -5,7 +5,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
-- 
2.36.1

[RFC v2 v2 09/29] bus: move IOVA definition from header

[David Marchand]

iova enum definition does not need to be defined as part of the bus API.
Move it to rte_eal.h.
With this step, rte_eal.h does not depend on rte_bus.h and rte_dev.h.
Fix existing code that was relying on these implicit inclusions.

Signed-off-by: David Marchand 
---
 app/test-compress-perf/comp_perf_options.h   |  2 ++
 drivers/bus/vmbus/rte_bus_vmbus.h|  1 +
 drivers/compress/zlib/zlib_pmd_ops.c |  1 +
 drivers/net/failsafe/failsafe.c  |  1 +
 drivers/net/failsafe/failsafe_eal.c  |  1 +
 examples/multi_process/hotplug_mp/commands.c |  2 ++
 lib/compressdev/rte_compressdev.c|  1 +
 lib/compressdev/rte_compressdev_pmd.c|  1 +
 lib/cryptodev/cryptodev_pmd.c|  2 ++
 lib/eal/common/eal_thread.h  |  1 +
 lib/eal/common/hotplug_mp.c  |  1 +
 lib/eal/include/rte_bus.h| 18 ++
 lib/eal/include/rte_eal.h| 15 ++-
 lib/eal/include/rte_lcore.h  |  2 ++
 lib/eal/windows/eal.c|  1 +
 lib/ethdev/rte_ethdev.c  |  1 +
 lib/pcapng/rte_pcapng.c  |  1 +
 17 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/app/test-compress-perf/comp_perf_options.h 
b/app/test-compress-perf/comp_perf_options.h
index 0b777521c5..57dd146330 100644
--- a/app/test-compress-perf/comp_perf_options.h
+++ b/app/test-compress-perf/comp_perf_options.h
@@ -5,6 +5,8 @@
 #ifndef _COMP_PERF_OPS_
 #define _COMP_PERF_OPS_
 
+#include 
+
 #define MAX_LIST   32
 #define MIN_COMPRESSED_BUF_SIZE 8
 #define EXPANSE_RATIO 1.1
diff --git a/drivers/bus/vmbus/rte_bus_vmbus.h 
b/drivers/bus/vmbus/rte_bus_vmbus.h
index a24bad831d..4421326fe8 100644
--- a/drivers/bus/vmbus/rte_bus_vmbus.h
+++ b/drivers/bus/vmbus/rte_bus_vmbus.h
@@ -23,6 +23,7 @@ extern "C" {
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/compress/zlib/zlib_pmd_ops.c 
b/drivers/compress/zlib/zlib_pmd_ops.c
index 0a73aed949..7d657d81bc 100644
--- a/drivers/compress/zlib/zlib_pmd_ops.c
+++ b/drivers/compress/zlib/zlib_pmd_ops.c
@@ -4,6 +4,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 
diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 05cf533896..3eb7d32b76 100644
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "failsafe_private.h"
diff --git a/drivers/net/failsafe/failsafe_eal.c 
b/drivers/net/failsafe/failsafe_eal.c
index cb4a2abc02..130344dce2 100644
--- a/drivers/net/failsafe/failsafe_eal.c
+++ b/drivers/net/failsafe/failsafe_eal.c
@@ -3,6 +3,7 @@
  * Copyright 2017 Mellanox Technologies, Ltd
  */
 
+#include 
 #include 
 #include 
 
diff --git a/examples/multi_process/hotplug_mp/commands.c 
b/examples/multi_process/hotplug_mp/commands.c
index 41ea265e45..da8b5e5924 100644
--- a/examples/multi_process/hotplug_mp/commands.c
+++ b/examples/multi_process/hotplug_mp/commands.c
@@ -8,6 +8,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 
 /**/
diff --git a/lib/compressdev/rte_compressdev.c 
b/lib/compressdev/rte_compressdev.c
index 12469042f7..7f6dedbc52 100644
--- a/lib/compressdev/rte_compressdev.c
+++ b/lib/compressdev/rte_compressdev.c
@@ -9,6 +9,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/lib/compressdev/rte_compressdev_pmd.c 
b/lib/compressdev/rte_compressdev_pmd.c
index 7f500d76d4..9bfae077db 100644
--- a/lib/compressdev/rte_compressdev_pmd.c
+++ b/lib/compressdev/rte_compressdev_pmd.c
@@ -5,6 +5,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "rte_compressdev_internal.h"
diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c
index 1903ade388..75d0075b86 100644
--- a/lib/cryptodev/cryptodev_pmd.c
+++ b/lib/cryptodev/cryptodev_pmd.c
@@ -3,6 +3,8 @@
  */
 
 #include 
+
+#include 
 #include 
 #include 
 #include 
diff --git a/lib/eal/common/eal_thread.h b/lib/eal/common/eal_thread.h
index ca3378d463..e0240ccc60 100644
--- a/lib/eal/common/eal_thread.h
+++ b/lib/eal/common/eal_thread.h
@@ -5,6 +5,7 @@
 #ifndef EAL_THREAD_H
 #define EAL_THREAD_H
 
+#include 
 #include 
 
 /**
diff --git a/lib/eal/common/hotplug_mp.c b/lib/eal/common/hotplug_mp.c
index bde0de196e..1614a57752 100644
--- a/lib/eal/common/hotplug_mp.c
+++ b/lib/eal/common/hotplug_mp.c
@@ -3,6 +3,7 @@
  */
 #include 
 
+#include 
 #include 
 #include 
 #include 
diff --git a/lib/eal/include/rte_bus.h b/lib/eal/include/rte_bus.h
index 6efd28..17edaa37c9 100644
--- a/lib/eal/include/rte_bus.h
+++ b/lib/eal/include/rte_bus.h
@@ -20,27 +20,13 @@ extern "C" {
 
 #include 
 
-#include 
 #include 
+#include 
+#include 
 
 /** Double linked list of buses */
 RTE_TAILQ_HEAD(rte_bus_list, rte_bus);
 
-
-/**
- * IOVA mapping mode.

[RFC v2 v2 10/29] drivers/bus: remove back reference to bus objects

[David Marchand]

There is no need for a back reference to a singleton object in the bus
driver objects: each function is contextually aware of which bus object
it should manipulate.

Signed-off-by: David Marchand 
---
 drivers/bus/auxiliary/auxiliary_common.c  |  2 --
 drivers/bus/auxiliary/rte_bus_auxiliary.h |  2 --
 drivers/bus/dpaa/dpaa_bus.c   | 10 +-
 drivers/bus/dpaa/rte_dpaa_bus.h   |  1 -
 drivers/bus/fslmc/fslmc_bus.c | 10 +-
 drivers/bus/fslmc/rte_fslmc.h |  1 -
 drivers/bus/pci/pci_common.c  |  2 --
 drivers/bus/pci/rte_bus_pci.h |  1 -
 drivers/bus/vmbus/rte_bus_vmbus.h |  2 --
 drivers/bus/vmbus/vmbus_common.c  |  2 --
 10 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/drivers/bus/auxiliary/auxiliary_common.c 
b/drivers/bus/auxiliary/auxiliary_common.c
index 2cf8fe672d..0b212f2d64 100644
--- a/drivers/bus/auxiliary/auxiliary_common.c
+++ b/drivers/bus/auxiliary/auxiliary_common.c
@@ -259,7 +259,6 @@ void
 rte_auxiliary_register(struct rte_auxiliary_driver *driver)
 {
TAILQ_INSERT_TAIL(&auxiliary_bus.driver_list, driver, next);
-   driver->bus = &auxiliary_bus;
 }
 
 /* Unregister a driver */
@@ -267,7 +266,6 @@ void
 rte_auxiliary_unregister(struct rte_auxiliary_driver *driver)
 {
TAILQ_REMOVE(&auxiliary_bus.driver_list, driver, next);
-   driver->bus = NULL;
 }
 
 /* Add a device to auxiliary bus */
diff --git a/drivers/bus/auxiliary/rte_bus_auxiliary.h 
b/drivers/bus/auxiliary/rte_bus_auxiliary.h
index 93b266daf7..b19696e5e6 100644
--- a/drivers/bus/auxiliary/rte_bus_auxiliary.h
+++ b/drivers/bus/auxiliary/rte_bus_auxiliary.h
@@ -32,7 +32,6 @@ extern "C" {
 
 /* Forward declarations */
 struct rte_auxiliary_driver;
-struct rte_auxiliary_bus;
 struct rte_auxiliary_device;
 
 /**
@@ -125,7 +124,6 @@ struct rte_auxiliary_device {
 struct rte_auxiliary_driver {
RTE_TAILQ_ENTRY(rte_auxiliary_driver) next; /**< Next in list. */
struct rte_driver driver; /**< Inherit core driver. */
-   struct rte_auxiliary_bus *bus;/**< Auxiliary bus reference. */
rte_auxiliary_match_t *match; /**< Device match function. */
rte_auxiliary_probe_t *probe; /**< Device probe function. */
rte_auxiliary_remove_t *remove;   /**< Device remove function. */
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index e442bc4c33..2c286d5817 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -520,23 +520,15 @@ rte_dpaa_driver_register(struct rte_dpaa_driver *driver)
BUS_INIT_FUNC_TRACE();
 
TAILQ_INSERT_TAIL(&rte_dpaa_bus.driver_list, driver, next);
-   /* Update Bus references */
-   driver->dpaa_bus = &rte_dpaa_bus;
 }
 
 /* un-register a dpaa bus based dpaa driver */
 void
 rte_dpaa_driver_unregister(struct rte_dpaa_driver *driver)
 {
-   struct rte_dpaa_bus *dpaa_bus;
-
BUS_INIT_FUNC_TRACE();
 
-   dpaa_bus = driver->dpaa_bus;
-
-   TAILQ_REMOVE(&dpaa_bus->driver_list, driver, next);
-   /* Update Bus references */
-   driver->dpaa_bus = NULL;
+   TAILQ_REMOVE(&rte_dpaa_bus.driver_list, driver, next);
 }
 
 static int
diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h
index 1f04d9ebd3..5e8f32dfbf 100644
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -119,7 +119,6 @@ typedef int (*rte_dpaa_remove_t)(struct rte_dpaa_device 
*dpaa_dev);
 struct rte_dpaa_driver {
TAILQ_ENTRY(rte_dpaa_driver) next;
struct rte_driver driver;
-   struct rte_dpaa_bus *dpaa_bus;
enum rte_dpaa_type drv_type;
rte_dpaa_probe_t probe;
rte_dpaa_remove_t remove;
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index e9edc27e0a..f112d2afeb 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -530,27 +530,19 @@ rte_fslmc_driver_register(struct rte_dpaa2_driver *driver)
RTE_VERIFY(driver);
 
TAILQ_INSERT_TAIL(&rte_fslmc_bus.driver_list, driver, next);
-   /* Update Bus references */
-   driver->fslmc_bus = &rte_fslmc_bus;
 }
 
 /*un-register a fslmc bus based dpaa2 driver */
 void
 rte_fslmc_driver_unregister(struct rte_dpaa2_driver *driver)
 {
-   struct rte_fslmc_bus *fslmc_bus;
-
-   fslmc_bus = driver->fslmc_bus;
-
/* Cleanup the PA->VA Translation table; From wherever this function
 * is called from.
 */
if (rte_eal_iova_mode() == RTE_IOVA_PA)
dpaax_iova_table_depopulate();
 
-   TAILQ_REMOVE(&fslmc_bus->driver_list, driver, next);
-   /* Update Bus references */
-   driver->fslmc_bus = NULL;
+   TAILQ_REMOVE(&rte_fslmc_bus.driver_list, driver, next);
 }
 
 /*
diff --git a/drivers/bus/fslmc/rte_fslmc.h b/drivers/bus/fslmc/rte_fslmc.h
index 8c67bfba55..9c3791635c 100644
--- a/drivers/bus/fslmc/rte_fsl

[RFC v2 v2 11/29] drivers/bus: hide specific structures

[David Marchand]

Now that there is no bus specific object referenced in the driver
objects, we can hide rte_dpaa_bus, rte_fslmc_bus, rte_pci_bus,
rte_vmbus_bus specific structures into their bus code.

While at it:
- move enumerators only used in the bus code itself,
- remove unneeded list head structure type,
- reorder the definitions and macro manipulating the bus singleton object,
- remove inclusion of rte_bus.h and update code that relied on it,

Signed-off-by: David Marchand 
---
Changes since RFC v1:
- dropped kni UT and ethtool example changes after new cleanup was added,
- cleaned ifgpa and vdev bus,

---
 app/test-pmd/testpmd.h|  1 +
 drivers/bus/auxiliary/private.h   | 28 +++
 drivers/bus/auxiliary/rte_bus_auxiliary.h |  1 -
 drivers/bus/dpaa/dpaa_bus.c   |  8 +++
 drivers/bus/dpaa/rte_dpaa_bus.h   | 13 ---
 drivers/bus/fslmc/fslmc_bus.c |  1 +
 drivers/bus/fslmc/fslmc_vfio.c|  2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dprc.c  |  1 +
 drivers/bus/fslmc/private.h   | 27 ++
 drivers/bus/fslmc/rte_fslmc.h | 20 
 drivers/bus/ifpga/ifpga_bus.c |  4 ++--
 drivers/bus/ifpga/rte_bus_ifpga.h |  6 -
 drivers/bus/pci/bsd/pci.c |  2 --
 drivers/bus/pci/linux/pci.c   |  3 ---
 drivers/bus/pci/private.h | 18 ++-
 drivers/bus/pci/rte_bus_pci.h | 22 --
 drivers/bus/pci/windows/pci.c |  1 +
 drivers/bus/pci/windows/pci_netuio.c  |  1 +
 drivers/bus/vdev/rte_bus_vdev.h   |  3 ---
 drivers/bus/vdev/vdev.c   |  6 ++---
 drivers/bus/vmbus/private.h   | 18 +++
 drivers/bus/vmbus/rte_bus_vmbus.h | 20 
 drivers/bus/vmbus/vmbus_common.c  |  1 -
 drivers/common/mlx5/mlx5_common_pci.c |  1 +
 drivers/net/bonding/rte_eth_bond_args.c   |  1 +
 drivers/net/mlx5/linux/mlx5_os.c  |  1 +
 drivers/net/netvsc/hn_ethdev.c|  1 +
 27 files changed, 97 insertions(+), 114 deletions(-)
 create mode 100644 drivers/bus/fslmc/private.h

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index fb2f5195d3..8694c65539 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -8,6 +8,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #ifdef RTE_LIB_GRO
 #include 
diff --git a/drivers/bus/auxiliary/private.h b/drivers/bus/auxiliary/private.h
index d22e83cf7a..d97e8c694e 100644
--- a/drivers/bus/auxiliary/private.h
+++ b/drivers/bus/auxiliary/private.h
@@ -9,9 +9,10 @@
 #include 
 #include 
 
+#include 
+
 #include "rte_bus_auxiliary.h"
 
-extern struct rte_auxiliary_bus auxiliary_bus;
 extern int auxiliary_bus_logtype;
 
 #define AUXILIARY_LOG(level, ...) \
@@ -19,27 +20,24 @@ extern int auxiliary_bus_logtype;
RTE_FMT("auxiliary bus: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
RTE_FMT_TAIL(__VA_ARGS__,)))
 
-/* Auxiliary bus iterators */
-#define FOREACH_DEVICE_ON_AUXILIARY_BUS(p) \
-   TAILQ_FOREACH(p, &(auxiliary_bus.device_list), next)
-
-#define FOREACH_DRIVER_ON_AUXILIARY_BUS(p) \
-   TAILQ_FOREACH(p, &(auxiliary_bus.driver_list), next)
-
-/* List of auxiliary devices. */
-TAILQ_HEAD(rte_auxiliary_device_list, rte_auxiliary_device);
-/* List of auxiliary drivers. */
-TAILQ_HEAD(rte_auxiliary_driver_list, rte_auxiliary_driver);
-
 /*
  * Structure describing the auxiliary bus
  */
 struct rte_auxiliary_bus {
struct rte_bus bus;  /* Inherit the generic class */
-   struct rte_auxiliary_device_list device_list;  /* List of devices */
-   struct rte_auxiliary_driver_list driver_list;  /* List of drivers */
+   TAILQ_HEAD(, rte_auxiliary_device) device_list;  /* List of devices */
+   TAILQ_HEAD(, rte_auxiliary_driver) driver_list;  /* List of drivers */
 };
 
+extern struct rte_auxiliary_bus auxiliary_bus;
+
+/* Auxiliary bus iterators */
+#define FOREACH_DEVICE_ON_AUXILIARY_BUS(p) \
+   TAILQ_FOREACH(p, &(auxiliary_bus.device_list), next)
+
+#define FOREACH_DRIVER_ON_AUXILIARY_BUS(p) \
+   TAILQ_FOREACH(p, &(auxiliary_bus.driver_list), next)
+
 /*
  * Test whether the auxiliary device exist.
  */
diff --git a/drivers/bus/auxiliary/rte_bus_auxiliary.h 
b/drivers/bus/auxiliary/rte_bus_auxiliary.h
index b19696e5e6..3b3dbc866a 100644
--- a/drivers/bus/auxiliary/rte_bus_auxiliary.h
+++ b/drivers/bus/auxiliary/rte_bus_auxiliary.h
@@ -25,7 +25,6 @@ extern "C" {
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #define RTE_BUS_AUXILIARY_NAME "auxiliary"
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 2c286d5817..ad4ea156a6 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -43,6 +43,14 @@
 #include 
 #include 
 
+struct rte_dpaa_bus {
+   struct rte_bus bus;
+   TAILQ_HEAD(, rte_dpaa_device

[RFC v2 v2 12/29] bus: introduce accessors

[David Marchand]

Add helpers to get a rte_bus object details.
This will be used externally.
Internal users may still dereference a rte_bus object.

Signed-off-by: David Marchand 
---
Changes since RFC v1:
- changed approach: only external users are updated,

---
 app/test-pmd/config.c|  6 ++---
 app/test-pmd/testpmd.c   |  4 +--
 app/test-pmd/testpmd.h   |  4 +--
 app/test/test_devargs.c  |  4 +--
 examples/multi_process/hotplug_mp/commands.c |  4 +--
 lib/eal/common/eal_common_bus.c  | 26 
 lib/eal/include/rte_bus.h| 12 +
 lib/eal/version.map  |  3 +++
 8 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 39bce480bf..bc154e8bf7 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -642,7 +642,7 @@ device_infos_display(const char *identifier)
if (identifier && da.bus != next)
continue;
 
-   snprintf(devstr, sizeof(devstr), "bus=%s", next->name);
+   snprintf(devstr, sizeof(devstr), "bus=%s", rte_bus_name(next));
RTE_DEV_FOREACH(dev, devstr, &dev_iter) {
 
if (!dev->driver)
@@ -653,7 +653,7 @@ device_infos_display(const char *identifier)
continue;
printf("\n%s Infos for device %s %s\n",
   info_border, dev->name, info_border);
-   printf("Bus name: %s", dev->bus->name);
+   printf("Bus name: %s", rte_bus_name(dev->bus));
printf("\nDriver name: %s", dev->driver->name);
printf("\nDevargs: %s",
   dev->devargs ? dev->devargs->args : "");
@@ -1154,7 +1154,7 @@ port_reg_off_is_invalid(portid_t port_id, uint32_t 
reg_off)
}
 
bus = rte_bus_find_by_device(ports[port_id].dev_info.device);
-   if (bus && !strcmp(bus->name, "pci")) {
+   if (bus && !strcmp(rte_bus_name(bus), "pci")) {
pci_dev = RTE_DEV_TO_PCI(ports[port_id].dev_info.device);
} else {
fprintf(stderr, "Not a PCI device\n");
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index addcbcac85..51c2488b45 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3507,9 +3507,9 @@ detach_devargs(char *identifier)
}
}
 
-   if (rte_eal_hotplug_remove(da.bus->name, da.name) != 0) {
+   if (rte_eal_hotplug_remove(rte_bus_name(da.bus), da.name) != 0) {
TESTPMD_LOG(ERR, "Failed to detach device %s(%s)\n",
-   da.name, da.bus->name);
+   da.name, rte_bus_name(da.bus));
rte_devargs_reset(&da);
return;
}
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 8694c65539..59a8a429c5 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -819,7 +819,7 @@ port_pci_reg_read(struct rte_port *port, uint32_t reg_off)
}
 
bus = rte_bus_find_by_device(port->dev_info.device);
-   if (bus && !strcmp(bus->name, "pci")) {
+   if (bus && !strcmp(rte_bus_name(bus), "pci")) {
pci_dev = RTE_DEV_TO_PCI(port->dev_info.device);
} else {
fprintf(stderr, "Not a PCI device\n");
@@ -847,7 +847,7 @@ port_pci_reg_write(struct rte_port *port, uint32_t reg_off, 
uint32_t reg_v)
}
 
bus = rte_bus_find_by_device(port->dev_info.device);
-   if (bus && !strcmp(bus->name, "pci")) {
+   if (bus && !strcmp(rte_bus_name(bus), "pci")) {
pci_dev = RTE_DEV_TO_PCI(port->dev_info.device);
} else {
fprintf(stderr, "Not a PCI device\n");
diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c
index 16621285d2..ac5bc34c18 100644
--- a/app/test/test_devargs.c
+++ b/app/test/test_devargs.c
@@ -98,9 +98,9 @@ test_valid_devargs_cases(const struct devargs_case *list, 
size_t n)
  list[i].bus_kv) != 0)
goto fail;
if (list[i].bus != NULL &&
-   strcmp(da.bus->name, list[i].bus) != 0) {
+   strcmp(rte_bus_name(da.bus), list[i].bus) != 0) {
printf("rte_devargs_parse(%s) bus name (%s) not 
expected (%s)\n",
-  list[i].devargs, da.bus->name, list[i].bus);
+  list[i].devargs, rte_bus_name(da.bus), 
list[i].bus);
goto fail;
}
if ((list[i].class_kv > 0 || list[i].class != NULL) &&
diff --git a/examples/multi_process/hotplug_mp/commands.c 
b/examples/multi_process/hotplug_mp/commands.c
index da8b5e5924..88f44e00a0 100644
--- a/examples/multi_process/hotplug_mp/commands.c
+++ b/examples/multi_proc

[RFC v2 v2 14/29] bbdev: mark driver header

[David Marchand]

rte_bbdev_pmd.h is a driver only header.

Signed-off-by: David Marchand 
---
 lib/bbdev/meson.build | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/bbdev/meson.build b/lib/bbdev/meson.build
index 07685e7578..7d035065f1 100644
--- a/lib/bbdev/meson.build
+++ b/lib/bbdev/meson.build
@@ -8,7 +8,6 @@ if is_windows
 endif
 
 sources = files('rte_bbdev.c')
-headers = files('rte_bbdev.h',
-'rte_bbdev_pmd.h',
-'rte_bbdev_op.h')
+headers = files('rte_bbdev.h', 'rte_bbdev_op.h')
+driver_sdk_headers = files('rte_bbdev_pmd.h')
 deps += ['mbuf']
-- 
2.36.1

[RFC v2 v2 13/29] bus: hide bus object

[David Marchand]

Make rte_bus opaque for non internal users.
This will make extending this object possible without breaking the ABI.

Introduce a new driver header and move rte_bus definition and helpers.
Update drivers and library to use the internal header.

Signed-off-by: David Marchand 
---
Changes since RFC v1:
- update all existing users of the public header to use the internal one,

---
 app/test/test_devargs.c  |   2 +-
 app/test/test_vdev.c |   2 +-
 drivers/bus/auxiliary/auxiliary_common.c |   2 +-
 drivers/bus/auxiliary/auxiliary_params.c |   2 +-
 drivers/bus/auxiliary/private.h  |   2 +-
 drivers/bus/dpaa/dpaa_bus.c  |   4 +-
 drivers/bus/fslmc/fslmc_bus.c|   2 +-
 drivers/bus/fslmc/private.h  |   2 +-
 drivers/bus/ifpga/ifpga_bus.c|   2 +-
 drivers/bus/pci/linux/pci_vfio.c |   2 +-
 drivers/bus/pci/pci_common.c |   2 +-
 drivers/bus/pci/pci_params.c |   2 +-
 drivers/bus/pci/private.h|   2 +-
 drivers/bus/vdev/vdev.c  |   2 +-
 drivers/bus/vmbus/private.h  |   2 +-
 drivers/common/mlx5/mlx5_common_pci.c|   2 +-
 drivers/dma/idxd/idxd_bus.c  |   2 +-
 drivers/net/bonding/rte_eth_bond_args.c  |   2 +-
 drivers/net/failsafe/failsafe.c  |   2 +-
 drivers/net/failsafe/failsafe_eal.c  |   2 +-
 drivers/net/mlx5/linux/mlx5_os.c |   2 +-
 drivers/net/netvsc/hn_ethdev.c   |   2 +-
 drivers/net/vdev_netvsc/vdev_netvsc.c|   2 +-
 drivers/net/virtio/virtio_pci.c  |   2 +-
 drivers/raw/ioat/idxd_bus.c  |   2 +-
 lib/eal/common/eal_common_bus.c  |   2 +-
 lib/eal/common/eal_common_dev.c  |   2 +-
 lib/eal/common/eal_common_devargs.c  |   2 +-
 lib/eal/common/hotplug_mp.c  |   2 +-
 lib/eal/include/bus_driver.h | 296 +++
 lib/eal/include/meson.build  |   4 +
 lib/eal/include/rte_bus.h| 275 +
 lib/eal/linux/eal_dev.c  |   2 +-
 lib/eal/version.map  |   4 +-
 lib/ethdev/rte_ethdev.c  |   2 +-
 lib/pcapng/rte_pcapng.c  |   2 +-
 36 files changed, 338 insertions(+), 307 deletions(-)
 create mode 100644 lib/eal/include/bus_driver.h

diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c
index ac5bc34c18..14a0b11fbe 100644
--- a/app/test/test_devargs.c
+++ b/app/test/test_devargs.c
@@ -6,10 +6,10 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "test.h"
diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c
index 5eeff3106d..9e39993e90 100644
--- a/app/test/test_vdev.c
+++ b/app/test/test_vdev.c
@@ -6,9 +6,9 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
-#include 
 #include 
 
 #include "test.h"
diff --git a/drivers/bus/auxiliary/auxiliary_common.c 
b/drivers/bus/auxiliary/auxiliary_common.c
index 0b212f2d64..38d722e653 100644
--- a/drivers/bus/auxiliary/auxiliary_common.c
+++ b/drivers/bus/auxiliary/auxiliary_common.c
@@ -12,7 +12,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/auxiliary/auxiliary_params.c 
b/drivers/bus/auxiliary/auxiliary_params.c
index 9017118b36..542083dc89 100644
--- a/drivers/bus/auxiliary/auxiliary_params.c
+++ b/drivers/bus/auxiliary/auxiliary_params.c
@@ -4,7 +4,7 @@
 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/auxiliary/private.h b/drivers/bus/auxiliary/private.h
index d97e8c694e..1e0e584039 100644
--- a/drivers/bus/auxiliary/private.h
+++ b/drivers/bus/auxiliary/private.h
@@ -9,7 +9,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "rte_bus_auxiliary.h"
 
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index ad4ea156a6..ed3036a642 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -14,6 +14,8 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -26,10 +28,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index 8498f5321a..0b52c8e46c 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -9,7 +9,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/fslmc/private.h b/drivers/bus/fslmc/private.h
index 80d4673ca8..f08dc7716b 100644
--- a/drivers/bus/fslmc/private.h
+++ b/drivers/bus/fslmc/private.h
@@ -5,7 +5,7 @@
 #ifndef __PRIVATE_H__
 #define __PRIVATE_H__
 
-#include 
+#include 
 
 #include 
 
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index 5353dbdb01..d962fb8362 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -13,8 +13,8 @@
 #in

[RFC v2 v2 15/29] ethdev: mark some headers as driver only

[David Marchand]

Those headers are for drivers as they include ethdev_driver.h, a
driver-only header.

Fixes: 19cc526d6c79 ("ethdev: install driver headers")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
---
 lib/ethdev/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build
index 47bb2625b0..c25762ce66 100644
--- a/lib/ethdev/meson.build
+++ b/lib/ethdev/meson.build
@@ -24,11 +24,8 @@ headers = files(
 'rte_ethdev_trace_fp.h',
 'rte_dev_info.h',
 'rte_flow.h',
-'rte_flow_driver.h',
 'rte_mtr.h',
-'rte_mtr_driver.h',
 'rte_tm.h',
-'rte_tm_driver.h',
 )
 
 indirect_headers += files(
@@ -40,6 +37,9 @@ driver_sdk_headers += files(
 'ethdev_driver.h',
 'ethdev_pci.h',
 'ethdev_vdev.h',
+'rte_flow_driver.h',
+'rte_mtr_driver.h',
+'rte_tm_driver.h',
 )
 
 deps += ['net', 'kvargs', 'meter', 'telemetry']
-- 
2.36.1

[RFC v2 v2 17/29] drivers: export drivers headers

[David Marchand]

Same as for device classes, external DPDK users may need to include some
bus headers for their out of tree drivers.

Signed-off-by: David Marchand 
---
 drivers/meson.build | 4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/meson.build b/drivers/meson.build
index b22c2adda7..7449643fa9 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -89,6 +89,7 @@ foreach subpath:subdirs
 name = drv
 sources = []
 headers = []
+driver_sdk_headers = [] # public headers included by drivers
 objs = []
 cflags = default_cflags
 includes = [include_directories(drv_path)]
@@ -158,6 +159,9 @@ foreach subpath:subdirs
 dpdk_extra_ldflags += pkgconfig_extra_libs
 
 install_headers(headers)
+if get_option('enable_driver_sdk')
+install_headers(driver_sdk_headers)
+endif
 
 # generate pmdinfo sources by building a temporary
 # lib and then running pmdinfogen on the contents of
-- 
2.36.1

[RFC v2 v2 16/29] rawdev: mark driver header

[David Marchand]

rte_rawdev_pmd.h is a driver only header.

Signed-off-by: David Marchand 
---
 lib/rawdev/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/rawdev/meson.build b/lib/rawdev/meson.build
index 7dfc3d5cf9..ccfd922fda 100644
--- a/lib/rawdev/meson.build
+++ b/lib/rawdev/meson.build
@@ -8,6 +8,7 @@ if is_windows
 endif
 
 sources = files('rte_rawdev.c')
-headers = files('rte_rawdev.h', 'rte_rawdev_pmd.h')
+headers = files('rte_rawdev.h')
+driver_sdk_headers = files('rte_rawdev_pmd.h')
 
 deps += ['telemetry']
-- 
2.36.1

[RFC v2 v2 18/29] bus/auxiliary: make driver-only headers private

[David Marchand]

The auxiliary bus interface is for drivers only.
Mark as internal and move the header on the driver headers list.

Signed-off-by: David Marchand 
---
 drivers/bus/auxiliary/auxiliary_common.c  |  1 -
 drivers/bus/auxiliary/auxiliary_params.c  |  1 -
 ...rte_bus_auxiliary.h => bus_auxiliary_driver.h} | 15 ---
 drivers/bus/auxiliary/linux/auxiliary.c   |  1 -
 drivers/bus/auxiliary/meson.build |  4 +---
 drivers/bus/auxiliary/private.h   |  2 +-
 drivers/bus/auxiliary/version.map |  3 +--
 drivers/common/mlx5/linux/mlx5_common_auxiliary.c |  2 +-
 drivers/common/mlx5/linux/mlx5_common_os.c|  2 +-
 drivers/common/mlx5/mlx5_common_private.h |  2 +-
 drivers/net/mlx5/linux/mlx5_os.c  |  2 +-
 11 files changed, 15 insertions(+), 20 deletions(-)
 rename drivers/bus/auxiliary/{rte_bus_auxiliary.h => bus_auxiliary_driver.h} 
(94%)

diff --git a/drivers/bus/auxiliary/auxiliary_common.c 
b/drivers/bus/auxiliary/auxiliary_common.c
index 38d722e653..259ff152c4 100644
--- a/drivers/bus/auxiliary/auxiliary_common.c
+++ b/drivers/bus/auxiliary/auxiliary_common.c
@@ -23,7 +23,6 @@
 #include 
 
 #include "private.h"
-#include "rte_bus_auxiliary.h"
 
 static struct rte_devargs *
 auxiliary_devargs_lookup(const char *name)
diff --git a/drivers/bus/auxiliary/auxiliary_params.c 
b/drivers/bus/auxiliary/auxiliary_params.c
index 542083dc89..a889e392c6 100644
--- a/drivers/bus/auxiliary/auxiliary_params.c
+++ b/drivers/bus/auxiliary/auxiliary_params.c
@@ -10,7 +10,6 @@
 #include 
 
 #include "private.h"
-#include "rte_bus_auxiliary.h"
 
 enum auxiliary_params {
RTE_AUXILIARY_PARAM_NAME,
diff --git a/drivers/bus/auxiliary/rte_bus_auxiliary.h 
b/drivers/bus/auxiliary/bus_auxiliary_driver.h
similarity index 94%
rename from drivers/bus/auxiliary/rte_bus_auxiliary.h
rename to drivers/bus/auxiliary/bus_auxiliary_driver.h
index 3b3dbc866a..44bacc3c0e 100644
--- a/drivers/bus/auxiliary/rte_bus_auxiliary.h
+++ b/drivers/bus/auxiliary/bus_auxiliary_driver.h
@@ -22,6 +22,7 @@ extern "C" {
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -41,7 +42,7 @@ struct rte_auxiliary_device;
  * @return
  *   Whether the driver can handle the auxiliary device.
  */
-typedef bool(rte_auxiliary_match_t)(const char *name);
+typedef bool (rte_auxiliary_match_t)(const char *name);
 
 /**
  * Initialization function for the driver called during auxiliary probing.
@@ -54,8 +55,8 @@ typedef bool(rte_auxiliary_match_t)(const char *name);
  *   - 0 On success.
  *   - Negative value and rte_errno is set otherwise.
  */
-typedef int(rte_auxiliary_probe_t)(struct rte_auxiliary_driver *drv,
-   struct rte_auxiliary_device *dev);
+typedef int (rte_auxiliary_probe_t)(struct rte_auxiliary_driver *drv,
+   struct rte_auxiliary_device *dev);
 
 /**
  * Uninitialization function for the driver called during hotplugging.
@@ -85,7 +86,7 @@ typedef int (rte_auxiliary_remove_t)(struct 
rte_auxiliary_device *dev);
  *   - Negative value and rte_errno is set otherwise.
  */
 typedef int (rte_auxiliary_dma_map_t)(struct rte_auxiliary_device *dev,
-  void *addr, uint64_t iova, size_t len);
+   void *addr, uint64_t iova, size_t len);
 
 /**
  * Driver-specific DMA un-mapping. After a successful call the device
@@ -104,7 +105,7 @@ typedef int (rte_auxiliary_dma_map_t)(struct 
rte_auxiliary_device *dev,
  *   - Negative value and rte_errno is set otherwise.
  */
 typedef int (rte_auxiliary_dma_unmap_t)(struct rte_auxiliary_device *dev,
-void *addr, uint64_t iova, size_t len);
+   void *addr, uint64_t iova, size_t len);
 
 /**
  * A structure describing an auxiliary device.
@@ -157,7 +158,7 @@ struct rte_auxiliary_driver {
  *   A pointer to a rte_auxiliary_driver structure describing the driver
  *   to be registered.
  */
-__rte_experimental
+__rte_internal
 void rte_auxiliary_register(struct rte_auxiliary_driver *driver);
 
 /** Helper for auxiliary device registration from driver instance */
@@ -179,7 +180,7 @@ void rte_auxiliary_register(struct rte_auxiliary_driver 
*driver);
  *   A pointer to a rte_auxiliary_driver structure describing the driver
  *   to be unregistered.
  */
-__rte_experimental
+__rte_internal
 void rte_auxiliary_unregister(struct rte_auxiliary_driver *driver);
 
 #ifdef __cplusplus
diff --git a/drivers/bus/auxiliary/linux/auxiliary.c 
b/drivers/bus/auxiliary/linux/auxiliary.c
index 28092e31c4..d4c564cd78 100644
--- a/drivers/bus/auxiliary/linux/auxiliary.c
+++ b/drivers/bus/auxiliary/linux/auxiliary.c
@@ -11,7 +11,6 @@
 #include 
 #include 
 
-#include "../rte_bus_auxiliary.h"
 #include "../private.h"
 
 #define AUXILIARY_SYSFS_PATH "/sys/bus/auxiliary/devices"
diff --git a/drivers/bus/auxiliary/meson.build 
b/drivers/bus/auxiliary/meson.build
index e2b356f8d2..fcb1a349c4 100644
--- a/drivers/bus

[RFC v2 v2 19/29] bus/dpaa: make driver-only headers private

[David Marchand]

The dpaa bus interface is for drivers only.
Mark as internal and move the header on the driver headers list.

Signed-off-by: David Marchand 
---
 drivers/bus/dpaa/base/qbman/qman.c | 2 +-
 drivers/bus/dpaa/{rte_dpaa_bus.h => bus_dpaa_driver.h} | 9 ++---
 drivers/bus/dpaa/dpaa_bus.c| 2 +-
 drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +-
 drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c  | 2 +-
 drivers/dma/dpaa/dpaa_qdma.c   | 2 +-
 drivers/event/dpaa/dpaa_eventdev.c | 2 +-
 drivers/mempool/dpaa/dpaa_mempool.h| 2 +-
 drivers/net/dpaa/dpaa_ethdev.c | 2 +-
 drivers/net/dpaa/dpaa_rxtx.c   | 2 +-
 10 files changed, 15 insertions(+), 12 deletions(-)
 rename drivers/bus/dpaa/{rte_dpaa_bus.h => bus_dpaa_driver.h} (97%)

diff --git a/drivers/bus/dpaa/base/qbman/qman.c 
b/drivers/bus/dpaa/base/qbman/qman.c
index 447c091770..3949bf8712 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -7,7 +7,7 @@
 
 #include "qman.h"
 #include 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h 
b/drivers/bus/dpaa/bus_dpaa_driver.h
similarity index 97%
rename from drivers/bus/dpaa/rte_dpaa_bus.h
rename to drivers/bus/dpaa/bus_dpaa_driver.h
index 69c759c68b..4360295335 100644
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/bus_dpaa_driver.h
@@ -3,9 +3,10 @@
  *   Copyright 2017-2022 NXP
  *
  */
-#ifndef __RTE_DPAA_BUS_H__
-#define __RTE_DPAA_BUS_H__
+#ifndef BUS_DPAA_DRIVER_H
+#define BUS_DPAA_DRIVER_H
 
+#include 
 #include 
 #include 
 #include 
@@ -152,6 +153,7 @@ extern struct dpaa_memseg_list rte_dpaa_memsegs;
 /* Either iterate over the list of internal memseg references or fallback to
  * EAL memseg based iova2virt.
  */
+__rte_internal
 static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr)
 {
struct dpaa_memseg *ms;
@@ -178,6 +180,7 @@ static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr)
return va;
 }
 
+__rte_internal
 static inline rte_iova_t
 rte_dpaa_mem_vtop(void *vaddr)
 {
@@ -249,4 +252,4 @@ struct fm_eth_port_cfg *dpaa_get_eth_port_cfg(int dev_id);
 }
 #endif
 
-#endif /* __RTE_DPAA_BUS_H__ */
+#endif /* BUS_DPAA_DRIVER_H */
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index ed3036a642..4b6473674f 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -34,7 +34,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c 
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 05415dbf3b..7e554cb2b1 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -41,7 +41,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c 
b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
index d081953e26..29c5935739 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c
@@ -15,7 +15,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/drivers/dma/dpaa/dpaa_qdma.c b/drivers/dma/dpaa/dpaa_qdma.c
index 9386fe5698..10e65ef1d7 100644
--- a/drivers/dma/dpaa/dpaa_qdma.c
+++ b/drivers/dma/dpaa/dpaa_qdma.c
@@ -2,7 +2,7 @@
  * Copyright 2021 NXP
  */
 
-#include 
+#include 
 #include 
 
 #include "dpaa_qdma.h"
diff --git a/drivers/event/dpaa/dpaa_eventdev.c 
b/drivers/event/dpaa/dpaa_eventdev.c
index ff6cc0be18..aa403f9e06 100644
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -29,7 +29,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/mempool/dpaa/dpaa_mempool.h 
b/drivers/mempool/dpaa/dpaa_mempool.h
index dc0058e6dd..3f0eafa7dd 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.h
+++ b/drivers/mempool/dpaa/dpaa_mempool.h
@@ -14,7 +14,7 @@
 
 #include 
 
-#include 
+#include 
 #include 
 
 #include 
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index e5a072cf49..f21cbba0d9 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 956fe946fa..20b75efb63 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -37,7 +37,7 @@
 
 #include "dpaa_ethdev.h"
 #include "dpaa_rxtx.h"
-#include 
+#include 
 #include 
 
 #include 
-- 
2.36.1

[RFC v2 v2 20/29] bus/fslmc: make driver-only headers private

[David Marchand]

The fslmc bus interface is for drivers only.
Mark as internal and move the header on the driver headers list.

Signed-off-by: David Marchand 
---
 drivers/bus/fslmc/{rte_fslmc.h => bus_fslmc_driver.h} | 7 ---
 drivers/bus/fslmc/fslmc_bus.c | 1 -
 drivers/bus/fslmc/fslmc_vfio.c| 1 -
 drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c  | 2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpci.c  | 2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpio.c  | 2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dprc.c  | 1 -
 drivers/bus/fslmc/private.h   | 2 +-
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c   | 2 +-
 drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c   | 2 +-
 drivers/dma/dpaa2/dpaa2_qdma.c| 2 +-
 drivers/event/dpaa2/dpaa2_eventdev.c  | 2 +-
 drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 2 +-
 drivers/event/dpaa2/dpaa2_hw_dpcon.c  | 2 +-
 drivers/net/dpaa2/dpaa2_ethdev.c  | 2 +-
 drivers/net/dpaa2/dpaa2_ethdev.h  | 2 +-
 drivers/net/dpaa2/dpaa2_mux.c | 2 +-
 drivers/net/dpaa2/dpaa2_ptp.c | 2 +-
 drivers/net/dpaa2/dpaa2_recycle.c | 2 +-
 drivers/net/dpaa2/dpaa2_rxtx.c| 2 +-
 20 files changed, 20 insertions(+), 22 deletions(-)
 rename drivers/bus/fslmc/{rte_fslmc.h => bus_fslmc_driver.h} (98%)

diff --git a/drivers/bus/fslmc/rte_fslmc.h 
b/drivers/bus/fslmc/bus_fslmc_driver.h
similarity index 98%
rename from drivers/bus/fslmc/rte_fslmc.h
rename to drivers/bus/fslmc/bus_fslmc_driver.h
index 6bdee86aaf..798ddebf3a 100644
--- a/drivers/bus/fslmc/rte_fslmc.h
+++ b/drivers/bus/fslmc/bus_fslmc_driver.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef _RTE_FSLMC_H_
-#define _RTE_FSLMC_H_
+#ifndef BUS_FSLMC_DRIVER_H
+#define BUS_FSLMC_DRIVER_H
 
 /**
  * @file
@@ -26,6 +26,7 @@ extern "C" {
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -209,4 +210,4 @@ RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
 }
 #endif
 
-#endif /* _RTE_FSLMC_H_ */
+#endif /* BUS_FSLMC_DRIVER_H */
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index 0b52c8e46c..8503004e3d 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -17,7 +17,6 @@
 #include 
 
 #include "private.h"
-#include 
 #include 
 #include "fslmc_logs.h"
 
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index b172c84d52..8604e43947 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -32,7 +32,6 @@
 #include 
 
 #include "private.h"
-#include "rte_fslmc.h"
 #include "fslmc_vfio.h"
 #include "fslmc_logs.h"
 #include 
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c 
b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
index 122aa1740d..cfe4280f87 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
@@ -23,7 +23,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include "portal/dpaa2_hw_pvt.h"
 #include "portal/dpaa2_hw_dpio.h"
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c 
b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c
index 8ed969c7c0..b7d81b518c 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c
@@ -21,7 +21,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include "portal/dpaa2_hw_pvt.h"
 #include "portal/dpaa2_hw_dpio.h"
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c 
b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
index 22c51c1a82..071b0d297d 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
@@ -33,7 +33,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include "dpaa2_hw_pvt.h"
 #include "dpaa2_hw_dpio.h"
 #include 
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c 
b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c
index 28780717bd..223e34bcba 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dprc.c
@@ -14,7 +14,6 @@
 
 #include "private.h"
 #include 
-#include 
 #include 
 #include "portal/dpaa2_hw_pvt.h"
 
diff --git a/drivers/bus/fslmc/private.h b/drivers/bus/fslmc/private.h
index f08dc7716b..e7425d819b 100644
--- a/drivers/bus/fslmc/private.h
+++ b/drivers/bus/fslmc/private.h
@@ -7,7 +7,7 @@
 
 #include 
 
-#include 
+#include 
 
 /*
  * FSLMC bus
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c 
b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 8444f1a795..0cce861899 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -20,7 +20,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c 
b/drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c
index e68a4875dd..b3242791ac 100644
--- a/drivers/crypto

[RFC v2 v2 21/29] bus/ifpga: cleanup exported symbols

[David Marchand]

Remove unused symbols (exposed only in an internal header which
guarantees that no application out there relied on them).

Remove rte_ prefix and inline the rest to avoid having to expose them as
global symbols for a relatively small added value.

Signed-off-by: David Marchand 
---
 drivers/bus/ifpga/ifpga_bus.c| 13 +++--
 drivers/bus/ifpga/ifpga_common.c | 87 
 drivers/bus/ifpga/ifpga_common.h | 54 
 drivers/bus/ifpga/meson.build|  2 +-
 drivers/bus/ifpga/version.map|  2 -
 drivers/raw/ifpga/ifpga_rawdev.c |  2 +-
 6 files changed, 53 insertions(+), 107 deletions(-)
 delete mode 100644 drivers/bus/ifpga/ifpga_common.c

diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index d962fb8362..988e336a1b 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -117,9 +117,9 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
 
if (rte_kvargs_count(kvlist, IFPGA_ARG_PORT) == 1) {
if (rte_kvargs_process(kvlist, IFPGA_ARG_PORT,
-   &rte_ifpga_get_integer32_arg, &afu_pr_conf.afu_id.port) < 0) {
-   IFPGA_BUS_ERR("error to parse %s",
-IFPGA_ARG_PORT);
+   ifpga_get_integer32_arg,
+   &afu_pr_conf.afu_id.port) < 0) {
+   IFPGA_BUS_ERR("error to parse %s", IFPGA_ARG_PORT);
goto end;
}
} else {
@@ -130,9 +130,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
 
if (rte_kvargs_count(kvlist, IFPGA_AFU_BTS) == 1) {
if (rte_kvargs_process(kvlist, IFPGA_AFU_BTS,
-  &rte_ifpga_get_string_arg, &path) < 0) {
-   IFPGA_BUS_ERR("Failed to parse %s",
-IFPGA_AFU_BTS);
+   ifpga_get_string_arg, &path) < 0) {
+   IFPGA_BUS_ERR("Failed to parse %s", IFPGA_AFU_BTS);
goto end;
}
afu_pr_conf.pr_enable = 1;
@@ -228,7 +227,7 @@ ifpga_scan(void)
 
if (rte_kvargs_count(kvlist, IFPGA_ARG_NAME) == 1) {
if (rte_kvargs_process(kvlist, IFPGA_ARG_NAME,
-  &rte_ifpga_get_string_arg, &name) < 0) {
+   ifpga_get_string_arg, &name) < 0) {
IFPGA_BUS_ERR("error to parse %s",
 IFPGA_ARG_NAME);
goto end;
diff --git a/drivers/bus/ifpga/ifpga_common.c b/drivers/bus/ifpga/ifpga_common.c
deleted file mode 100644
index 223660d6ff..00
--- a/drivers/bus/ifpga/ifpga_common.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2018 Intel Corporation
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-#include "rte_bus_ifpga.h"
-#include "ifpga_logs.h"
-#include "ifpga_common.h"
-
-int rte_ifpga_get_string_arg(const char *key __rte_unused,
-   const char *value, void *extra_args)
-{
-   if (!value || !extra_args)
-   return -EINVAL;
-
-   *(char **)extra_args = strdup(value);
-
-   if (!*(char **)extra_args)
-   return -ENOMEM;
-
-   return 0;
-}
-int rte_ifpga_get_integer32_arg(const char *key __rte_unused,
-   const char *value, void *extra_args)
-{
-   if (!value || !extra_args)
-   return -EINVAL;
-
-   *(int *)extra_args = strtoull(value, NULL, 0);
-
-   return 0;
-}
-int ifpga_get_integer64_arg(const char *key __rte_unused,
-   const char *value, void *extra_args)
-{
-   if (!value || !extra_args)
-   return -EINVAL;
-
-   *(uint64_t *)extra_args = strtoull(value, NULL, 0);
-
-   return 0;
-}
-int ifpga_get_unsigned_long(const char *str, int base)
-{
-   unsigned long num;
-   char *end = NULL;
-
-   errno = 0;
-
-   num = strtoul(str, &end, base);
-   if ((str[0] == '\0') || (end == NULL) || (*end != '\0') || (errno != 0))
-   return -1;
-
-   return num;
-}
-
-int ifpga_afu_id_cmp(const struct rte_afu_id *afu_id0,
-   const struct rte_afu_id *afu_id1)
-{
-   if ((afu_id0->uuid.uuid_low == afu_id1->uuid.uuid_low) &&
-   (afu_id0->uuid.uuid_high == afu_id1->uuid.uuid_high) &&
-   (afu_id0->port == afu_id1->port)) {
-   return 0;
-   } else
-   return 1;
-}
diff --git a/drivers/bus/ifpga/ifpga_common.h b/drivers/bus/ifpga/ifpga_common.h
index f9254b9d5d..bb6524030f 100644
--- a/drivers/bus/ifpga/ifpga_common.h
+++ b/drivers/bus/ifpga/ifpga_common.h
@@ -5,14 +5,50 @@
 #ifndef _IFPGA_COMMON_H_
 #define _IFPGA_COMMON_

[RFC v2 v2 22/29] bus/ifpga: make driver-only headers private

[David Marchand]

The ifpga bus interface is for drivers only.
Mark as internal and move the header on the driver headers list.

Signed-off-by: David Marchand 
---
 .../bus/ifpga/{rte_bus_ifpga.h => bus_ifpga_driver.h} | 11 ---
 drivers/bus/ifpga/ifpga_bus.c |  4 ++--
 drivers/bus/ifpga/ifpga_common.h  |  2 +-
 drivers/bus/ifpga/meson.build |  2 +-
 drivers/bus/ifpga/version.map |  2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.c|  2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.h|  2 +-
 drivers/net/ipn3ke/ipn3ke_flow.c  |  2 +-
 drivers/net/ipn3ke/ipn3ke_representor.c   |  2 +-
 drivers/net/ipn3ke/ipn3ke_tm.c|  2 +-
 drivers/raw/ifpga/afu_pmd_core.h  |  2 +-
 drivers/raw/ifpga/afu_pmd_he_hssi.c   |  2 +-
 drivers/raw/ifpga/afu_pmd_he_lpbk.c   |  2 +-
 drivers/raw/ifpga/afu_pmd_he_mem.c|  2 +-
 drivers/raw/ifpga/afu_pmd_n3000.c |  2 +-
 drivers/raw/ifpga/ifpga_rawdev.c  |  2 +-
 16 files changed, 24 insertions(+), 19 deletions(-)
 rename drivers/bus/ifpga/{rte_bus_ifpga.h => bus_ifpga_driver.h} (95%)

diff --git a/drivers/bus/ifpga/rte_bus_ifpga.h 
b/drivers/bus/ifpga/bus_ifpga_driver.h
similarity index 95%
rename from drivers/bus/ifpga/rte_bus_ifpga.h
rename to drivers/bus/ifpga/bus_ifpga_driver.h
index 8792e23dd0..7b75c2ddbc 100644
--- a/drivers/bus/ifpga/rte_bus_ifpga.h
+++ b/drivers/bus/ifpga/bus_ifpga_driver.h
@@ -2,8 +2,8 @@
  * Copyright(c) 2010-2018 Intel Corporation
  */
 
-#ifndef _RTE_BUS_IFPGA_H_
-#define _RTE_BUS_IFPGA_H_
+#ifndef BUS_IFPGA_DRIVER_H
+#define BUS_IFPGA_DRIVER_H
 
 /**
  * @file
@@ -15,6 +15,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#include 
 #include 
 #include 
 #include 
@@ -105,6 +106,7 @@ struct rte_afu_driver {
const struct rte_afu_uuid *id_table;/**< AFU uuid within FPGA. */
 };
 
+__rte_internal
 static inline const char *
 rte_ifpga_device_name(const struct rte_afu_device *afu)
 {
@@ -119,6 +121,7 @@ rte_ifpga_device_name(const struct rte_afu_device *afu)
  * @param name
  *   A pointer to AFU name string.
  */
+__rte_internal
 struct rte_afu_device *
 rte_ifpga_find_afu_by_name(const char *name);
 
@@ -129,6 +132,7 @@ rte_ifpga_find_afu_by_name(const char *name);
  *   A pointer to a rte_afu_driver structure describing the driver
  *   to be registered.
  */
+__rte_internal
 void rte_ifpga_driver_register(struct rte_afu_driver *driver);
 
 /**
@@ -138,6 +142,7 @@ void rte_ifpga_driver_register(struct rte_afu_driver 
*driver);
  *   A pointer to a rte_afu_driver structure describing the driver
  *   to be unregistered.
  */
+__rte_internal
 void rte_ifpga_driver_unregister(struct rte_afu_driver *driver);
 
 #define RTE_PMD_REGISTER_AFU(nm, afudrv)\
@@ -157,4 +162,4 @@ static const char *afudrvinit_ ## nm ## _alias = 
RTE_STR(alias)
 }
 #endif /* __cplusplus */
 
-#endif /* _RTE_BUS_IFPGA_H_ */
+#endif /* BUS_IFPGA_DRIVER_H */
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index 988e336a1b..8c3021cd1a 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -28,7 +28,7 @@
 
 #include "rte_rawdev.h"
 #include "rte_rawdev_pmd.h"
-#include "rte_bus_ifpga.h"
+#include "bus_ifpga_driver.h"
 #include "ifpga_logs.h"
 #include "ifpga_common.h"
 
@@ -65,7 +65,7 @@ ifpga_find_afu_dev(const struct rte_rawdev *rdev,
 
TAILQ_FOREACH(afu_dev, &ifpga_afu_dev_list, next) {
if (afu_dev->rawdev == rdev &&
-   !ifpga_afu_id_cmp(&afu_dev->id, afu_id))
+   !ifpga_afu_id_cmp(&afu_dev->id, afu_id))
return afu_dev;
}
return NULL;
diff --git a/drivers/bus/ifpga/ifpga_common.h b/drivers/bus/ifpga/ifpga_common.h
index bb6524030f..a41a1628f5 100644
--- a/drivers/bus/ifpga/ifpga_common.h
+++ b/drivers/bus/ifpga/ifpga_common.h
@@ -9,7 +9,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 static inline int
diff --git a/drivers/bus/ifpga/meson.build b/drivers/bus/ifpga/meson.build
index 9d56a4bb2b..dedc94db2d 100644
--- a/drivers/bus/ifpga/meson.build
+++ b/drivers/bus/ifpga/meson.build
@@ -8,5 +8,5 @@ if is_windows
 endif
 
 deps += ['pci', 'kvargs', 'rawdev']
-headers = files('rte_bus_ifpga.h')
+driver_sdk_headers += files('bus_ifpga_driver.h')
 sources = files('ifpga_bus.c')
diff --git a/drivers/bus/ifpga/version.map b/drivers/bus/ifpga/version.map
index c33537d39d..3d1943afe4 100644
--- a/drivers/bus/ifpga/version.map
+++ b/drivers/bus/ifpga/version.map
@@ -1,4 +1,4 @@
-DPDK_22 {
+INTERNAL {
global:
 
rte_ifpga_driver_register;
diff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.c 
b/drivers/net/ipn3ke/ipn3ke_ethdev.c
index 550a8b0466..2e39113941 100644
--- a/drivers/net/ipn3ke/ipn3ke_ethdev.c
+++ b/drivers/net/ipn3ke/ipn3ke_

[RFC v2 v2 23/29] bus/pci: make driver-only headers private

[David Marchand]

The pci bus interface is for drivers only.
Mark as internal and move the header on the driver headers list.

Signed-off-by: David Marchand 
---
 app/test-pmd/testpmd.h|   2 +-
 app/test/virtual_pmd.c|   2 +-
 drivers/baseband/acc100/rte_acc100_pmd.c  |   2 +-
 .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c |   2 +-
 drivers/baseband/fpga_lte_fec/fpga_lte_fec.c  |   2 +-
 drivers/bus/pci/bsd/pci.c |   1 -
 drivers/bus/pci/bus_pci_driver.h  | 200 ++
 drivers/bus/pci/meson.build   |   1 +
 drivers/bus/pci/private.h |   1 +
 drivers/bus/pci/rte_bus_pci.h | 178 +---
 drivers/bus/pci/version.map   |  11 +-
 drivers/common/cnxk/roc_platform.h|   2 +-
 drivers/common/mlx5/linux/mlx5_common_os.c|   2 +-
 drivers/common/mlx5/linux/mlx5_common_os.h|   2 +-
 drivers/common/mlx5/mlx5_common.h |   2 +-
 drivers/common/mlx5/mlx5_common_pci.c |   2 +-
 drivers/common/mlx5/windows/mlx5_common_os.c  |   2 +-
 drivers/common/qat/qat_device.h   |   2 +-
 drivers/common/qat/qat_qp.c   |   2 +-
 drivers/common/sfc_efx/sfc_efx.h  |   2 +-
 drivers/compress/mlx5/mlx5_compress.c |   2 +-
 drivers/compress/octeontx/otx_zip.h   |   2 +-
 drivers/compress/qat/qat_comp.c   |   2 +-
 drivers/crypto/ccp/ccp_dev.h  |   2 +-
 drivers/crypto/ccp/ccp_pci.h  |   2 +-
 drivers/crypto/ccp/rte_ccp_pmd.c  |   2 +-
 drivers/crypto/cnxk/cn10k_cryptodev.c |   2 +-
 drivers/crypto/cnxk/cn9k_cryptodev.c  |   2 +-
 drivers/crypto/mlx5/mlx5_crypto.c |   2 +-
 drivers/crypto/nitrox/nitrox_device.h |   2 +-
 drivers/crypto/octeontx/otx_cryptodev.c   |   2 +-
 drivers/crypto/octeontx/otx_cryptodev_ops.c   |   2 +-
 drivers/crypto/qat/qat_sym.c  |   2 +-
 drivers/crypto/virtio/virtio_cryptodev.c  |   2 +-
 drivers/crypto/virtio/virtio_pci.h|   2 +-
 drivers/dma/cnxk/cnxk_dmadev.c|   2 +-
 drivers/dma/hisilicon/hisi_dmadev.c   |   2 +-
 drivers/dma/idxd/idxd_pci.c   |   2 +-
 drivers/dma/ioat/ioat_dmadev.c|   2 +-
 drivers/event/dlb2/pf/dlb2_main.h |   2 +-
 drivers/event/dlb2/pf/dlb2_pf.c   |   2 +-
 drivers/event/octeontx/ssovf_probe.c  |   2 +-
 drivers/event/octeontx/timvf_probe.c  |   2 +-
 drivers/gpu/cuda/cuda.c   |   2 +-
 drivers/mempool/cnxk/cnxk_mempool.c   |   2 +-
 drivers/mempool/octeontx/octeontx_fpavf.c |   2 +-
 drivers/net/ark/ark_ethdev.c  |   2 +-
 drivers/net/avp/avp_ethdev.c  |   2 +-
 drivers/net/bnx2x/bnx2x.h |   2 +-
 drivers/net/bnxt/bnxt.h   |   2 +-
 drivers/net/bonding/rte_eth_bond_args.c   |   2 +-
 drivers/net/cxgbe/base/adapter.h  |   2 +-
 drivers/net/cxgbe/cxgbe_ethdev.c  |   2 +-
 drivers/net/e1000/em_ethdev.c |   2 +-
 drivers/net/e1000/em_rxtx.c   |   2 +-
 drivers/net/e1000/igb_ethdev.c|   2 +-
 drivers/net/e1000/igb_pf.c|   2 +-
 drivers/net/ena/ena_ethdev.h  |   2 +-
 drivers/net/enic/base/vnic_dev.h  |   2 +-
 drivers/net/enic/enic_ethdev.c|   2 +-
 drivers/net/enic/enic_main.c  |   2 +-
 drivers/net/enic/enic_vf_representor.c|   2 +-
 drivers/net/hinic/base/hinic_pmd_hwdev.c  |   2 +-
 drivers/net/hinic/base/hinic_pmd_hwif.c   |   2 +-
 drivers/net/hinic/base/hinic_pmd_nicio.c  |   2 +-
 drivers/net/hinic/hinic_pmd_ethdev.c  |   2 +-
 drivers/net/hns3/hns3_common.c|   2 +-
 drivers/net/hns3/hns3_ethdev.c|   2 +-
 drivers/net/hns3/hns3_rxtx.c  |   2 +-
 drivers/net/i40e/i40e_ethdev.c|   2 +-
 drivers/net/i40e/i40e_vf_representor.c|   2 +-
 drivers/net/igc/igc_ethdev.c  |   2 +-
 drivers/net/ionic/ionic.h |   2 +-
 drivers/net/ionic/ionic_ethdev.c  |   2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.c|   2 +-
 drivers/net/ipn3ke/ipn3ke_representor.c   |   2 +-
 drivers/net/ipn3ke/ipn3ke_tm.c|   2 +-
 drivers/net/ixgbe/ixgbe_ethdev.c  |   2 +-
 drivers/net/ixgbe/ixgbe_ethdev.h  |   2 +-
 drivers/net/mlx4/mlx4_ethdev.c|   2 +-
 drivers/net/mlx5/linux/mlx5_ethdev_os.c   |   2 +-
 drivers/net/mlx5/linux/mlx5_os.c  |   2 +-
 drivers/net/mlx5/mlx5.c   |   2 +-
 drivers/net/mlx5/mlx5_ethdev.c|   2 +-
 drivers/net/mlx5/mlx5_flow_dv.c   |   2 +-
 drivers/net/mlx5/mlx5_txq.c   |   2 +-
 drivers/net

[RFC v2 v2 24/29] bus/vdev: make driver-only headers private

[David Marchand]

The vdev bus interface is for drivers only.
Mark as internal and move the header on the driver headers list.

Signed-off-by: David Marchand 
---
 app/test/test_vdev.c  |   2 +-
 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   | 131 ---
 drivers/bus/vdev/vdev.c   |   2 +-
 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   |   2 +-
 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 +-
 61 files changed, 216 insertions(+), 190 deletions(-)
 create mode 100644 drivers/bus/vdev/bus_vdev_driver.h

diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c
index 9e39993e90..0b71e9329b 100644
--- a/app/test/test_vdev.c
+++ b/app/test/test_vdev.c
@@ -7,9 +7,9 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
-#include 
 
 #include "test.h"
 
diff --git a/drivers/baseband/la12xx/bbdev_la12xx.c 
b/drivers/baseband/la12xx/bbdev_la12xx.c
index 4d1bd16751..f0927d9fca 100644
--- a/drivers/baseband/la12xx/bbdev_la12xx.c
+++ b/drivers/baseband/la12xx/bbdev_la12xx.c
@@ -10,7 +10,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/baseband/null/bbdev_null.c 
b/drivers/baseband/null/bbdev_null.c
index 248e12987f..e76ef2313f 100644
--- a/drivers/baseband/null/bbdev_null.c
+++ b/drivers/baseband/null/bbdev_null.c
@@ -5,7 +5,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c 
b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
index af7bc416f9..e8d0c43e6f 100644
--- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
+++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
@@ -5,7 +5,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/bus/vdev/bus_vdev_driver.h 
b/drivers/bus/vdev/bus_vd

[RFC v2 v2 25/29] bus/vmbus: make driver-only headers private

[David Marchand]

The vmbus bus interface is for drivers only.
Mark as internal and move the header on the driver headers list.

Signed-off-by: David Marchand 
---
 drivers/bus/vmbus/bus_vmbus_driver.h | 106 +++
 drivers/bus/vmbus/meson.build|   1 +
 drivers/bus/vmbus/private.h  |   2 +-
 drivers/bus/vmbus/rte_bus_vmbus.h|  83 -
 drivers/bus/vmbus/version.map|   9 ++-
 drivers/net/netvsc/hn_ethdev.c   |   2 +-
 drivers/net/netvsc/hn_nvs.c  |   2 +-
 drivers/net/netvsc/hn_rndis.c|   2 +-
 drivers/net/netvsc/hn_rxtx.c |   2 +-
 drivers/net/netvsc/hn_vf.c   |   2 +-
 10 files changed, 120 insertions(+), 91 deletions(-)
 create mode 100644 drivers/bus/vmbus/bus_vmbus_driver.h

diff --git a/drivers/bus/vmbus/bus_vmbus_driver.h 
b/drivers/bus/vmbus/bus_vmbus_driver.h
new file mode 100644
index 00..3424e791c9
--- /dev/null
+++ b/drivers/bus/vmbus/bus_vmbus_driver.h
@@ -0,0 +1,106 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018, Microsoft Corporation.
+ * All Rights Reserved.
+ */
+
+#ifndef BUS_VMBUS_DRIVER_H
+#define BUS_VMBUS_DRIVER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+#include 
+#include 
+
+struct vmbus_channel;
+struct vmbus_mon_page;
+
+/** Maximum number of VMBUS resources. */
+enum hv_uio_map {
+   HV_TXRX_RING_MAP = 0,
+   HV_INT_PAGE_MAP,
+   HV_MON_PAGE_MAP,
+   HV_RECV_BUF_MAP,
+   HV_SEND_BUF_MAP
+};
+#define VMBUS_MAX_RESOURCE 5
+
+/**
+ * A structure describing a VMBUS device.
+ */
+struct rte_vmbus_device {
+   RTE_TAILQ_ENTRY(rte_vmbus_device) next; /**< Next probed VMBUS device */
+   const struct rte_vmbus_driver *driver; /**< Associated driver */
+   struct rte_device device;  /**< Inherit core device */
+   rte_uuid_t device_id;  /**< VMBUS device id */
+   rte_uuid_t class_id;   /**< VMBUS device type */
+   uint32_t relid;/**< id for primary */
+   uint8_t monitor_id;/**< monitor page */
+   int uio_num;   /**< UIO device number */
+   uint32_t *int_page;/**< VMBUS interrupt page */
+   struct vmbus_channel *primary; /**< VMBUS primary channel */
+   struct vmbus_mon_page *monitor_page;   /**< VMBUS monitor page */
+
+   struct rte_intr_handle *intr_handle;/**< Interrupt handle */
+   struct rte_mem_resource resource[VMBUS_MAX_RESOURCE];
+};
+
+/**
+ * Initialization function for the driver called during VMBUS probing.
+ */
+typedef int (vmbus_probe_t)(struct rte_vmbus_driver *,
+   struct rte_vmbus_device *);
+
+/**
+ * Initialization function for the driver called during hot plugging.
+ */
+typedef int (vmbus_remove_t)(struct rte_vmbus_device *);
+
+/**
+ * A structure describing a VMBUS driver.
+ */
+struct rte_vmbus_driver {
+   RTE_TAILQ_ENTRY(rte_vmbus_driver) next; /**< Next in list. */
+   struct rte_driver driver;
+   vmbus_probe_t *probe;   /**< Device Probe function. */
+   vmbus_remove_t *remove; /**< Device Remove function. */
+
+   const rte_uuid_t *id_table; /**< ID table. */
+};
+
+/**
+ * Register a VMBUS driver.
+ *
+ * @param driver
+ *   A pointer to a rte_vmbus_driver structure describing the driver
+ *   to be registered.
+ */
+__rte_internal
+void rte_vmbus_register(struct rte_vmbus_driver *driver);
+
+/**
+ * Unregister a VMBUS driver.
+ *
+ * @param driver
+ *   A pointer to a rte_vmbus_driver structure describing the driver
+ *   to be unregistered.
+ */
+__rte_internal
+void rte_vmbus_unregister(struct rte_vmbus_driver *driver);
+
+/** Helper for VMBUS device registration from driver instance */
+#define RTE_PMD_REGISTER_VMBUS(nm, vmbus_drv)  \
+   RTE_INIT(vmbusinitfn_ ##nm) \
+   {   \
+   (vmbus_drv).driver.name = RTE_STR(nm);  \
+   rte_vmbus_register(&vmbus_drv); \
+   }   \
+   RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BUS_VMBUS_DRIVER_H */
diff --git a/drivers/bus/vmbus/meson.build b/drivers/bus/vmbus/meson.build
index 3892cbf67f..34988d1d84 100644
--- a/drivers/bus/vmbus/meson.build
+++ b/drivers/bus/vmbus/meson.build
@@ -8,6 +8,7 @@ endif
 
 
 headers = files('rte_bus_vmbus.h','rte_vmbus_reg.h')
+driver_sdk_headers = files('bus_vmbus_driver.h')
 
 sources = files(
 'vmbus_bufring.c',
diff --git a/drivers/bus/vmbus/private.h b/drivers/bus/vmbus/private.h
index 600530c4f6..e33424675c 100644
--- a/drivers/bus/vmbus/private.h
+++ b/drivers/bus/vmbus/private.h
@@ -10,10 +10,10 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
-#include 
 
 /**
  * Structure describing the VM bus
diff --git a/drivers/bus/vm

[RFC v2 v2 26/29] dev: introduce driver name

[David Marchand]

Add a helper to get a rte_driver object name.
This will be used externally.
Internal users may still dereference a rte_driver object.

Signed-off-by: David Marchand 
---
 app/test-pmd/config.c   |  2 +-
 lib/eal/common/eal_common_dev.c |  6 ++
 lib/eal/include/rte_dev.h   | 13 +
 lib/eal/version.map |  1 +
 lib/ethdev/rte_ethdev.h |  2 +-
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index bc154e8bf7..22aa086ef1 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -654,7 +654,7 @@ device_infos_display(const char *identifier)
printf("\n%s Infos for device %s %s\n",
   info_border, dev->name, info_border);
printf("Bus name: %s", rte_bus_name(dev->bus));
-   printf("\nDriver name: %s", dev->driver->name);
+   printf("\nDriver name: %s", 
rte_driver_name(dev->driver));
printf("\nDevargs: %s",
   dev->devargs ? dev->devargs->args : "");
printf("\nConnect to socket: %d", dev->numa_node);
diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c
index 62a598957c..16c5aef1d8 100644
--- a/lib/eal/common/eal_common_dev.c
+++ b/lib/eal/common/eal_common_dev.c
@@ -19,6 +19,12 @@
 #include "eal_private.h"
 #include "hotplug_mp.h"
 
+const char *
+rte_driver_name(const struct rte_driver *driver)
+{
+   return driver->name;
+}
+
 /**
  * The device event callback description.
  *
diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
index 24f9122558..871a046ffe 100644
--- a/lib/eal/include/rte_dev.h
+++ b/lib/eal/include/rte_dev.h
@@ -62,6 +62,19 @@ struct rte_driver {
const char *alias;  /**< Driver alias. */
 };
 
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * @param driver
+ *   A pointer to a driver structure.
+ * @return
+ *   A pointer to the driver name string.
+ */
+__rte_experimental
+const char *
+rte_driver_name(const struct rte_driver *driver);
+
 /*
  * Internal identifier length
  * Sufficiently large to allow for UUID or PCI address
diff --git a/lib/eal/version.map b/lib/eal/version.map
index 48c8a2f511..54f85ab01f 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -425,6 +425,7 @@ EXPERIMENTAL {
 
# added in 22.11
rte_bus_name;
+   rte_driver_name;
 };
 
 INTERNAL {
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index de9e970d4d..e9574f646f 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -3380,7 +3380,7 @@ int rte_eth_macaddrs_get(uint16_t port_id, struct 
rte_ether_addr *ma,
  * exists for the device and the rte_eth_dev 'dev' has been populated
  * successfully with a call to it:
  *
- * driver_name = dev->device->driver->name
+ * driver_name = rte_driver_name(dev->device->driver)
  * nb_rx_queues = dev->data->nb_rx_queues
  * nb_tx_queues = dev->data->nb_tx_queues
  * dev_flags = &dev->data->dev_flags
-- 
2.36.1

[RFC v2 v2 27/29] dev: hide driver object

[David Marchand]

Make rte_driver opaque for non internal users.
This will make extending this object possible without breaking the ABI.

Introduce a new driver header and move rte_driver definition.
Update drivers and library to use the internal header.

Signed-off-by: David Marchand 
---
 drivers/baseband/acc100/rte_acc100_pmd.c  |  2 +-
 .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c |  2 +-
 drivers/baseband/fpga_lte_fec/fpga_lte_fec.c  |  2 +-
 drivers/bus/auxiliary/auxiliary_params.c  |  2 +-
 drivers/bus/auxiliary/bus_auxiliary_driver.h  |  2 +-
 drivers/bus/dpaa/bus_dpaa_driver.h|  2 ++
 drivers/bus/fslmc/bus_fslmc_driver.h  |  2 +-
 drivers/bus/fslmc/fslmc_vfio.c|  2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c  |  2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpci.c  |  2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dpio.c  |  2 +-
 drivers/bus/fslmc/portal/dpaa2_hw_dprc.c  |  2 +-
 drivers/bus/ifpga/bus_ifpga_driver.h  |  1 +
 drivers/bus/pci/bus_pci_driver.h  |  2 +-
 drivers/bus/pci/pci_params.c  |  2 +-
 drivers/bus/vdev/bus_vdev_driver.h|  2 +-
 drivers/bus/vdev/vdev.c   |  2 +-
 drivers/bus/vdev/vdev_params.c|  2 +-
 drivers/bus/vmbus/bus_vmbus_driver.h  |  2 +-
 drivers/common/qat/dev/qat_dev_gen4.c |  2 +-
 drivers/common/qat/qat_qp.c   |  2 +-
 drivers/compress/zlib/zlib_pmd_ops.c  |  2 +-
 drivers/crypto/bcmfs/bcmfs_qp.c   |  2 +-
 drivers/crypto/bcmfs/bcmfs_sym_pmd.c  |  2 +-
 drivers/crypto/ccp/rte_ccp_pmd.c  |  2 +-
 drivers/crypto/cnxk/cn10k_cryptodev.c |  2 +-
 drivers/crypto/cnxk/cn9k_cryptodev.c  |  2 +-
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c   |  2 +-
 drivers/crypto/dpaa_sec/dpaa_sec.c|  2 +-
 drivers/crypto/scheduler/scheduler_pmd_ops.c  |  2 +-
 drivers/dma/idxd/idxd_bus.c   |  1 +
 drivers/event/dlb2/dlb2.c |  2 +-
 drivers/event/dlb2/pf/dlb2_pf.c   |  2 +-
 drivers/event/dpaa/dpaa_eventdev.c|  2 +-
 drivers/event/dpaa2/dpaa2_eventdev.c  |  2 +-
 drivers/event/dpaa2/dpaa2_hw_dpcon.c  |  2 +-
 drivers/event/octeontx/ssovf_evdev.c  |  2 +-
 drivers/event/skeleton/skeleton_eventdev.c|  2 +-
 drivers/gpu/cuda/cuda.c   |  2 +-
 drivers/mempool/dpaa2/dpaa2_hw_mempool.c  |  2 +-
 drivers/net/af_xdp/rte_eth_af_xdp.c   |  2 +-
 drivers/net/ark/ark_global.h  |  2 +-
 drivers/net/avp/avp_ethdev.c  |  2 +-
 drivers/net/axgbe/axgbe_common.h  |  2 +-
 drivers/net/bnx2x/bnx2x_ethdev.c  |  2 +-
 drivers/net/bnxt/bnxt_ethdev.c|  2 +-
 drivers/net/bnxt/rte_pmd_bnxt.c   |  2 +-
 drivers/net/cxgbe/base/t4_hw.c|  2 +-
 drivers/net/cxgbe/cxgbe_ethdev.c  |  2 +-
 drivers/net/cxgbe/cxgbe_main.c|  2 +-
 drivers/net/cxgbe/sge.c   |  2 +-
 drivers/net/dpaa2/base/dpaa2_hw_dpni.c|  2 +-
 drivers/net/dpaa2/dpaa2_ethdev.c  |  2 +-
 drivers/net/dpaa2/dpaa2_recycle.c |  2 +-
 drivers/net/dpaa2/dpaa2_rxtx.c|  2 +-
 drivers/net/dpaa2/dpaa2_sparser.c |  2 +-
 drivers/net/e1000/em_ethdev.c |  2 +-
 drivers/net/e1000/igb_ethdev.c|  2 +-
 drivers/net/e1000/igb_flow.c  |  2 +-
 drivers/net/ena/ena_ethdev.h  |  2 +-
 drivers/net/enic/enic_ethdev.c|  2 +-
 drivers/net/enic/enic_vf_representor.c|  2 +-
 drivers/net/failsafe/failsafe_private.h   |  2 +-
 drivers/net/fm10k/fm10k_ethdev.c  |  2 +-
 drivers/net/i40e/i40e_ethdev.c|  2 +-
 drivers/net/iavf/iavf_ethdev.c|  2 +-
 drivers/net/iavf/iavf_vchnl.c |  2 +-
 drivers/net/ice/ice_dcf.c |  2 +-
 drivers/net/ice/ice_dcf_ethdev.c  |  2 +-
 drivers/net/ixgbe/ixgbe_ethdev.c  |  2 +-
 drivers/net/ixgbe/ixgbe_flow.c|  2 +-
 drivers/net/mlx4/mlx4.c   |  2 +-
 drivers/net/netvsc/hn_ethdev.c|  2 +-
 drivers/net/netvsc/hn_nvs.c   |  2 +-
 drivers/net/netvsc/hn_rndis.c |  2 +-
 drivers/net/netvsc/hn_rxtx.c  |  2 +-
 drivers/net/nfp/nfp_common.c  |  2 +-
 drivers/net/nfp/nfp_ethdev.c  |  2 +-
 drivers/net/octeontx/octeontx_ethdev.c|  2 +-
 drivers/net/qede/qede_ethdev.h|  2 +-
 drivers/net/sfc/sfc_ethdev.c  |  2 +-
 drivers/net/sfc/sfc_sw_stats.c|  2 +-
 drivers/net/sfc/sfc_sw_stats.h|  2 +-
 drivers/net/thunderx/nicvf_ethdev.c   |  2 +-
 drivers/net/vdev_netvsc/vdev_netvsc.c |  2 +-
 drivers/net/virtio/virtio_ethdev.c|  2 +

[RFC v2 v2 28/29] dev: introduce device accessors

[David Marchand]

Prepare for making the device object opaque by adding accessors.
Update existing "external" users.

Signed-off-by: David Marchand 
---
 app/proc-info/main.c   |  6 ++--
 examples/ethtool/lib/rte_ethtool.c |  2 +-
 examples/l3fwd/l3fwd_em.c  |  4 +--
 examples/l3fwd/l3fwd_fib.c |  8 ++---
 examples/l3fwd/l3fwd_lpm.c |  4 +--
 examples/vdpa/main.c   | 16 -
 lib/eal/common/eal_common_dev.c| 24 ++
 lib/eal/include/rte_dev.h  | 53 ++
 lib/eal/version.map|  4 +++
 lib/ethdev/rte_ethdev.h|  2 +-
 10 files changed, 102 insertions(+), 21 deletions(-)

diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 1bfba5f60d..d52ac8a038 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -755,7 +755,7 @@ show_port(void)
}
 
printf("\t  -- driver %s device %s socket %d\n",
-  dev_info.driver_name, dev_info.device->name,
+  dev_info.driver_name, rte_dev_name(dev_info.device),
   rte_eth_dev_socket_id(i));
 
ret = rte_eth_dev_owner_get(i, &owner);
@@ -1254,7 +1254,7 @@ show_crypto(void)
   rte_cryptodev_name_get(i),
   dev_info.driver_name,
   dev_info.driver_id,
-  dev_info.device->numa_node,
+  rte_dev_numa_node(dev_info.device),
   rte_cryptodev_queue_pair_count(i));
 
display_crypto_feature_info(dev_info.feature_flags);
@@ -1466,7 +1466,7 @@ dump_regs(char *file_prefix)
else
printf("Device (%s) regs dumped successfully, "
"driver:%s version:0X%08X\n",
-   dev_info.device->name,
+   rte_dev_name(dev_info.device),
dev_info.driver_name, reg_info.version);
 
fclose(fp_regs);
diff --git a/examples/ethtool/lib/rte_ethtool.c 
b/examples/ethtool/lib/rte_ethtool.c
index 88dc917b73..33acc5e3cc 100644
--- a/examples/ethtool/lib/rte_ethtool.c
+++ b/examples/ethtool/lib/rte_ethtool.c
@@ -49,7 +49,7 @@ rte_ethtool_get_drvinfo(uint16_t port_id, struct 
ethtool_drvinfo *drvinfo)
strlcpy(drvinfo->driver, dev_info.driver_name,
sizeof(drvinfo->driver));
strlcpy(drvinfo->version, rte_version(), sizeof(drvinfo->version));
-   strlcpy(drvinfo->bus_info, dev_info.device->name,
+   strlcpy(drvinfo->bus_info, rte_dev_name(dev_info.device),
sizeof(drvinfo->bus_info));
 
memset(®_info, 0, sizeof(reg_info));
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 10be24c61d..0531282a1f 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -403,7 +403,7 @@ populate_ipv4_flow_into_table(const struct rte_hash *h)
   em_route_base_v4[i].v4_key.port_dst,
   em_route_base_v4[i].v4_key.port_src,
   em_route_base_v4[i].v4_key.proto,
-  em_route_base_v4[i].if_out, dev_info.device->name);
+  em_route_base_v4[i].if_out, 
rte_dev_name(dev_info.device));
}
printf("Hash: Adding 0x%" PRIx64 " keys\n",
(uint64_t)route_num_v4);
@@ -455,7 +455,7 @@ populate_ipv6_flow_into_table(const struct rte_hash *h)
   em_route_base_v6[i].v6_key.port_dst,
   em_route_base_v6[i].v6_key.port_src,
   em_route_base_v6[i].v6_key.proto,
-  em_route_base_v6[i].if_out, dev_info.device->name);
+  em_route_base_v6[i].if_out, 
rte_dev_name(dev_info.device));
}
printf("Hash: Adding 0x%" PRIx64 "keys\n",
(uint64_t)route_num_v6);
diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c
index e02e4b3f5a..b82e0c0354 100644
--- a/examples/l3fwd/l3fwd_fib.c
+++ b/examples/l3fwd/l3fwd_fib.c
@@ -640,11 +640,11 @@ setup_fib(const int socketid)
printf("FIB: Adding route %s / %d (%d) [%s]\n", abuf,
   route_base_v4[i].depth,
   route_base_v4[i].if_out,
-  dev_info.device->name);
+  rte_dev_name(dev_info.device));
} else {
printf("FIB: IPv4 route added to port %d [%s]\n",
   route_base_v4[i].if_out,
-  dev_info.device->name);
+  rte_dev_name(dev_info.device));
}
}
/* >8 End of setup fib. */
@@ -695,11 +695,11 @@ setup_fib(const int socketid)
printf("FIB: Adding route %s / %d (%d) [

[RFC v2 v2 29/29] dev: hide device object

[David Marchand]

Make rte_device opaque for non internal users.
This will make extending this object possible without breaking the ABI.

Signed-off-by: David Marchand 
---
 lib/eal/common/eal_private.h |  2 +-
 lib/eal/include/dev_driver.h | 14 ++
 lib/eal/include/rte_dev.h| 13 +
 lib/vhost/vdpa.c |  1 +
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h
index 44d14241f0..3ca9ce2ffc 100644
--- a/lib/eal/common/eal_private.h
+++ b/lib/eal/common/eal_private.h
@@ -10,7 +10,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/lib/eal/include/dev_driver.h b/lib/eal/include/dev_driver.h
index 015188abd5..01c3e30994 100644
--- a/lib/eal/include/dev_driver.h
+++ b/lib/eal/include/dev_driver.h
@@ -12,6 +12,8 @@ extern "C" {
 #include 
 #include 
 
+struct rte_devargs;
+
 /**
  * A structure describing a device driver.
  */
@@ -21,6 +23,18 @@ struct rte_driver {
const char *alias;  /**< Driver alias. */
 };
 
+/**
+ * A structure describing a generic device.
+ */
+struct rte_device {
+   RTE_TAILQ_ENTRY(rte_device) next; /**< Next device */
+   const char *name; /**< Device name */
+   const struct rte_driver *driver; /**< Driver assigned after probing */
+   const struct rte_bus *bus;/**< Bus handle assigned on scan */
+   int numa_node;/**< NUMA node connection */
+   struct rte_devargs *devargs;  /**< Arguments for latest probing */
+};
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
index a80447a645..3077cf3f0f 100644
--- a/lib/eal/include/rte_dev.h
+++ b/lib/eal/include/rte_dev.h
@@ -25,6 +25,7 @@ extern "C" {
 
 struct rte_bus;
 struct rte_driver;
+struct rte_device;
 
 /**
  * The device event type.
@@ -127,18 +128,6 @@ __rte_experimental
 int
 rte_dev_numa_node(const struct rte_device *dev);
 
-/**
- * A structure describing a generic device.
- */
-struct rte_device {
-   RTE_TAILQ_ENTRY(rte_device) next; /**< Next device */
-   const char *name; /**< Device name */
-   const struct rte_driver *driver; /**< Driver assigned after probing */
-   const struct rte_bus *bus;/**< Bus handle assigned on scan */
-   int numa_node;/**< NUMA node connection */
-   struct rte_devargs *devargs;  /**< Arguments for latest probing */
-};
-
 /**
  * Query status of a device.
  *
diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c
index bdebcbe565..aaf3f267e9 100644
--- a/lib/vhost/vdpa.c
+++ b/lib/vhost/vdpa.c
@@ -10,6 +10,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
-- 
2.36.1

[PATCH] crypto/ccp: Check for the NULL pointer after calling rte_malloc

[835703180]

From: Shiqi Liu <835703...@qq.com>

As the possible failure of the rte_malloc(), the not_checked and
checked could be NULL pointer.
Therefore, it should be better to check it in order to avoid
the dereference of the NULL pointer.

Fixes: 09a0fd736a0 ("crypto/ccp: enable IOMMU")
Signed-off-by: Shiqi Liu <835703...@qq.com>
---
 drivers/crypto/ccp/rte_ccp_pmd.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c
index a35a8cd775..776f928864 100644
--- a/drivers/crypto/ccp/rte_ccp_pmd.c
+++ b/drivers/crypto/ccp/rte_ccp_pmd.c
@@ -301,6 +301,9 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv 
__rte_unused,
};
 
sha_ctx = (void *)rte_malloc(NULL, SHA512_DIGEST_SIZE, 64);
+   if (sha_ctx == NULL) {
+   return -ENOMEM;
+   }
if (ccp_pmd_init_done) {
RTE_LOG(INFO, PMD, "CCP PMD already initialized\n");
return -EFAULT;
-- 
2.35.1.windows.2

Re: [RFC] rwlock: prevent readers from starving writers

[Stephen Hemminger]

On Sat, 9 Jul 2022 00:04:27 +0200
Morten Brørup  wrote:

> > >  typedef struct {
> > > - volatile int32_t cnt; /**< -1 when W lock held, > 0 when R locks  
> > held.  
> > > */
> > > + volatile int32_t cnt;  
> 
> Not signed anymore, so consider uint32_t. Suggest also rename to cnt_state or 
> similar, since it is not just a counter anymor

I tried that but the rte_wait_until is using signed value.

Re: [RFC] rwlock: prevent readers from starving writers

[Stephen Hemminger]

On Sat, 9 Jul 2022 00:04:27 +0200
Morten Brørup  wrote:

> Always the creative mind, Stephen. :-)
> 
> You might consider adding/updating even more comments.
> 
> Acked-by: Morten Brørup 

The motivation is that our work load is reader/writer lock heavy
with small number of threads. Therefore the number of atomic operations
per lock matters, but starving is bad. And any compare-exchange on ARM
is expensive and should be avoided if possible.

The concept here came from this great page.
https://locklessinc.com/articles/locks/

Will add link in next version.

Re: [RFC PATCH 11/11] bus: hide bus object

[Stephen Hemminger]

On Sat, 9 Jul 2022 10:16:43 +0200
David Marchand  wrote:

> On Tue, Jun 28, 2022 at 8:23 PM Tyler Retzlaff
>  wrote:
> >
> > On Tue, Jun 28, 2022 at 10:38:27AM -0700, Stephen Hemminger wrote:  
> > > On Tue, 28 Jun 2022 10:07:12 -0700
> > > Tyler Retzlaff  wrote:
> > >  
> > > > > > to avoid people tripping over mishandling pointers in/out of the api
> > > > > > surface taking the opaque object you could declare opaque handle 
> > > > > > for the
> > > > > > api to operate on instead. it would force the use of a cast in the
> > > > > > implementation but would avoid accidental void * of the wrong thing 
> > > > > > that
> > > > > > got cached being passed in. if the cast was really undesirable just
> > > > > > whack it under an inline / internal function.  
> > > > >
> > > > > I don't like that because it least to dangerous casts in the internal 
> > > > > code.
> > > > > Better to keep the the type of the object. As long as the API only 
> > > > > passes
> > > > > around an pointer to a struct, without exposing the contents of the 
> > > > > struct;
> > > > > it is safer and easier to debug.  
> > > >
> > > > as i mentioned you can use an inline/internal function or even a macro
> > > > to hide the cast, you could provide some additional integrity checks
> > > > here if desired as a value add.
> > > >
> > > > the fact that you expose that it is a struct is an internal
> > > > implementation detail, if truly opaque tomorrow you could convert it
> > > > to a simple integer that indexes or enumerates something and prevents
> > > > any meaningful interpretation in the application.
> > > >
> > > > when you say it is safer to debug i think you mean for dpdk devs not the
> > > > application developer because unless the app developer does something
> > > > really gross/dangerous casting they really can't "mishandle" the opaque
> > > > object except to use one that isn't initialized at all which we
> > > > can detect and handle internally in a general way.
> > > >
> > > > i will however concede there would be slightly more finger work when
> > > > debugging dpdk itself since gdb / debugger doesn't automatically infer
> > > > type so you end up having to tell gdb what is in the uintptr_t.
> > > >
> > > > anyway just drawing from experience in the driver frameworks we maintain
> > > > in windows, i think one of our regrets is that we didn't do this from
> > > > day 1 and subsequentl that we initially only used one opaque type
> > > > instead of defining separate (not implicitly convertable) types to each
> > > > opaque type.  
> > >
> > > It seems to be a difference in style/taste.  
> >
> > it's not i've sited at least one example of a mistake that becomes a
> > compile time failure where application code is incorrectly authored
> > where use of a pointer offers no such protection.
> >  
> > > The Linux/Unix side prefers opaque structure pointers.
> > > Windows (and LLVM) uses numeric handles.
> > >
> > > At this point DPDK should follow the Linux bus.  
> >
> > dpdk is multi-platform and unix does not necessarily standardize on
> > pointer to struct for opaque objects. freebsd has many apis notably
> > bus_space that does uses handles and as previously mentioned posix
> > threads uses handles.
> >
> > i understand that linux is an important platform but it isn't the only
> > platform dpdk targets and just because it is important doesn't mean it
> > should always enjoy being the defacto standard.
> >
> > anyway, i'll leave it for the patch author to decide. i still like the
> > patch series either way. i just think this would make applications more
> > robust.  
> 
> Thanks for this feedback Tyler.
> I would lean towards Stephen opinion atm, but I am not decided yet.
> 
> For now, I'll post a v2, extending the series to other internal objects.
> We can conclude on this topic during 22.11.

If you get chance to deconstruct API, switching to a numeric index
is safest similar to what Tyler suggested.  Think of ethdev port number
and Posix file descriptor model. The advantage of an index is that
it can be validated more easily by the code that is called.

Re: [RFC v2 v2 00/29] Bus and device cleanup for 22.11

[Stephen Hemminger]

On Sat,  9 Jul 2022 10:26:15 +0200
David Marchand  wrote:

> This is a PoC for hiding the rte_bus, rte_driver and rte_device objects.
> And mark associated driver only API as internal.
> 
> A good amount of the patches are preparation work on rte_bus.h,
> rte_dev.h, rte_devargs.h and rte_eal.h headers, removing dependencies
> between them. This is something I had in store for some time, maybe I
> should have dropped it from the PoC, but I think those cleanups are
> worth it in any case.
> 
> Then PCI bus specific handling are moved from unit tests and examples,
> though there is still a special case left in testpmd that may require a
> new API, to be discussed.
> 
> After this series, driver-only API headers for registering to buses are
> not exported anymore, unless the enable_driver_sdk meson option is
> selected.
> 
> New accessors for rte_bus, rte_driver and rte_device have been added,
> marked with an experimental tag though we may declare them as stable
> right away so that users can switch to them directly. That's also
> something to agree on.
> 
> I simplified my series and switched to only update "external" users,
> like app/ and examples/ files.
> We need some checkpatch new checks to be sure we won't get some
> driver-only headers included in these areas. That's something I'll work
> on in the non RFC series.
> 
> "Internal" users are simply using the internal headers. That helps
> greatly reducing the size of the changes.
> 
> Disclaimer: again, in this v2, this series is a bit rushed (I brute forced
> compilation tests in GHA so that it passes between patches, but there still
> may be something broken...).
> Not surprisingly, the ABI check in the CI is expected to fail.
> 
> 
> Comments welcome.

Looks good to me, lots of work but will the separation internal
and external API's will help in future.

[PATCH] doc: announce marking device and driver objects as internal

[David Marchand]

rte_driver and rte_device are unnecessarily exposed in the public API/ABI.
Announce that they will be made opaque in the public API and mark
associated API as internal.
This impacts all bus, as their driver registration mechanism will be
made internal.

Note: the PCI bus had a similar deprecation notice that we can remove as
the new one is more generic.

Signed-off-by: David Marchand 
---
 doc/guides/rel_notes/deprecation.rst | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst 
b/doc/guides/rel_notes/deprecation.rst
index a9fd6676be..b9cc267b30 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -38,6 +38,13 @@ Deprecation Notices
   external users may still register their bus using a new driver header (see
   ``enable_driver_sdk`` meson option).
 
+* drivers: As a followup on the work on the ``rte_bus`` object, the
+  ``rte_driver`` and ``rte_device`` objects (and as a domino effect, their
+  bus-specific counterparts) will be made opaque in DPDK 22.11.
+  Registering a driver on a bus will be marked as an internal API:
+  external users may still register their drivers using the bus specific
+  driver header (see ``enable_driver_sdk`` meson option).
+
 * mempool: Helper macro ``MEMPOOL_HEADER_SIZE()`` is deprecated and will
   be removed in DPDK 22.11. The replacement macro
   ``RTE_MEMPOOL_HEADER_SIZE()`` is internal only.
@@ -49,11 +56,6 @@ Deprecation Notices
 * mempool: The mempool API macros ``MEMPOOL_PG_*`` are deprecated and
   will be removed in DPDK 22.11.
 
-* pci: To reduce unnecessary ABIs exposed by DPDK bus driver, "rte_bus_pci.h"
-  will be made internal in 21.11 and macros/data structures/functions defined
-  in the header will not be considered as ABI anymore. This change is inspired
-  by the RFC https://patchwork.dpdk.org/project/dpdk/list/?series=17176.
-
 * lib: will fix extending some enum/define breaking the ABI. There are multiple
   samples in DPDK that enum/define terminated with a ``.*MAX.*`` value which is
   used by iterators, and arrays holding these values are sized with this
-- 
2.36.1

[PATCH v3] examples/vm_power_manager: use safe version of list iterator

[Hamza Khan]

Currently, when vm_power_manager exits, we are using a LIST_FOREACH
macro to iterate over VM info structures while freeing them. This
leads to use-after-free error. To address this, replace all usages of
LIST_* with TAILQ_* macros, and use the RTE_TAILQ_FOREACH_SAFE macro
to iterate and delete VM info structures.

* The change is small and doesn’t affect other code
* Testing was performed on the patch

Fixes: e8ae9b662506 ("examples/vm_power: channel manager and monitor in host")
Cc: alan.ca...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Hamza Khan 

---
V3: Update commit message
V2: Use RTE_TAILQ_* marcos
---
 examples/vm_power_manager/channel_manager.c | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/examples/vm_power_manager/channel_manager.c 
b/examples/vm_power_manager/channel_manager.c
index 838465ab4b..e82c26ddca 100644
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -29,6 +29,8 @@
 #include "channel_monitor.h"
 #include "power_manager.h"
 
+#include "rte_tailq.h"
+
 
 #define RTE_LOGTYPE_CHANNEL_MANAGER RTE_LOGTYPE_USER1
 
@@ -58,16 +60,16 @@ struct virtual_machine_info {
virDomainInfo info;
rte_spinlock_t config_spinlock;
int allow_query;
-   LIST_ENTRY(virtual_machine_info) vms_info;
+   RTE_TAILQ_ENTRY(virtual_machine_info) vms_info;
 };
 
-LIST_HEAD(, virtual_machine_info) vm_list_head;
+RTE_TAILQ_HEAD(, virtual_machine_info) vm_list_head;
 
 static struct virtual_machine_info *
 find_domain_by_name(const char *name)
 {
struct virtual_machine_info *info;
-   LIST_FOREACH(info, &vm_list_head, vms_info) {
+   RTE_TAILQ_FOREACH(info, &vm_list_head, vms_info) {
if (!strncmp(info->name, name, CHANNEL_MGR_MAX_NAME_LEN-1))
return info;
}
@@ -878,7 +880,7 @@ add_vm(const char *vm_name)
 
new_domain->allow_query = 0;
rte_spinlock_init(&(new_domain->config_spinlock));
-   LIST_INSERT_HEAD(&vm_list_head, new_domain, vms_info);
+   TAILQ_INSERT_HEAD(&vm_list_head, new_domain, vms_info);
return 0;
 }
 
@@ -900,7 +902,7 @@ remove_vm(const char *vm_name)
rte_spinlock_unlock(&vm_info->config_spinlock);
return -1;
}
-   LIST_REMOVE(vm_info, vms_info);
+   TAILQ_REMOVE(&vm_list_head, vm_info, vms_info);
rte_spinlock_unlock(&vm_info->config_spinlock);
rte_free(vm_info);
return 0;
@@ -953,7 +955,7 @@ channel_manager_init(const char *path __rte_unused)
 {
virNodeInfo info;
 
-   LIST_INIT(&vm_list_head);
+   TAILQ_INIT(&vm_list_head);
if (connect_hypervisor(path) < 0) {
global_n_host_cpus = 64;
global_hypervisor_available = 0;
@@ -1005,9 +1007,9 @@ channel_manager_exit(void)
 {
unsigned i;
char mask[RTE_MAX_LCORE];
-   struct virtual_machine_info *vm_info;
+   struct virtual_machine_info *vm_info, *tmp;
 
-   LIST_FOREACH(vm_info, &vm_list_head, vms_info) {
+   RTE_TAILQ_FOREACH_SAFE(vm_info, &vm_list_head, vms_info, tmp) {
 
rte_spinlock_lock(&(vm_info->config_spinlock));
 
@@ -1022,7 +1024,7 @@ channel_manager_exit(void)
}
rte_spinlock_unlock(&(vm_info->config_spinlock));
 
-   LIST_REMOVE(vm_info, vms_info);
+   TAILQ_REMOVE(&vm_list_head, vm_info, vms_info);
rte_free(vm_info);
}
 
-- 
2.25.1

RE: [PATCH 1/2] common: add safe version of foreach-list to Linux

[Khan, Hamza]

> -Original Message-
> From: Thomas Monjalon 
> Sent: Thursday 7 July 2022 20:10
> To: Khan, Hamza 
> Cc: dev@dpdk.org
> Subject: Re: [PATCH 1/2] common: add safe version of foreach-list to Linux
> 
> 07/07/2022 17:59, Khan, Hamza:
> >
> > > -Original Message-
> > > From: Thomas Monjalon 
> > > Sent: Tuesday 5 July 2022 17:16
> > > To: Khan, Hamza 
> > > Cc: dev@dpdk.org
> > > Subject: Re: [PATCH 1/2] common: add safe version of foreach-list to
> > > Linux
> > >
> > > 01/06/2022 12:54, Hamza Khan:
> > > > Linux EAL does not have the LIST_FOREACH_SAFE version of the
> > > > iterator macros. Add it.
> > > >
> > > > Signed-off-by: Hamza Khan 
> > > > ---
> > > >  lib/eal/linux/include/rte_os.h | 7 +++
> > > >  1 file changed, 7 insertions(+)
> > > >
> > > > diff --git a/lib/eal/linux/include/rte_os.h
> > > > b/lib/eal/linux/include/rte_os.h index c72bf5b7e6..00d7714181
> > > > 100644
> > > > --- a/lib/eal/linux/include/rte_os.h
> > > > +++ b/lib/eal/linux/include/rte_os.h
> > > > @@ -26,6 +26,13 @@ extern "C" {
> > > >  #define RTE_STAILQ_HEAD(name, type) STAILQ_HEAD(name, type)
> > > #define
> > > > RTE_STAILQ_ENTRY(type) STAILQ_ENTRY(type)
> > > >
> > > > +#ifndef LIST_FOREACH_SAFE
> > > > +#defineLIST_FOREACH_SAFE(var, head, field, tvar)
> > >   \
> > > > +   for ((var) = LIST_FIRST((head));
> > > > \
> > > > +   (var) && ((tvar) = LIST_NEXT((var), field), 1); 
> > > > \
> > > > +   (var) = (tvar))
> > > > +#endif
> > >
> > > I'm not sure we want to add such thing without a RTE_ prefix.
> > > And we should not need LIST_*, we have RTE_TAILQ_*.
> > >
> > >
> > I have sent v2 patch with the aforementioned fix.
> > However Is being held until the list moderator can review it for
> > approval
> 
> I've unblocked it.
> This is blocked because you are not registered in the mailing list, so it is
> considered as spam.
> 
The maintainers will only accept fixes into RC4 if they can be confident in the 
patch.
So I have edited the Commit Message and created a V3
I registered with the mailing list yesterday but it seems that it is being held 
again.
Do you have any suggestions on how to avoid this for future patches ?
Thanks
Hamza

RE: [PATCH] vdpa/sfc: resolve race between libvhost and dev_conf

[Srivastava, Vijay]

>-Original Message-
>From: David Marchand 
>Sent: Friday, July 8, 2022 1:43 PM
>To: abhimanyu.sa...@xilinx.com; vsriv...@xilinx.com
>Cc: Maxime Coquelin ; dev ;
>Xia, Chenbo ; Andrew Rybchenko
>; Saini, Abhimanyu
>
>Subject: Re: [PATCH] vdpa/sfc: resolve race between libvhost and dev_conf
>
>CAUTION: This message has originated from an External Source. Please use
>proper judgment and caution when opening attachments, clicking links, or
>responding to this email.
>
>
>Hello Abhimanyu, Vijay,
>
>On Thu, Jul 7, 2022 at 2:38 PM Maxime Coquelin
> wrote:
>> On 7/6/22 11:24, abhimanyu.sa...@xilinx.com wrote:
>> > From: Abhimanyu Saini 
>> >
>> > libvhost calls dev_conf() before prosessing the
>> > VHOST_USER_SET_VRING_CALL message for the last VQ. So this message
>> > is processed after dev_conf() returns.
>> >
>> > However, the dev_conf() function spawns a thread to set
>> > rte_vhost_host_notifier_ctrl() before returning control to libvhost.
>> > This parallel thread in turn invokes get_notify_area().
>> > To get the notify_area, the vdpa driver needs to query the HW and
>> > for this query it needs an enabled VQ.
>> >
>> > But at the same time libvhost is processing the last
>> > VHOST_USER_SET_VRING_CALL, and to do that it disables the last VQ.
>> >
>> > Hence there is a race b/w the libvhost and the vdpa driver.
>> >
>> > To resolve this race condition, query the HW and cache notify_area
>> > inside dev_conf() instead of doing it the parallel thread.
>> >
>> > Signed-off-by: Abhimanyu Saini 
>> > ---
>> >   drivers/vdpa/sfc/sfc_vdpa_ops.c | 36 ++--
>> >   drivers/vdpa/sfc/sfc_vdpa_ops.h |  1 +
>> >   2 files changed, 19 insertions(+), 18 deletions(-)
>> >
>>
>> During today's Release status meeting, Andrew mentioned that this
>> patch has been for a log time already in your internal tree.
>>
>> So it gives a bit of confidence in taking it in -rc4.
>
>- But it is neither reviewed, nor acked by the driver maintainer.
>
>Vijay, as this driver maintainer, your opinion matters.
>We are in rc4 stage and we merge only critical fixes now.
>There won't be much time to test this fix once merged (and I am not talking
>about fixing a regression).
>
>Are you confident with this fix? 
Yes. 

>is it required for the 22.07 release?
It is not a blocker issue, but it would be good to have in this release. 

>If we don't get an answer, the safer is to let those fixes slip to a next 
>release.
>
>
>- Besides, I see there is a new fix for some sfc driver.
>https://patches.dpdk.org/project/dpdk/patch/20220708073702.29391-1-
>asa...@xilinx.com/
>The same questions will be asked.
>
>
>--
>David Marchand

Acked-by: Vijay Srivastava 

RE: [PATCH] common/sfc_efx/base: remove VQ index check during VQ start

[Srivastava, Vijay]

>From: Abhimanyu Saini 
>
>The used/avail queue indexes are not bound by queue size, because the
>descriptor entry index is calculated by a simple modulo between queue index
>and queue_size
>
>So, do not check initial used and avail queue indexes against queue size
>because it is possible for these indexes to be greater than queue size in the
>following cases:
>1) The queue is created to be migrated into, or
>2) The client issues a qstop/qstart after running datapath
>
>Fixes: 4dda72dbdeab3 ("common/sfc_efx/base: add base virtio support for
>vDPA")
>Cc: sta...@dpdk.org
>
>Signed-off-by: Abhimanyu Saini 
>---
> drivers/common/sfc_efx/base/rhead_virtio.c | 12 +---
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
>diff --git a/drivers/common/sfc_efx/base/rhead_virtio.c
>b/drivers/common/sfc_efx/base/rhead_virtio.c
>index 335cb74..7f08717 100644
>--- a/drivers/common/sfc_efx/base/rhead_virtio.c
>+++ b/drivers/common/sfc_efx/base/rhead_virtio.c
>@@ -47,14 +47,6 @@
>   goto fail2;
>   }
>
>-  if (evvdp != NULL) {
>-  if ((evvdp->evvd_vq_cidx > evvcp->evvc_vq_size) ||
>-  (evvdp->evvd_vq_pidx > evvcp->evvc_vq_size)) {
>-  rc = EINVAL;
>-  goto fail3;
>-  }
>-  }
>-
>   req.emr_cmd = MC_CMD_VIRTIO_INIT_QUEUE;
>   req.emr_in_buf = payload;
>   req.emr_in_length = MC_CMD_VIRTIO_INIT_QUEUE_REQ_LEN; @@ -
>116,15 +108,13 @@
>
>   if (req.emr_rc != 0) {
>   rc = req.emr_rc;
>-  goto fail4;
>+  goto fail3;
>   }
>
>   evvp->evv_vi_index = vi_index;
>
>   return (0);
>
>-fail4:
>-  EFSYS_PROBE(fail4);
> fail3:
>   EFSYS_PROBE(fail3);
> fail2:
>--
>1.8.3.1

Acked-by: Vijay Srivastava