Skip to contentSkip to conversation

ensure headers have correct includes

PATCH Superseded Bruce Richardson 13 participants 165 messages Jan 14, 2021 – Feb 22, 2021 Page 2 of 2

Subsystems (6)
lore
Share & tools
lore
#123 lore raw

PATCH v6 4/8 ethdev: make driver-only headers private

In reply to Bruce Richardson

The rte_ethdev_driver.h, rte_ethdev_vdev.h and rte_ethdev_pci.h files are for drivers only and should be a private to DPDK and not installed.

---
 app/test/test_link_bonding.c                               | 2 +-
 app/test/test_pdump.c                                      | 2 +-
 app/test/virtual_pmd.c                                     | 2 +-
 doc/guides/rel_notes/release_21_02.rst                     | 7 +++++++
 drivers/bus/dpaa/dpaa_bus.c                                | 2 +-
 drivers/bus/dpaa/include/fman.h                            | 2 +-
 drivers/bus/fslmc/fslmc_bus.c                              | 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/event/dpaa2/dpaa2_eventdev.c                       | 2 +-
 drivers/event/dpaa2/dpaa2_hw_dpcon.c                       | 2 +-
 drivers/event/octeontx/ssovf_evdev.c                       | 2 +-
 drivers/mempool/dpaa2/dpaa2_hw_mempool.c                   | 2 +-
 drivers/net/af_packet/rte_eth_af_packet.c                  | 4 ++--
 drivers/net/af_xdp/rte_eth_af_xdp.c                        | 4 ++--
 drivers/net/ark/ark_ethdev.c                               | 2 +-
 drivers/net/ark/ark_ethdev_rx.h                            | 2 +-
 drivers/net/ark/ark_ethdev_tx.h                            | 2 +-
 drivers/net/ark/ark_ext.h                                  | 2 +-
 drivers/net/ark/ark_global.h                               | 2 +-
 drivers/net/ark/ark_pktchkr.c                              | 2 +-
 drivers/net/ark/ark_pktgen.c                               | 2 +-
 drivers/net/atlantic/atl_ethdev.c                          | 2 +-
 drivers/net/atlantic/atl_rxtx.c                            | 2 +-
 drivers/net/atlantic/rte_pmd_atlantic.c                    | 2 +-
 drivers/net/avp/avp_ethdev.c                               | 4 ++--
 drivers/net/axgbe/axgbe_common.h                           | 2 +-
 drivers/net/bnx2x/bnx2x_ethdev.c                           | 2 +-
 drivers/net/bnx2x/bnx2x_ethdev.h                           | 2 +-
 drivers/net/bnxt/bnxt.h                                    | 2 +-
 drivers/net/bnxt/bnxt_ethdev.c                             | 4 ++--
 drivers/net/bnxt/bnxt_stats.h                              | 2 +-
 drivers/net/bnxt/rte_pmd_bnxt.c                            | 2 +-
 drivers/net/bonding/eth_bond_private.h                     | 2 +-
 drivers/net/bonding/rte_eth_bond_api.c                     | 2 +-
 drivers/net/bonding/rte_eth_bond_pmd.c                     | 4 ++--
 drivers/net/cxgbe/base/t4_hw.c                             | 2 +-
 drivers/net/cxgbe/base/t4vf_hw.c                           | 2 +-
 drivers/net/cxgbe/cxgbe_ethdev.c                           | 4 ++--
 drivers/net/cxgbe/cxgbe_main.c                             | 4 ++--
 drivers/net/cxgbe/cxgbevf_ethdev.c                         | 4 ++--
 drivers/net/cxgbe/cxgbevf_main.c                           | 4 ++--
 drivers/net/cxgbe/sge.c                                    | 2 +-
 drivers/net/dpaa/dpaa_ethdev.c                             | 2 +-
 drivers/net/dpaa/dpaa_ethdev.h                             | 2 +-
 drivers/net/dpaa/dpaa_rxtx.c                               | 2 +-
 drivers/net/dpaa2/base/dpaa2_hw_dpni.c                     | 2 +-
 drivers/net/dpaa2/dpaa2_ethdev.c                           | 2 +-
 drivers/net/dpaa2/dpaa2_rxtx.c                             | 2 +-
 drivers/net/e1000/em_ethdev.c                              | 4 ++--
 drivers/net/e1000/em_rxtx.c                                | 2 +-
 drivers/net/e1000/igb_ethdev.c                             | 4 ++--
 drivers/net/e1000/igb_flow.c                               | 4 ++--
 drivers/net/e1000/igb_pf.c                                 | 2 +-
 drivers/net/e1000/igb_rxtx.c                               | 2 +-
 drivers/net/ena/ena_ethdev.c                               | 4 ++--
 drivers/net/enetc/enetc_ethdev.c                           | 2 +-
 drivers/net/enic/enic_ethdev.c                             | 4 ++--
 drivers/net/enic/enic_flow.c                               | 2 +-
 drivers/net/enic/enic_fm_flow.c                            | 2 +-
 drivers/net/enic/enic_main.c                               | 2 +-
 drivers/net/enic/enic_res.c                                | 2 +-
 drivers/net/enic/enic_rxtx.c                               | 2 +-
 drivers/net/enic/enic_rxtx_vec_avx2.c                      | 2 +-
 drivers/net/enic/enic_vf_representor.c                     | 4 ++--
 drivers/net/failsafe/failsafe.c                            | 4 ++--
 drivers/net/failsafe/failsafe_ops.c                        | 2 +-
 drivers/net/failsafe/failsafe_private.h                    | 2 +-
 drivers/net/failsafe/failsafe_rxtx.c                       | 2 +-
 drivers/net/fm10k/fm10k_ethdev.c                           | 4 ++--
 drivers/net/fm10k/fm10k_rxtx.c                             | 2 +-
 drivers/net/fm10k/fm10k_rxtx_vec.c                         | 2 +-
 drivers/net/hinic/base/hinic_pmd_hwdev.c                   | 2 +-
 drivers/net/hinic/hinic_pmd_ethdev.c                       | 2 +-
 drivers/net/hinic/hinic_pmd_ethdev.h                       | 2 +-
 drivers/net/hns3/hns3_cmd.c                                | 2 +-
 drivers/net/hns3/hns3_ethdev.c                             | 2 +-
 drivers/net/hns3/hns3_ethdev.h                             | 2 +-
 drivers/net/hns3/hns3_ethdev_vf.c                          | 2 +-
 drivers/net/hns3/hns3_fdir.c                               | 2 +-
 drivers/net/hns3/hns3_mbx.c                                | 2 +-
 drivers/net/hns3/hns3_mp.c                                 | 2 +-
 drivers/net/hns3/hns3_regs.c                               | 2 +-
 drivers/net/hns3/hns3_rxtx.c                               | 2 +-
 drivers/net/hns3/hns3_rxtx_vec.c                           | 2 +-
 drivers/net/hns3/hns3_rxtx_vec_sve.c                       | 2 +-
 drivers/net/i40e/i40e_ethdev.c                             | 4 ++--
 drivers/net/i40e/i40e_ethdev_vf.c                          | 4 ++--
 drivers/net/i40e/i40e_fdir.c                               | 2 +-
 drivers/net/i40e/i40e_flow.c                               | 2 +-
 drivers/net/i40e/i40e_pf.c                                 | 2 +-
 drivers/net/i40e/i40e_rxtx.c                               | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_altivec.c                   | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx2.c                      | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c                    | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_common.h                    | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_neon.c                      | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c                       | 2 +-
 drivers/net/i40e/i40e_vf_representor.c                     | 2 +-
 drivers/net/iavf/iavf_ethdev.c                             | 4 ++--
 drivers/net/iavf/iavf_fdir.c                               | 2 +-
 drivers/net/iavf/iavf_generic_flow.c                       | 2 +-
 drivers/net/iavf/iavf_hash.c                               | 2 +-
 drivers/net/iavf/iavf_rxtx.c                               | 2 +-
 drivers/net/iavf/iavf_rxtx_vec_common.h                    | 2 +-
 drivers/net/iavf/iavf_rxtx_vec_sse.c                       | 2 +-
 drivers/net/iavf/iavf_vchnl.c                              | 4 ++--
 drivers/net/ice/ice_acl_filter.c                           | 2 +-
 drivers/net/ice/ice_dcf.c                                  | 4 ++--
 drivers/net/ice/ice_dcf.h                                  | 2 +-
 drivers/net/ice/ice_dcf_ethdev.c                           | 2 +-
 drivers/net/ice/ice_ethdev.c                               | 2 +-
 drivers/net/ice/ice_ethdev.h                               | 2 +-
 drivers/net/ice/ice_generic_flow.c                         | 2 +-
 drivers/net/ice/ice_hash.c                                 | 2 +-
 drivers/net/ice/ice_rxtx.c                                 | 2 +-
 drivers/net/ice/ice_switch_filter.c                        | 2 +-
 drivers/net/igc/igc_ethdev.c                               | 4 ++--
 drivers/net/igc/igc_filter.h                               | 2 +-
 drivers/net/igc/igc_txrx.c                                 | 2 +-
 drivers/net/ionic/ionic_ethdev.c                           | 4 ++--
 drivers/net/ionic/ionic_lif.c                              | 2 +-
 drivers/net/ionic/ionic_rxtx.c                             | 2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.c                         | 2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.h                         | 4 ++--
 drivers/net/ipn3ke/ipn3ke_flow.c                           | 2 +-
 drivers/net/ipn3ke/ipn3ke_representor.c                    | 2 +-
 drivers/net/ipn3ke/ipn3ke_tm.c                             | 2 +-
 drivers/net/ixgbe/ixgbe_bypass.c                           | 2 +-
 drivers/net/ixgbe/ixgbe_ethdev.c                           | 4 ++--
 drivers/net/ixgbe/ixgbe_fdir.c                             | 2 +-
 drivers/net/ixgbe/ixgbe_flow.c                             | 2 +-
 drivers/net/ixgbe/ixgbe_ipsec.c                            | 4 ++--
 drivers/net/ixgbe/ixgbe_pf.c                               | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c                             | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h                  | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c                    | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c                     | 2 +-
 drivers/net/ixgbe/ixgbe_vf_representor.c                   | 2 +-
 drivers/net/ixgbe/rte_pmd_ixgbe.c                          | 2 +-
 drivers/net/kni/rte_eth_kni.c                              | 4 ++--
 drivers/net/liquidio/base/lio_23xx_vf.c                    | 2 +-
 drivers/net/liquidio/base/lio_mbox.c                       | 2 +-
 drivers/net/liquidio/lio_ethdev.c                          | 4 ++--
 drivers/net/liquidio/lio_rxtx.c                            | 2 +-
 drivers/net/memif/memif_socket.c                           | 4 ++--
 drivers/net/memif/rte_eth_memif.c                          | 4 ++--
 drivers/net/memif/rte_eth_memif.h                          | 2 +-
 drivers/net/mlx4/mlx4.c                                    | 4 ++--
 drivers/net/mlx4/mlx4.h                                    | 2 +-
 drivers/net/mlx4/mlx4_ethdev.c                             | 2 +-
 drivers/net/mlx4/mlx4_flow.c                               | 2 +-
 drivers/net/mlx4/mlx4_flow.h                               | 2 +-
 drivers/net/mlx4/mlx4_intr.c                               | 2 +-
 drivers/net/mlx4/mlx4_mp.c                                 | 2 +-
 drivers/net/mlx4/mlx4_rxq.c                                | 2 +-
 drivers/net/mlx4/mlx4_rxtx.h                               | 2 +-
 drivers/net/mlx4/mlx4_txq.c                                | 2 +-
 drivers/net/mlx5/linux/mlx5_ethdev_os.c                    | 2 +-
 drivers/net/mlx5/linux/mlx5_mp_os.c                        | 2 +-
 drivers/net/mlx5/linux/mlx5_os.c                           | 4 ++--
 drivers/net/mlx5/linux/mlx5_verbs.c                        | 2 +-
 drivers/net/mlx5/linux/mlx5_vlan_os.c                      | 2 +-
 drivers/net/mlx5/mlx5.c                                    | 4 ++--
 drivers/net/mlx5/mlx5.h                                    | 2 +-
 drivers/net/mlx5/mlx5_defs.h                               | 2 +-
 drivers/net/mlx5/mlx5_ethdev.c                             | 2 +-
 drivers/net/mlx5/mlx5_flow.c                               | 2 +-
 drivers/net/mlx5/mlx5_flow_dv.c                            | 2 +-
 drivers/net/mlx5/mlx5_flow_verbs.c                         | 2 +-
 drivers/net/mlx5/mlx5_mac.c                                | 2 +-
 drivers/net/mlx5/mlx5_rss.c                                | 2 +-
 drivers/net/mlx5/mlx5_rxmode.c                             | 2 +-
 drivers/net/mlx5/mlx5_rxq.c                                | 2 +-
 drivers/net/mlx5/mlx5_stats.c                              | 2 +-
 drivers/net/mlx5/mlx5_trigger.c                            | 2 +-
 drivers/net/mlx5/mlx5_txpp.c                               | 2 +-
 drivers/net/mlx5/mlx5_txq.c                                | 2 +-
 drivers/net/mlx5/mlx5_vlan.c                               | 2 +-
 drivers/net/mlx5/windows/mlx5_ethdev_os.c                  | 2 +-
 drivers/net/mlx5/windows/mlx5_mp_os.c                      | 2 +-
 drivers/net/mlx5/windows/mlx5_os.c                         | 2 +-
 drivers/net/mlx5/windows/mlx5_vlan_os.c                    | 2 +-
 drivers/net/mvneta/mvneta_ethdev.c                         | 2 +-
 drivers/net/mvpp2/mrvl_ethdev.c                            | 2 +-
 drivers/net/netvsc/hn_ethdev.c                             | 2 +-
 drivers/net/netvsc/hn_rndis.c                              | 2 +-
 drivers/net/netvsc/hn_vf.c                                 | 2 +-
 drivers/net/nfb/nfb_ethdev.c                               | 2 +-
 drivers/net/nfb/nfb_tx.h                                   | 2 +-
 drivers/net/nfp/nfp_net.c                                  | 4 ++--
 drivers/net/nfp/nfpcore/nfp_cpp.h                          | 2 +-
 drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c                 | 2 +-
 drivers/net/nfp/nfpcore/nfp_cppcore.c                      | 2 +-
 drivers/net/null/rte_eth_null.c                            | 4 ++--
 drivers/net/octeontx/octeontx_ethdev.h                     | 2 +-
 drivers/net/octeontx/octeontx_rxtx.c                       | 2 +-
 drivers/net/octeontx/octeontx_rxtx.h                       | 2 +-
 drivers/net/octeontx2/otx2_ethdev.c                        | 2 +-
 drivers/net/octeontx2/otx2_link.c                          | 2 +-
 drivers/net/octeontx2/otx2_ptp.c                           | 2 +-
 drivers/net/pcap/rte_eth_pcap.c                            | 4 ++--
 drivers/net/pfe/pfe_eth.h                                  | 2 +-
 drivers/net/pfe/pfe_ethdev.c                               | 2 +-
 drivers/net/qede/qede_ethdev.h                             | 4 ++--
 drivers/net/ring/rte_eth_ring.c                            | 2 +-
 drivers/net/sfc/sfc.h                                      | 2 +-
 drivers/net/sfc/sfc_dp_rx.h                                | 2 +-
 drivers/net/sfc/sfc_dp_tx.h                                | 2 +-
 drivers/net/sfc/sfc_ethdev.c                               | 4 ++--
 drivers/net/sfc/sfc_ev.h                                   | 2 +-
 drivers/net/sfc/sfc_flow.c                                 | 2 +-
 drivers/net/sfc/sfc_rx.h                                   | 2 +-
 drivers/net/sfc/sfc_tx.h                                   | 2 +-
 drivers/net/softnic/rte_eth_softnic.c                      | 4 ++--
 drivers/net/softnic/rte_eth_softnic_internals.h            | 2 +-
 drivers/net/szedata2/rte_eth_szedata2.c                    | 4 ++--
 drivers/net/tap/rte_eth_tap.c                              | 4 ++--
 drivers/net/tap/rte_eth_tap.h                              | 2 +-
 drivers/net/thunderx/nicvf_ethdev.c                        | 4 ++--
 drivers/net/thunderx/nicvf_ethdev.h                        | 2 +-
 drivers/net/thunderx/nicvf_rxtx.c                          | 2 +-
 drivers/net/thunderx/nicvf_rxtx.h                          | 2 +-
 drivers/net/thunderx/nicvf_struct.h                        | 2 +-
 drivers/net/txgbe/txgbe_ethdev.c                           | 2 +-
 drivers/net/txgbe/txgbe_ipsec.c                            | 2 +-
 drivers/net/txgbe/txgbe_pf.c                               | 2 +-
 drivers/net/txgbe/txgbe_rxtx.c                             | 2 +-
 drivers/net/vhost/rte_eth_vhost.c                          | 4 ++--
 drivers/net/virtio/virtio_ethdev.c                         | 4 ++--
 drivers/net/virtio/virtio_pci.h                            | 2 +-
 drivers/net/virtio/virtio_rxtx.c                           | 2 +-
 drivers/net/virtio/virtio_rxtx_simple.c                    | 2 +-
 drivers/net/virtio/virtio_rxtx_simple_altivec.c            | 2 +-
 drivers/net/virtio/virtio_rxtx_simple_neon.c               | 2 +-
 drivers/net/virtio/virtio_rxtx_simple_sse.c                | 2 +-
 drivers/net/virtio/virtio_user_ethdev.c                    | 2 +-
 drivers/net/vmxnet3/vmxnet3_ethdev.c                       | 4 ++--
 drivers/net/vmxnet3/vmxnet3_rxtx.c                         | 2 +-
 lib/librte_ethdev/{rte_ethdev_driver.h => ethdev_driver.h} | 0
 lib/librte_ethdev/{rte_ethdev_pci.h => ethdev_pci.h}       | 2 +-
 lib/librte_ethdev/ethdev_private.c                         | 2 +-
 lib/librte_ethdev/{rte_ethdev_vdev.h => ethdev_vdev.h}     | 2 +-
 lib/librte_ethdev/meson.build                              | 3 ---
 lib/librte_ethdev/rte_class_eth.c                          | 2 +-
 lib/librte_ethdev/rte_ethdev.c                             | 2 +-
 lib/librte_ethdev/rte_ethdev.h                             | 2 +-
 lib/librte_ethdev/rte_flow_driver.h                        | 2 +-
 lib/librte_ethdev/rte_mtr_driver.h                         | 2 +-
 lib/librte_ethdev/rte_tm_driver.h                          | 2 +-
 252 files changed, 302 insertions(+), 298 deletions(-)
 rename lib/librte_ethdev/{rte_ethdev_driver.h => ethdev_driver.h} (100%)
 rename lib/librte_ethdev/{rte_ethdev_pci.h => ethdev_pci.h} (99%)
 rename lib/librte_ethdev/{rte_ethdev_vdev.h => ethdev_vdev.h} (97%)
app/test/test_link_bonding.c +1 -1
index e8b76bd850..8a5c8310a8 100644
@@ -17,7 +17,7 @@
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_lcore.h>
 #include <rte_memory.h>
app/test/test_pdump.c +1 -1
index 21fcc1bc4c..b49fcfb3f1 100644
@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_pdump.h>
 #include "rte_eal.h"
 #include "rte_lcore.h"
app/test/virtual_pmd.c +1 -1
index 2c24c9b3f5..7036f401ed 100644
@@ -4,7 +4,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_malloc.h>
doc/guides/rel_notes/release_21_02.rst +7 -0
index ae36b6a3fa..33bac4fff8 100644
@@ -140,6 +140,13 @@ Removed Items
   PCI device IDs ``0x16c8, 0x16c9, 0x16ca, 0x16ce, 0x16cf, 0x16df, 0x16d0,``
   ``0x16d1, 0x16d2, 0x16d4, 0x16d5, 0x16e7, 0x16e8, 0x16e9`` has been removed.
 
+* The internal header files ``rte_ethdev_driver.h``, ``rte_ethdev_vdev.h`` and
+  ``rte_ethdev_pci.h`` are no longer installed as part of the DPDK ``ninja
+  install`` action and are renamed to ``ethdev_driver.h``, ``ethdev_vdev.h`` and
+  ``ethdev_pci.h`` respectively in the source tree, to reflect the fact that
+  they are non-public headers.
+
+
 API Changes
 -----------
 
drivers/bus/dpaa/dpaa_bus.c +1 -1
index f39d6e2092..662cbfaae5 100644
@@ -27,7 +27,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
 #include <rte_bus.h>
drivers/bus/dpaa/include/fman.h +1 -1
index f2b0bf91e7..516c6c1515 100644
@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #include <net/if.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 
 #include <compat.h>
drivers/bus/fslmc/fslmc_bus.c +1 -1
index 58435589b2..26910ac01f 100644
@@ -13,7 +13,7 @@
 #include <rte_malloc.h>
 #include <rte_devargs.h>
 #include <rte_memcpy.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_mbuf_dyn.h>
 
 #include <rte_fslmc.h>
drivers/bus/fslmc/fslmc_vfio.c +1 -1
index b52f36c33e..c8373e627a 100644
@@ -22,7 +22,7 @@
 
 #include <eal_filesystem.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c +1 -1
index d9619848d8..122aa1740d 100644
@@ -19,7 +19,7 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_mbuf_pool_ops.h>
 
 #include <fslmc_logs.h>
drivers/bus/fslmc/portal/dpaa2_hw_dpci.c +1 -1
index d393ce6186..8ed969c7c0 100644
@@ -18,7 +18,7 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <fslmc_logs.h>
 #include <rte_fslmc.h>
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +1 -1
index 1a9dd18b99..c6f8312a1d 100644
@@ -24,7 +24,7 @@
 #include<sys/eventfd.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/event/dpaa2/dpaa2_eventdev.c +1 -1
index eeb2494bd0..e4fa3a2e46 100644
@@ -24,7 +24,7 @@
 #include <rte_memory.h>
 #include <rte_pci.h>
 #include <rte_bus_vdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cryptodev.h>
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_event_eth_tx_adapter.h>
drivers/event/dpaa2/dpaa2_hw_dpcon.c +1 -1
index 200b71640b..acc1fde771 100644
@@ -18,7 +18,7 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <rte_fslmc.h>
 #include <mc/fsl_dpcon.h>
drivers/event/octeontx/ssovf_evdev.c +1 -1
index e60a7dc69e..17325bbf6a 100644
@@ -8,7 +8,7 @@
 #include <rte_debug.h>
 #include <rte_dev.h>
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_kvargs.h>
 #include <rte_lcore.h>
drivers/mempool/dpaa2/dpaa2_hw_mempool.c +1 -1
index 97ce08d78f..ca49a8d42a 100644
@@ -14,7 +14,7 @@
 #include <errno.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/af_packet/rte_eth_af_packet.c +2 -2
index 671ee87ae2..bfe5a0a451 100644
@@ -8,8 +8,8 @@
 
 #include <rte_string_fns.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
drivers/net/af_xdp/rte_eth_af_xdp.c +2 -2
index 703b7417ed..b8d5ad0d91 100644
@@ -19,8 +19,8 @@
 #include <bpf/xsk.h>
 
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
 #include <rte_string_fns.h>
drivers/net/ark/ark_ethdev.c +1 -1
index a658993512..ef650a4658 100644
@@ -7,7 +7,7 @@
 #include <dlfcn.h>
 
 #include <rte_bus_pci.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_kvargs.h>
 
 #include "rte_pmd_ark.h"
drivers/net/ark/ark_ethdev_rx.h +1 -1
index 001fa9bdfa..33c1f2c953 100644
@@ -9,7 +9,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 extern uint64_t ark_timestamp_rx_dynflag;
 extern int ark_timestamp_dynfield_offset;
drivers/net/ark/ark_ethdev_tx.h +1 -1
index e448ce2225..12c71a7158 100644
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 
 uint16_t eth_ark_xmit_pkts_noop(void *vtxq,
drivers/net/ark/ark_ext.h +1 -1
index 5a987e4d67..821fb55bba 100644
@@ -5,7 +5,7 @@
 #ifndef _ARK_EXT_H_
 #define _ARK_EXT_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 /*
  * This is the template file for users who which to define a dynamic
drivers/net/ark/ark_global.h +1 -1
index 403df5900b..91726ecc20 100644
@@ -9,7 +9,7 @@
 #include <assert.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/ark/ark_pktchkr.c +1 -1
index b8fb69497d..0f2d31e5be 100644
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ark_pktchkr.h"
drivers/net/ark/ark_pktgen.c +1 -1
index 4a02662a46..ac4322a359 100644
@@ -10,7 +10,7 @@
 #include <rte_string_fns.h>
 #include <rte_eal.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ark_pktgen.h"
drivers/net/atlantic/atl_ethdev.c +1 -1
index b0716773ad..473f6209f6 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_alarm.h>
 
 #include "atl_ethdev.h"
drivers/net/atlantic/atl_rxtx.c +1 -1
index 449ffd454d..7d367c9306 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_net.h>
 
 #include "atl_ethdev.h"
drivers/net/atlantic/rte_pmd_atlantic.c +1 -1
index 2962f5c6cb..00fc2872e5 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018 Aquantia Corporation
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "rte_pmd_atlantic.h"
 #include "atl_ethdev.h"
drivers/net/avp/avp_ethdev.c +2 -2
index f531e03c02..566a3606a2 100644
@@ -8,8 +8,8 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
 #include <rte_malloc.h>
drivers/net/axgbe/axgbe_common.h +1 -1
index 91404ca01c..b83fdcca85 100644
@@ -35,7 +35,7 @@
 #include <rte_ethdev.h>
 #include <rte_dev.h>
 #include <rte_errno.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_io.h>
drivers/net/bnx2x/bnx2x_ethdev.c +1 -1
index d35c75a2e2..50db70dfcd 100644
@@ -10,7 +10,7 @@
 
 #include <rte_string_fns.h>
 #include <rte_dev.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_alarm.h>
 
 /*
drivers/net/bnx2x/bnx2x_ethdev.h +1 -1
index f712bb3e84..fa1c3ba955 100644
@@ -31,7 +31,7 @@
 #include <rte_debug.h>
 #include <rte_pci.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_spinlock.h>
 #include <rte_eal.h>
 #include <rte_mempool.h>
drivers/net/bnxt/bnxt.h +1 -1
index d2d76b623a..0db6e58f3d 100644
@@ -12,7 +12,7 @@
 
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memory.h>
 #include <rte_lcore.h>
 #include <rte_spinlock.h>
drivers/net/bnxt/bnxt_ethdev.c +2 -2
index 74b0f3d1dc..e8a7a8ecd4 100644
@@ -7,8 +7,8 @@
 #include <stdbool.h>
 
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
 #include <rte_alarm.h>
drivers/net/bnxt/bnxt_stats.h +1 -1
index 3cf2a1b822..50c3d92b9a 100644
@@ -6,7 +6,7 @@
 #ifndef _BNXT_STATS_H_
 #define _BNXT_STATS_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 void bnxt_free_stats(struct bnxt *bp);
 int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
drivers/net/bnxt/rte_pmd_bnxt.c +1 -1
index d67db46c65..965381c0c4 100644
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
 #include <rte_byteorder.h>
drivers/net/bonding/eth_bond_private.h +1 -1
index 8f198bd50e..75fb8dc02e 100644
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <sys/queue.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_spinlock.h>
 #include <rte_bitmap.h>
drivers/net/bonding/rte_eth_bond_api.c +1 -1
index 55c8e3167c..17e6ff8b90 100644
@@ -6,7 +6,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_tcp.h>
 #include <rte_bus_vdev.h>
 #include <rte_kvargs.h>
drivers/net/bonding/rte_eth_bond_pmd.c +2 -2
index 66ab8dd693..5241c60089 100644
@@ -7,8 +7,8 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_tcp.h>
 #include <rte_udp.h>
 #include <rte_ip.h>
drivers/net/cxgbe/base/t4_hw.c +1 -1
index ef20dc6675..0e3033b550 100644
@@ -16,7 +16,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/cxgbe/base/t4vf_hw.c +1 -1
index cd011bc1b8..561d759dbc 100644
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 
 #include "common.h"
drivers/net/cxgbe/cxgbe_ethdev.c +2 -2
index cfa385bab7..bfa57c979d 100644
@@ -28,8 +28,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/cxgbe/cxgbe_main.c +2 -2
index 3b56eccfbe..83ad758e88 100644
@@ -27,8 +27,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_random.h>
 #include <rte_dev.h>
 #include <rte_kvargs.h>
drivers/net/cxgbe/cxgbevf_ethdev.c +2 -2
index c2918f5356..bf1815c25f 100644
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 
 #include "cxgbe.h"
 #include "cxgbe_pfvf.h"
drivers/net/cxgbe/cxgbevf_main.c +2 -2
index 9ee060504f..f639612ae4 100644
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 
 #include "base/common.h"
drivers/net/cxgbe/sge.c +1 -1
index 8c7dbe3a1d..56b8ec1f33 100644
@@ -28,7 +28,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/dpaa/dpaa_ethdev.c +1 -1
index 0c87c136d7..d643514de6 100644
@@ -29,7 +29,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
 
drivers/net/dpaa/dpaa_ethdev.h +1 -1
index a858b1372c..b5728e09c2 100644
@@ -9,7 +9,7 @@
 
 /* System headers */
 #include <stdbool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_event_eth_rx_adapter.h>
 
 #include <fsl_usd.h>
drivers/net/dpaa/dpaa_rxtx.c +1 -1
index e2459d9b99..e38fba23c0 100644
@@ -26,7 +26,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
 #include <rte_ip.h>
drivers/net/dpaa2/base/dpaa2_hw_dpni.c +1 -1
index 25b1d2bb6d..87c893db51 100644
@@ -9,7 +9,7 @@
 #include <net/if.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/dpaa2/dpaa2_ethdev.c +1 -1
index 6f38da3cce..38774e255b 100644
@@ -9,7 +9,7 @@
 #include <net/if.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/dpaa2/dpaa2_rxtx.c +1 -1
index 9cca6d16c3..003b379fa7 100644
@@ -9,7 +9,7 @@
 #include <net/if.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/e1000/em_ethdev.c +2 -2
index 2036c6e917..9b8c4a7de5 100644
@@ -15,8 +15,8 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
 #include <rte_malloc.h>
drivers/net/e1000/em_rxtx.c +1 -1
index 19e3bffd46..db5d1222ce 100644
@@ -32,7 +32,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_ip.h>
 #include <rte_udp.h>
drivers/net/e1000/igb_ethdev.c +2 -2
index dfe87508c2..ec355cbf35 100644
@@ -17,8 +17,8 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
 #include <rte_malloc.h>
drivers/net/e1000/igb_flow.c +2 -2
index ccb184df95..33f6b1d6b3 100644
@@ -15,8 +15,8 @@
 #include <rte_debug.h>
 #include <rte_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
 #include <rte_atomic.h>
drivers/net/e1000/igb_pf.c +1 -1
index 9d74c08abe..2ce74dd5a9 100644
@@ -16,7 +16,7 @@
 #include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memcpy.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
drivers/net/e1000/igb_rxtx.c +1 -1
index dd520cd82c..1500d2ffff 100644
@@ -31,7 +31,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_udp.h>
 #include <rte_tcp.h>
drivers/net/ena/ena_ethdev.c +2 -2
index 20ff3653c6..c796af4aa7 100644
@@ -5,8 +5,8 @@
 
 #include <rte_string_fns.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_tcp.h>
 #include <rte_atomic.h>
 #include <rte_dev.h>
drivers/net/enetc/enetc_ethdev.c +1 -1
index 4d2c9c0474..0b45168c60 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdbool.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_random.h>
 #include <dpaax_iova_table.h>
 
drivers/net/enic/enic_ethdev.c +2 -2
index 1c8d60e264..b3f441c8f7 100644
@@ -9,8 +9,8 @@
 #include <rte_dev.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_kvargs.h>
 #include <rte_string_fns.h>
 
drivers/net/enic/enic_flow.c +1 -1
index 1eec96abca..97ee7509ce 100644
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <rte_log.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow_driver.h>
 #include <rte_ether.h>
 #include <rte_ip.h>
drivers/net/enic/enic_fm_flow.c +1 -1
index ad1e89a581..21d9b1cef7 100644
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <rte_log.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow_driver.h>
 #include <rte_ether.h>
 #include <rte_hash.h>
drivers/net/enic/enic_main.c +1 -1
index 805eb5e46a..2a06d46872 100644
@@ -15,7 +15,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "enic_compat.h"
 #include "enic.h"
drivers/net/enic/enic_res.c +1 -1
index 1405db15ab..689bf748ae 100644
@@ -4,7 +4,7 @@
  */
 
 #include "enic_compat.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "wq_enet_desc.h"
 #include "rq_enet_desc.h"
 #include "cq_enet_desc.h"
drivers/net/enic/enic_rxtx.c +1 -1
index 4b6b97eb10..a2a02227e3 100644
@@ -4,7 +4,7 @@
  */
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_net.h>
 #include <rte_prefetch.h>
 
drivers/net/enic/enic_rxtx_vec_avx2.c +1 -1
index f0bea33423..1848f52717 100644
@@ -4,7 +4,7 @@
  */
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_vect.h>
 
 #include "enic_compat.h"
drivers/net/enic/enic_vf_representor.c +2 -2
index c2c03c0281..f7b79c1c4e 100644
@@ -8,8 +8,8 @@
 #include <rte_bus_pci.h>
 #include <rte_common.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_flow_driver.h>
 #include <rte_kvargs.h>
 #include <rte_pci.h>
drivers/net/failsafe/failsafe.c +2 -2
index ba81c82174..e3bda0df2b 100644
@@ -7,8 +7,8 @@
 
 #include <rte_alarm.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_devargs.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
drivers/net/failsafe/failsafe_ops.c +1 -1
index 492047f587..2b6ca9080d 100644
@@ -9,7 +9,7 @@
 
 #include <rte_debug.h>
 #include <rte_atomic.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_flow.h>
 #include <rte_cycles.h>
drivers/net/failsafe/failsafe_private.h +1 -1
index 0f9a572af8..cd39d103c6 100644
@@ -12,7 +12,7 @@
 
 #include <rte_atomic.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_devargs.h>
 #include <rte_flow.h>
 #include <rte_interrupts.h>
drivers/net/failsafe/failsafe_rxtx.c +1 -1
index fee08fa23c..fe67293299 100644
@@ -6,7 +6,7 @@
 #include <rte_atomic.h>
 #include <rte_debug.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "failsafe_private.h"
 
drivers/net/fm10k/fm10k_ethdev.c +2 -2
index c187088a33..fd471c415e 100644
@@ -2,8 +2,8 @@
  * Copyright(c) 2013-2016 Intel Corporation
  */
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
 #include <rte_string_fns.h>
drivers/net/fm10k/fm10k_rxtx.c +1 -1
index 4accaa2cd6..8585c5b9e4 100644
@@ -4,7 +4,7 @@
 
 #include <inttypes.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_net.h>
 #include "fm10k.h"
drivers/net/fm10k/fm10k_rxtx_vec.c +1 -1
index 6fcc939ad9..39e3cdac1f 100644
@@ -4,7 +4,7 @@
 
 #include <inttypes.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include "fm10k.h"
 #include "base/fm10k_type.h"
drivers/net/hinic/base/hinic_pmd_hwdev.c +1 -1
index 41c99bdbf8..cb9cf6efa2 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2017 Huawei Technologies Co., Ltd
  */
 
-#include<rte_ethdev_driver.h>
+#include<ethdev_driver.h>
 #include <rte_bus_pci.h>
 #include <rte_hash.h>
 #include <rte_jhash.h>
drivers/net/hinic/hinic_pmd_ethdev.c +1 -1
index 5a2c171099..1d6b710c9f 100644
@@ -4,7 +4,7 @@
 
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
drivers/net/hinic/hinic_pmd_ethdev.h +1 -1
index c7338d83be..70b4d32ff2 100644
@@ -7,7 +7,7 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "base/hinic_compat.h"
 #include "base/hinic_pmd_cfg.h"
drivers/net/hns3/hns3_cmd.c +1 -1
index f58f4f7adc..45dbead512 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_io.h>
 
 #include "hns3_ethdev.h"
drivers/net/hns3/hns3_ethdev.c +1 -1
index 449d967784..a796469435 100644
@@ -4,7 +4,7 @@
 
 #include <rte_alarm.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 
 #include "hns3_ethdev.h"
drivers/net/hns3/hns3_ethdev.h +1 -1
index 0d17170fa7..6374a76794 100644
@@ -6,7 +6,7 @@
 #define _HNS3_ETHDEV_H_
 
 #include <sys/time.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_byteorder.h>
 #include <rte_io.h>
 #include <rte_spinlock.h>
drivers/net/hns3/hns3_ethdev_vf.c +1 -1
index bb4ec6bb39..394ffe38cd 100644
@@ -4,7 +4,7 @@
 
 #include <linux/pci_regs.h>
 #include <rte_alarm.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_io.h>
 #include <rte_pci.h>
 #include <rte_vfio.h>
drivers/net/hns3/hns3_fdir.c +1 -1
index 857cc94c98..896540df78 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_hash.h>
 #include <rte_hash_crc.h>
 #include <rte_io.h>
drivers/net/hns3/hns3_mbx.c +1 -1
index d2a5db8aab..1d500b984c 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_io.h>
 
 #include "hns3_ethdev.h"
drivers/net/hns3/hns3_mp.c +1 -1
index ed2567a8ff..3342a781ad 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 #include <rte_io.h>
 
drivers/net/hns3/hns3_regs.c +1 -1
index f2cb465eed..01550458b7 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_io.h>
 
 #include "hns3_ethdev.h"
drivers/net/hns3/hns3_rxtx.c +1 -1
index 0badfc9260..676962553f 100644
@@ -6,7 +6,7 @@
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_vxlan.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_io.h>
 #include <rte_net.h>
 #include <rte_malloc.h>
drivers/net/hns3/hns3_rxtx_vec.c +1 -1
index a26c83d146..2bc4372449 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_io.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "hns3_ethdev.h"
 #include "hns3_rxtx.h"
drivers/net/hns3/hns3_rxtx_vec_sve.c +1 -1
index 8c2c8f6108..b02bae7a0d 100644
@@ -4,7 +4,7 @@
 
 #include <arm_sve.h>
 #include <rte_io.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "hns3_ethdev.h"
 #include "hns3_rxtx.h"
drivers/net/i40e/i40e_ethdev.c +2 -2
index 946994b80a..d7cd049891 100644
@@ -17,8 +17,8 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memzone.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
drivers/net/i40e/i40e_ethdev_vf.c +2 -2
index 5d7db7fe13..2909b4d894 100644
@@ -25,8 +25,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_dev.h>
 
drivers/net/i40e/i40e_fdir.c +1 -1
index f5defcf585..c572d003cb 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_memzone.h>
 #include <rte_malloc.h>
drivers/net/i40e/i40e_flow.c +1 -1
index 7fe760dba2..4d44282312 100644
@@ -12,7 +12,7 @@
 
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
drivers/net/i40e/i40e_pf.c +1 -1
index 65d649b627..f3d6d899f6 100644
@@ -14,7 +14,7 @@
 #include <rte_string_fns.h>
 #include <rte_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 
drivers/net/i40e/i40e_rxtx.c +1 -1
index 89560d4ee5..00db6c88a3 100644
@@ -17,7 +17,7 @@
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_tcp.h>
 #include <rte_sctp.h>
 #include <rte_udp.h>
drivers/net/i40e/i40e_rxtx_vec_altivec.c +1 -1
index d3238bfb6a..e6e468752c 100644
@@ -4,7 +4,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_rxtx_vec_avx2.c +1 -1
index e5a1deaeb2..ea554b4fda 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_rxtx_vec_avx512.c +1 -1
index e92f97b7ed..80b153e8f6 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_rxtx_vec_common.h +1 -1
index 31f73f6054..33cebbe88b 100644
@@ -5,7 +5,7 @@
 #ifndef _I40E_RXTX_VEC_COMMON_H_
 #define _I40E_RXTX_VEC_COMMON_H_
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "i40e_ethdev.h"
drivers/net/i40e/i40e_rxtx_vec_neon.c +1 -1
index f094de69ae..d81269624e 100644
@@ -4,7 +4,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_vect.h>
 
drivers/net/i40e/i40e_rxtx_vec_sse.c +1 -1
index 0bcb48e24e..45fce0a022 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_vf_representor.c +1 -1
index 9e40406a3d..7ed47c1a2c 100644
@@ -7,7 +7,7 @@
 #include <rte_pci.h>
 #include <rte_malloc.h>
 
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "base/i40e_type.h"
 #include "base/virtchnl.h"
 #include "i40e_ethdev.h"
drivers/net/iavf/iavf_ethdev.c +2 -2
index cf6ea0b15c..e9c8c1157a 100644
@@ -19,8 +19,8 @@
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
 #include <rte_dev.h>
drivers/net/iavf/iavf_fdir.c +1 -1
index f48f574a5d..4e864b4b9c 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
 
drivers/net/iavf/iavf_generic_flow.c +1 -1
index aabbcf34c2..8635ff83ca 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
 
drivers/net/iavf/iavf_hash.c +1 -1
index 958c73c4fb..f437fc3170 100644
@@ -12,7 +12,7 @@
 
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/iavf/iavf_rxtx.c +1 -1
index 1ddbad0f1f..3d471d9acc 100644
@@ -17,7 +17,7 @@
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_tcp.h>
 #include <rte_sctp.h>
 #include <rte_udp.h>
drivers/net/iavf/iavf_rxtx_vec_common.h +1 -1
index 7ad1e0f68a..46a18732d3 100644
@@ -5,7 +5,7 @@
 #ifndef _IAVF_RXTX_VEC_COMMON_H_
 #define _IAVF_RXTX_VEC_COMMON_H_
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "iavf.h"
drivers/net/iavf/iavf_rxtx_vec_sse.c +1 -1
index 75c77f9d32..8574d0830f 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "iavf.h"
drivers/net/iavf/iavf_vchnl.c +2 -2
index 3ef29d509d..8add888987 100644
@@ -16,8 +16,8 @@
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_dev.h>
 
 #include "iavf.h"
drivers/net/ice/ice_acl_filter.c +1 -1
index 363ce68318..113cb68765 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/ice/ice_dcf.c +2 -2
index 4a9af3292c..dbe42fa3df 100644
@@ -17,8 +17,8 @@
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
 #include <rte_dev.h>
drivers/net/ice/ice_dcf.h +1 -1
index ff029963bf..0cb90b5e9f 100644
@@ -5,7 +5,7 @@
 #ifndef _ICE_DCF_H_
 #define _ICE_DCF_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <iavf_prototype.h>
 #include <iavf_adminq_cmd.h>
drivers/net/ice/ice_dcf_ethdev.c +1 -1
index ea1f2951ba..86f70cf7ff 100644
@@ -14,7 +14,7 @@
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
drivers/net/ice/ice_ethdev.c +1 -1
index ec29f0fe40..c021d7ab6c 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include <stdio.h>
 #include <sys/types.h>
drivers/net/ice/ice_ethdev.h +1 -1
index 2b03c59671..7e9cbd2e9a 100644
@@ -7,7 +7,7 @@
 
 #include <rte_kvargs.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "base/ice_common.h"
 #include "base/ice_adminq_cmd.h"
drivers/net/ice/ice_generic_flow.c +1 -1
index c4496dbbe1..25d15a8adb 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
 
drivers/net/ice/ice_hash.c +1 -1
index 2d23c8dd50..322df649b1 100644
@@ -12,7 +12,7 @@
 
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/ice/ice_rxtx.c +1 -1
index 7286e3a445..6727d94c04 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_net.h>
 #include <rte_vect.h>
 
drivers/net/ice/ice_switch_filter.c +1 -1
index 7bac77ecd1..5ca0985e21 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/igc/igc_ethdev.c +2 -2
index 802212fc57..dbaa7a83e5 100644
@@ -8,8 +8,8 @@
 #include <rte_string_fns.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_alarm.h>
 
drivers/net/igc/igc_filter.h +1 -1
index 877f51c88b..df8516bc40 100644
@@ -8,7 +8,7 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_eth_ctrl.h>
 
 #include "igc_ethdev.h"
drivers/net/igc/igc_txrx.c +1 -1
index 4654ec41f0..c0a5d5e84f 100644
@@ -4,7 +4,7 @@
 
 #include <rte_config.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_net.h>
 
 #include "igc_logs.h"
drivers/net/ionic/ionic_ethdev.c +2 -2
index 2face7c635..ded3ffe48d 100644
@@ -5,9 +5,9 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "ionic_logs.h"
 #include "ionic.h"
drivers/net/ionic/ionic_lif.c +1 -1
index f39b54e8ef..f3d55c0fa6 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "ionic.h"
 #include "ionic_logs.h"
drivers/net/ionic/ionic_rxtx.c +1 -1
index 5d0e9d5d5a..61ad396469 100644
@@ -31,7 +31,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_udp.h>
 #include <rte_tcp.h>
drivers/net/ipn3ke/ipn3ke_ethdev.c +1 -1
index 4446d2af9e..f8e751cb09 100644
@@ -11,7 +11,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_sched.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <rte_io.h>
 #include <rte_rawdev.h>
drivers/net/ipn3ke/ipn3ke_ethdev.h +2 -2
index a6815a9cca..ba3f8821e2 100644
@@ -15,8 +15,8 @@
 
 #include <rte_mbuf.h>
 #include <rte_flow_driver.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_bus_vdev.h>
drivers/net/ipn3ke/ipn3ke_flow.c +1 -1
index f857e64afb..c702e19ea5 100644
@@ -13,7 +13,7 @@
 #include <rte_io.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/ipn3ke/ipn3ke_representor.c +1 -1
index 9e15cce34f..856d21ef9b 100644
@@ -12,7 +12,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_sched.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_spinlock.h>
 
 #include <rte_io.h>
drivers/net/ipn3ke/ipn3ke_tm.c +1 -1
index 17ac026d38..6a9b98fd7f 100644
@@ -14,7 +14,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_sched.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <rte_io.h>
 #include <rte_rawdev.h>
drivers/net/ixgbe/ixgbe_bypass.c +1 -1
index ae38ce3559..67ced6c723 100644
@@ -4,7 +4,7 @@
 
 #include <time.h>
 #include <rte_atomic.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include "ixgbe_ethdev.h"
 #include "ixgbe_bypass_api.h"
 #include "rte_pmd_ixgbe.h"
drivers/net/ixgbe/ixgbe_ethdev.c +2 -2
index c8b9ec8c11..761a0f26bb 100644
@@ -27,8 +27,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/ixgbe/ixgbe_fdir.c +1 -1
index 11b9effeba..27a49bbce5 100644
@@ -13,7 +13,7 @@
 #include <rte_debug.h>
 #include <rte_pci.h>
 #include <rte_vxlan.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ixgbe_logs.h"
drivers/net/ixgbe/ixgbe_flow.c +1 -1
index 9aeb2e4a49..0b10e91a9b 100644
@@ -25,7 +25,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/ixgbe/ixgbe_ipsec.c +2 -2
index 62f2a5f764..e45c5501e6 100644
@@ -2,8 +2,8 @@
  * Copyright(c) 2010-2017 Intel Corporation
  */
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_ip.h>
 #include <rte_jhash.h>
 #include <rte_security_driver.h>
drivers/net/ixgbe/ixgbe_pf.c +1 -1
index 15982af8da..fbf2b17d16 100644
@@ -15,7 +15,7 @@
 #include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memcpy.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
drivers/net/ixgbe/ixgbe_rxtx.c +1 -1
index cc8f70e6dd..470cf12dec 100644
@@ -33,7 +33,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_security_driver.h>
 #include <rte_prefetch.h>
 #include <rte_udp.h>
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +1 -1
index a97c27189b..adba855ca3 100644
@@ -5,7 +5,7 @@
 #ifndef _IXGBE_RXTX_VEC_COMMON_H_
 #define _IXGBE_RXTX_VEC_COMMON_H_
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "ixgbe_ethdev.h"
 #include "ixgbe_rxtx.h"
drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c +1 -1
index a5a5b2167f..f83b800ad9 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_vect.h>
 
drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +1 -1
index 90c076825a..9bbffe6119 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ixgbe_ethdev.h"
drivers/net/ixgbe/ixgbe_vf_representor.c +1 -1
index 8185f0d3bb..d5b636a194 100644
@@ -6,7 +6,7 @@
 #include <rte_pci.h>
 #include <rte_malloc.h>
 
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "base/ixgbe_type.h"
 #include "base/ixgbe_vf.h"
 #include "ixgbe_ethdev.h"
drivers/net/ixgbe/rte_pmd_ixgbe.c +1 -1
index d2f708242c..cf089cd9ae 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2010-2017 Intel Corporation
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "base/ixgbe_api.h"
 #include "base/ixgbe_x550.h"
drivers/net/kni/rte_eth_kni.c +2 -2
index 1696787a9b..9ce74e549b 100644
@@ -7,8 +7,8 @@
 #include <unistd.h>
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_kni.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
drivers/net/liquidio/base/lio_23xx_vf.c +1 -1
index ddbc8c0e0c..c6b8310b71 100644
@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cycles.h>
 #include <rte_malloc.h>
 
drivers/net/liquidio/base/lio_mbox.c +1 -1
index 1129001515..2ac2b1b334 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cycles.h>
 
 #include "lio_logs.h"
drivers/net/liquidio/lio_ethdev.c +2 -2
index eb0fdab45a..0b189d5d15 100644
@@ -3,8 +3,8 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_cycles.h>
 #include <rte_malloc.h>
 #include <rte_alarm.h>
drivers/net/liquidio/lio_rxtx.c +1 -1
index 8d705bfe7f..a067b60e47 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cycles.h>
 #include <rte_malloc.h>
 
drivers/net/memif/memif_socket.c +2 -2
index c526f90778..5b373738e6 100644
@@ -13,8 +13,8 @@
 #include <rte_version.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
drivers/net/memif/rte_eth_memif.c +2 -2
index 8ed9aebab7..77c95bcb7a 100644
@@ -17,8 +17,8 @@
 #include <rte_version.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
drivers/net/memif/rte_eth_memif.h +1 -1
index 765a7e5998..24321d3a39 100644
@@ -11,7 +11,7 @@
 
 #include <sys/queue.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_interrupts.h>
 
drivers/net/mlx4/mlx4.c +2 -2
index d5d8c96351..27af426363 100644
@@ -33,8 +33,8 @@
 #include <rte_common.h>
 #include <rte_dev.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
 #include <rte_interrupts.h>
drivers/net/mlx4/mlx4.h +1 -1
index c6cb29493e..63df8fcf2b 100644
@@ -19,7 +19,7 @@
 #pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_interrupts.h>
 #include <rte_mempool.h>
drivers/net/mlx4/mlx4_ethdev.c +1 -1
index 9ff05c6738..783ff94dce 100644
@@ -34,7 +34,7 @@
 
 #include <rte_bus_pci.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
 #include <rte_pci.h>
drivers/net/mlx4/mlx4_flow.c +1 -1
index 2a86382db7..b8ecfa829b 100644
@@ -27,7 +27,7 @@
 
 #include <rte_byteorder.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
drivers/net/mlx4/mlx4_flow.h +1 -1
index 26465c66a4..e4366f28bb 100644
@@ -18,7 +18,7 @@
 #pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
 #include <rte_byteorder.h>
drivers/net/mlx4/mlx4_intr.c +1 -1
index 6786b12ab5..d56009c418 100644
@@ -23,7 +23,7 @@
 
 #include <rte_alarm.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_io.h>
 #include <rte_interrupts.h>
 
drivers/net/mlx4/mlx4_mp.c +1 -1
index eca0c20a8a..e05da89c0e 100644
@@ -7,7 +7,7 @@
 #include <time.h>
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 
 #include "mlx4.h"
drivers/net/mlx4/mlx4_rxq.c +1 -1
index 0699bdd5f2..978cbb8201 100644
@@ -26,7 +26,7 @@
 #include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
drivers/net/mlx4/mlx4_rxtx.h +1 -1
index 9de6c59411..7c72ce6d17 100644
@@ -19,7 +19,7 @@
 #pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
 
drivers/net/mlx4/mlx4_txq.c +1 -1
index 37b84413fb..8262071505 100644
@@ -27,7 +27,7 @@
 
 #include <rte_common.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
drivers/net/mlx5/linux/mlx5_ethdev_os.c +1 -1
index e36a78091c..0e8de9439e 100644
@@ -24,7 +24,7 @@
 #include <sys/un.h>
 #include <time.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_bus_pci.h>
 #include <rte_mbuf.h>
 #include <rte_common.h>
drivers/net/mlx5/linux/mlx5_mp_os.c +1 -1
index 08ade75799..60fdee22a1 100644
@@ -7,7 +7,7 @@
 #include <time.h>
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 
 #include <mlx5_common_mp.h>
drivers/net/mlx5/linux/mlx5_os.c +2 -2
index 9ac1d46b1b..7efa7c6cd2 100644
@@ -16,8 +16,8 @@
 #include <fcntl.h>
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_common.h>
drivers/net/mlx5/linux/mlx5_verbs.c +1 -1
index 318e39b1df..43ff85f9c4 100644
@@ -14,7 +14,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 
 #include <mlx5_glue.h>
drivers/net/mlx5/linux/mlx5_vlan_os.c +1 -1
index 40e895e080..005904bdfe 100644
@@ -14,7 +14,7 @@
  */
 #include <sys/types.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_hypervisor.h>
drivers/net/mlx5/mlx5.c +2 -2
index 3730f32295..50a6d2b19f 100644
@@ -11,8 +11,8 @@
 #include <errno.h>
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_common.h>
drivers/net/mlx5/mlx5.h +1 -1
index 101e9c20d0..4bbf628885 100644
@@ -15,7 +15,7 @@
 
 #include <rte_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_rwlock.h>
 #include <rte_interrupts.h>
 #include <rte_errno.h>
drivers/net/mlx5/mlx5_defs.h +1 -1
index 85a0979653..af29d93901 100644
@@ -6,7 +6,7 @@
 #ifndef RTE_PMD_MLX5_DEFS_H_
 #define RTE_PMD_MLX5_DEFS_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_vxlan.h>
 
 #include "mlx5_autoconf.h"
drivers/net/mlx5/mlx5_ethdev.c +1 -1
index 45ee7e4488..51b39ddde5 100644
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_bus_pci.h>
 #include <rte_mbuf.h>
 #include <rte_common.h>
drivers/net/mlx5/mlx5_flow.c +1 -1
index 2ca6148c1d..6716a20141 100644
@@ -12,7 +12,7 @@
 
 #include <rte_common.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_eal_paging.h>
 #include <rte_flow.h>
 #include <rte_cycles.h>
drivers/net/mlx5/mlx5_flow_dv.c +1 -1
index c1ddff7364..707d6749e2 100644
@@ -10,7 +10,7 @@
 
 #include <rte_common.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
 #include <rte_malloc.h>
drivers/net/mlx5/mlx5_flow_verbs.c +1 -1
index 2d4381946d..9347490967 100644
@@ -10,7 +10,7 @@
 
 #include <rte_common.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
 #include <rte_malloc.h>
drivers/net/mlx5/mlx5_mac.c +1 -1
index bd786fd638..6ffcfcd97a 100644
@@ -11,7 +11,7 @@
 #include <netinet/in.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 
 #include "mlx5_defs.h"
drivers/net/mlx5/mlx5_rss.c +1 -1
index 845cebe2e8..dc0131af3a 100644
@@ -9,7 +9,7 @@
 #include <string.h>
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <mlx5_malloc.h>
 
drivers/net/mlx5/mlx5_rxmode.c +1 -1
index 7613ff770d..cf93ccac86 100644
@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <mlx5_glue.h>
 #include "mlx5.h"
drivers/net/mlx5/mlx5_rxq.c +1 -1
index 787b2b74dd..92e3a792e1 100644
@@ -12,7 +12,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
 #include <rte_debug.h>
drivers/net/mlx5/mlx5_stats.c +1 -1
index 82d4d4a745..a6569b250a 100644
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 
drivers/net/mlx5/mlx5_trigger.c +1 -1
index 48210bf0b2..94dd56709e 100644
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_cycles.h>
drivers/net/mlx5/mlx5_txpp.c +1 -1
index b38482d4e9..696282ca31 100644
@@ -5,7 +5,7 @@
 #include <stdint.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_malloc.h>
drivers/net/mlx5/mlx5_txq.c +1 -1
index b81bb4a12d..5142e50858 100644
@@ -12,7 +12,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_eal_paging.h>
 
drivers/net/mlx5/mlx5_vlan.c +1 -1
index dbb9d362f3..64678d3f51 100644
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_hypervisor.h>
drivers/net/mlx5/windows/mlx5_ethdev_os.c +1 -1
index 076c688699..8609d38eca 100644
@@ -5,7 +5,7 @@
 
 #include <rte_errno.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_interrupts.h>
 
 #include <mlx5_glue.h>
drivers/net/mlx5/windows/mlx5_mp_os.c +1 -1
index db793b1f7d..8313c29ffb 100644
@@ -6,7 +6,7 @@
 #include <time.h>
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 
 #include <mlx5_common_mp.h>
drivers/net/mlx5/windows/mlx5_os.c +1 -1
index b036432937..e37cc65c17 100644
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 
 #include <rte_windows.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include <mlx5_glue.h>
 #include <mlx5_devx_cmds.h>
drivers/net/mlx5/windows/mlx5_vlan_os.c +1 -1
index d3b11e0001..3917c822e4 100644
@@ -13,7 +13,7 @@
  */
 #include <sys/types.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 
 #include <mlx5.h>
drivers/net/mvneta/mvneta_ethdev.c +1 -1
index 2cd73919ce..b0940b4462 100644
@@ -5,7 +5,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
 
drivers/net/mvpp2/mrvl_ethdev.c +1 -1
index f25cf9e46d..1d67f2abf1 100644
@@ -5,7 +5,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_kvargs.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
drivers/net/netvsc/hn_ethdev.c +1 -1
index 5a401b4b06..04904b1514 100644
@@ -24,7 +24,7 @@
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cycles.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
drivers/net/netvsc/hn_rndis.c +1 -1
index 1ce260c89b..e317539de7 100644
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
 #include <rte_memzone.h>
drivers/net/netvsc/hn_vf.c +1 -1
index 86392917c5..2dc7abe354 100644
@@ -16,7 +16,7 @@
 
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_lcore.h>
 #include <rte_memory.h>
 #include <rte_bus_vmbus.h>
drivers/net/nfb/nfb_ethdev.c +1 -1
index c55bcdf1ef..7e91d59847 100644
@@ -9,7 +9,7 @@
 #include <netcope/rxmac.h>
 #include <netcope/txmac.h>
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_kvargs.h>
 
 #include "nfb_stats.h"
drivers/net/nfb/nfb_tx.h +1 -1
index b6578cc38a..28daeae0b8 100644
@@ -10,7 +10,7 @@
 #include <nfb/nfb.h>
 #include <nfb/ndp.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ethdev.h>
 #include <rte_malloc.h>
 
drivers/net/nfp/nfp_net.c +2 -2
index 9ea24e5bda..9927c9c44b 100644
@@ -17,8 +17,8 @@
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_debug.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_dev.h>
 #include <rte_ether.h>
 #include <rte_malloc.h>
drivers/net/nfp/nfpcore/nfp_cpp.h +1 -1
index 1427954c17..78f7b8ca2f 100644
@@ -6,7 +6,7 @@
 #ifndef __NFP_CPP_H__
 #define __NFP_CPP_H__
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "nfp-common/nfp_platform.h"
 #include "nfp-common/nfp_resid.h"
drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +1 -1
index 36725d69ab..bad80a5a1c 100644
@@ -33,7 +33,7 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_string_fns.h>
 
 #include "nfp_cpp.h"
drivers/net/nfp/nfpcore/nfp_cppcore.c +1 -1
index dec4a8b6d1..848c452eab 100644
@@ -12,7 +12,7 @@
 #include <sys/types.h>
 
 #include <rte_byteorder.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "nfp_cpp.h"
 #include "nfp_target.h"
drivers/net/null/rte_eth_null.c +2 -2
index 49ee8da8e4..32764e8f0e 100644
@@ -4,8 +4,8 @@
  */
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_bus_vdev.h>
drivers/net/octeontx/octeontx_ethdev.h +1 -1
index 780a094ffa..b73515de37 100644
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 
 #include <rte_common.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_eventdev.h>
 #include <rte_mempool.h>
 #include <rte_memory.h>
drivers/net/octeontx/octeontx_rxtx.c +1 -1
index bbe43a874b..61865ef0bc 100644
@@ -9,7 +9,7 @@
 
 #include <rte_atomic.h>
 #include <rte_common.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_log.h>
 #include <rte_mbuf.h>
drivers/net/octeontx/octeontx_rxtx.h +1 -1
index 7c24d8b4fd..2ed28ea563 100644
@@ -5,7 +5,7 @@
 #ifndef	__OCTEONTX_RXTX_H__
 #define	__OCTEONTX_RXTX_H__
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #define OFFLOAD_FLAGS					\
 	uint16_t rx_offload_flags;			\
drivers/net/octeontx2/otx2_ethdev.c +1 -1
index 9bfe95d6b1..e9fbbca4da 100644
@@ -4,7 +4,7 @@
 
 #include <inttypes.h>
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_io.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
drivers/net/octeontx2/otx2_link.c +1 -1
index 439ec4fa89..a79b997376 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_common.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "otx2_ethdev.h"
 
drivers/net/octeontx2/otx2_ptp.c +1 -1
index b8ef4c181d..91e5c0f6bd 100644
@@ -2,7 +2,7 @@
  * Copyright(C) 2019 Marvell International Ltd.
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "otx2_ethdev.h"
 
drivers/net/pcap/rte_eth_pcap.c +2 -2
index a32b1f3f37..ff02ade70d 100644
@@ -19,8 +19,8 @@
 #include <pcap.h>
 
 #include <rte_cycles.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
drivers/net/pfe/pfe_eth.h +1 -1
index 9820d7bf47..fbc11b4ffb 100644
@@ -7,7 +7,7 @@
 
 #include <compat.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_vdev.h>
 
 #define ETH_ALEN 6
 #define GEMAC_NO_PHY            BIT(0)
drivers/net/pfe/pfe_ethdev.c +1 -1
index 3b079693fb..8cf59e210d 100644
@@ -5,7 +5,7 @@
 #include <sys/ioctl.h>
 #include <sys/epoll.h>
 #include <rte_kvargs.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_vdev.h>
 #include <rte_bus_vdev.h>
 #include <rte_ether.h>
 #include <dpaa_of.h>
drivers/net/qede/qede_ethdev.h +2 -2
index 61a65ac42e..da4b87f5e2 100644
@@ -11,8 +11,8 @@
 #include <sys/queue.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_dev.h>
 #include <rte_ip.h>
 
drivers/net/ring/rte_eth_ring.c +1 -1
index 41402a5159..472d838582 100644
@@ -4,7 +4,7 @@
 
 #include "rte_eth_ring.h"
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/sfc/sfc.h +1 -1
index ed059e142f..fdee800482 100644
@@ -14,7 +14,7 @@
 
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_kvargs.h>
 #include <rte_spinlock.h>
 #include <rte_atomic.h>
drivers/net/sfc/sfc_dp_rx.h +1 -1
index f3e00e2e38..f20154b568 100644
@@ -11,7 +11,7 @@
 #define _SFC_DP_RX_H
 
 #include <rte_mempool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "sfc_dp.h"
 
drivers/net/sfc/sfc_dp_tx.h +1 -1
index 3ecdfcdd28..b4af68984a 100644
@@ -10,7 +10,7 @@
 #ifndef _SFC_DP_TX_H
 #define _SFC_DP_TX_H
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "sfc_dp.h"
 #include "sfc_debug.h"
drivers/net/sfc/sfc_ethdev.c +2 -2
index f2f5336435..d6f6a84eab 100644
@@ -8,8 +8,8 @@
  */
 
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_errno.h>
drivers/net/sfc/sfc_ev.h +1 -1
index 3c7e5580e2..03bfb14b5c 100644
@@ -10,7 +10,7 @@
 #ifndef _SFC_EV_H_
 #define _SFC_EV_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "efx.h"
 
drivers/net/sfc/sfc_flow.c +1 -1
index 4321045d1a..ab1d2cc595 100644
@@ -10,7 +10,7 @@
 #include <rte_byteorder.h>
 #include <rte_tailq.h>
 #include <rte_common.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
drivers/net/sfc/sfc_rx.h +1 -1
index d6ee9cf802..0d64b9c8bb 100644
@@ -12,7 +12,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "efx.h"
 
drivers/net/sfc/sfc_tx.h +1 -1
index d583ee9c3d..3367bade37 100644
@@ -11,7 +11,7 @@
 #define _SFC_TX_H
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "efx.h"
 
drivers/net/softnic/rte_eth_softnic.c +2 -2
index 3387ab485f..99d8468c94 100644
@@ -6,8 +6,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_bus_vdev.h>
 #include <rte_kvargs.h>
drivers/net/softnic/rte_eth_softnic_internals.h +1 -1
index 9c8737c9e2..faf90a5a8c 100644
@@ -19,7 +19,7 @@
 #include <rte_pipeline.h>
 
 #include <rte_ethdev_core.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_tm_driver.h>
 #include <rte_flow_driver.h>
 #include <rte_mtr_driver.h>
drivers/net/szedata2/rte_eth_szedata2.c +2 -2
index 7874c4f4f8..6eaeadf1c8 100644
@@ -15,8 +15,8 @@
 #include <libsze2.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_kvargs.h>
drivers/net/tap/rte_eth_tap.c +2 -2
index 2542de3065..c36d4bf76e 100644
@@ -7,8 +7,8 @@
 #include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_bus_vdev.h>
 #include <rte_kvargs.h>
drivers/net/tap/rte_eth_tap.h +1 -1
index ba45de8409..a98ea11a33 100644
@@ -13,7 +13,7 @@
 
 #include <linux/if_tun.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_gso.h>
 #include "tap_log.h"
drivers/net/thunderx/nicvf_ethdev.c +2 -2
index c2e7c334d4..c45d6e00a9 100644
@@ -23,8 +23,8 @@
 #include <rte_dev.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_interrupts.h>
 #include <rte_log.h>
 #include <rte_memory.h>
drivers/net/thunderx/nicvf_ethdev.h +1 -1
index 3914117997..b8dd905d0b 100644
@@ -5,7 +5,7 @@
 #ifndef __THUNDERX_NICVF_ETHDEV_H__
 #define __THUNDERX_NICVF_ETHDEV_H__
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #define THUNDERX_NICVF_PMD_VERSION      "2.0"
 #define THUNDERX_REG_BYTES		8
drivers/net/thunderx/nicvf_rxtx.c +1 -1
index d0ea95f1d1..91e09ff8d5 100644
@@ -13,7 +13,7 @@
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_log.h>
 #include <rte_mbuf.h>
drivers/net/thunderx/nicvf_rxtx.h +1 -1
index 1f274b2954..d6ed660b4e 100644
@@ -6,7 +6,7 @@
 #define __THUNDERX_NICVF_RXTX_H__
 
 #include <rte_byteorder.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #define NICVF_RX_OFFLOAD_NONE           0x1
 #define NICVF_RX_OFFLOAD_CKSUM          0x2
drivers/net/thunderx/nicvf_struct.h +1 -1
index cf1c281a06..0ca207d0dd 100644
@@ -11,7 +11,7 @@
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_interrupts.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memory.h>
 
 struct nicvf_rbdr {
drivers/net/txgbe/txgbe_ethdev.c +1 -1
index eef4b6d4a5..23f9d17091 100644
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <rte_common.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include <rte_interrupts.h>
 #include <rte_log.h>
drivers/net/txgbe/txgbe_ipsec.c +1 -1
index daa523b204..9f4eee4081 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2015-2020
  */
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_security_driver.h>
 #include <rte_cryptodev.h>
 
drivers/net/txgbe/txgbe_pf.c +1 -1
index 151f2c7a45..e4bd990b96 100644
@@ -15,7 +15,7 @@
 #include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memcpy.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
drivers/net/txgbe/txgbe_rxtx.c +1 -1
index 3ad92248c6..ac09e75a3e 100644
@@ -19,7 +19,7 @@
 #include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_security_driver.h>
 #include <rte_memzone.h>
 #include <rte_atomic.h>
drivers/net/vhost/rte_eth_vhost.c +2 -2
index 5845bb15f3..d198fc8a8e 100644
@@ -8,8 +8,8 @@
 #include <sys/epoll.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_bus_vdev.h>
drivers/net/virtio/virtio_ethdev.c +2 -2
index 92a3d4efa5..edcd6203d9 100644
@@ -8,8 +8,8 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
 #include <rte_memzone.h>
drivers/net/virtio/virtio_pci.h +1 -1
index ab61e911b8..0382dc5b2c 100644
@@ -10,7 +10,7 @@
 
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 struct virtqueue;
 struct virtnet_ctl;
drivers/net/virtio/virtio_rxtx.c +1 -1
index 622d4bf201..fb7382eff7 100644
@@ -15,7 +15,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_string_fns.h>
 #include <rte_errno.h>
drivers/net/virtio/virtio_rxtx_simple.c +1 -1
index a26182bb46..f248869a8f 100644
@@ -15,7 +15,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_string_fns.h>
 #include <rte_errno.h>
drivers/net/virtio/virtio_rxtx_simple_altivec.c +1 -1
index a260ebdf57..f09a1eda49 100644
@@ -14,7 +14,7 @@
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
drivers/net/virtio/virtio_rxtx_simple_neon.c +1 -1
index 12e034dc0a..2cba800807 100644
@@ -12,7 +12,7 @@
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
drivers/net/virtio/virtio_rxtx_simple_sse.c +1 -1
index 1056e9c20b..85a5a6664a 100644
@@ -14,7 +14,7 @@
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
drivers/net/virtio/virtio_user_ethdev.c +1 -1
index 241808cd8f..308275b70e 100644
@@ -13,7 +13,7 @@
 
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_vdev.h>
 #include <rte_bus_vdev.h>
 #include <rte_alarm.h>
 #include <rte_cycles.h>
drivers/net/vmxnet3/vmxnet3_ethdev.c +2 -2
index 23a2ebbefa..ecdecc427c 100644
@@ -26,8 +26,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_string_fns.h>
 #include <rte_malloc.h>
 #include <rte_dev.h>
drivers/net/vmxnet3/vmxnet3_rxtx.c +1 -1
index 95c697f8e3..5cf53d4de8 100644
@@ -32,7 +32,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_ip.h>
 #include <rte_udp.h>
lib/librte_ethdev/ethdev_driver.h renamed from lib/librte_ethdev/rte_ethdev_driver.h +0 -0
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_driver.h
rename to lib/librte_ethdev/ethdev_driver.h
lib/librte_ethdev/ethdev_pci.h renamed from lib/librte_ethdev/rte_ethdev_pci.h +1 -1
similarity index 99%
rename from lib/librte_ethdev/rte_ethdev_pci.h
rename to lib/librte_ethdev/ethdev_pci.h
index bf715896ae..8edca82ce8 100644
@@ -10,7 +10,7 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_config.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 /**
  * Copy pci device info to the Ethernet device data.
lib/librte_ethdev/ethdev_private.c +1 -1
index 162a502fe7..5960c75cc5 100644
@@ -3,7 +3,7 @@
  */
 
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "ethdev_private.h"
 
 uint16_t
lib/librte_ethdev/ethdev_vdev.h renamed from lib/librte_ethdev/rte_ethdev_vdev.h +1 -1
similarity index 97%
rename from lib/librte_ethdev/rte_ethdev_vdev.h
rename to lib/librte_ethdev/ethdev_vdev.h
index 4ba3f28964..46c75d9e5f 100644
@@ -9,7 +9,7 @@
 #include <rte_config.h>
 #include <rte_malloc.h>
 #include <rte_bus_vdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 /**
  * @internal
lib/librte_ethdev/meson.build +0 -3
index e4b610246f..829abd456b 100644
@@ -11,12 +11,9 @@ sources = files('ethdev_private.c',
 	'rte_tm.c')
 
 headers = files('rte_ethdev.h',
-	'rte_ethdev_driver.h',
 	'rte_ethdev_core.h',
-	'rte_ethdev_pci.h',
 	'rte_ethdev_trace.h',
 	'rte_ethdev_trace_fp.h',
-	'rte_ethdev_vdev.h',
 	'rte_eth_ctrl.h',
 	'rte_dev_info.h',
 	'rte_flow.h',
lib/librte_ethdev/rte_class_eth.c +1 -1
index 6338355e25..ca2ce87f7a 100644
@@ -12,7 +12,7 @@
 
 #include "rte_ethdev.h"
 #include "rte_ethdev_core.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "ethdev_private.h"
 
 enum eth_params {
lib/librte_ethdev/rte_ethdev.c +1 -1
index daf5f24f7e..f40df65e34 100644
@@ -41,7 +41,7 @@
 
 #include "rte_ethdev_trace.h"
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "ethdev_profile.h"
 #include "ethdev_private.h"
 
lib/librte_ethdev/rte_ethdev.h +1 -1
index eb299955d4..89b8ba2fc4 100644
@@ -20,7 +20,7 @@
  * - The driver-oriented Ethernet API that exports functions allowing
  *   an Ethernet Poll Mode Driver (PMD) to allocate an Ethernet device instance,
  *   create memzone for HW rings and process registered callbacks, and so on.
- *   PMDs should include rte_ethdev_driver.h instead of this header.
+ *   PMDs should include ethdev_driver.h instead of this header.
  *
  * By default, all the functions of the Ethernet Device API exported by a PMD
  * are lock-free functions which assume to not be invoked in parallel on
lib/librte_ethdev/rte_flow_driver.h +1 -1
index f3d72827cc..dabd819d10 100644
@@ -18,7 +18,7 @@
 #include <stdint.h>
 
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "rte_flow.h"
 
 #ifdef __cplusplus
lib/librte_ethdev/rte_mtr_driver.h +1 -1
index 3b39532935..a0ddc2b5f4 100644
@@ -18,7 +18,7 @@
 
 #include <rte_errno.h>
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "rte_mtr.h"
 
 #ifdef __cplusplus
lib/librte_ethdev/rte_tm_driver.h +1 -1
index b86ed89c00..45290fb3fd 100644
@@ -18,7 +18,7 @@
 
 #include <rte_errno.h>
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "rte_tm.h"
 
 #ifdef __cplusplus
Signature · 1 line
2.27.0
Reviewed-by on v6 4/8
#124 lore raw

Re: [dpdk-dev] [PATCH v6 4/8] ethdev: make driver-only headers private

Hi Bruce,

Quoted 8 lines · Bruce Richardson
|drivers/net/vhost/rte_eth_vhost.c | 4 ++--
drivers/net/virtio/virtio_ethdev.c | 4 ++--
drivers/net/virtio/virtio_pci.h | 2 +- drivers/net/virtio/virtio_rxtx.c
| 2 +- drivers/net/virtio/virtio_rxtx_simple.c | 2 +-
drivers/net/virtio/virtio_rxtx_simple_altivec.c | 2 +-
drivers/net/virtio/virtio_rxtx_simple_neon.c | 2 +-
drivers/net/virtio/virtio_rxtx_simple_sse.c | 2 +-
drivers/net/virtio/virtio_user_ethdev.c | 2 +-|

Both the Virtio & Vhost looks good to me:

Note that you'll need to rebase, as my Virtio rework series just got merged by Ferruh on net-next main branch, and it conflict a bit. There are new files created, so you may want to look carefully!

Thanks,
Maxime

Acked-by on v6 4/8
#125 lore raw

Re: [dpdk-dev] [PATCH v6 4/8] ethdev: make driver-only headers private

In reply to Bruce Richardson

27/01/2021 18:33, Bruce Richardson:

Quoted 4 lines

The rte_ethdev_driver.h, rte_ethdev_vdev.h and rte_ethdev_pci.h files are for drivers only and should be a private to DPDK and not installed.

Such change was not possible (or very difficult) with make because standard cross component includes were looking up only in installed headers.

We probably have other cases of unneeded installed headers or wrongly prefixed headers.

#126 lore raw

Re: [dpdk-dev] [PATCH v6 4/8] ethdev: make driver-only headers private

In reply to Bruce Richardson
Quoted 5 lines · Bruce Richardson
doc/guides/rel_notes/release_21_02.rst +0 -0
index ae36b6a3fa..33bac4fff8 100644

doc/guides/rel_notes/release_21_02.rst Removed Items · line 149

Quoted 10 lines
doc/guides/rel_notes/release_21_02.rst +7 -0
@@ -140,6 +140,13 @@ Removed Items
   PCI device IDs ``0x16c8, 0x16c9, 0x16ca, 0x16ce, 0x16cf, 0x16df, 0x16d0,``
   ``0x16d1, 0x16d2, 0x16d4, 0x16d5, 0x16e7, 0x16e8, 0x16e9`` has been removed.
 
+* The internal header files ``rte_ethdev_driver.h``, ``rte_ethdev_vdev.h`` and
+  ``rte_ethdev_pci.h`` are no longer installed as part of the DPDK ``ninja
+  install`` action and are renamed to ``ethdev_driver.h``, ``ethdev_vdev.h`` and
+  ``ethdev_pci.h`` respectively in the source tree, to reflect the fact that
+  they are non-public headers.
+
+

Updates on libs come before drivers updates.
So this note on ethdev goes before the note on bnxt devices above. The same comment applies in following patches.

Signature · 1 line
David Marchand
Acked-by on v6 4/8
#127 lore raw

Re: [dpdk-dev] [PATCH v6 4/8] ethdev: make driver-only headers private

In reply to Bruce Richardson
Quoted 18 lines

-----Original Message-----
From: Bruce Richardson <[email protected]>
Sent: Wednesday, January 27, 2021 12:33 PM
Subject: [PATCH v6 4/8] ethdev: make driver-only headers private

[Please note: This e-mail is from an EXTERNAL e-mail address]

The rte_ethdev_driver.h, rte_ethdev_vdev.h and rte_ethdev_pci.h files are for drivers only and should be a private to DPDK and not installed.

---
 drivers/net/avp/avp_ethdev.c                               | 4 ++--
drivers/net/avp/avp_ethdev.c +0 -0
index f531e03c02..566a3606a2 100644

drivers/net/avp/avp_ethdev.c line 15

Quoted 10 lines
drivers/net/avp/avp_ethdev.c +2 -2
@@ -8,8 +8,8 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
 #include <rte_malloc.h>
#128 lore raw

PATCH v6 5/8 build: separate out headers for include checking

In reply to Bruce Richardson

For some libraries, there may be some header files which are not for direct inclusion, but rather are to be included via other header files. To allow later checking of these files for missing includes, we separate out the indirect include files from the direct ones.

---
 doc/guides/contributing/coding_style.rst | 12 ++++++++++++
 lib/librte_eal/include/meson.build       |  2 +-
 lib/librte_eal/x86/include/meson.build   | 14 +++++++++-----
 lib/librte_ethdev/meson.build            |  5 +++--
 lib/librte_hash/meson.build              |  4 ++--
 lib/librte_ipsec/meson.build             |  3 ++-
 lib/librte_lpm/meson.build               |  2 +-
 lib/librte_regexdev/meson.build          |  2 +-
 lib/librte_ring/meson.build              |  4 +++-
 lib/librte_stack/meson.build             |  4 +++-
 lib/librte_table/meson.build             |  7 +++----
 lib/meson.build                          |  3 +++
 meson.build                              |  1 +
 meson_options.txt                        |  2 ++
 14 files changed, 46 insertions(+), 19 deletions(-)
doc/guides/contributing/coding_style.rst +12 -0
index bb3f3efcbc..dba4145228 100644
@@ -891,6 +891,18 @@ headers
 	installed to $PREFIX/include when ``ninja install`` is run. As with
 	source files, these should be specified using the meson ``files()``
 	function.
+	When ``check_includes`` build option is set to ``true``, each header file
+	has additional checks performed on it, for example to ensure that it is
+	not missing any include statements for dependent headers.
+	For header files which are public, but only included indirectly in
+	applications, these checks can be skipped by using the ``headers_no_chkincs``
+	variable rather than ``headers``.
+
+headers_no_chkincs
+	**Default Value = []**.
+	As with ``headers`` option above, except that the files are not checked
+	for all needed include files as part of a DPDK build when
+	``check_includes`` is set to ``true``.
 
 includes:
 	**Default Value = []**.
lib/librte_eal/include/meson.build +1 -1
index 0dea342e1d..449740e510 100644
@@ -16,7 +16,6 @@ headers += files(
 	'rte_dev.h',
 	'rte_devargs.h',
 	'rte_eal.h',
-	'rte_eal_interrupts.h',
 	'rte_eal_memconfig.h',
 	'rte_eal_trace.h',
 	'rte_errno.h',
@@ -49,6 +48,7 @@ headers += files(
 	'rte_version.h',
 	'rte_vfio.h',
 )
+headers_no_chkincs += files('rte_eal_interrupts.h')
 
 # special case install the generic headers, since they go in a subdir
 generic_headers = files(
lib/librte_eal/x86/include/meson.build +9 -5
index 549cc21a42..835ea22947 100644
@@ -2,11 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 arch_headers = files(
-	'rte_atomic_32.h',
-	'rte_atomic_64.h',
 	'rte_atomic.h',
-	'rte_byteorder_32.h',
-	'rte_byteorder_64.h',
 	'rte_byteorder.h',
 	'rte_cpuflags.h',
 	'rte_cycles.h',
@@ -22,4 +18,12 @@ arch_headers = files(
 	'rte_ticketlock.h',
 	'rte_vect.h',
 )
-install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
+arch_headers_no_chkincs = files(
+	'rte_atomic_32.h',
+	'rte_atomic_64.h',
+	'rte_byteorder_32.h',
+	'rte_byteorder_64.h',
+)
+install_headers(arch_headers + arch_headers_no_chkincs,
+		subdir: get_option('include_subdir_arch'))
+dpdk_chkinc_headers += arch_headers
lib/librte_ethdev/meson.build +3 -2
index 829abd456b..b7da959dd1 100644
@@ -11,10 +11,8 @@ sources = files('ethdev_private.c',
 	'rte_tm.c')
 
 headers = files('rte_ethdev.h',
-	'rte_ethdev_core.h',
 	'rte_ethdev_trace.h',
 	'rte_ethdev_trace_fp.h',
-	'rte_eth_ctrl.h',
 	'rte_dev_info.h',
 	'rte_flow.h',
 	'rte_flow_driver.h',
@@ -22,5 +20,8 @@ headers = files('rte_ethdev.h',
 	'rte_mtr_driver.h',
 	'rte_tm.h',
 	'rte_tm_driver.h')
+headers_no_chkincs += files(
+	'rte_ethdev_core.h',
+	'rte_eth_ctrl.h')
 
 deps += ['net', 'kvargs', 'meter', 'telemetry']
lib/librte_hash/meson.build +2 -2
index 0977a63fd2..b3ebc8b078 100644
@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-headers = files('rte_crc_arm64.h',
-	'rte_fbk_hash.h',
+headers = files('rte_fbk_hash.h',
 	'rte_hash_crc.h',
 	'rte_hash.h',
 	'rte_jhash.h',
 	'rte_thash.h')
+headers_no_chkincs += files('rte_crc_arm64.h')
 
 sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c')
 deps += ['ring']
lib/librte_ipsec/meson.build +2 -1
index fc69970ec5..e24e6ed22b 100644
@@ -3,6 +3,7 @@
 
 sources = files('esp_inb.c', 'esp_outb.c', 'sa.c', 'ses.c', 'ipsec_sad.c')
 
-headers = files('rte_ipsec.h', 'rte_ipsec_group.h', 'rte_ipsec_sa.h', 'rte_ipsec_sad.h')
+headers = files('rte_ipsec.h', 'rte_ipsec_sa.h', 'rte_ipsec_sad.h')
+headers_no_chkincs += files('rte_ipsec_group.h')
 
 deps += ['mbuf', 'net', 'cryptodev', 'security', 'hash']
lib/librte_lpm/meson.build +1 -1
index f93c866409..3d3d515a4d 100644
@@ -5,6 +5,6 @@ sources = files('rte_lpm.c', 'rte_lpm6.c')
 headers = files('rte_lpm.h', 'rte_lpm6.h')
 # since header files have different names, we can install all vector headers
 # without worrying about which architecture we actually need
-headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h', 'rte_lpm_sve.h')
+headers_no_chkincs += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h', 'rte_lpm_sve.h')
 deps += ['hash']
 deps += ['rcu']
lib/librte_regexdev/meson.build +1 -1
index c417b9caf0..1ab21bd4d8 100644
@@ -3,6 +3,6 @@
 
 sources = files('rte_regexdev.c')
 headers = files('rte_regexdev.h',
-	'rte_regexdev_core.h',
 	'rte_regexdev_driver.h')
+headers_no_chkincs += files('rte_regexdev_core.h')
 deps += ['mbuf']
lib/librte_ring/meson.build +3 -1
index 36fdcb6a57..1a95dae9e5 100644
@@ -2,7 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('rte_ring.c')
-headers = files('rte_ring.h',
+headers = files('rte_ring.h')
+# most sub-headers are not for direct inclusion
+headers_no_chkincs += files (
 		'rte_ring_core.h',
 		'rte_ring_elem.h',
 		'rte_ring_c11_mem.h',
lib/librte_stack/meson.build +3 -1
index 8f82a40ec2..5d9b3601b3 100644
@@ -2,7 +2,9 @@
 # Copyright(c) 2019 Intel Corporation
 
 sources = files('rte_stack.c', 'rte_stack_std.c', 'rte_stack_lf.c')
-headers = files('rte_stack.h',
+headers = files('rte_stack.h')
+# subheaders, not for direct inclusion by apps
+headers_no_chkincs += files(
 		'rte_stack_std.h',
 		'rte_stack_lf.h',
 		'rte_stack_lf_generic.h',
lib/librte_table/meson.build +3 -4
index d69678386e..a8b1c9a254 100644
@@ -20,7 +20,6 @@ headers = files('rte_table.h',
 		'rte_table_hash.h',
 		'rte_table_hash_cuckoo.h',
 		'rte_table_hash_func.h',
-		'rte_table_hash_func_arm64.h',
 		'rte_lru.h',
 		'rte_table_array.h',
 		'rte_table_stub.h',
@@ -28,6 +27,6 @@ headers = files('rte_table.h',
 		'rte_swx_table_em.h',)
 deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
 
-if arch_subdir == 'x86'
-	headers += files('rte_lru_x86.h')
-endif
+headers_no_chkincs += files('rte_lru_x86.h',
+		'rte_lru_arm64.h',
+		'rte_table_hash_func_arm64.h')
lib/meson.build +3 -0
index 44f0a62142..aa0a5ac8fc 100644
@@ -66,6 +66,7 @@ foreach l:libraries
 	use_function_versioning = false
 	sources = []
 	headers = []
+	headers_no_chkincs = [] # public headers not directly included by apps
 	includes = []
 	cflags = default_cflags
 	objs = [] # other object files to link against, used e.g. for
@@ -103,6 +104,8 @@ foreach l:libraries
 		enabled_libs += name
 		dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
 		install_headers(headers)
+		install_headers(headers_no_chkincs)
+		dpdk_chkinc_headers += headers
 
 		libname = 'rte_' + name
 		includes += include_directories(dir_name)
meson.build +1 -0
index 2b9c37eb42..e6e34d0a98 100644
@@ -16,6 +16,7 @@ cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
 dpdk_static_libraries = []
+dpdk_chkinc_headers = []
 dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
meson_options.txt +2 -0
index 4604328224..5c382487da 100644
@@ -1,5 +1,7 @@
 # Please keep these options sorted alphabetically.
 
+option('check_includes', type: 'boolean', value: false,
+	description: 'build "chkincs" to verify each header file can compile alone')
 option('disable_drivers', type: 'string', value: '',
 	description: 'Comma-separated list of drivers to explicitly disable.')
 option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
Signature · 1 line
2.27.0
#129 lore raw

Re: [dpdk-dev] [PATCH v6 5/8] build: separate out headers for include checking

27/01/2021 18:33, Bruce Richardson:

Quoted 6 lines

For some libraries, there may be some header files which are not for direct inclusion, but rather are to be included via other header files. To allow later checking of these files for missing includes, we separate out the indirect include files from the direct ones.

[...]

doc/guides/contributing/coding_style.rst headers · line 905

Quoted 12 lines
doc/guides/contributing/coding_style.rst +12 -0
+	When ``check_includes`` build option is set to ``true``, each header file
+	has additional checks performed on it, for example to ensure that it is
+	not missing any include statements for dependent headers.
+	For header files which are public, but only included indirectly in
+	applications, these checks can be skipped by using the ``headers_no_chkincs``
+	variable rather than ``headers``.
+
+headers_no_chkincs
+	**Default Value = []**.
+	As with ``headers`` option above, except that the files are not checked
+	for all needed include files as part of a DPDK build when
+	``check_includes`` is set to ``true``.

If all such headers are included directly, I would prefer naming this group "indirect_headers" because maybe we will want to do other kind of processing on indirect headers.

[...]

meson_options.txt line 4

Quoted 7 lines
meson_options.txt +2 -0
@@ -1,5 +1,7 @@
 # Please keep these options sorted alphabetically.
 
+option('check_includes', type: 'boolean', value: false,
+	description: 'build "chkincs" to verify each header file can compile alone')

This should in the patch introducing the check?

#130 lore raw

Re: [dpdk-dev] [PATCH v6 5/8] build: separate out headers for include checking

Quoted 9 lines · Thomas Monjalon

27/01/2021 18:33, Bruce Richardson:

Quoted 6 lines

For some libraries, there may be some header files which are not for direct inclusion, but rather are to be included via other header files. To allow later checking of these files for missing includes, we separate out the indirect include files from the direct ones.

[...]

Quoted 17 lines

doc/guides/contributing/coding_style.rst headers · line 905

Quoted 12 lines
doc/guides/contributing/coding_style.rst +12 -0
+	When ``check_includes`` build option is set to ``true``, each header file
+	has additional checks performed on it, for example to ensure that it is
+	not missing any include statements for dependent headers.
+	For header files which are public, but only included indirectly in
+	applications, these checks can be skipped by using the ``headers_no_chkincs``
+	variable rather than ``headers``.
+
+headers_no_chkincs
+	**Default Value = []**.
+	As with ``headers`` option above, except that the files are not checked
+	for all needed include files as part of a DPDK build when
+	``check_includes`` is set to ``true``.

If all such headers are included directly, I would prefer naming this group "indirect_headers" because maybe we will want to do other kind of processing on indirect headers.

Sure. The current naming was chosen so that a grep of the code for on receiving errors about "chkincs" would show this up, but I think your suggestion is better.

Quoted 11 lines

[...]

meson_options.txt line 4

Quoted 7 lines
meson_options.txt +2 -0
@@ -1,5 +1,7 @@
 # Please keep these options sorted alphabetically.
 
+option('check_includes', type: 'boolean', value: false,
+	description: 'build "chkincs" to verify each header file can compile alone')

This should in the patch introducing the check?

It was originally, but then we hit an issue with wanting/needing to refer to this option in the documentation about splitting the header file lists. Therefore, I decided to add the option in this patch. Alternatively, this patch and the next can be merged into one.

#131 lore raw

PATCH v6 6/8 buildtools/chkincs: add app to verify header includes

In reply to Bruce Richardson

To verify that all DPDK headers are ok for inclusion directly in a C file, and are not missing any other pre-requisite headers, we can auto-generate for each header an empty C file that includes that header. Compiling these files will throw errors if any header has unmet dependencies.

To ensure ongoing compliance, we enable this build test as part of the default x86 build in "test-meson-builds.sh".

---
 MAINTAINERS                                 |  4 +++
 buildtools/chkincs/gen_c_file_for_header.py | 12 +++++++
 buildtools/chkincs/main.c                   |  4 +++
 buildtools/chkincs/meson.build              | 40 +++++++++++++++++++++
 devtools/test-meson-builds.sh               |  2 +-
 doc/guides/rel_notes/release_21_02.rst      |  8 +++++
 meson.build                                 |  5 +++
 7 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100755 buildtools/chkincs/gen_c_file_for_header.py
 create mode 100644 buildtools/chkincs/main.c
 create mode 100644 buildtools/chkincs/meson.build
MAINTAINERS +4 -0
index 1a12916f56..d4f9ebe46d 100644
@@ -1562,6 +1562,10 @@ F: app/test/test_resource.c
 F: app/test/virtual_pmd.c
 F: app/test/virtual_pmd.h
 
+Header build sanity checking
+M: Bruce Richardson <[email protected]>
+F: buildtools/chkincs/
+
 Sample packet helper functions for unit test
 M: Reshma Pattan <[email protected]>
 F: app/test/sample_packet_forward.c
buildtools/chkincs/gen_c_file_for_header.py new file +12 -0
new file mode 100755
index 0000000000..ed46948aea
@@ -0,0 +1,12 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+from sys import argv
+from os.path import abspath
+
+(h_file, c_file) = argv[1:]
+
+contents = '#include "' + abspath(h_file) + '"'
+with open(c_file, 'w') as cf:
+    cf.write(contents)
buildtools/chkincs/main.c new file +4 -0
new file mode 100644
index 0000000000..d25bb8852a
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+int main(void) { return 0; }
buildtools/chkincs/meson.build new file +40 -0
new file mode 100644
index 0000000000..5dc43283e0
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+if not get_option('check_includes')
+	build = false
+	subdir_done()
+endif
+
+if is_windows
+	# for windows, the shebang line in the script won't work.
+	error('option "check_includes" is not supported on windows')
+endif
+
+gen_c_file_for_header = find_program('gen_c_file_for_header.py')
+gen_c_files = generator(gen_c_file_for_header,
+	output: '@[email protected]',
+	arguments: ['@INPUT@', '@OUTPUT@'])
+
+cflags = machine_args
+cflags += '-Wno-unused-function' # needed if we include generic headers
+cflags += '-DALLOW_EXPERIMENTAL_API'
+
+# some ethdev headers depend on bus headers
+includes = include_directories('../../drivers/bus/pci',
+	'../../drivers/bus/vdev')
+
+sources = files('main.c')
+sources += gen_c_files.process(dpdk_chkinc_headers)
+
+deps = []
+foreach l:enabled_libs
+	deps += get_variable('static_rte_' + l)
+endforeach
+
+executable('chkincs', sources,
+	c_args: cflags,
+	include_directories: includes,
+	dependencies: deps,
+	link_whole: dpdk_static_libraries + dpdk_drivers,
+	install: false)
devtools/test-meson-builds.sh +1 -1
index efa91e0e40..07b5e6aeca 100755
@@ -227,7 +227,7 @@ default_machine='nehalem'
 if ! check_cc_flags "-march=$default_machine" ; then
 	default_machine='corei7'
 fi
-build build-x86-default cc skipABI \
+build build-x86-default cc skipABI -Dcheck_includes=true\
 	-Dlibdir=lib -Dmachine=$default_machine $use_shared
 
 # 32-bit with default compiler
doc/guides/rel_notes/release_21_02.rst +8 -0
index 33bac4fff8..245d1a6473 100644
@@ -122,6 +122,14 @@ New Features
   * Added support for aes-cbc sha256-128-hmac cipher combination in OCTEON TX2
     crypto PMD lookaside protocol offload for IPsec.
 
+* **Added support for build-time checking of header includes**
+
+  A new build option ``check_includes`` has been added, which, when enabled,
+  will perform build-time checking on DPDK public header files, to ensure none
+  are missing dependent header includes. This feature, disabled by default, is
+  intended for use by developers contributing to the DPDK SDK itself, and is
+  integrated into the build scripts and automated CI for patch contributions.
+
 
 Removed Items
 -------------
meson.build +5 -0
index e6e34d0a98..fcc4d4c900 100644
@@ -68,6 +68,11 @@ if get_option('enable_kmods')
 	subdir('kernel')
 endif
 
+# check header includes if requested
+if get_option('check_includes')
+	subdir('buildtools/chkincs')
+endif
+
 # write the build config
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
Signature · 1 line
2.27.0
#132 lore raw

Re: [dpdk-dev] [PATCH v6 6/8] buildtools/chkincs: add app to verify header includes

Quoted 28 lines · Bruce Richardson

To verify that all DPDK headers are ok for inclusion directly in a C file, and are not missing any other pre-requisite headers, we can auto-generate for each header an empty C file that includes that header. Compiling these files will throw errors if any header has unmet dependencies.

To ensure ongoing compliance, we enable this build test as part of the default x86 build in "test-meson-builds.sh".

---
 MAINTAINERS                                 |  4 +++
 buildtools/chkincs/gen_c_file_for_header.py | 12 +++++++
 buildtools/chkincs/main.c                   |  4 +++
 buildtools/chkincs/meson.build              | 40 +++++++++++++++++++++
 devtools/test-meson-builds.sh               |  2 +-
 doc/guides/rel_notes/release_21_02.rst      |  8 +++++
 meson.build                                 |  5 +++
 7 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100755 buildtools/chkincs/gen_c_file_for_header.py
 create mode 100644 buildtools/chkincs/main.c
 create mode 100644 buildtools/chkincs/meson.build
MAINTAINERS +0 -0
index 1a12916f56..d4f9ebe46d 100644

MAINTAINERS F: app/test/test_resource.c · line 1568

Quoted 7 lines
MAINTAINERS +4 -0
@@ -1562,6 +1562,10 @@ F: app/test/test_resource.c
 F: app/test/virtual_pmd.c
 F: app/test/virtual_pmd.h
 
+Header build sanity checking
+M: Bruce Richardson <[email protected]>
+F: buildtools/chkincs/
+

This can be squashed in the generic "Build System" block.

Quoted 52 lines
MAINTAINERS +0 -0
 Sample packet helper functions for unit test
 M: Reshma Pattan <[email protected]>
 F: app/test/sample_packet_forward.c
buildtools/chkincs/gen_c_file_for_header.py new file +12 -0
new file mode 100755
index 0000000000..ed46948aea
@@ -0,0 +1,12 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+from sys import argv
+from os.path import abspath
+
+(h_file, c_file) = argv[1:]
+
+contents = '#include "' + abspath(h_file) + '"'
+with open(c_file, 'w') as cf:
+    cf.write(contents)
buildtools/chkincs/main.c new file +4 -0
new file mode 100644
index 0000000000..d25bb8852a
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+int main(void) { return 0; }
buildtools/chkincs/meson.build new file +15 -0
new file mode 100644
index 0000000000..5dc43283e0
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+if not get_option('check_includes')
+       build = false
+       subdir_done()
+endif
+
+if is_windows
+       # for windows, the shebang line in the script won't work.
+       error('option "check_includes" is not supported on windows')
+endif
+
+gen_c_file_for_header = find_program('gen_c_file_for_header.py')
+gen_c_files = generator(gen_c_file_for_header,

buildtools/chkincs/meson.build line 25

Quoted 10 lines
buildtools/chkincs/meson.build new file +10 -0
+       output: '@[email protected]',
+       arguments: ['@INPUT@', '@OUTPUT@'])
+
+cflags = machine_args
+cflags += '-Wno-unused-function' # needed if we include generic headers
+cflags += '-DALLOW_EXPERIMENTAL_API'
+
+# some ethdev headers depend on bus headers
+includes = include_directories('../../drivers/bus/pci',
+       '../../drivers/bus/vdev')

ethdev headers are fine now, afaics.
So this comment can be changed to a more vague "some driver headers depend on bus headers".

Quoted 20 lines
buildtools/chkincs/meson.build new file +15 -0
+
+sources = files('main.c')
+sources += gen_c_files.process(dpdk_chkinc_headers)
+
+deps = []
+foreach l:enabled_libs
+       deps += get_variable('static_rte_' + l)
+endforeach
+
+executable('chkincs', sources,
+       c_args: cflags,
+       include_directories: includes,
+       dependencies: deps,
+       link_whole: dpdk_static_libraries + dpdk_drivers,
+       install: false)
devtools/test-meson-builds.sh +0 -0
index efa91e0e40..07b5e6aeca 100755

devtools/test-meson-builds.sh default_machine='nehalem' · line 230

Quoted 5 lines
devtools/test-meson-builds.sh +1 -1
@@ -227,7 +227,7 @@ default_machine='nehalem'
 if ! check_cc_flags "-march=$default_machine" ; then
        default_machine='corei7'
 fi
-build build-x86-default cc skipABI \
+build build-x86-default cc skipABI -Dcheck_includes=true\

Space before \ to be consistent with the rest of the file.

Quoted 10 lines
devtools/test-meson-builds.sh +0 -0
        -Dlibdir=lib -Dmachine=$default_machine $use_shared
 
 # 32-bit with default compiler
doc/guides/rel_notes/release_21_02.rst +0 -0
index 33bac4fff8..245d1a6473 100644
@@ -122,6 +122,14 @@ New Features
   * Added support for aes-cbc sha256-128-hmac cipher combination in OCTEON TX2
     crypto PMD lookaside protocol offload for IPsec.

doc/guides/rel_notes/release_21_02.rst New Features · line 133

Quoted 10 lines
doc/guides/rel_notes/release_21_02.rst +8 -0
 
+* **Added support for build-time checking of header includes**
+
+  A new build option ``check_includes`` has been added, which, when enabled,
+  will perform build-time checking on DPDK public header files, to ensure none
+  are missing dependent header includes. This feature, disabled by default, is
+  intended for use by developers contributing to the DPDK SDK itself, and is
+  integrated into the build scripts and automated CI for patch contributions.
+
 

Should be earlier in the new features list.

Quoted 21 lines
doc/guides/rel_notes/release_21_02.rst +0 -0
 Removed Items
 -------------
meson.build +5 -1
index e6e34d0a98..fcc4d4c900 100644
@@ -68,6 +68,11 @@ if get_option('enable_kmods')
        subdir('kernel')
 endif
 
+# check header includes if requested
+if get_option('check_includes')
+       subdir('buildtools/chkincs')
+endif
+
 # write the build config
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
--

2.27.0

Signature · 1 line
David Marchand
#133 lore raw

Re: [dpdk-dev] [PATCH v6 6/8] buildtools/chkincs: add app to verify header includes

Quoted 33 lines · David Marchand
Quoted 31 lines · Bruce Richardson

To verify that all DPDK headers are ok for inclusion directly in a C file, and are not missing any other pre-requisite headers, we can auto-generate for each header an empty C file that includes that header. Compiling these files will throw errors if any header has unmet dependencies.

To ensure ongoing compliance, we enable this build test as part of the default x86 build in "test-meson-builds.sh".

---
 MAINTAINERS                                 |  4 +++
 buildtools/chkincs/gen_c_file_for_header.py | 12 +++++++
 buildtools/chkincs/main.c                   |  4 +++
 buildtools/chkincs/meson.build              | 40 +++++++++++++++++++++
 devtools/test-meson-builds.sh               |  2 +-
 doc/guides/rel_notes/release_21_02.rst      |  8 +++++
 meson.build                                 |  5 +++
 7 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100755 buildtools/chkincs/gen_c_file_for_header.py
 create mode 100644 buildtools/chkincs/main.c
 create mode 100644 buildtools/chkincs/meson.build
MAINTAINERS +0 -0
index 1a12916f56..d4f9ebe46d 100644
@@ -1562,6 +1562,10 @@ F: app/test/test_resource.c
 F: app/test/virtual_pmd.c
 F: app/test/virtual_pmd.h
 
Quoted 7 lines

MAINTAINERS F: app/test/test_resource.c · line 1568

Quoted 4 lines
MAINTAINERS +4 -0
+Header build sanity checking
+M: Bruce Richardson <[email protected]>
+F: buildtools/chkincs/
+

This can be squashed in the generic "Build System" block.

Ok.

Quoted 59 lines
Quoted 59 lines
MAINTAINERS +0 -0
 Sample packet helper functions for unit test
 M: Reshma Pattan <[email protected]>
 F: app/test/sample_packet_forward.c
buildtools/chkincs/gen_c_file_for_header.py new file +12 -0
new file mode 100755
index 0000000000..ed46948aea
@@ -0,0 +1,12 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+from sys import argv
+from os.path import abspath
+
+(h_file, c_file) = argv[1:]
+
+contents = '#include "' + abspath(h_file) + '"'
+with open(c_file, 'w') as cf:
+    cf.write(contents)
buildtools/chkincs/main.c new file +4 -0
new file mode 100644
index 0000000000..d25bb8852a
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+int main(void) { return 0; }
buildtools/chkincs/meson.build new file +21 -0
new file mode 100644
index 0000000000..5dc43283e0
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+if not get_option('check_includes')
+       build = false
+       subdir_done()
+endif
+
+if is_windows
+       # for windows, the shebang line in the script won't work.
+       error('option "check_includes" is not supported on windows')
+endif
+
+gen_c_file_for_header = find_program('gen_c_file_for_header.py')
+gen_c_files = generator(gen_c_file_for_header,
+       output: '@[email protected]',
+       arguments: ['@INPUT@', '@OUTPUT@'])
+
+cflags = machine_args
+cflags += '-Wno-unused-function' # needed if we include generic headers
+cflags += '-DALLOW_EXPERIMENTAL_API'
Quoted 9 lines

buildtools/chkincs/meson.build line 25

Quoted 4 lines
buildtools/chkincs/meson.build new file +4 -0
+
+# some ethdev headers depend on bus headers
+includes = include_directories('../../drivers/bus/pci',
+       '../../drivers/bus/vdev')

ethdev headers are fine now, afaics.
So this comment can be changed to a more vague "some driver headers depend on bus headers".

Driver headers are not checked yet by the code, only lib ones, so I will see if this block can be omitted until needed.

Quoted 20 lines
Quoted 20 lines
buildtools/chkincs/meson.build new file +15 -0
+
+sources = files('main.c')
+sources += gen_c_files.process(dpdk_chkinc_headers)
+
+deps = []
+foreach l:enabled_libs
+       deps += get_variable('static_rte_' + l)
+endforeach
+
+executable('chkincs', sources,
+       c_args: cflags,
+       include_directories: includes,
+       dependencies: deps,
+       link_whole: dpdk_static_libraries + dpdk_drivers,
+       install: false)
devtools/test-meson-builds.sh +0 -0
index efa91e0e40..07b5e6aeca 100755
Quoted 9 lines

devtools/test-meson-builds.sh default_machine='nehalem' · line 230

Quoted 6 lines
devtools/test-meson-builds.sh +1 -1
@@ -227,7 +227,7 @@ default_machine='nehalem'
 if ! check_cc_flags "-march=$default_machine" ; then
        default_machine='corei7'
 fi
-build build-x86-default cc skipABI \
+build build-x86-default cc skipABI -Dcheck_includes=true\

Space before \ to be consistent with the rest of the file.

Sure.

Quoted 12 lines
Quoted 12 lines
devtools/test-meson-builds.sh +0 -0
        -Dlibdir=lib -Dmachine=$default_machine $use_shared
 
 # 32-bit with default compiler
doc/guides/rel_notes/release_21_02.rst +0 -0
index 33bac4fff8..245d1a6473 100644
@@ -122,6 +122,14 @@ New Features
   * Added support for aes-cbc sha256-128-hmac cipher combination in OCTEON TX2
     crypto PMD lookaside protocol offload for IPsec.
 
Quoted 12 lines

doc/guides/rel_notes/release_21_02.rst New Features · line 133

Quoted 9 lines
doc/guides/rel_notes/release_21_02.rst +8 -0
+* **Added support for build-time checking of header includes**
+
+  A new build option ``check_includes`` has been added, which, when enabled,
+  will perform build-time checking on DPDK public header files, to ensure none
+  are missing dependent header includes. This feature, disabled by default, is
+  intended for use by developers contributing to the DPDK SDK itself, and is
+  integrated into the build scripts and automated CI for patch contributions.
+
 

Should be earlier in the new features list.

This was actually a deliberate choice on my part, since I was in two minds as to whether or how this should be called out in the release note. I felt it was not really of interest to user, and only to DPDK developers, so I put it at the end to de-emphasise it.

#134 lore raw

Re: [dpdk-dev] [PATCH v6 6/8] buildtools/chkincs: add app to verify header includes

Quoted 10 lines · Bruce Richardson
Quoted 8 lines

buildtools/chkincs/meson.build line 25

Quoted 3 lines
buildtools/chkincs/meson.build new file +3 -0
+# some ethdev headers depend on bus headers
+includes = include_directories('../../drivers/bus/pci',
+       '../../drivers/bus/vdev')

ethdev headers are fine now, afaics.
So this comment can be changed to a more vague "some driver headers depend on bus headers".

Driver headers are not checked yet by the code, only lib ones, so I will see if this block can be omitted until needed.

I tried yesterday, iirc, you'll hit issues with eventdev driver headers.

Signature · 1 line
David Marchand
#135 lore raw

Re: [dpdk-dev] [PATCH v6 6/8] buildtools/chkincs: add app to verify header includes

Quoted 10 lines · David Marchand
Quoted 8 lines · Bruce Richardson
Quoted 8 lines

buildtools/chkincs/meson.build line 25

Quoted 3 lines
buildtools/chkincs/meson.build new file +3 -0
+# some ethdev headers depend on bus headers
+includes = include_directories('../../drivers/bus/pci',
+       '../../drivers/bus/vdev')

ethdev headers are fine now, afaics.
So this comment can be changed to a more vague "some driver headers depend on bus headers".

Quoted 5 lines
Quoted 2 lines

Driver headers are not checked yet by the code, only lib ones, so I will see if this block can be omitted until needed.

I tried yesterday, iirc, you'll hit issues with eventdev driver headers.

Ok, thanks for trying.

#136 lore raw

Re: [dpdk-dev] [PATCH v6 6/8] buildtools/chkincs: add app to verify header includes

In reply to David Marchand
Quoted 10 lines · David Marchand
Quoted 8 lines · Bruce Richardson
Quoted 8 lines

buildtools/chkincs/meson.build line 25

Quoted 3 lines
buildtools/chkincs/meson.build new file +3 -0
+# some ethdev headers depend on bus headers
+includes = include_directories('../../drivers/bus/pci',
+       '../../drivers/bus/vdev')

ethdev headers are fine now, afaics.
So this comment can be changed to a more vague "some driver headers depend on bus headers".

Quoted 5 lines
Quoted 2 lines

Driver headers are not checked yet by the code, only lib ones, so I will see if this block can be omitted until needed.

I tried yesterday, iirc, you'll hit issues with eventdev driver headers.

Ok, I've done up a patch for eventdev similar to that of ethdev to make private the rte_eventdev_pmd*.h files, and these lines can now be removed. The eventdev files already had doxygen comments in them that they were not for application use.

/Bruce

#137 lore raw

PATCH v6 7/8 devtools: remove check-includes script

In reply to Bruce Richardson

The check-includes script allowed checking header files in a given directory to ensure that each header compiled alone without requiring any other header inclusions.

With header checking now being done by the chkincs app in the build system this script can be removed.

---
 MAINTAINERS                            |   1 -
 devtools/check-includes.sh             | 259 -------------------------
 doc/guides/rel_notes/release_21_02.rst |   3 +
 3 files changed, 3 insertions(+), 260 deletions(-)
 delete mode 100755 devtools/check-includes.sh
MAINTAINERS +0 -1
index d4f9ebe46d..8498b402db 100644
@@ -81,7 +81,6 @@ F: devtools/check-dup-includes.sh
 F: devtools/check-maintainers.sh
 F: devtools/check-forbidden-tokens.awk
 F: devtools/check-git-log.sh
-F: devtools/check-includes.sh
 F: devtools/check-spdx-tag.sh
 F: devtools/check-symbol-maps.sh
 F: devtools/checkpatches.sh
devtools/check-includes.sh deleted +0 -259

259 lines not on this page · raw message

doc/guides/rel_notes/release_21_02.rst +3 -0
index 245d1a6473..c73ec6ede0 100644
@@ -154,6 +154,9 @@ Removed Items
   ``ethdev_pci.h`` respectively in the source tree, to reflect the fact that
   they are non-public headers.
 
+* The ``check-includes.sh`` script for checking DPDK header files has been
+  removed, being replaced by the ``check_includes`` build option described above.
+
 
 API Changes
 -----------
Signature · 1 line
2.27.0
#138 lore raw

Re: [dpdk-dev] [PATCH v6 7/8] devtools: remove check-includes script

27/01/2021 18:33, Bruce Richardson:

doc/guides/rel_notes/release_21_02.rst Removed Items · line 158

Quoted 2 lines
doc/guides/rel_notes/release_21_02.rst +2 -0
+* The ``check-includes.sh`` script for checking DPDK header files has been
+  removed, being replaced by the ``check_includes`` build option described above.

How do they compare?
Is the new test checking C++ compliance? pedantic?

#139 lore raw

Re: [dpdk-dev] [PATCH v6 7/8] devtools: remove check-includes script

Quoted 7 lines · Thomas Monjalon

27/01/2021 18:33, Bruce Richardson:

Quoted 3 lines

+* The ``check-includes.sh`` script for checking DPDK header files has been + removed, being replaced by the ``check_includes`` build option described above.

How do they compare? Is the new test checking C++ compliance? pedantic?

The new support does not do either of those things - though pedantic checks should be fairly easy to do - so I'm ok to drop this patch and not remove the script.

Unfortunately, in my limited testing of it, the script has some usability issues now that on build all the lib includes are no longer copies to a single include folder. There is no automatic detection of include paths for other dependent headers, which means that to run the tool on e.g. ethdev lib, you need to set up the CFLAGS to include the paths to the net, eal, kvargs, meter, etc. libraries. Then again, it may work well on an installed DPDK instance for testing, but the fact that nobody has complained about it being hard to use before indicates that it is not being used, and if it's not being used I felt it as well to just drop it.

/Bruce

#140 lore raw

Re: [dpdk-dev] [PATCH v6 7/8] devtools: remove check-includes script

28/01/2021 12:38, Bruce Richardson:

Quoted 12 lines · Thomas Monjalon
Quoted 7 lines

27/01/2021 18:33, Bruce Richardson:

Quoted 3 lines

+* The ``check-includes.sh`` script for checking DPDK header files has been + removed, being replaced by the ``check_includes`` build option described above.

How do they compare? Is the new test checking C++ compliance? pedantic?

The new support does not do either of those things - though pedantic checks should be fairly easy to do - so I'm ok to drop this patch and not remove the script.

Quoted 9 lines

Unfortunately, in my limited testing of it, the script has some usability issues now that on build all the lib includes are no longer copies to a single include folder. There is no automatic detection of include paths for other dependent headers, which means that to run the tool on e.g. ethdev lib, you need to set up the CFLAGS to include the paths to the net, eal, kvargs, meter, etc. libraries. Then again, it may work well on an installed DPDK instance for testing, but the fact that nobody has complained about it being hard to use before indicates that it is not being used, and if it's not being used I felt it as well to just drop it.

I am OK to drop it.
My question is more about improving the new tool to reach the initial goals of the old script.

#141 lore raw

PATCH v6 8/8 ci: add checking of includes to CI builds

In reply to Bruce Richardson

For CI builds, turn on the checking of includes.

---
 .ci/linux-build.sh | 1 +
 1 file changed, 1 insertion(+)
.ci/linux-build.sh +1 -0
index afa3689a09..fdbeb5a616 100755
@@ -57,6 +57,7 @@ fi
 OPTS="$OPTS -Dmachine=default"
 OPTS="$OPTS --default-library=$DEF_LIB"
 OPTS="$OPTS --buildtype=debugoptimized"
+OPTS="$OPTS -Dcheck_includes=true"
 meson build --werror $OPTS
 ninja -C build
 

--
2.27.0

#142 lore raw

Re: [dpdk-dev] [PATCH v6 8/8] ci: add checking of includes to CI builds

27/01/2021 18:33, Bruce Richardson:

Quoted 13 lines

For CI builds, turn on the checking of includes.

---
 .ci/linux-build.sh | 1 +
 1 file changed, 1 insertion(+)
.ci/linux-build.sh +0 -0
index afa3689a09..fdbeb5a616 100755

.ci/linux-build.sh fi · line 60

Quoted 4 lines
.ci/linux-build.sh +1 -0
@@ -57,6 +57,7 @@ fi
 OPTS="$OPTS -Dmachine=default"
 OPTS="$OPTS --default-library=$DEF_LIB"
 OPTS="$OPTS --buildtype=debugoptimized"
+OPTS="$OPTS -Dcheck_includes=true"

Which percentage of time does it add on GHA?

#143 lore raw

Re: [dpdk-dev] [PATCH v6 8/8] ci: add checking of includes to CI builds

Quoted 7 lines · Thomas Monjalon

27/01/2021 18:33, Bruce Richardson:

Quoted 6 lines

For CI builds, turn on the checking of includes.

Aaron Conole <[email protected]> --- .ci/linux-build.sh | 1 + 1 file changed, 1 insertion(+)

Quoted 8 lines
Quoted 5 lines
.ci/linux-build.sh index renamed from .ci/linux-build.sh +0 -0

afa3689a09..fdbeb5a616 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -57,6 +57,7 @@ fi OPTS="$OPTS -Dmachine=default" OPTS="$OPTS --default-library=$DEF_LIB" OPTS="$OPTS --buildtype=debugoptimized" +OPTS="$OPTS -Dcheck_includes=true"

Which percentage of time does it add on GHA?

I'd have to gather some before/after tests to know for sure, but to check it wasn't too heavy-weight I was just monitoring the log at the end of a build on GHA. The specific build I watched took nearly 15 minutes, and I would guess-timate that the extra task took about 20 seconds of that.

#144 lore raw

Re: [dpdk-dev] [PATCH v6 8/8] ci: add checking of includes to CI builds

Quoted 16 lines · Bruce Richardson
Quoted 7 lines · Thomas Monjalon

27/01/2021 18:33, Bruce Richardson:

Quoted 6 lines

For CI builds, turn on the checking of includes.

Aaron Conole <[email protected]> --- .ci/linux-build.sh | 1 + 1 file changed, 1 insertion(+)

Quoted 8 lines
Quoted 5 lines
.ci/linux-build.sh index renamed from .ci/linux-build.sh +0 -0

afa3689a09..fdbeb5a616 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -57,6 +57,7 @@ fi OPTS="$OPTS -Dmachine=default" OPTS="$OPTS --default-library=$DEF_LIB" OPTS="$OPTS --buildtype=debugoptimized" +OPTS="$OPTS -Dcheck_includes=true"

Which percentage of time does it add on GHA?

Quoted 4 lines

I'd have to gather some before/after tests to know for sure, but to check it wasn't too heavy-weight I was just monitoring the log at the end of a build on GHA. The specific build I watched took nearly 15 minutes, and I would guess-timate that the extra task took about 20 seconds of that.

Related to this, and to ensure we don't increase the GHA build time massively, is there a reliably way to test this out? Looking at the daily builds on GHA I see some successful builds completing in 7.5 mins, while others take almost 18 minutes.
The extra build time from this chkincs takes very little time on my own system but perhaps we want to limit it to a single build on GHA. I'm not very familiar with configuring those builds, so perhaps someone could suggest how to do so.

Thanks,
/Bruce

#145 lore raw

Re: [dpdk-dev] [PATCH v6 8/8] ci: add checking of includes to CI builds

Quoted 23 lines · Bruce Richardson
Quoted 16 lines · Bruce Richardson
Quoted 7 lines · Thomas Monjalon

27/01/2021 18:33, Bruce Richardson:

Quoted 6 lines

For CI builds, turn on the checking of includes.

Aaron Conole <[email protected]> --- .ci/linux-build.sh | 1 + 1 file changed, 1 insertion(+)

Quoted 8 lines
Quoted 5 lines
.ci/linux-build.sh index renamed from .ci/linux-build.sh +0 -0

afa3689a09..fdbeb5a616 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -57,6 +57,7 @@ fi OPTS="$OPTS -Dmachine=default" OPTS="$OPTS --default-library=$DEF_LIB" OPTS="$OPTS --buildtype=debugoptimized" +OPTS="$OPTS -Dcheck_includes=true"

Which percentage of time does it add on GHA?

Quoted 4 lines

I'd have to gather some before/after tests to know for sure, but to check it wasn't too heavy-weight I was just monitoring the log at the end of a build on GHA. The specific build I watched took nearly 15 minutes, and I would guess-timate that the extra task took about 20 seconds of that.

Quoted 4 lines

Related to this, and to ensure we don't increase the GHA build time massively, is there a reliably way to test this out? Looking at the daily builds on GHA I see some successful builds completing in 7.5 mins, while others take almost 18 minutes.

I guess it depends on the changes being tested.
We have a ccache regenerated once a week against the main branch. That might help compilations for changes on drivers only.

And it might depend on luck too / the resources available on the system that runs the tests.
We once hit a case with OVS GHA where the cached DPDK binaries were built on a system that had a more recent cpu (and this is the reason why we now build with -Dmachine=default).

Quoted 4 lines

The extra build time from this chkincs takes very little time on my own system but perhaps we want to limit it to a single build on GHA. I'm not very familiar with configuring those builds, so perhaps someone could suggest how to do so.

From what I see in ovsrobot/dpdk/actions logs, the impact is small.

Signature · 1 line
David Marchand
#146 lore raw

Re: [dpdk-dev] [PATCH v6 8/8] ci: add checking of includes to CI builds

Quoted 41 lines · David Marchand
Quoted 23 lines · Bruce Richardson
Quoted 16 lines · Bruce Richardson
Quoted 7 lines · Thomas Monjalon

27/01/2021 18:33, Bruce Richardson:

Quoted 6 lines

For CI builds, turn on the checking of includes.

Aaron Conole <[email protected]> --- .ci/linux-build.sh | 1 + 1 file changed, 1 insertion(+)

Quoted 8 lines
Quoted 5 lines
.ci/linux-build.sh index renamed from .ci/linux-build.sh +0 -0

afa3689a09..fdbeb5a616 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -57,6 +57,7 @@ fi OPTS="$OPTS -Dmachine=default" OPTS="$OPTS --default-library=$DEF_LIB" OPTS="$OPTS --buildtype=debugoptimized" +OPTS="$OPTS -Dcheck_includes=true"

Which percentage of time does it add on GHA?

Quoted 4 lines

I'd have to gather some before/after tests to know for sure, but to check it wasn't too heavy-weight I was just monitoring the log at the end of a build on GHA. The specific build I watched took nearly 15 minutes, and I would guess-timate that the extra task took about 20 seconds of that.

Quoted 4 lines

Related to this, and to ensure we don't increase the GHA build time massively, is there a reliably way to test this out? Looking at the daily builds on GHA I see some successful builds completing in 7.5 mins, while others take almost 18 minutes.

I guess it depends on the changes being tested.
We have a ccache regenerated once a week against the main branch. That might help compilations for changes on drivers only.

And it might depend on luck too / the resources available on the system that runs the tests.
We once hit a case with OVS GHA where the cached DPDK binaries were built on a system that had a more recent cpu (and this is the reason why we now build with -Dmachine=default).

Quoted 6 lines
Quoted 4 lines

The extra build time from this chkincs takes very little time on my own system but perhaps we want to limit it to a single build on GHA. I'm not very familiar with configuring those builds, so perhaps someone could suggest how to do so.

From what I see in ovsrobot/dpdk/actions logs, the impact is small.

+1 - it seems negligible from what I can tell.

#147 lore raw

Re: [dpdk-dev] [PATCH v6 0/8] add checking of header includes

In reply to Bruce Richardson
Quoted 36 lines · Bruce Richardson

As a general principle, each header file should include any other headers it needs to provide data type definitions or macros. For example, any header using the uintX_t types in structures or function prototypes should include "stdint.h" to provide those type definitions.

In practice, while many, but not all, headers in DPDK did include all necessary headers, it was never actually checked that each header could be included in a C file and compiled without having any compiler errors about missing definitions. The script "check-includes.sh" could be used for this job, but it was not called out in the documentation, so many contributors may not have been aware of it's existance. It also was difficult to run from a source-code directory, as the script did not automatically allow finding of headers from one DPDK library directory to another [this was probably based on running it on a build created by the "make" build system, where all headers were in a single directory]. To attempt to have a build-system integrated replacement, this patchset adds a "chkincs" app in the buildtools directory to verify this on an ongoing basis.

This chkincs app does nothing when run, and is not installed as part of a DPDK "ninja install", it's for build-time checking only. Its source code consists of one C file per public DPDK header, where that C file contains nothing except an include for that header. Therefore, if any header is added to the lib folder which fails to compile when included alone, the build of chkincs will fail with a suitable error message. Since this compile checking is not needed on most builds of DPDK, the building of chkincs is disabled by default, but can be enabled by the "test_includes" meson option. To catch errors with patch submissions, the final patch of this series enables it for a single build in test-meson-builds script.

Future work could involve doing similar checks on headers for C++ compatibility, which was something done by the check-includes.sh script but which is missing here.

Quoted 6 lines

V6:
* Added release notes updates for:
- renamed, no-longer-installed header files
- new "check_includes" build option
- removal of old check_includes script
* Included acks from previous versions

I have some comments, see replies on patches.
I can address them if you are ok, and I would take this series for -rc2 without needing a respin.

Sidenote: I like how we are hiding API by simply not exporting headers. We need more cleanups like this.
Ethdev has been cleaned; this will probably remove the need for the ABI exception on eth_dev_ops.
Eventdev, other driver classes and bus drivers will probably be the next to look at.

Signature · 1 line
David Marchand
#148 lore raw

Re: [dpdk-dev] [PATCH v6 0/8] add checking of header includes

Quoted 45 lines · David Marchand
Quoted 36 lines · Bruce Richardson

As a general principle, each header file should include any other headers it needs to provide data type definitions or macros. For example, any header using the uintX_t types in structures or function prototypes should include "stdint.h" to provide those type definitions.

In practice, while many, but not all, headers in DPDK did include all necessary headers, it was never actually checked that each header could be included in a C file and compiled without having any compiler errors about missing definitions. The script "check-includes.sh" could be used for this job, but it was not called out in the documentation, so many contributors may not have been aware of it's existance. It also was difficult to run from a source-code directory, as the script did not automatically allow finding of headers from one DPDK library directory to another [this was probably based on running it on a build created by the "make" build system, where all headers were in a single directory]. To attempt to have a build-system integrated replacement, this patchset adds a "chkincs" app in the buildtools directory to verify this on an ongoing basis.

This chkincs app does nothing when run, and is not installed as part of a DPDK "ninja install", it's for build-time checking only. Its source code consists of one C file per public DPDK header, where that C file contains nothing except an include for that header. Therefore, if any header is added to the lib folder which fails to compile when included alone, the build of chkincs will fail with a suitable error message. Since this compile checking is not needed on most builds of DPDK, the building of chkincs is disabled by default, but can be enabled by the "test_includes" meson option. To catch errors with patch submissions, the final patch of this series enables it for a single build in test-meson-builds script.

Future work could involve doing similar checks on headers for C++ compatibility, which was something done by the check-includes.sh script but which is missing here.

Quoted 6 lines

V6:
* Added release notes updates for:
- renamed, no-longer-installed header files
- new "check_includes" build option
- removal of old check_includes script
* Included acks from previous versions

Quoted 4 lines

I have some comments, see replies on patches.
I can address them if you are ok, and I would take this series for -rc2 without needing a respin.

Thomas has some feedback too now, and I think there are one or two patches where we might want to wait for consensus. However, if you are happy to take these as they are and do any fixups yourself feel free.

Quoted 7 lines

Sidenote: I like how we are hiding API by simply not exporting headers. We need more cleanups like this.
Ethdev has been cleaned; this will probably remove the need for the ABI exception on eth_dev_ops.
Eventdev, other driver classes and bus drivers will probably be the next to look at.

Yes, there is plenty more cleanup work still needed.

* The chkincs support added here integrates nicely into the build but does not fully support everything that the old script did, so investigation is needed especially for c++ checking support.

* Beyond that we should also look to do cleanup based on IWYU to remove excess headers. This work gives us a nice safety-net for that as it should flag to us if we every remove too much from a public header.

#149 lore raw

v7 cover add checking of header includes

In reply to Bruce Richardson

As a general principle, each header file should include any other headers it needs to provide data type definitions or macros. For example, any header using the uintX_t types in structures or function prototypes should include "stdint.h" to provide those type definitions.

In practice, while many, but not all, headers in DPDK did include all necessary headers, it was never actually checked that each header could be included in a C file and compiled without having any compiler errors about missing definitions. The script "check-includes.sh" could be used for this job, but it was not called out in the documentation, so many contributors may not have been aware of it's existance. It also was difficult to run from a source-code directory, as the script did not automatically allow finding of headers from one DPDK library directory to another [this was probably based on running it on a build created by the "make" build system, where all headers were in a single directory]. To attempt to have a build-system integrated replacement, this patchset adds a "chkincs" app in the buildtools directory to verify this on an ongoing basis.

This chkincs app does nothing when run, and is not installed as part of a DPDK "ninja install", it's for build-time checking only. Its source code consists of one C file per public DPDK header, where that C file contains nothing except an include for that header. Therefore, if any header is added to the lib folder which fails to compile when included alone, the build of chkincs will fail with a suitable error message. Since this compile checking is not needed on most builds of DPDK, the building of chkincs is disabled by default, but can be enabled by the "test_includes" meson option. To catch errors with patch submissions, the final patch of this series enables it for a single build in test-meson-builds script.

Future work could involve doing similar checks on headers for C++ compatibility, which was something done by the check-includes.sh script but which is missing here.

V7:
* fixed issue with compilers not supporting __has_attribute
* added patch to add missing headers to power library .h file
* added patch to make eventdev headers non-public
* renamed headers_no_chkincs to indirect_headers

V6:
* Added release notes updates for:
- renamed, no-longer-installed header files
- new "check_includes" build option
- removal of old check_includes script
* Included acks from previous versions

V5:
* Removed private ethdev headers from checks and installing
* Removed the ALLOW_INTERNAL_APIS macro from chkincs build.

V4:
* Fixed build errors with clang and arm builds
* Added support for running chkincs as part of github actions CI

V3:
* Shrunk patchset as most header fixes already applied
* Moved chkincs from "apps" to the "buildtools" directory, which is a better location for something not for installation for end-user use.
* Added patch to drop check-includes script.

V2:
* Add maintainers file entry for new app
* Drop patch for c11 ring header
* Use build variable "headers_no_chkincs" for tracking exceptions *** SUBJECT HERE ***

*** BLURB HERE ***

Bruce Richardson (10):
eal: add missing include to mcslock
eal: fix error attribute use for clang
power: fix missing header includes
rib: fix missing header include
ethdev: make driver-only headers private
eventdev: make driver-only headers private
build: separate out headers for include checking buildtools/chkincs: add app to verify header includes
devtools: remove check-includes script
ci: add checking of includes to CI builds

 .ci/linux-build.sh                            |   1 +
 MAINTAINERS                                   |   2 +-
 app/test/test_link_bonding.c                  |   2 +-
 app/test/test_pdump.c                         |   2 +-
 app/test/virtual_pmd.c                        |   2 +-
 buildtools/chkincs/gen_c_file_for_header.py   |  12 +
 buildtools/chkincs/main.c                     |   4 +
 buildtools/chkincs/meson.build                |  36 +++
 devtools/check-includes.sh                    | 259 ------------------
 devtools/test-meson-builds.sh                 |   2 +-
 doc/guides/contributing/coding_style.rst      |  12 +
 doc/guides/rel_notes/release_21_02.rst        |  24 ++
 drivers/bus/dpaa/dpaa_bus.c                   |   2 +-
 drivers/bus/dpaa/include/fman.h               |   2 +-
 drivers/bus/fslmc/fslmc_bus.c                 |   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/event/dlb/dlb.c                       |   2 +-
 drivers/event/dlb/dlb_priv.h                  |   4 +-
 drivers/event/dlb/rte_pmd_dlb.c               |   2 +-
 drivers/event/dlb2/dlb2.c                     |   2 +-
 drivers/event/dlb2/pf/dlb2_pf.c               |   4 +-
 drivers/event/dlb2/rte_pmd_dlb2.c             |   2 +-
 drivers/event/dpaa/dpaa_eventdev.c            |   2 +-
 drivers/event/dpaa/dpaa_eventdev.h            |   4 +-
 drivers/event/dpaa2/dpaa2_eventdev.c          |   2 +-
 drivers/event/dpaa2/dpaa2_eventdev.h          |   4 +-
 drivers/event/dpaa2/dpaa2_hw_dpcon.c          |   2 +-
 drivers/event/dsw/dsw_evdev.c                 |   4 +-
 drivers/event/octeontx/ssovf_evdev.c          |   2 +-
 drivers/event/octeontx/ssovf_evdev.h          |   2 +-
 drivers/event/octeontx2/otx2_evdev.c          |   2 +-
 drivers/event/octeontx2/otx2_evdev.h          |   2 +-
 drivers/event/opdl/opdl_evdev.h               |   2 +-
 drivers/event/skeleton/skeleton_eventdev.h    |   4 +-
 drivers/event/sw/sw_evdev.h                   |   2 +-
 drivers/mempool/dpaa2/dpaa2_hw_mempool.c      |   2 +-
 drivers/net/af_packet/rte_eth_af_packet.c     |   4 +-
 drivers/net/af_xdp/rte_eth_af_xdp.c           |   4 +-
 drivers/net/ark/ark_ethdev.c                  |   2 +-
 drivers/net/ark/ark_ethdev_rx.h               |   2 +-
 drivers/net/ark/ark_ethdev_tx.h               |   2 +-
 drivers/net/ark/ark_ext.h                     |   2 +-
 drivers/net/ark/ark_global.h                  |   2 +-
 drivers/net/ark/ark_pktchkr.c                 |   2 +-
 drivers/net/ark/ark_pktgen.c                  |   2 +-
 drivers/net/atlantic/atl_ethdev.c             |   2 +-
 drivers/net/atlantic/atl_rxtx.c               |   2 +-
 drivers/net/atlantic/rte_pmd_atlantic.c       |   2 +-
 drivers/net/avp/avp_ethdev.c                  |   4 +-
 drivers/net/axgbe/axgbe_common.h              |   2 +-
 drivers/net/bnx2x/bnx2x_ethdev.c              |   2 +-
 drivers/net/bnx2x/bnx2x_ethdev.h              |   2 +-
 drivers/net/bnxt/bnxt.h                       |   2 +-
 drivers/net/bnxt/bnxt_ethdev.c                |   4 +-
 drivers/net/bnxt/bnxt_stats.h                 |   2 +-
 drivers/net/bnxt/rte_pmd_bnxt.c               |   2 +-
 drivers/net/bonding/eth_bond_private.h        |   2 +-
 drivers/net/bonding/rte_eth_bond_api.c        |   2 +-
 drivers/net/bonding/rte_eth_bond_pmd.c        |   4 +-
 drivers/net/cxgbe/base/t4_hw.c                |   2 +-
 drivers/net/cxgbe/base/t4vf_hw.c              |   2 +-
 drivers/net/cxgbe/cxgbe_ethdev.c              |   4 +-
 drivers/net/cxgbe/cxgbe_main.c                |   4 +-
 drivers/net/cxgbe/cxgbevf_ethdev.c            |   4 +-
 drivers/net/cxgbe/cxgbevf_main.c              |   4 +-
 drivers/net/cxgbe/sge.c                       |   2 +-
 drivers/net/dpaa/dpaa_ethdev.c                |   2 +-
 drivers/net/dpaa/dpaa_ethdev.h                |   2 +-
 drivers/net/dpaa/dpaa_rxtx.c                  |   2 +-
 drivers/net/dpaa2/base/dpaa2_hw_dpni.c        |   2 +-
 drivers/net/dpaa2/dpaa2_ethdev.c              |   2 +-
 drivers/net/dpaa2/dpaa2_rxtx.c                |   2 +-
 drivers/net/e1000/em_ethdev.c                 |   4 +-
 drivers/net/e1000/em_rxtx.c                   |   2 +-
 drivers/net/e1000/igb_ethdev.c                |   4 +-
 drivers/net/e1000/igb_flow.c                  |   4 +-
 drivers/net/e1000/igb_pf.c                    |   2 +-
 drivers/net/e1000/igb_rxtx.c                  |   2 +-
 drivers/net/ena/ena_ethdev.c                  |   4 +-
 drivers/net/enetc/enetc_ethdev.c              |   2 +-
 drivers/net/enic/enic_ethdev.c                |   4 +-
 drivers/net/enic/enic_flow.c                  |   2 +-
 drivers/net/enic/enic_fm_flow.c               |   2 +-
 drivers/net/enic/enic_main.c                  |   2 +-
 drivers/net/enic/enic_res.c                   |   2 +-
 drivers/net/enic/enic_rxtx.c                  |   2 +-
 drivers/net/enic/enic_rxtx_vec_avx2.c         |   2 +-
 drivers/net/enic/enic_vf_representor.c        |   4 +-
 drivers/net/failsafe/failsafe.c               |   4 +-
 drivers/net/failsafe/failsafe_ops.c           |   2 +-
 drivers/net/failsafe/failsafe_private.h       |   2 +-
 drivers/net/failsafe/failsafe_rxtx.c          |   2 +-
 drivers/net/fm10k/fm10k_ethdev.c              |   4 +-
 drivers/net/fm10k/fm10k_rxtx.c                |   2 +-
 drivers/net/fm10k/fm10k_rxtx_vec.c            |   2 +-
 drivers/net/hinic/base/hinic_pmd_hwdev.c      |   2 +-
 drivers/net/hinic/hinic_pmd_ethdev.c          |   2 +-
 drivers/net/hinic/hinic_pmd_ethdev.h          |   2 +-
 drivers/net/hns3/hns3_cmd.c                   |   2 +-
 drivers/net/hns3/hns3_ethdev.c                |   2 +-
 drivers/net/hns3/hns3_ethdev.h                |   2 +-
 drivers/net/hns3/hns3_ethdev_vf.c             |   2 +-
 drivers/net/hns3/hns3_fdir.c                  |   2 +-
 drivers/net/hns3/hns3_mbx.c                   |   2 +-
 drivers/net/hns3/hns3_mp.c                    |   2 +-
 drivers/net/hns3/hns3_regs.c                  |   2 +-
 drivers/net/hns3/hns3_rxtx.c                  |   2 +-
 drivers/net/hns3/hns3_rxtx_vec.c              |   2 +-
 drivers/net/hns3/hns3_rxtx_vec_sve.c          |   2 +-
 drivers/net/i40e/i40e_ethdev.c                |   4 +-
 drivers/net/i40e/i40e_ethdev_vf.c             |   4 +-
 drivers/net/i40e/i40e_fdir.c                  |   2 +-
 drivers/net/i40e/i40e_flow.c                  |   2 +-
 drivers/net/i40e/i40e_pf.c                    |   2 +-
 drivers/net/i40e/i40e_rxtx.c                  |   2 +-
 drivers/net/i40e/i40e_rxtx_vec_altivec.c      |   2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx2.c         |   2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c       |   2 +-
 drivers/net/i40e/i40e_rxtx_vec_common.h       |   2 +-
 drivers/net/i40e/i40e_rxtx_vec_neon.c         |   2 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c          |   2 +-
 drivers/net/i40e/i40e_vf_representor.c        |   2 +-
 drivers/net/iavf/iavf_ethdev.c                |   4 +-
 drivers/net/iavf/iavf_fdir.c                  |   2 +-
 drivers/net/iavf/iavf_generic_flow.c          |   2 +-
 drivers/net/iavf/iavf_hash.c                  |   2 +-
 drivers/net/iavf/iavf_rxtx.c                  |   2 +-
 drivers/net/iavf/iavf_rxtx_vec_common.h       |   2 +-
 drivers/net/iavf/iavf_rxtx_vec_sse.c          |   2 +-
 drivers/net/iavf/iavf_vchnl.c                 |   4 +-
 drivers/net/ice/ice_acl_filter.c              |   2 +-
 drivers/net/ice/ice_dcf.c                     |   4 +-
 drivers/net/ice/ice_dcf.h                     |   2 +-
 drivers/net/ice/ice_dcf_ethdev.c              |   2 +-
 drivers/net/ice/ice_ethdev.c                  |   2 +-
 drivers/net/ice/ice_ethdev.h                  |   2 +-
 drivers/net/ice/ice_generic_flow.c            |   2 +-
 drivers/net/ice/ice_hash.c                    |   2 +-
 drivers/net/ice/ice_rxtx.c                    |   2 +-
 drivers/net/ice/ice_switch_filter.c           |   2 +-
 drivers/net/igc/igc_ethdev.c                  |   4 +-
 drivers/net/igc/igc_filter.h                  |   2 +-
 drivers/net/igc/igc_txrx.c                    |   2 +-
 drivers/net/ionic/ionic_ethdev.c              |   4 +-
 drivers/net/ionic/ionic_lif.c                 |   2 +-
 drivers/net/ionic/ionic_rxtx.c                |   2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.c            |   2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.h            |   4 +-
 drivers/net/ipn3ke/ipn3ke_flow.c              |   2 +-
 drivers/net/ipn3ke/ipn3ke_representor.c       |   2 +-
 drivers/net/ipn3ke/ipn3ke_tm.c                |   2 +-
 drivers/net/ixgbe/ixgbe_bypass.c              |   2 +-
 drivers/net/ixgbe/ixgbe_ethdev.c              |   4 +-
 drivers/net/ixgbe/ixgbe_fdir.c                |   2 +-
 drivers/net/ixgbe/ixgbe_flow.c                |   2 +-
 drivers/net/ixgbe/ixgbe_ipsec.c               |   4 +-
 drivers/net/ixgbe/ixgbe_pf.c                  |   2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c                |   2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h     |   2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c       |   2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c        |   2 +-
 drivers/net/ixgbe/ixgbe_vf_representor.c      |   2 +-
 drivers/net/ixgbe/rte_pmd_ixgbe.c             |   2 +-
 drivers/net/kni/rte_eth_kni.c                 |   4 +-
 drivers/net/liquidio/base/lio_23xx_vf.c       |   2 +-
 drivers/net/liquidio/base/lio_mbox.c          |   2 +-
 drivers/net/liquidio/lio_ethdev.c             |   4 +-
 drivers/net/liquidio/lio_rxtx.c               |   2 +-
 drivers/net/memif/memif_socket.c              |   4 +-
 drivers/net/memif/rte_eth_memif.c             |   4 +-
 drivers/net/memif/rte_eth_memif.h             |   2 +-
 drivers/net/mlx4/mlx4.c                       |   4 +-
 drivers/net/mlx4/mlx4.h                       |   2 +-
 drivers/net/mlx4/mlx4_ethdev.c                |   2 +-
 drivers/net/mlx4/mlx4_flow.c                  |   2 +-
 drivers/net/mlx4/mlx4_flow.h                  |   2 +-
 drivers/net/mlx4/mlx4_intr.c                  |   2 +-
 drivers/net/mlx4/mlx4_mp.c                    |   2 +-
 drivers/net/mlx4/mlx4_rxq.c                   |   2 +-
 drivers/net/mlx4/mlx4_rxtx.h                  |   2 +-
 drivers/net/mlx4/mlx4_txq.c                   |   2 +-
 drivers/net/mlx5/linux/mlx5_ethdev_os.c       |   2 +-
 drivers/net/mlx5/linux/mlx5_mp_os.c           |   2 +-
 drivers/net/mlx5/linux/mlx5_os.c              |   4 +-
 drivers/net/mlx5/linux/mlx5_verbs.c           |   2 +-
 drivers/net/mlx5/linux/mlx5_vlan_os.c         |   2 +-
 drivers/net/mlx5/mlx5.c                       |   4 +-
 drivers/net/mlx5/mlx5.h                       |   2 +-
 drivers/net/mlx5/mlx5_defs.h                  |   2 +-
 drivers/net/mlx5/mlx5_ethdev.c                |   2 +-
 drivers/net/mlx5/mlx5_flow.c                  |   2 +-
 drivers/net/mlx5/mlx5_flow_dv.c               |   2 +-
 drivers/net/mlx5/mlx5_flow_verbs.c            |   2 +-
 drivers/net/mlx5/mlx5_mac.c                   |   2 +-
 drivers/net/mlx5/mlx5_rss.c                   |   2 +-
 drivers/net/mlx5/mlx5_rxmode.c                |   2 +-
 drivers/net/mlx5/mlx5_rxq.c                   |   2 +-
 drivers/net/mlx5/mlx5_stats.c                 |   2 +-
 drivers/net/mlx5/mlx5_trigger.c               |   2 +-
 drivers/net/mlx5/mlx5_txpp.c                  |   2 +-
 drivers/net/mlx5/mlx5_txq.c                   |   2 +-
 drivers/net/mlx5/mlx5_vlan.c                  |   2 +-
 drivers/net/mlx5/windows/mlx5_ethdev_os.c     |   2 +-
 drivers/net/mlx5/windows/mlx5_mp_os.c         |   2 +-
 drivers/net/mlx5/windows/mlx5_os.c            |   2 +-
 drivers/net/mlx5/windows/mlx5_vlan_os.c       |   2 +-
 drivers/net/mvneta/mvneta_ethdev.c            |   2 +-
 drivers/net/mvpp2/mrvl_ethdev.c               |   2 +-
 drivers/net/netvsc/hn_ethdev.c                |   2 +-
 drivers/net/netvsc/hn_rndis.c                 |   2 +-
 drivers/net/netvsc/hn_vf.c                    |   2 +-
 drivers/net/nfb/nfb_ethdev.c                  |   2 +-
 drivers/net/nfb/nfb_tx.h                      |   2 +-
 drivers/net/nfp/nfp_net.c                     |   4 +-
 drivers/net/nfp/nfpcore/nfp_cpp.h             |   2 +-
 drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c    |   2 +-
 drivers/net/nfp/nfpcore/nfp_cppcore.c         |   2 +-
 drivers/net/null/rte_eth_null.c               |   4 +-
 drivers/net/octeontx/octeontx_ethdev.h        |   2 +-
 drivers/net/octeontx/octeontx_rxtx.c          |   2 +-
 drivers/net/octeontx/octeontx_rxtx.h          |   2 +-
 drivers/net/octeontx2/otx2_ethdev.c           |   2 +-
 drivers/net/octeontx2/otx2_link.c             |   2 +-
 drivers/net/octeontx2/otx2_ptp.c              |   2 +-
 drivers/net/pcap/rte_eth_pcap.c               |   4 +-
 drivers/net/pfe/pfe_eth.h                     |   2 +-
 drivers/net/pfe/pfe_ethdev.c                  |   2 +-
 drivers/net/qede/qede_ethdev.h                |   4 +-
 drivers/net/ring/rte_eth_ring.c               |   2 +-
 drivers/net/sfc/sfc.h                         |   2 +-
 drivers/net/sfc/sfc_dp_rx.h                   |   2 +-
 drivers/net/sfc/sfc_dp_tx.h                   |   2 +-
 drivers/net/sfc/sfc_ethdev.c                  |   4 +-
 drivers/net/sfc/sfc_ev.h                      |   2 +-
 drivers/net/sfc/sfc_flow.c                    |   2 +-
 drivers/net/sfc/sfc_rx.h                      |   2 +-
 drivers/net/sfc/sfc_tx.h                      |   2 +-
 drivers/net/softnic/rte_eth_softnic.c         |   4 +-
 .../net/softnic/rte_eth_softnic_internals.h   |   2 +-
 drivers/net/szedata2/rte_eth_szedata2.c       |   4 +-
 drivers/net/tap/rte_eth_tap.c                 |   4 +-
 drivers/net/tap/rte_eth_tap.h                 |   2 +-
 drivers/net/thunderx/nicvf_ethdev.c           |   4 +-
 drivers/net/thunderx/nicvf_ethdev.h           |   2 +-
 drivers/net/thunderx/nicvf_rxtx.c             |   2 +-
 drivers/net/thunderx/nicvf_rxtx.h             |   2 +-
 drivers/net/thunderx/nicvf_struct.h           |   2 +-
 drivers/net/txgbe/txgbe_ethdev.c              |   2 +-
 drivers/net/txgbe/txgbe_ipsec.c               |   2 +-
 drivers/net/txgbe/txgbe_pf.c                  |   2 +-
 drivers/net/txgbe/txgbe_rxtx.c                |   2 +-
 drivers/net/vhost/rte_eth_vhost.c             |   4 +-
 drivers/net/virtio/virtio_ethdev.c            |   4 +-
 drivers/net/virtio/virtio_pci.h               |   2 +-
 drivers/net/virtio/virtio_rxtx.c              |   2 +-
 drivers/net/virtio/virtio_rxtx_simple.c       |   2 +-
 .../net/virtio/virtio_rxtx_simple_altivec.c   |   2 +-
 drivers/net/virtio/virtio_rxtx_simple_neon.c  |   2 +-
 drivers/net/virtio/virtio_rxtx_simple_sse.c   |   2 +-
 drivers/net/virtio/virtio_user_ethdev.c       |   2 +-
 drivers/net/vmxnet3/vmxnet3_ethdev.c          |   4 +-
 drivers/net/vmxnet3/vmxnet3_rxtx.c            |   2 +-
 lib/librte_eal/include/generic/rte_mcslock.h  |   1 +
 lib/librte_eal/include/meson.build            |   2 +-
 lib/librte_eal/include/rte_compat.h           |  13 +-
 lib/librte_eal/x86/include/meson.build        |  14 +-
 .../{rte_ethdev_driver.h => ethdev_driver.h}  |   0
 .../{rte_ethdev_pci.h => ethdev_pci.h}        |   2 +-
 lib/librte_ethdev/ethdev_private.c            |   2 +-
 .../{rte_ethdev_vdev.h => ethdev_vdev.h}      |   2 +-
 lib/librte_ethdev/meson.build                 |   8 +-
 lib/librte_ethdev/rte_class_eth.c             |   2 +-
 lib/librte_ethdev/rte_ethdev.c                |   2 +-
 lib/librte_ethdev/rte_ethdev.h                |   2 +-
 lib/librte_ethdev/rte_flow_driver.h           |   2 +-
 lib/librte_ethdev/rte_mtr_driver.h            |   2 +-
 lib/librte_ethdev/rte_tm_driver.h             |   2 +-
 .../{rte_eventdev_pmd.h => eventdev_pmd.h}    |   0
 ..._eventdev_pmd_pci.h => eventdev_pmd_pci.h} |   2 +-
 ...ventdev_pmd_vdev.h => eventdev_pmd_vdev.h} |   2 +-
 lib/librte_eventdev/meson.build               |   3 -
 .../rte_event_crypto_adapter.c                |   2 +-
 .../rte_event_eth_rx_adapter.c                |   2 +-
 .../rte_event_eth_tx_adapter.c                |   2 +-
 lib/librte_eventdev/rte_event_timer_adapter.c |   2 +-
 lib/librte_eventdev/rte_eventdev.c            |   2 +-
 lib/librte_hash/meson.build                   |   4 +-
 lib/librte_ipsec/meson.build                  |   3 +-
 lib/librte_lpm/meson.build                    |   2 +-
 lib/librte_power/rte_power_guest_channel.h    |   6 +
 lib/librte_regexdev/meson.build               |   2 +-
 lib/librte_rib/rte_rib6.h                     |   1 +
 lib/librte_ring/meson.build                   |   4 +-
 lib/librte_stack/meson.build                  |   4 +-
 lib/librte_table/meson.build                  |   7 +-
 lib/meson.build                               |   3 +
 meson.build                                   |   6 +
 meson_options.txt                             |   2 +
 301 files changed, 474 insertions(+), 611 deletions(-)
 create mode 100755 buildtools/chkincs/gen_c_file_for_header.py
 create mode 100644 buildtools/chkincs/main.c
 create mode 100644 buildtools/chkincs/meson.build
 delete mode 100755 devtools/check-includes.sh
 rename lib/librte_ethdev/{rte_ethdev_driver.h => ethdev_driver.h} (100%)
 rename lib/librte_ethdev/{rte_ethdev_pci.h => ethdev_pci.h} (99%)
 rename lib/librte_ethdev/{rte_ethdev_vdev.h => ethdev_vdev.h} (97%)
 rename lib/librte_eventdev/{rte_eventdev_pmd.h => eventdev_pmd.h} (100%)
 rename lib/librte_eventdev/{rte_eventdev_pmd_pci.h => eventdev_pmd_pci.h} (99%)
 rename lib/librte_eventdev/{rte_eventdev_pmd_vdev.h => eventdev_pmd_vdev.h} (98%)

--
2.27.0

#150 lore raw

PATCH v7 1/10 eal: add missing include to mcslock

Include 'rte_branch_prediction.h' to get the likely/unlikely macro definitions.

Fixes 2173f3333b61 ("mcslock: add MCS queued lock implementation")
---
 lib/librte_eal/include/generic/rte_mcslock.h | 1 +
 1 file changed, 1 insertion(+)
lib/librte_eal/include/generic/rte_mcslock.h +1 -0
index d370bef17a..9f323bd2a2 100644
@@ -22,6 +22,7 @@
 #include <rte_lcore.h>
 #include <rte_common.h>
 #include <rte_pause.h>
+#include <rte_branch_prediction.h>
 
 /**
  * The rte_mcslock_t type.
Signature · 1 line
2.27.0
#151 lore raw

PATCH v7 2/10 eal: fix error attribute use for clang

In reply to Bruce Richardson

Clang does not have an "error" attribute for functions, so for marking internal functions we need to check for the error attribute, and provide a fallback if it is not present. For clang, we can use "diagnose_if" attribute, similarly checking for its presence before use.

Fixes fba5af82adc8 ("eal: add internal ABI tag definition")
---
 lib/librte_eal/include/rte_compat.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
lib/librte_eal/include/rte_compat.h +12 -1
index 4cd8f68d68..2718612cce 100644
@@ -19,12 +19,23 @@ __attribute__((section(".text.experimental")))
 
 #endif
 
-#ifndef ALLOW_INTERNAL_API
+#ifndef __has_attribute
+/* if no has_attribute assume no support for attribute too */
+#define __has_attribute(x) 0
+#endif
+
+#if !defined ALLOW_INTERNAL_API && __has_attribute(error) /* For GCC */
 
 #define __rte_internal \
 __attribute__((error("Symbol is not public ABI"), \
 section(".text.internal")))
 
+#elif !defined ALLOW_INTERNAL_API && __has_attribute(diagnose_if) /* For clang */
+
+#define __rte_internal \
+__attribute__((diagnose_if(1, "Symbol is not public ABI", "error"), \
+section(".text.internal")))
+
 #else
 
 #define __rte_internal \

--
2.27.0

#152 lore raw

PATCH v7 3/10 power: fix missing header includes

In reply to Bruce Richardson

The rte_power_guest_channel.h file did not include it's dependent headers, so add them.

Fixes 5f443cc0f905 ("power: create guest channel public header file")

---

This is one of those issues where it's hard to identify exactly where the issue started, so picking the commit making the file a public one.

---
 lib/librte_power/rte_power_guest_channel.h | 6 ++++++
 1 file changed, 6 insertions(+)
lib/librte_power/rte_power_guest_channel.h +6 -0
index adc9738174..ed4fbfdcd3 100644
@@ -4,6 +4,12 @@
 #ifndef RTE_POWER_GUEST_CHANNEL_H
 #define RTE_POWER_GUEST_CHANNEL_H
 
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+
+#include <rte_compat.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
Signature · 1 line
2.27.0
#153 lore raw

PATCH v7 4/10 rib: fix missing header include

In reply to Bruce Richardson

The rte_rib6 header was using RTE_MIN macro from rte_common.h but not including the header file.

Fixes f7e861e21c46 ("rib: support IPv6")
---
 lib/librte_rib/rte_rib6.h | 1 +
 1 file changed, 1 insertion(+)
lib/librte_rib/rte_rib6.h +1 -0
index b5e10569b9..dbd52928a2 100644
@@ -20,6 +20,7 @@
 
 #include <rte_memcpy.h>
 #include <rte_compat.h>
+#include <rte_common.h>
 
 #ifdef __cplusplus
 extern "C" {
Signature · 1 line
2.27.0
#154 lore raw

PATCH v7 5/10 ethdev: make driver-only headers private

In reply to Bruce Richardson

The rte_ethdev_driver.h, rte_ethdev_vdev.h and rte_ethdev_pci.h files are for drivers only and should be a private to DPDK and not installed.

---

This patch has some minor conflicts with virtio changes on next-net. The fix for any conflicts is to ensure that any #includes for the renamed files use the new names without the "rte_" prefix.

---
 app/test/test_link_bonding.c                               | 2 +-
 app/test/test_pdump.c                                      | 2 +-
 app/test/virtual_pmd.c                                     | 2 +-
 doc/guides/rel_notes/release_21_02.rst                     | 7 +++++++
 drivers/bus/dpaa/dpaa_bus.c                                | 2 +-
 drivers/bus/dpaa/include/fman.h                            | 2 +-
 drivers/bus/fslmc/fslmc_bus.c                              | 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/event/dpaa2/dpaa2_eventdev.c                       | 2 +-
 drivers/event/dpaa2/dpaa2_hw_dpcon.c                       | 2 +-
 drivers/event/octeontx/ssovf_evdev.c                       | 2 +-
 drivers/mempool/dpaa2/dpaa2_hw_mempool.c                   | 2 +-
 drivers/net/af_packet/rte_eth_af_packet.c                  | 4 ++--
 drivers/net/af_xdp/rte_eth_af_xdp.c                        | 4 ++--
 drivers/net/ark/ark_ethdev.c                               | 2 +-
 drivers/net/ark/ark_ethdev_rx.h                            | 2 +-
 drivers/net/ark/ark_ethdev_tx.h                            | 2 +-
 drivers/net/ark/ark_ext.h                                  | 2 +-
 drivers/net/ark/ark_global.h                               | 2 +-
 drivers/net/ark/ark_pktchkr.c                              | 2 +-
 drivers/net/ark/ark_pktgen.c                               | 2 +-
 drivers/net/atlantic/atl_ethdev.c                          | 2 +-
 drivers/net/atlantic/atl_rxtx.c                            | 2 +-
 drivers/net/atlantic/rte_pmd_atlantic.c                    | 2 +-
 drivers/net/avp/avp_ethdev.c                               | 4 ++--
 drivers/net/axgbe/axgbe_common.h                           | 2 +-
 drivers/net/bnx2x/bnx2x_ethdev.c                           | 2 +-
 drivers/net/bnx2x/bnx2x_ethdev.h                           | 2 +-
 drivers/net/bnxt/bnxt.h                                    | 2 +-
 drivers/net/bnxt/bnxt_ethdev.c                             | 4 ++--
 drivers/net/bnxt/bnxt_stats.h                              | 2 +-
 drivers/net/bnxt/rte_pmd_bnxt.c                            | 2 +-
 drivers/net/bonding/eth_bond_private.h                     | 2 +-
 drivers/net/bonding/rte_eth_bond_api.c                     | 2 +-
 drivers/net/bonding/rte_eth_bond_pmd.c                     | 4 ++--
 drivers/net/cxgbe/base/t4_hw.c                             | 2 +-
 drivers/net/cxgbe/base/t4vf_hw.c                           | 2 +-
 drivers/net/cxgbe/cxgbe_ethdev.c                           | 4 ++--
 drivers/net/cxgbe/cxgbe_main.c                             | 4 ++--
 drivers/net/cxgbe/cxgbevf_ethdev.c                         | 4 ++--
 drivers/net/cxgbe/cxgbevf_main.c                           | 4 ++--
 drivers/net/cxgbe/sge.c                                    | 2 +-
 drivers/net/dpaa/dpaa_ethdev.c                             | 2 +-
 drivers/net/dpaa/dpaa_ethdev.h                             | 2 +-
 drivers/net/dpaa/dpaa_rxtx.c                               | 2 +-
 drivers/net/dpaa2/base/dpaa2_hw_dpni.c                     | 2 +-
 drivers/net/dpaa2/dpaa2_ethdev.c                           | 2 +-
 drivers/net/dpaa2/dpaa2_rxtx.c                             | 2 +-
 drivers/net/e1000/em_ethdev.c                              | 4 ++--
 drivers/net/e1000/em_rxtx.c                                | 2 +-
 drivers/net/e1000/igb_ethdev.c                             | 4 ++--
 drivers/net/e1000/igb_flow.c                               | 4 ++--
 drivers/net/e1000/igb_pf.c                                 | 2 +-
 drivers/net/e1000/igb_rxtx.c                               | 2 +-
 drivers/net/ena/ena_ethdev.c                               | 4 ++--
 drivers/net/enetc/enetc_ethdev.c                           | 2 +-
 drivers/net/enic/enic_ethdev.c                             | 4 ++--
 drivers/net/enic/enic_flow.c                               | 2 +-
 drivers/net/enic/enic_fm_flow.c                            | 2 +-
 drivers/net/enic/enic_main.c                               | 2 +-
 drivers/net/enic/enic_res.c                                | 2 +-
 drivers/net/enic/enic_rxtx.c                               | 2 +-
 drivers/net/enic/enic_rxtx_vec_avx2.c                      | 2 +-
 drivers/net/enic/enic_vf_representor.c                     | 4 ++--
 drivers/net/failsafe/failsafe.c                            | 4 ++--
 drivers/net/failsafe/failsafe_ops.c                        | 2 +-
 drivers/net/failsafe/failsafe_private.h                    | 2 +-
 drivers/net/failsafe/failsafe_rxtx.c                       | 2 +-
 drivers/net/fm10k/fm10k_ethdev.c                           | 4 ++--
 drivers/net/fm10k/fm10k_rxtx.c                             | 2 +-
 drivers/net/fm10k/fm10k_rxtx_vec.c                         | 2 +-
 drivers/net/hinic/base/hinic_pmd_hwdev.c                   | 2 +-
 drivers/net/hinic/hinic_pmd_ethdev.c                       | 2 +-
 drivers/net/hinic/hinic_pmd_ethdev.h                       | 2 +-
 drivers/net/hns3/hns3_cmd.c                                | 2 +-
 drivers/net/hns3/hns3_ethdev.c                             | 2 +-
 drivers/net/hns3/hns3_ethdev.h                             | 2 +-
 drivers/net/hns3/hns3_ethdev_vf.c                          | 2 +-
 drivers/net/hns3/hns3_fdir.c                               | 2 +-
 drivers/net/hns3/hns3_mbx.c                                | 2 +-
 drivers/net/hns3/hns3_mp.c                                 | 2 +-
 drivers/net/hns3/hns3_regs.c                               | 2 +-
 drivers/net/hns3/hns3_rxtx.c                               | 2 +-
 drivers/net/hns3/hns3_rxtx_vec.c                           | 2 +-
 drivers/net/hns3/hns3_rxtx_vec_sve.c                       | 2 +-
 drivers/net/i40e/i40e_ethdev.c                             | 4 ++--
 drivers/net/i40e/i40e_ethdev_vf.c                          | 4 ++--
 drivers/net/i40e/i40e_fdir.c                               | 2 +-
 drivers/net/i40e/i40e_flow.c                               | 2 +-
 drivers/net/i40e/i40e_pf.c                                 | 2 +-
 drivers/net/i40e/i40e_rxtx.c                               | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_altivec.c                   | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx2.c                      | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_avx512.c                    | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_common.h                    | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_neon.c                      | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c                       | 2 +-
 drivers/net/i40e/i40e_vf_representor.c                     | 2 +-
 drivers/net/iavf/iavf_ethdev.c                             | 4 ++--
 drivers/net/iavf/iavf_fdir.c                               | 2 +-
 drivers/net/iavf/iavf_generic_flow.c                       | 2 +-
 drivers/net/iavf/iavf_hash.c                               | 2 +-
 drivers/net/iavf/iavf_rxtx.c                               | 2 +-
 drivers/net/iavf/iavf_rxtx_vec_common.h                    | 2 +-
 drivers/net/iavf/iavf_rxtx_vec_sse.c                       | 2 +-
 drivers/net/iavf/iavf_vchnl.c                              | 4 ++--
 drivers/net/ice/ice_acl_filter.c                           | 2 +-
 drivers/net/ice/ice_dcf.c                                  | 4 ++--
 drivers/net/ice/ice_dcf.h                                  | 2 +-
 drivers/net/ice/ice_dcf_ethdev.c                           | 2 +-
 drivers/net/ice/ice_ethdev.c                               | 2 +-
 drivers/net/ice/ice_ethdev.h                               | 2 +-
 drivers/net/ice/ice_generic_flow.c                         | 2 +-
 drivers/net/ice/ice_hash.c                                 | 2 +-
 drivers/net/ice/ice_rxtx.c                                 | 2 +-
 drivers/net/ice/ice_switch_filter.c                        | 2 +-
 drivers/net/igc/igc_ethdev.c                               | 4 ++--
 drivers/net/igc/igc_filter.h                               | 2 +-
 drivers/net/igc/igc_txrx.c                                 | 2 +-
 drivers/net/ionic/ionic_ethdev.c                           | 4 ++--
 drivers/net/ionic/ionic_lif.c                              | 2 +-
 drivers/net/ionic/ionic_rxtx.c                             | 2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.c                         | 2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.h                         | 4 ++--
 drivers/net/ipn3ke/ipn3ke_flow.c                           | 2 +-
 drivers/net/ipn3ke/ipn3ke_representor.c                    | 2 +-
 drivers/net/ipn3ke/ipn3ke_tm.c                             | 2 +-
 drivers/net/ixgbe/ixgbe_bypass.c                           | 2 +-
 drivers/net/ixgbe/ixgbe_ethdev.c                           | 4 ++--
 drivers/net/ixgbe/ixgbe_fdir.c                             | 2 +-
 drivers/net/ixgbe/ixgbe_flow.c                             | 2 +-
 drivers/net/ixgbe/ixgbe_ipsec.c                            | 4 ++--
 drivers/net/ixgbe/ixgbe_pf.c                               | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c                             | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h                  | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c                    | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c                     | 2 +-
 drivers/net/ixgbe/ixgbe_vf_representor.c                   | 2 +-
 drivers/net/ixgbe/rte_pmd_ixgbe.c                          | 2 +-
 drivers/net/kni/rte_eth_kni.c                              | 4 ++--
 drivers/net/liquidio/base/lio_23xx_vf.c                    | 2 +-
 drivers/net/liquidio/base/lio_mbox.c                       | 2 +-
 drivers/net/liquidio/lio_ethdev.c                          | 4 ++--
 drivers/net/liquidio/lio_rxtx.c                            | 2 +-
 drivers/net/memif/memif_socket.c                           | 4 ++--
 drivers/net/memif/rte_eth_memif.c                          | 4 ++--
 drivers/net/memif/rte_eth_memif.h                          | 2 +-
 drivers/net/mlx4/mlx4.c                                    | 4 ++--
 drivers/net/mlx4/mlx4.h                                    | 2 +-
 drivers/net/mlx4/mlx4_ethdev.c                             | 2 +-
 drivers/net/mlx4/mlx4_flow.c                               | 2 +-
 drivers/net/mlx4/mlx4_flow.h                               | 2 +-
 drivers/net/mlx4/mlx4_intr.c                               | 2 +-
 drivers/net/mlx4/mlx4_mp.c                                 | 2 +-
 drivers/net/mlx4/mlx4_rxq.c                                | 2 +-
 drivers/net/mlx4/mlx4_rxtx.h                               | 2 +-
 drivers/net/mlx4/mlx4_txq.c                                | 2 +-
 drivers/net/mlx5/linux/mlx5_ethdev_os.c                    | 2 +-
 drivers/net/mlx5/linux/mlx5_mp_os.c                        | 2 +-
 drivers/net/mlx5/linux/mlx5_os.c                           | 4 ++--
 drivers/net/mlx5/linux/mlx5_verbs.c                        | 2 +-
 drivers/net/mlx5/linux/mlx5_vlan_os.c                      | 2 +-
 drivers/net/mlx5/mlx5.c                                    | 4 ++--
 drivers/net/mlx5/mlx5.h                                    | 2 +-
 drivers/net/mlx5/mlx5_defs.h                               | 2 +-
 drivers/net/mlx5/mlx5_ethdev.c                             | 2 +-
 drivers/net/mlx5/mlx5_flow.c                               | 2 +-
 drivers/net/mlx5/mlx5_flow_dv.c                            | 2 +-
 drivers/net/mlx5/mlx5_flow_verbs.c                         | 2 +-
 drivers/net/mlx5/mlx5_mac.c                                | 2 +-
 drivers/net/mlx5/mlx5_rss.c                                | 2 +-
 drivers/net/mlx5/mlx5_rxmode.c                             | 2 +-
 drivers/net/mlx5/mlx5_rxq.c                                | 2 +-
 drivers/net/mlx5/mlx5_stats.c                              | 2 +-
 drivers/net/mlx5/mlx5_trigger.c                            | 2 +-
 drivers/net/mlx5/mlx5_txpp.c                               | 2 +-
 drivers/net/mlx5/mlx5_txq.c                                | 2 +-
 drivers/net/mlx5/mlx5_vlan.c                               | 2 +-
 drivers/net/mlx5/windows/mlx5_ethdev_os.c                  | 2 +-
 drivers/net/mlx5/windows/mlx5_mp_os.c                      | 2 +-
 drivers/net/mlx5/windows/mlx5_os.c                         | 2 +-
 drivers/net/mlx5/windows/mlx5_vlan_os.c                    | 2 +-
 drivers/net/mvneta/mvneta_ethdev.c                         | 2 +-
 drivers/net/mvpp2/mrvl_ethdev.c                            | 2 +-
 drivers/net/netvsc/hn_ethdev.c                             | 2 +-
 drivers/net/netvsc/hn_rndis.c                              | 2 +-
 drivers/net/netvsc/hn_vf.c                                 | 2 +-
 drivers/net/nfb/nfb_ethdev.c                               | 2 +-
 drivers/net/nfb/nfb_tx.h                                   | 2 +-
 drivers/net/nfp/nfp_net.c                                  | 4 ++--
 drivers/net/nfp/nfpcore/nfp_cpp.h                          | 2 +-
 drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c                 | 2 +-
 drivers/net/nfp/nfpcore/nfp_cppcore.c                      | 2 +-
 drivers/net/null/rte_eth_null.c                            | 4 ++--
 drivers/net/octeontx/octeontx_ethdev.h                     | 2 +-
 drivers/net/octeontx/octeontx_rxtx.c                       | 2 +-
 drivers/net/octeontx/octeontx_rxtx.h                       | 2 +-
 drivers/net/octeontx2/otx2_ethdev.c                        | 2 +-
 drivers/net/octeontx2/otx2_link.c                          | 2 +-
 drivers/net/octeontx2/otx2_ptp.c                           | 2 +-
 drivers/net/pcap/rte_eth_pcap.c                            | 4 ++--
 drivers/net/pfe/pfe_eth.h                                  | 2 +-
 drivers/net/pfe/pfe_ethdev.c                               | 2 +-
 drivers/net/qede/qede_ethdev.h                             | 4 ++--
 drivers/net/ring/rte_eth_ring.c                            | 2 +-
 drivers/net/sfc/sfc.h                                      | 2 +-
 drivers/net/sfc/sfc_dp_rx.h                                | 2 +-
 drivers/net/sfc/sfc_dp_tx.h                                | 2 +-
 drivers/net/sfc/sfc_ethdev.c                               | 4 ++--
 drivers/net/sfc/sfc_ev.h                                   | 2 +-
 drivers/net/sfc/sfc_flow.c                                 | 2 +-
 drivers/net/sfc/sfc_rx.h                                   | 2 +-
 drivers/net/sfc/sfc_tx.h                                   | 2 +-
 drivers/net/softnic/rte_eth_softnic.c                      | 4 ++--
 drivers/net/softnic/rte_eth_softnic_internals.h            | 2 +-
 drivers/net/szedata2/rte_eth_szedata2.c                    | 4 ++--
 drivers/net/tap/rte_eth_tap.c                              | 4 ++--
 drivers/net/tap/rte_eth_tap.h                              | 2 +-
 drivers/net/thunderx/nicvf_ethdev.c                        | 4 ++--
 drivers/net/thunderx/nicvf_ethdev.h                        | 2 +-
 drivers/net/thunderx/nicvf_rxtx.c                          | 2 +-
 drivers/net/thunderx/nicvf_rxtx.h                          | 2 +-
 drivers/net/thunderx/nicvf_struct.h                        | 2 +-
 drivers/net/txgbe/txgbe_ethdev.c                           | 2 +-
 drivers/net/txgbe/txgbe_ipsec.c                            | 2 +-
 drivers/net/txgbe/txgbe_pf.c                               | 2 +-
 drivers/net/txgbe/txgbe_rxtx.c                             | 2 +-
 drivers/net/vhost/rte_eth_vhost.c                          | 4 ++--
 drivers/net/virtio/virtio_ethdev.c                         | 4 ++--
 drivers/net/virtio/virtio_pci.h                            | 2 +-
 drivers/net/virtio/virtio_rxtx.c                           | 2 +-
 drivers/net/virtio/virtio_rxtx_simple.c                    | 2 +-
 drivers/net/virtio/virtio_rxtx_simple_altivec.c            | 2 +-
 drivers/net/virtio/virtio_rxtx_simple_neon.c               | 2 +-
 drivers/net/virtio/virtio_rxtx_simple_sse.c                | 2 +-
 drivers/net/virtio/virtio_user_ethdev.c                    | 2 +-
 drivers/net/vmxnet3/vmxnet3_ethdev.c                       | 4 ++--
 drivers/net/vmxnet3/vmxnet3_rxtx.c                         | 2 +-
 lib/librte_ethdev/{rte_ethdev_driver.h => ethdev_driver.h} | 0
 lib/librte_ethdev/{rte_ethdev_pci.h => ethdev_pci.h}       | 2 +-
 lib/librte_ethdev/ethdev_private.c                         | 2 +-
 lib/librte_ethdev/{rte_ethdev_vdev.h => ethdev_vdev.h}     | 2 +-
 lib/librte_ethdev/meson.build                              | 3 ---
 lib/librte_ethdev/rte_class_eth.c                          | 2 +-
 lib/librte_ethdev/rte_ethdev.c                             | 2 +-
 lib/librte_ethdev/rte_ethdev.h                             | 2 +-
 lib/librte_ethdev/rte_flow_driver.h                        | 2 +-
 lib/librte_ethdev/rte_mtr_driver.h                         | 2 +-
 lib/librte_ethdev/rte_tm_driver.h                          | 2 +-
 252 files changed, 302 insertions(+), 298 deletions(-)
 rename lib/librte_ethdev/{rte_ethdev_driver.h => ethdev_driver.h} (100%)
 rename lib/librte_ethdev/{rte_ethdev_pci.h => ethdev_pci.h} (99%)
 rename lib/librte_ethdev/{rte_ethdev_vdev.h => ethdev_vdev.h} (97%)
app/test/test_link_bonding.c +1 -1
index e8b76bd850..8a5c8310a8 100644
@@ -17,7 +17,7 @@
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_lcore.h>
 #include <rte_memory.h>
app/test/test_pdump.c +1 -1
index 21fcc1bc4c..b49fcfb3f1 100644
@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_pdump.h>
 #include "rte_eal.h"
 #include "rte_lcore.h"
app/test/virtual_pmd.c +1 -1
index 2c24c9b3f5..7036f401ed 100644
@@ -4,7 +4,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_malloc.h>
doc/guides/rel_notes/release_21_02.rst +7 -0
index 8ea957738f..3831d1ca1e 100644
@@ -145,11 +145,18 @@ Removed Items
    Also, make sure to start the actual text at the margin.
    =======================================================
 
+* The internal header files ``rte_ethdev_driver.h``, ``rte_ethdev_vdev.h`` and
+  ``rte_ethdev_pci.h`` are no longer installed as part of the DPDK ``ninja
+  install`` action and are renamed to ``ethdev_driver.h``, ``ethdev_vdev.h`` and
+  ``ethdev_pci.h`` respectively in the source tree, to reflect the fact that
+  they are non-public headers.
+
 * Removed support for NetXtreme devices belonging to ``BCM573xx and
   BCM5740x`` families. Specifically the support for the following Broadcom
   PCI device IDs ``0x16c8, 0x16c9, 0x16ca, 0x16ce, 0x16cf, 0x16df, 0x16d0,``
   ``0x16d1, 0x16d2, 0x16d4, 0x16d5, 0x16e7, 0x16e8, 0x16e9`` has been removed.
 
+
 API Changes
 -----------
 
drivers/bus/dpaa/dpaa_bus.c +1 -1
index f39d6e2092..662cbfaae5 100644
@@ -27,7 +27,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
 #include <rte_bus.h>
drivers/bus/dpaa/include/fman.h +1 -1
index f2b0bf91e7..516c6c1515 100644
@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #include <net/if.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 
 #include <compat.h>
drivers/bus/fslmc/fslmc_bus.c +1 -1
index 58435589b2..26910ac01f 100644
@@ -13,7 +13,7 @@
 #include <rte_malloc.h>
 #include <rte_devargs.h>
 #include <rte_memcpy.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_mbuf_dyn.h>
 
 #include <rte_fslmc.h>
drivers/bus/fslmc/fslmc_vfio.c +1 -1
index b52f36c33e..c8373e627a 100644
@@ -22,7 +22,7 @@
 
 #include <eal_filesystem.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c +1 -1
index d9619848d8..122aa1740d 100644
@@ -19,7 +19,7 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_mbuf_pool_ops.h>
 
 #include <fslmc_logs.h>
drivers/bus/fslmc/portal/dpaa2_hw_dpci.c +1 -1
index d393ce6186..8ed969c7c0 100644
@@ -18,7 +18,7 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <fslmc_logs.h>
 #include <rte_fslmc.h>
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +1 -1
index 1a9dd18b99..c6f8312a1d 100644
@@ -24,7 +24,7 @@
 #include<sys/eventfd.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/event/dpaa2/dpaa2_eventdev.c +1 -1
index eeb2494bd0..e4fa3a2e46 100644
@@ -24,7 +24,7 @@
 #include <rte_memory.h>
 #include <rte_pci.h>
 #include <rte_bus_vdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cryptodev.h>
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_event_eth_tx_adapter.h>
drivers/event/dpaa2/dpaa2_hw_dpcon.c +1 -1
index 200b71640b..acc1fde771 100644
@@ -18,7 +18,7 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <rte_fslmc.h>
 #include <mc/fsl_dpcon.h>
drivers/event/octeontx/ssovf_evdev.c +1 -1
index e60a7dc69e..17325bbf6a 100644
@@ -8,7 +8,7 @@
 #include <rte_debug.h>
 #include <rte_dev.h>
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_kvargs.h>
 #include <rte_lcore.h>
drivers/mempool/dpaa2/dpaa2_hw_mempool.c +1 -1
index 97ce08d78f..ca49a8d42a 100644
@@ -14,7 +14,7 @@
 #include <errno.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/af_packet/rte_eth_af_packet.c +2 -2
index 671ee87ae2..bfe5a0a451 100644
@@ -8,8 +8,8 @@
 
 #include <rte_string_fns.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
drivers/net/af_xdp/rte_eth_af_xdp.c +2 -2
index 703b7417ed..b8d5ad0d91 100644
@@ -19,8 +19,8 @@
 #include <bpf/xsk.h>
 
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
 #include <rte_string_fns.h>
drivers/net/ark/ark_ethdev.c +1 -1
index a658993512..ef650a4658 100644
@@ -7,7 +7,7 @@
 #include <dlfcn.h>
 
 #include <rte_bus_pci.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_kvargs.h>
 
 #include "rte_pmd_ark.h"
drivers/net/ark/ark_ethdev_rx.h +1 -1
index 001fa9bdfa..33c1f2c953 100644
@@ -9,7 +9,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 extern uint64_t ark_timestamp_rx_dynflag;
 extern int ark_timestamp_dynfield_offset;
drivers/net/ark/ark_ethdev_tx.h +1 -1
index e448ce2225..12c71a7158 100644
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 
 uint16_t eth_ark_xmit_pkts_noop(void *vtxq,
drivers/net/ark/ark_ext.h +1 -1
index 5a987e4d67..821fb55bba 100644
@@ -5,7 +5,7 @@
 #ifndef _ARK_EXT_H_
 #define _ARK_EXT_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 /*
  * This is the template file for users who which to define a dynamic
drivers/net/ark/ark_global.h +1 -1
index 403df5900b..91726ecc20 100644
@@ -9,7 +9,7 @@
 #include <assert.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/ark/ark_pktchkr.c +1 -1
index b8fb69497d..0f2d31e5be 100644
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ark_pktchkr.h"
drivers/net/ark/ark_pktgen.c +1 -1
index 4a02662a46..ac4322a359 100644
@@ -10,7 +10,7 @@
 #include <rte_string_fns.h>
 #include <rte_eal.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ark_pktgen.h"
drivers/net/atlantic/atl_ethdev.c +1 -1
index b0716773ad..473f6209f6 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_alarm.h>
 
 #include "atl_ethdev.h"
drivers/net/atlantic/atl_rxtx.c +1 -1
index 449ffd454d..7d367c9306 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_net.h>
 
 #include "atl_ethdev.h"
drivers/net/atlantic/rte_pmd_atlantic.c +1 -1
index 2962f5c6cb..00fc2872e5 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018 Aquantia Corporation
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "rte_pmd_atlantic.h"
 #include "atl_ethdev.h"
drivers/net/avp/avp_ethdev.c +2 -2
index f531e03c02..566a3606a2 100644
@@ -8,8 +8,8 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
 #include <rte_malloc.h>
drivers/net/axgbe/axgbe_common.h +1 -1
index 91404ca01c..b83fdcca85 100644
@@ -35,7 +35,7 @@
 #include <rte_ethdev.h>
 #include <rte_dev.h>
 #include <rte_errno.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_io.h>
drivers/net/bnx2x/bnx2x_ethdev.c +1 -1
index d35c75a2e2..50db70dfcd 100644
@@ -10,7 +10,7 @@
 
 #include <rte_string_fns.h>
 #include <rte_dev.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_alarm.h>
 
 /*
drivers/net/bnx2x/bnx2x_ethdev.h +1 -1
index f712bb3e84..fa1c3ba955 100644
@@ -31,7 +31,7 @@
 #include <rte_debug.h>
 #include <rte_pci.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_spinlock.h>
 #include <rte_eal.h>
 #include <rte_mempool.h>
drivers/net/bnxt/bnxt.h +1 -1
index d2d76b623a..0db6e58f3d 100644
@@ -12,7 +12,7 @@
 
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memory.h>
 #include <rte_lcore.h>
 #include <rte_spinlock.h>
drivers/net/bnxt/bnxt_ethdev.c +2 -2
index 74b0f3d1dc..e8a7a8ecd4 100644
@@ -7,8 +7,8 @@
 #include <stdbool.h>
 
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
 #include <rte_alarm.h>
drivers/net/bnxt/bnxt_stats.h +1 -1
index 3cf2a1b822..50c3d92b9a 100644
@@ -6,7 +6,7 @@
 #ifndef _BNXT_STATS_H_
 #define _BNXT_STATS_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 void bnxt_free_stats(struct bnxt *bp);
 int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
drivers/net/bnxt/rte_pmd_bnxt.c +1 -1
index d67db46c65..965381c0c4 100644
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
 #include <rte_byteorder.h>
drivers/net/bonding/eth_bond_private.h +1 -1
index 8f198bd50e..75fb8dc02e 100644
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <sys/queue.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_spinlock.h>
 #include <rte_bitmap.h>
drivers/net/bonding/rte_eth_bond_api.c +1 -1
index 55c8e3167c..17e6ff8b90 100644
@@ -6,7 +6,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_tcp.h>
 #include <rte_bus_vdev.h>
 #include <rte_kvargs.h>
drivers/net/bonding/rte_eth_bond_pmd.c +2 -2
index 66ab8dd693..5241c60089 100644
@@ -7,8 +7,8 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_tcp.h>
 #include <rte_udp.h>
 #include <rte_ip.h>
drivers/net/cxgbe/base/t4_hw.c +1 -1
index ef20dc6675..0e3033b550 100644
@@ -16,7 +16,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/cxgbe/base/t4vf_hw.c +1 -1
index cd011bc1b8..561d759dbc 100644
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 
 #include "common.h"
drivers/net/cxgbe/cxgbe_ethdev.c +2 -2
index cfa385bab7..bfa57c979d 100644
@@ -28,8 +28,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/cxgbe/cxgbe_main.c +2 -2
index 3b56eccfbe..83ad758e88 100644
@@ -27,8 +27,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_random.h>
 #include <rte_dev.h>
 #include <rte_kvargs.h>
drivers/net/cxgbe/cxgbevf_ethdev.c +2 -2
index c2918f5356..bf1815c25f 100644
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 
 #include "cxgbe.h"
 #include "cxgbe_pfvf.h"
drivers/net/cxgbe/cxgbevf_main.c +2 -2
index 9ee060504f..f639612ae4 100644
@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 
 #include "base/common.h"
drivers/net/cxgbe/sge.c +1 -1
index 8c7dbe3a1d..56b8ec1f33 100644
@@ -28,7 +28,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/dpaa/dpaa_ethdev.c +1 -1
index 0c87c136d7..d643514de6 100644
@@ -29,7 +29,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
 
drivers/net/dpaa/dpaa_ethdev.h +1 -1
index a858b1372c..b5728e09c2 100644
@@ -9,7 +9,7 @@
 
 /* System headers */
 #include <stdbool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_event_eth_rx_adapter.h>
 
 #include <fsl_usd.h>
drivers/net/dpaa/dpaa_rxtx.c +1 -1
index e2459d9b99..e38fba23c0 100644
@@ -26,7 +26,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
 #include <rte_ip.h>
drivers/net/dpaa2/base/dpaa2_hw_dpni.c +1 -1
index 25b1d2bb6d..87c893db51 100644
@@ -9,7 +9,7 @@
 #include <net/if.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/dpaa2/dpaa2_ethdev.c +1 -1
index 6f38da3cce..38774e255b 100644
@@ -9,7 +9,7 @@
 #include <net/if.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/dpaa2/dpaa2_rxtx.c +1 -1
index 9cca6d16c3..003b379fa7 100644
@@ -9,7 +9,7 @@
 #include <net/if.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/e1000/em_ethdev.c +2 -2
index 2036c6e917..9b8c4a7de5 100644
@@ -15,8 +15,8 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
 #include <rte_malloc.h>
drivers/net/e1000/em_rxtx.c +1 -1
index 19e3bffd46..db5d1222ce 100644
@@ -32,7 +32,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_ip.h>
 #include <rte_udp.h>
drivers/net/e1000/igb_ethdev.c +2 -2
index dfe87508c2..ec355cbf35 100644
@@ -17,8 +17,8 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
 #include <rte_malloc.h>
drivers/net/e1000/igb_flow.c +2 -2
index ccb184df95..33f6b1d6b3 100644
@@ -15,8 +15,8 @@
 #include <rte_debug.h>
 #include <rte_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
 #include <rte_atomic.h>
drivers/net/e1000/igb_pf.c +1 -1
index 9d74c08abe..2ce74dd5a9 100644
@@ -16,7 +16,7 @@
 #include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memcpy.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
drivers/net/e1000/igb_rxtx.c +1 -1
index dd520cd82c..1500d2ffff 100644
@@ -31,7 +31,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_udp.h>
 #include <rte_tcp.h>
drivers/net/ena/ena_ethdev.c +2 -2
index 20ff3653c6..c796af4aa7 100644
@@ -5,8 +5,8 @@
 
 #include <rte_string_fns.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_tcp.h>
 #include <rte_atomic.h>
 #include <rte_dev.h>
drivers/net/enetc/enetc_ethdev.c +1 -1
index 4d2c9c0474..0b45168c60 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdbool.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_random.h>
 #include <dpaax_iova_table.h>
 
drivers/net/enic/enic_ethdev.c +2 -2
index 1c8d60e264..b3f441c8f7 100644
@@ -9,8 +9,8 @@
 #include <rte_dev.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_kvargs.h>
 #include <rte_string_fns.h>
 
drivers/net/enic/enic_flow.c +1 -1
index 1eec96abca..97ee7509ce 100644
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <rte_log.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow_driver.h>
 #include <rte_ether.h>
 #include <rte_ip.h>
drivers/net/enic/enic_fm_flow.c +1 -1
index ad1e89a581..21d9b1cef7 100644
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <rte_log.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow_driver.h>
 #include <rte_ether.h>
 #include <rte_hash.h>
drivers/net/enic/enic_main.c +1 -1
index 805eb5e46a..2a06d46872 100644
@@ -15,7 +15,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "enic_compat.h"
 #include "enic.h"
drivers/net/enic/enic_res.c +1 -1
index 1405db15ab..689bf748ae 100644
@@ -4,7 +4,7 @@
  */
 
 #include "enic_compat.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "wq_enet_desc.h"
 #include "rq_enet_desc.h"
 #include "cq_enet_desc.h"
drivers/net/enic/enic_rxtx.c +1 -1
index 4b6b97eb10..a2a02227e3 100644
@@ -4,7 +4,7 @@
  */
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_net.h>
 #include <rte_prefetch.h>
 
drivers/net/enic/enic_rxtx_vec_avx2.c +1 -1
index f0bea33423..1848f52717 100644
@@ -4,7 +4,7 @@
  */
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_vect.h>
 
 #include "enic_compat.h"
drivers/net/enic/enic_vf_representor.c +2 -2
index c2c03c0281..f7b79c1c4e 100644
@@ -8,8 +8,8 @@
 #include <rte_bus_pci.h>
 #include <rte_common.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_flow_driver.h>
 #include <rte_kvargs.h>
 #include <rte_pci.h>
drivers/net/failsafe/failsafe.c +2 -2
index ba81c82174..e3bda0df2b 100644
@@ -7,8 +7,8 @@
 
 #include <rte_alarm.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_devargs.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
drivers/net/failsafe/failsafe_ops.c +1 -1
index 492047f587..2b6ca9080d 100644
@@ -9,7 +9,7 @@
 
 #include <rte_debug.h>
 #include <rte_atomic.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_flow.h>
 #include <rte_cycles.h>
drivers/net/failsafe/failsafe_private.h +1 -1
index 0f9a572af8..cd39d103c6 100644
@@ -12,7 +12,7 @@
 
 #include <rte_atomic.h>
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_devargs.h>
 #include <rte_flow.h>
 #include <rte_interrupts.h>
drivers/net/failsafe/failsafe_rxtx.c +1 -1
index fee08fa23c..fe67293299 100644
@@ -6,7 +6,7 @@
 #include <rte_atomic.h>
 #include <rte_debug.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "failsafe_private.h"
 
drivers/net/fm10k/fm10k_ethdev.c +2 -2
index c187088a33..fd471c415e 100644
@@ -2,8 +2,8 @@
  * Copyright(c) 2013-2016 Intel Corporation
  */
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
 #include <rte_string_fns.h>
drivers/net/fm10k/fm10k_rxtx.c +1 -1
index 4accaa2cd6..8585c5b9e4 100644
@@ -4,7 +4,7 @@
 
 #include <inttypes.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_net.h>
 #include "fm10k.h"
drivers/net/fm10k/fm10k_rxtx_vec.c +1 -1
index 6fcc939ad9..39e3cdac1f 100644
@@ -4,7 +4,7 @@
 
 #include <inttypes.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include "fm10k.h"
 #include "base/fm10k_type.h"
drivers/net/hinic/base/hinic_pmd_hwdev.c +1 -1
index 41c99bdbf8..cb9cf6efa2 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2017 Huawei Technologies Co., Ltd
  */
 
-#include<rte_ethdev_driver.h>
+#include<ethdev_driver.h>
 #include <rte_bus_pci.h>
 #include <rte_hash.h>
 #include <rte_jhash.h>
drivers/net/hinic/hinic_pmd_ethdev.c +1 -1
index 5a2c171099..1d6b710c9f 100644
@@ -4,7 +4,7 @@
 
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
drivers/net/hinic/hinic_pmd_ethdev.h +1 -1
index c7338d83be..70b4d32ff2 100644
@@ -7,7 +7,7 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "base/hinic_compat.h"
 #include "base/hinic_pmd_cfg.h"
drivers/net/hns3/hns3_cmd.c +1 -1
index f58f4f7adc..45dbead512 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_io.h>
 
 #include "hns3_ethdev.h"
drivers/net/hns3/hns3_ethdev.c +1 -1
index 449d967784..a796469435 100644
@@ -4,7 +4,7 @@
 
 #include <rte_alarm.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 
 #include "hns3_ethdev.h"
drivers/net/hns3/hns3_ethdev.h +1 -1
index 0d17170fa7..6374a76794 100644
@@ -6,7 +6,7 @@
 #define _HNS3_ETHDEV_H_
 
 #include <sys/time.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_byteorder.h>
 #include <rte_io.h>
 #include <rte_spinlock.h>
drivers/net/hns3/hns3_ethdev_vf.c +1 -1
index bb4ec6bb39..394ffe38cd 100644
@@ -4,7 +4,7 @@
 
 #include <linux/pci_regs.h>
 #include <rte_alarm.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_io.h>
 #include <rte_pci.h>
 #include <rte_vfio.h>
drivers/net/hns3/hns3_fdir.c +1 -1
index 857cc94c98..896540df78 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_hash.h>
 #include <rte_hash_crc.h>
 #include <rte_io.h>
drivers/net/hns3/hns3_mbx.c +1 -1
index d2a5db8aab..1d500b984c 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_io.h>
 
 #include "hns3_ethdev.h"
drivers/net/hns3/hns3_mp.c +1 -1
index ed2567a8ff..3342a781ad 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 #include <rte_io.h>
 
drivers/net/hns3/hns3_regs.c +1 -1
index f2cb465eed..01550458b7 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018-2019 Hisilicon Limited.
  */
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_io.h>
 
 #include "hns3_ethdev.h"
drivers/net/hns3/hns3_rxtx.c +1 -1
index 0badfc9260..676962553f 100644
@@ -6,7 +6,7 @@
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_vxlan.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_io.h>
 #include <rte_net.h>
 #include <rte_malloc.h>
drivers/net/hns3/hns3_rxtx_vec.c +1 -1
index a26c83d146..2bc4372449 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_io.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "hns3_ethdev.h"
 #include "hns3_rxtx.h"
drivers/net/hns3/hns3_rxtx_vec_sve.c +1 -1
index 8c2c8f6108..b02bae7a0d 100644
@@ -4,7 +4,7 @@
 
 #include <arm_sve.h>
 #include <rte_io.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "hns3_ethdev.h"
 #include "hns3_rxtx.h"
drivers/net/i40e/i40e_ethdev.c +2 -2
index 946994b80a..d7cd049891 100644
@@ -17,8 +17,8 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memzone.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
drivers/net/i40e/i40e_ethdev_vf.c +2 -2
index 5d7db7fe13..2909b4d894 100644
@@ -25,8 +25,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_dev.h>
 
drivers/net/i40e/i40e_fdir.c +1 -1
index f5defcf585..c572d003cb 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_memzone.h>
 #include <rte_malloc.h>
drivers/net/i40e/i40e_flow.c +1 -1
index 7fe760dba2..4d44282312 100644
@@ -12,7 +12,7 @@
 
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
drivers/net/i40e/i40e_pf.c +1 -1
index 65d649b627..f3d6d899f6 100644
@@ -14,7 +14,7 @@
 #include <rte_string_fns.h>
 #include <rte_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 
drivers/net/i40e/i40e_rxtx.c +1 -1
index 668edd6626..804fce8606 100644
@@ -17,7 +17,7 @@
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_tcp.h>
 #include <rte_sctp.h>
 #include <rte_udp.h>
drivers/net/i40e/i40e_rxtx_vec_altivec.c +1 -1
index d3238bfb6a..e6e468752c 100644
@@ -4,7 +4,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_rxtx_vec_avx2.c +1 -1
index e5a1deaeb2..ea554b4fda 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_rxtx_vec_avx512.c +1 -1
index e92f97b7ed..80b153e8f6 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_rxtx_vec_common.h +1 -1
index 31f73f6054..33cebbe88b 100644
@@ -5,7 +5,7 @@
 #ifndef _I40E_RXTX_VEC_COMMON_H_
 #define _I40E_RXTX_VEC_COMMON_H_
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "i40e_ethdev.h"
drivers/net/i40e/i40e_rxtx_vec_neon.c +1 -1
index f094de69ae..d81269624e 100644
@@ -4,7 +4,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_vect.h>
 
drivers/net/i40e/i40e_rxtx_vec_sse.c +1 -1
index 0bcb48e24e..45fce0a022 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_vf_representor.c +1 -1
index 9e40406a3d..7ed47c1a2c 100644
@@ -7,7 +7,7 @@
 #include <rte_pci.h>
 #include <rte_malloc.h>
 
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "base/i40e_type.h"
 #include "base/virtchnl.h"
 #include "i40e_ethdev.h"
drivers/net/iavf/iavf_ethdev.c +2 -2
index cf6ea0b15c..e9c8c1157a 100644
@@ -19,8 +19,8 @@
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
 #include <rte_dev.h>
drivers/net/iavf/iavf_fdir.c +1 -1
index f48f574a5d..4e864b4b9c 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
 
drivers/net/iavf/iavf_generic_flow.c +1 -1
index aabbcf34c2..8635ff83ca 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
 
drivers/net/iavf/iavf_hash.c +1 -1
index 958c73c4fb..f437fc3170 100644
@@ -12,7 +12,7 @@
 
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/iavf/iavf_rxtx.c +1 -1
index 1ddbad0f1f..3d471d9acc 100644
@@ -17,7 +17,7 @@
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_tcp.h>
 #include <rte_sctp.h>
 #include <rte_udp.h>
drivers/net/iavf/iavf_rxtx_vec_common.h +1 -1
index 7ad1e0f68a..46a18732d3 100644
@@ -5,7 +5,7 @@
 #ifndef _IAVF_RXTX_VEC_COMMON_H_
 #define _IAVF_RXTX_VEC_COMMON_H_
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "iavf.h"
drivers/net/iavf/iavf_rxtx_vec_sse.c +1 -1
index 75c77f9d32..8574d0830f 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "iavf.h"
drivers/net/iavf/iavf_vchnl.c +2 -2
index 3ef29d509d..8add888987 100644
@@ -16,8 +16,8 @@
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_dev.h>
 
 #include "iavf.h"
drivers/net/ice/ice_acl_filter.c +1 -1
index 363ce68318..113cb68765 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/ice/ice_dcf.c +2 -2
index 4a9af3292c..dbe42fa3df 100644
@@ -17,8 +17,8 @@
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
 #include <rte_dev.h>
drivers/net/ice/ice_dcf.h +1 -1
index ff029963bf..0cb90b5e9f 100644
@@ -5,7 +5,7 @@
 #ifndef _ICE_DCF_H_
 #define _ICE_DCF_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <iavf_prototype.h>
 #include <iavf_adminq_cmd.h>
drivers/net/ice/ice_dcf_ethdev.c +1 -1
index ea1f2951ba..86f70cf7ff 100644
@@ -14,7 +14,7 @@
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
 #include <rte_memzone.h>
drivers/net/ice/ice_ethdev.c +1 -1
index ec29f0fe40..c021d7ab6c 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include <stdio.h>
 #include <sys/types.h>
drivers/net/ice/ice_ethdev.h +1 -1
index 2b03c59671..7e9cbd2e9a 100644
@@ -7,7 +7,7 @@
 
 #include <rte_kvargs.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "base/ice_common.h"
 #include "base/ice_adminq_cmd.h"
drivers/net/ice/ice_generic_flow.c +1 -1
index c4496dbbe1..25d15a8adb 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_tailq.h>
 
drivers/net/ice/ice_hash.c +1 -1
index 2d23c8dd50..322df649b1 100644
@@ -12,7 +12,7 @@
 
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/ice/ice_rxtx.c +1 -1
index 69f994579a..4136d045e1 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_net.h>
 #include <rte_vect.h>
 
drivers/net/ice/ice_switch_filter.c +1 -1
index 7bac77ecd1..5ca0985e21 100644
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/igc/igc_ethdev.c +2 -2
index 802212fc57..dbaa7a83e5 100644
@@ -8,8 +8,8 @@
 #include <rte_string_fns.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_alarm.h>
 
drivers/net/igc/igc_filter.h +1 -1
index 877f51c88b..df8516bc40 100644
@@ -8,7 +8,7 @@
 
 #include <rte_ethdev.h>
 #include <rte_ethdev_core.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_eth_ctrl.h>
 
 #include "igc_ethdev.h"
drivers/net/igc/igc_txrx.c +1 -1
index 4654ec41f0..c0a5d5e84f 100644
@@ -4,7 +4,7 @@
 
 #include <rte_config.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_net.h>
 
 #include "igc_logs.h"
drivers/net/ionic/ionic_ethdev.c +2 -2
index 2face7c635..ded3ffe48d 100644
@@ -5,9 +5,9 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "ionic_logs.h"
 #include "ionic.h"
drivers/net/ionic/ionic_lif.c +1 -1
index f39b54e8ef..f3d55c0fa6 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "ionic.h"
 #include "ionic_logs.h"
drivers/net/ionic/ionic_rxtx.c +1 -1
index 5d0e9d5d5a..61ad396469 100644
@@ -31,7 +31,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_udp.h>
 #include <rte_tcp.h>
drivers/net/ipn3ke/ipn3ke_ethdev.c +1 -1
index 4446d2af9e..f8e751cb09 100644
@@ -11,7 +11,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_sched.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <rte_io.h>
 #include <rte_rawdev.h>
drivers/net/ipn3ke/ipn3ke_ethdev.h +2 -2
index a6815a9cca..ba3f8821e2 100644
@@ -15,8 +15,8 @@
 
 #include <rte_mbuf.h>
 #include <rte_flow_driver.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_bus_vdev.h>
drivers/net/ipn3ke/ipn3ke_flow.c +1 -1
index f857e64afb..c702e19ea5 100644
@@ -13,7 +13,7 @@
 #include <rte_io.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
drivers/net/ipn3ke/ipn3ke_representor.c +1 -1
index 9e15cce34f..856d21ef9b 100644
@@ -12,7 +12,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_sched.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_spinlock.h>
 
 #include <rte_io.h>
drivers/net/ipn3ke/ipn3ke_tm.c +1 -1
index 17ac026d38..6a9b98fd7f 100644
@@ -14,7 +14,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_sched.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <rte_io.h>
 #include <rte_rawdev.h>
drivers/net/ixgbe/ixgbe_bypass.c +1 -1
index ae38ce3559..67ced6c723 100644
@@ -4,7 +4,7 @@
 
 #include <time.h>
 #include <rte_atomic.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include "ixgbe_ethdev.h"
 #include "ixgbe_bypass_api.h"
 #include "rte_pmd_ixgbe.h"
drivers/net/ixgbe/ixgbe_ethdev.c +2 -2
index c8b9ec8c11..761a0f26bb 100644
@@ -27,8 +27,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/ixgbe/ixgbe_fdir.c +1 -1
index 11b9effeba..27a49bbce5 100644
@@ -13,7 +13,7 @@
 #include <rte_debug.h>
 #include <rte_pci.h>
 #include <rte_vxlan.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ixgbe_logs.h"
drivers/net/ixgbe/ixgbe_flow.c +1 -1
index 9aeb2e4a49..0b10e91a9b 100644
@@ -25,7 +25,7 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
drivers/net/ixgbe/ixgbe_ipsec.c +2 -2
index 62f2a5f764..e45c5501e6 100644
@@ -2,8 +2,8 @@
  * Copyright(c) 2010-2017 Intel Corporation
  */
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_ip.h>
 #include <rte_jhash.h>
 #include <rte_security_driver.h>
drivers/net/ixgbe/ixgbe_pf.c +1 -1
index 15982af8da..fbf2b17d16 100644
@@ -15,7 +15,7 @@
 #include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memcpy.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
drivers/net/ixgbe/ixgbe_rxtx.c +1 -1
index c0305a8238..36e6ca9010 100644
@@ -33,7 +33,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_security_driver.h>
 #include <rte_prefetch.h>
 #include <rte_udp.h>
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +1 -1
index a97c27189b..adba855ca3 100644
@@ -5,7 +5,7 @@
 #ifndef _IXGBE_RXTX_VEC_COMMON_H_
 #define _IXGBE_RXTX_VEC_COMMON_H_
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "ixgbe_ethdev.h"
 #include "ixgbe_rxtx.h"
drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c +1 -1
index a5a5b2167f..f83b800ad9 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_vect.h>
 
drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +1 -1
index 90c076825a..9bbffe6119 100644
@@ -3,7 +3,7 @@
  */
 
 #include <stdint.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 
 #include "ixgbe_ethdev.h"
drivers/net/ixgbe/ixgbe_vf_representor.c +1 -1
index 8185f0d3bb..d5b636a194 100644
@@ -6,7 +6,7 @@
 #include <rte_pci.h>
 #include <rte_malloc.h>
 
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "base/ixgbe_type.h"
 #include "base/ixgbe_vf.h"
 #include "ixgbe_ethdev.h"
drivers/net/ixgbe/rte_pmd_ixgbe.c +1 -1
index d2f708242c..cf089cd9ae 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2010-2017 Intel Corporation
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "base/ixgbe_api.h"
 #include "base/ixgbe_x550.h"
drivers/net/kni/rte_eth_kni.c +2 -2
index 1696787a9b..9ce74e549b 100644
@@ -7,8 +7,8 @@
 #include <unistd.h>
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_kni.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
drivers/net/liquidio/base/lio_23xx_vf.c +1 -1
index ddbc8c0e0c..c6b8310b71 100644
@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cycles.h>
 #include <rte_malloc.h>
 
drivers/net/liquidio/base/lio_mbox.c +1 -1
index 1129001515..2ac2b1b334 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cycles.h>
 
 #include "lio_logs.h"
drivers/net/liquidio/lio_ethdev.c +2 -2
index eb0fdab45a..0b189d5d15 100644
@@ -3,8 +3,8 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_cycles.h>
 #include <rte_malloc.h>
 #include <rte_alarm.h>
drivers/net/liquidio/lio_rxtx.c +1 -1
index 8d705bfe7f..a067b60e47 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cycles.h>
 #include <rte_malloc.h>
 
drivers/net/memif/memif_socket.c +2 -2
index c526f90778..5b373738e6 100644
@@ -13,8 +13,8 @@
 #include <rte_version.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
drivers/net/memif/rte_eth_memif.c +2 -2
index 8ed9aebab7..77c95bcb7a 100644
@@ -17,8 +17,8 @@
 #include <rte_version.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
drivers/net/memif/rte_eth_memif.h +1 -1
index 765a7e5998..24321d3a39 100644
@@ -11,7 +11,7 @@
 
 #include <sys/queue.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_interrupts.h>
 
drivers/net/mlx4/mlx4.c +2 -2
index d5d8c96351..27af426363 100644
@@ -33,8 +33,8 @@
 #include <rte_common.h>
 #include <rte_dev.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
 #include <rte_interrupts.h>
drivers/net/mlx4/mlx4.h +1 -1
index c6cb29493e..63df8fcf2b 100644
@@ -19,7 +19,7 @@
 #pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_interrupts.h>
 #include <rte_mempool.h>
drivers/net/mlx4/mlx4_ethdev.c +1 -1
index 9ff05c6738..783ff94dce 100644
@@ -34,7 +34,7 @@
 
 #include <rte_bus_pci.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
 #include <rte_pci.h>
drivers/net/mlx4/mlx4_flow.c +1 -1
index 2a86382db7..b8ecfa829b 100644
@@ -27,7 +27,7 @@
 
 #include <rte_byteorder.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
drivers/net/mlx4/mlx4_flow.h +1 -1
index 26465c66a4..e4366f28bb 100644
@@ -18,7 +18,7 @@
 #pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
 #include <rte_byteorder.h>
drivers/net/mlx4/mlx4_intr.c +1 -1
index 6786b12ab5..d56009c418 100644
@@ -23,7 +23,7 @@
 
 #include <rte_alarm.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_io.h>
 #include <rte_interrupts.h>
 
drivers/net/mlx4/mlx4_mp.c +1 -1
index eca0c20a8a..e05da89c0e 100644
@@ -7,7 +7,7 @@
 #include <time.h>
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 
 #include "mlx4.h"
drivers/net/mlx4/mlx4_rxq.c +1 -1
index 0699bdd5f2..978cbb8201 100644
@@ -26,7 +26,7 @@
 #include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
drivers/net/mlx4/mlx4_rxtx.h +1 -1
index 9de6c59411..7c72ce6d17 100644
@@ -19,7 +19,7 @@
 #pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
 
drivers/net/mlx4/mlx4_txq.c +1 -1
index 37b84413fb..8262071505 100644
@@ -27,7 +27,7 @@
 
 #include <rte_common.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
drivers/net/mlx5/linux/mlx5_ethdev_os.c +1 -1
index e36a78091c..0e8de9439e 100644
@@ -24,7 +24,7 @@
 #include <sys/un.h>
 #include <time.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_bus_pci.h>
 #include <rte_mbuf.h>
 #include <rte_common.h>
drivers/net/mlx5/linux/mlx5_mp_os.c +1 -1
index 08ade75799..60fdee22a1 100644
@@ -7,7 +7,7 @@
 #include <time.h>
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 
 #include <mlx5_common_mp.h>
drivers/net/mlx5/linux/mlx5_os.c +2 -2
index 9ac1d46b1b..7efa7c6cd2 100644
@@ -16,8 +16,8 @@
 #include <fcntl.h>
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_common.h>
drivers/net/mlx5/linux/mlx5_verbs.c +1 -1
index 318e39b1df..43ff85f9c4 100644
@@ -14,7 +14,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 
 #include <mlx5_glue.h>
drivers/net/mlx5/linux/mlx5_vlan_os.c +1 -1
index 40e895e080..005904bdfe 100644
@@ -14,7 +14,7 @@
  */
 #include <sys/types.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_hypervisor.h>
drivers/net/mlx5/mlx5.c +2 -2
index 3730f32295..50a6d2b19f 100644
@@ -11,8 +11,8 @@
 #include <errno.h>
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_common.h>
drivers/net/mlx5/mlx5.h +1 -1
index 101e9c20d0..4bbf628885 100644
@@ -15,7 +15,7 @@
 
 #include <rte_pci.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_rwlock.h>
 #include <rte_interrupts.h>
 #include <rte_errno.h>
drivers/net/mlx5/mlx5_defs.h +1 -1
index 85a0979653..af29d93901 100644
@@ -6,7 +6,7 @@
 #ifndef RTE_PMD_MLX5_DEFS_H_
 #define RTE_PMD_MLX5_DEFS_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_vxlan.h>
 
 #include "mlx5_autoconf.h"
drivers/net/mlx5/mlx5_ethdev.c +1 -1
index 45ee7e4488..51b39ddde5 100644
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_bus_pci.h>
 #include <rte_mbuf.h>
 #include <rte_common.h>
drivers/net/mlx5/mlx5_flow.c +1 -1
index 2ca6148c1d..6716a20141 100644
@@ -12,7 +12,7 @@
 
 #include <rte_common.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_eal_paging.h>
 #include <rte_flow.h>
 #include <rte_cycles.h>
drivers/net/mlx5/mlx5_flow_dv.c +1 -1
index c1ddff7364..707d6749e2 100644
@@ -10,7 +10,7 @@
 
 #include <rte_common.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
 #include <rte_malloc.h>
drivers/net/mlx5/mlx5_flow_verbs.c +1 -1
index 2d4381946d..9347490967 100644
@@ -10,7 +10,7 @@
 
 #include <rte_common.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
 #include <rte_malloc.h>
drivers/net/mlx5/mlx5_mac.c +1 -1
index bd786fd638..6ffcfcd97a 100644
@@ -11,7 +11,7 @@
 #include <netinet/in.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 
 #include "mlx5_defs.h"
drivers/net/mlx5/mlx5_rss.c +1 -1
index 845cebe2e8..dc0131af3a 100644
@@ -9,7 +9,7 @@
 #include <string.h>
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <mlx5_malloc.h>
 
drivers/net/mlx5/mlx5_rxmode.c +1 -1
index 7613ff770d..cf93ccac86 100644
@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <mlx5_glue.h>
 #include "mlx5.h"
drivers/net/mlx5/mlx5_rxq.c +1 -1
index 787b2b74dd..92e3a792e1 100644
@@ -12,7 +12,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
 #include <rte_debug.h>
drivers/net/mlx5/mlx5_stats.c +1 -1
index 82d4d4a745..a6569b250a 100644
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 
drivers/net/mlx5/mlx5_trigger.c +1 -1
index 48210bf0b2..94dd56709e 100644
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_cycles.h>
drivers/net/mlx5/mlx5_txpp.c +1 -1
index b38482d4e9..696282ca31 100644
@@ -5,7 +5,7 @@
 #include <stdint.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #include <rte_malloc.h>
drivers/net/mlx5/mlx5_txq.c +1 -1
index b81bb4a12d..5142e50858 100644
@@ -12,7 +12,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_eal_paging.h>
 
drivers/net/mlx5/mlx5_vlan.c +1 -1
index dbb9d362f3..64678d3f51 100644
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_hypervisor.h>
drivers/net/mlx5/windows/mlx5_ethdev_os.c +1 -1
index 076c688699..8609d38eca 100644
@@ -5,7 +5,7 @@
 
 #include <rte_errno.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_interrupts.h>
 
 #include <mlx5_glue.h>
drivers/net/mlx5/windows/mlx5_mp_os.c +1 -1
index db793b1f7d..8313c29ffb 100644
@@ -6,7 +6,7 @@
 #include <time.h>
 
 #include <rte_eal.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_string_fns.h>
 
 #include <mlx5_common_mp.h>
drivers/net/mlx5/windows/mlx5_os.c +1 -1
index b036432937..e37cc65c17 100644
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 
 #include <rte_windows.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include <mlx5_glue.h>
 #include <mlx5_devx_cmds.h>
drivers/net/mlx5/windows/mlx5_vlan_os.c +1 -1
index d3b11e0001..3917c822e4 100644
@@ -13,7 +13,7 @@
  */
 #include <sys/types.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_common.h>
 
 #include <mlx5.h>
drivers/net/mvneta/mvneta_ethdev.c +1 -1
index 2cd73919ce..b0940b4462 100644
@@ -5,7 +5,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
 
drivers/net/mvpp2/mrvl_ethdev.c +1 -1
index f25cf9e46d..1d67f2abf1 100644
@@ -5,7 +5,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_kvargs.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
drivers/net/netvsc/hn_ethdev.c +1 -1
index 5a401b4b06..04904b1514 100644
@@ -24,7 +24,7 @@
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_cycles.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
drivers/net/netvsc/hn_rndis.c +1 -1
index 1ce260c89b..e317539de7 100644
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
 #include <rte_memzone.h>
drivers/net/netvsc/hn_vf.c +1 -1
index 86392917c5..2dc7abe354 100644
@@ -16,7 +16,7 @@
 
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_lcore.h>
 #include <rte_memory.h>
 #include <rte_bus_vmbus.h>
drivers/net/nfb/nfb_ethdev.c +1 -1
index c55bcdf1ef..7e91d59847 100644
@@ -9,7 +9,7 @@
 #include <netcope/rxmac.h>
 #include <netcope/txmac.h>
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_kvargs.h>
 
 #include "nfb_stats.h"
drivers/net/nfb/nfb_tx.h +1 -1
index b6578cc38a..28daeae0b8 100644
@@ -10,7 +10,7 @@
 #include <nfb/nfb.h>
 #include <nfb/ndp.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ethdev.h>
 #include <rte_malloc.h>
 
drivers/net/nfp/nfp_net.c +2 -2
index 9ea24e5bda..9927c9c44b 100644
@@ -17,8 +17,8 @@
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_debug.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_dev.h>
 #include <rte_ether.h>
 #include <rte_malloc.h>
drivers/net/nfp/nfpcore/nfp_cpp.h +1 -1
index 1427954c17..78f7b8ca2f 100644
@@ -6,7 +6,7 @@
 #ifndef __NFP_CPP_H__
 #define __NFP_CPP_H__
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "nfp-common/nfp_platform.h"
 #include "nfp-common/nfp_resid.h"
drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +1 -1
index 36725d69ab..bad80a5a1c 100644
@@ -33,7 +33,7 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_string_fns.h>
 
 #include "nfp_cpp.h"
drivers/net/nfp/nfpcore/nfp_cppcore.c +1 -1
index dec4a8b6d1..848c452eab 100644
@@ -12,7 +12,7 @@
 #include <sys/types.h>
 
 #include <rte_byteorder.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "nfp_cpp.h"
 #include "nfp_target.h"
drivers/net/null/rte_eth_null.c +2 -2
index 49ee8da8e4..32764e8f0e 100644
@@ -4,8 +4,8 @@
  */
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_bus_vdev.h>
drivers/net/octeontx/octeontx_ethdev.h +1 -1
index 780a094ffa..b73515de37 100644
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 
 #include <rte_common.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_eventdev.h>
 #include <rte_mempool.h>
 #include <rte_memory.h>
drivers/net/octeontx/octeontx_rxtx.c +1 -1
index bbe43a874b..61865ef0bc 100644
@@ -9,7 +9,7 @@
 
 #include <rte_atomic.h>
 #include <rte_common.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_log.h>
 #include <rte_mbuf.h>
drivers/net/octeontx/octeontx_rxtx.h +1 -1
index 7c24d8b4fd..2ed28ea563 100644
@@ -5,7 +5,7 @@
 #ifndef	__OCTEONTX_RXTX_H__
 #define	__OCTEONTX_RXTX_H__
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #define OFFLOAD_FLAGS					\
 	uint16_t rx_offload_flags;			\
drivers/net/octeontx2/otx2_ethdev.c +1 -1
index 9bfe95d6b1..e9fbbca4da 100644
@@ -4,7 +4,7 @@
 
 #include <inttypes.h>
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_io.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
drivers/net/octeontx2/otx2_link.c +1 -1
index 439ec4fa89..a79b997376 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_common.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "otx2_ethdev.h"
 
drivers/net/octeontx2/otx2_ptp.c +1 -1
index b8ef4c181d..91e5c0f6bd 100644
@@ -2,7 +2,7 @@
  * Copyright(C) 2019 Marvell International Ltd.
  */
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "otx2_ethdev.h"
 
drivers/net/pcap/rte_eth_pcap.c +2 -2
index a32b1f3f37..ff02ade70d 100644
@@ -19,8 +19,8 @@
 #include <pcap.h>
 
 #include <rte_cycles.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
drivers/net/pfe/pfe_eth.h +1 -1
index 9820d7bf47..fbc11b4ffb 100644
@@ -7,7 +7,7 @@
 
 #include <compat.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_vdev.h>
 
 #define ETH_ALEN 6
 #define GEMAC_NO_PHY            BIT(0)
drivers/net/pfe/pfe_ethdev.c +1 -1
index 3b079693fb..8cf59e210d 100644
@@ -5,7 +5,7 @@
 #include <sys/ioctl.h>
 #include <sys/epoll.h>
 #include <rte_kvargs.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_vdev.h>
 #include <rte_bus_vdev.h>
 #include <rte_ether.h>
 #include <dpaa_of.h>
drivers/net/qede/qede_ethdev.h +2 -2
index 61a65ac42e..da4b87f5e2 100644
@@ -11,8 +11,8 @@
 #include <sys/queue.h>
 
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_dev.h>
 #include <rte_ip.h>
 
drivers/net/ring/rte_eth_ring.c +1 -1
index 41402a5159..472d838582 100644
@@ -4,7 +4,7 @@
 
 #include "rte_eth_ring.h"
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
drivers/net/sfc/sfc.h +1 -1
index ed059e142f..fdee800482 100644
@@ -14,7 +14,7 @@
 
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_kvargs.h>
 #include <rte_spinlock.h>
 #include <rte_atomic.h>
drivers/net/sfc/sfc_dp_rx.h +1 -1
index f3e00e2e38..f20154b568 100644
@@ -11,7 +11,7 @@
 #define _SFC_DP_RX_H
 
 #include <rte_mempool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "sfc_dp.h"
 
drivers/net/sfc/sfc_dp_tx.h +1 -1
index 3ecdfcdd28..b4af68984a 100644
@@ -10,7 +10,7 @@
 #ifndef _SFC_DP_TX_H
 #define _SFC_DP_TX_H
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "sfc_dp.h"
 #include "sfc_debug.h"
drivers/net/sfc/sfc_ethdev.c +2 -2
index f2f5336435..d6f6a84eab 100644
@@ -8,8 +8,8 @@
  */
 
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_errno.h>
drivers/net/sfc/sfc_ev.h +1 -1
index 3c7e5580e2..03bfb14b5c 100644
@@ -10,7 +10,7 @@
 #ifndef _SFC_EV_H_
 #define _SFC_EV_H_
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "efx.h"
 
drivers/net/sfc/sfc_flow.c +1 -1
index 4321045d1a..ab1d2cc595 100644
@@ -10,7 +10,7 @@
 #include <rte_byteorder.h>
 #include <rte_tailq.h>
 #include <rte_common.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
drivers/net/sfc/sfc_rx.h +1 -1
index d6ee9cf802..0d64b9c8bb 100644
@@ -12,7 +12,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "efx.h"
 
drivers/net/sfc/sfc_tx.h +1 -1
index d583ee9c3d..3367bade37 100644
@@ -11,7 +11,7 @@
 #define _SFC_TX_H
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include "efx.h"
 
drivers/net/softnic/rte_eth_softnic.c +2 -2
index 3387ab485f..99d8468c94 100644
@@ -6,8 +6,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_bus_vdev.h>
 #include <rte_kvargs.h>
drivers/net/softnic/rte_eth_softnic_internals.h +1 -1
index 9c8737c9e2..faf90a5a8c 100644
@@ -19,7 +19,7 @@
 #include <rte_pipeline.h>
 
 #include <rte_ethdev_core.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_tm_driver.h>
 #include <rte_flow_driver.h>
 #include <rte_mtr_driver.h>
drivers/net/szedata2/rte_eth_szedata2.c +2 -2
index 7874c4f4f8..6eaeadf1c8 100644
@@ -15,8 +15,8 @@
 #include <libsze2.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_kvargs.h>
drivers/net/tap/rte_eth_tap.c +2 -2
index 2542de3065..c36d4bf76e 100644
@@ -7,8 +7,8 @@
 #include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_bus_vdev.h>
 #include <rte_kvargs.h>
drivers/net/tap/rte_eth_tap.h +1 -1
index ba45de8409..a98ea11a33 100644
@@ -13,7 +13,7 @@
 
 #include <linux/if_tun.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_gso.h>
 #include "tap_log.h"
drivers/net/thunderx/nicvf_ethdev.c +2 -2
index c2e7c334d4..c45d6e00a9 100644
@@ -23,8 +23,8 @@
 #include <rte_dev.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_interrupts.h>
 #include <rte_log.h>
 #include <rte_memory.h>
drivers/net/thunderx/nicvf_ethdev.h +1 -1
index 3914117997..b8dd905d0b 100644
@@ -5,7 +5,7 @@
 #ifndef __THUNDERX_NICVF_ETHDEV_H__
 #define __THUNDERX_NICVF_ETHDEV_H__
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #define THUNDERX_NICVF_PMD_VERSION      "2.0"
 #define THUNDERX_REG_BYTES		8
drivers/net/thunderx/nicvf_rxtx.c +1 -1
index d0ea95f1d1..91e09ff8d5 100644
@@ -13,7 +13,7 @@
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_errno.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_log.h>
 #include <rte_mbuf.h>
drivers/net/thunderx/nicvf_rxtx.h +1 -1
index 1f274b2954..d6ed660b4e 100644
@@ -6,7 +6,7 @@
 #define __THUNDERX_NICVF_RXTX_H__
 
 #include <rte_byteorder.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #define NICVF_RX_OFFLOAD_NONE           0x1
 #define NICVF_RX_OFFLOAD_CKSUM          0x2
drivers/net/thunderx/nicvf_struct.h +1 -1
index cf1c281a06..0ca207d0dd 100644
@@ -11,7 +11,7 @@
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_interrupts.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memory.h>
 
 struct nicvf_rbdr {
drivers/net/txgbe/txgbe_ethdev.c +1 -1
index eef4b6d4a5..23f9d17091 100644
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <rte_common.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include <rte_interrupts.h>
 #include <rte_log.h>
drivers/net/txgbe/txgbe_ipsec.c +1 -1
index daa523b204..9f4eee4081 100644
@@ -2,7 +2,7 @@
  * Copyright(c) 2015-2020
  */
 
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_security_driver.h>
 #include <rte_cryptodev.h>
 
drivers/net/txgbe/txgbe_pf.c +1 -1
index 151f2c7a45..e4bd990b96 100644
@@ -15,7 +15,7 @@
 #include <rte_debug.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_memcpy.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
drivers/net/txgbe/txgbe_rxtx.c +1 -1
index 3ad92248c6..ac09e75a3e 100644
@@ -19,7 +19,7 @@
 #include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_security_driver.h>
 #include <rte_memzone.h>
 #include <rte_atomic.h>
drivers/net/vhost/rte_eth_vhost.c +2 -2
index 5845bb15f3..d198fc8a8e 100644
@@ -8,8 +8,8 @@
 #include <sys/epoll.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_driver.h>
+#include <ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_bus_vdev.h>
drivers/net/virtio/virtio_ethdev.c +2 -2
index 92a3d4efa5..edcd6203d9 100644
@@ -8,8 +8,8 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
 #include <rte_memzone.h>
drivers/net/virtio/virtio_pci.h +1 -1
index ab61e911b8..0382dc5b2c 100644
@@ -10,7 +10,7 @@
 
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 struct virtqueue;
 struct virtnet_ctl;
drivers/net/virtio/virtio_rxtx.c +1 -1
index 622d4bf201..fb7382eff7 100644
@@ -15,7 +15,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_string_fns.h>
 #include <rte_errno.h>
drivers/net/virtio/virtio_rxtx_simple.c +1 -1
index a26182bb46..f248869a8f 100644
@@ -15,7 +15,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_string_fns.h>
 #include <rte_errno.h>
drivers/net/virtio/virtio_rxtx_simple_altivec.c +1 -1
index a260ebdf57..f09a1eda49 100644
@@ -14,7 +14,7 @@
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
drivers/net/virtio/virtio_rxtx_simple_neon.c +1 -1
index 12e034dc0a..2cba800807 100644
@@ -12,7 +12,7 @@
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
drivers/net/virtio/virtio_rxtx_simple_sse.c +1 -1
index 1056e9c20b..85a5a6664a 100644
@@ -14,7 +14,7 @@
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
drivers/net/virtio/virtio_user_ethdev.c +1 -1
index 241808cd8f..308275b70e 100644
@@ -13,7 +13,7 @@
 
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
-#include <rte_ethdev_vdev.h>
+#include <ethdev_vdev.h>
 #include <rte_bus_vdev.h>
 #include <rte_alarm.h>
 #include <rte_cycles.h>
drivers/net/vmxnet3/vmxnet3_ethdev.c +2 -2
index 23a2ebbefa..ecdecc427c 100644
@@ -26,8 +26,8 @@
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_string_fns.h>
 #include <rte_malloc.h>
 #include <rte_dev.h>
drivers/net/vmxnet3/vmxnet3_rxtx.c +1 -1
index 95c697f8e3..5cf53d4de8 100644
@@ -32,7 +32,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_prefetch.h>
 #include <rte_ip.h>
 #include <rte_udp.h>
lib/librte_ethdev/ethdev_driver.h renamed from lib/librte_ethdev/rte_ethdev_driver.h +0 -0
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_driver.h
rename to lib/librte_ethdev/ethdev_driver.h
lib/librte_ethdev/ethdev_pci.h renamed from lib/librte_ethdev/rte_ethdev_pci.h +1 -1
similarity index 99%
rename from lib/librte_ethdev/rte_ethdev_pci.h
rename to lib/librte_ethdev/ethdev_pci.h
index bf715896ae..8edca82ce8 100644
@@ -10,7 +10,7 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_config.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 /**
  * Copy pci device info to the Ethernet device data.
lib/librte_ethdev/ethdev_private.c +1 -1
index 162a502fe7..5960c75cc5 100644
@@ -3,7 +3,7 @@
  */
 
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "ethdev_private.h"
 
 uint16_t
lib/librte_ethdev/ethdev_vdev.h renamed from lib/librte_ethdev/rte_ethdev_vdev.h +1 -1
similarity index 97%
rename from lib/librte_ethdev/rte_ethdev_vdev.h
rename to lib/librte_ethdev/ethdev_vdev.h
index 4ba3f28964..46c75d9e5f 100644
@@ -9,7 +9,7 @@
 #include <rte_config.h>
 #include <rte_malloc.h>
 #include <rte_bus_vdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 /**
  * @internal
lib/librte_ethdev/meson.build +0 -3
index e4b610246f..829abd456b 100644
@@ -11,12 +11,9 @@ sources = files('ethdev_private.c',
 	'rte_tm.c')
 
 headers = files('rte_ethdev.h',
-	'rte_ethdev_driver.h',
 	'rte_ethdev_core.h',
-	'rte_ethdev_pci.h',
 	'rte_ethdev_trace.h',
 	'rte_ethdev_trace_fp.h',
-	'rte_ethdev_vdev.h',
 	'rte_eth_ctrl.h',
 	'rte_dev_info.h',
 	'rte_flow.h',
lib/librte_ethdev/rte_class_eth.c +1 -1
index 6338355e25..ca2ce87f7a 100644
@@ -12,7 +12,7 @@
 
 #include "rte_ethdev.h"
 #include "rte_ethdev_core.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "ethdev_private.h"
 
 enum eth_params {
lib/librte_ethdev/rte_ethdev.c +1 -1
index daf5f24f7e..f40df65e34 100644
@@ -41,7 +41,7 @@
 
 #include "rte_ethdev_trace.h"
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "ethdev_profile.h"
 #include "ethdev_private.h"
 
lib/librte_ethdev/rte_ethdev.h +1 -1
index eb299955d4..89b8ba2fc4 100644
@@ -20,7 +20,7 @@
  * - The driver-oriented Ethernet API that exports functions allowing
  *   an Ethernet Poll Mode Driver (PMD) to allocate an Ethernet device instance,
  *   create memzone for HW rings and process registered callbacks, and so on.
- *   PMDs should include rte_ethdev_driver.h instead of this header.
+ *   PMDs should include ethdev_driver.h instead of this header.
  *
  * By default, all the functions of the Ethernet Device API exported by a PMD
  * are lock-free functions which assume to not be invoked in parallel on
lib/librte_ethdev/rte_flow_driver.h +1 -1
index f3d72827cc..dabd819d10 100644
@@ -18,7 +18,7 @@
 #include <stdint.h>
 
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "rte_flow.h"
 
 #ifdef __cplusplus
lib/librte_ethdev/rte_mtr_driver.h +1 -1
index 3b39532935..a0ddc2b5f4 100644
@@ -18,7 +18,7 @@
 
 #include <rte_errno.h>
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "rte_mtr.h"
 
 #ifdef __cplusplus
lib/librte_ethdev/rte_tm_driver.h +1 -1
index b86ed89c00..45290fb3fd 100644
@@ -18,7 +18,7 @@
 
 #include <rte_errno.h>
 #include "rte_ethdev.h"
-#include "rte_ethdev_driver.h"
+#include "ethdev_driver.h"
 #include "rte_tm.h"
 
 #ifdef __cplusplus

--
2.27.0

#155 lore raw

PATCH v7 6/10 eventdev: make driver-only headers private

In reply to Bruce Richardson

The rte_eventdev_pmd*.h files are for drivers only and should be private to DPDK, and not installed for app use.

---
 doc/guides/rel_notes/release_21_02.rst                      | 6 ++++++
 drivers/event/dlb/dlb.c                                     | 2 +-
 drivers/event/dlb/dlb_priv.h                                | 4 ++--
 drivers/event/dlb/rte_pmd_dlb.c                             | 2 +-
 drivers/event/dlb2/dlb2.c                                   | 2 +-
 drivers/event/dlb2/pf/dlb2_pf.c                             | 4 ++--
 drivers/event/dlb2/rte_pmd_dlb2.c                           | 2 +-
 drivers/event/dpaa/dpaa_eventdev.c                          | 2 +-
 drivers/event/dpaa/dpaa_eventdev.h                          | 4 ++--
 drivers/event/dpaa2/dpaa2_eventdev.h                        | 4 ++--
 drivers/event/dsw/dsw_evdev.c                               | 4 ++--
 drivers/event/octeontx/ssovf_evdev.h                        | 2 +-
 drivers/event/octeontx2/otx2_evdev.c                        | 2 +-
 drivers/event/octeontx2/otx2_evdev.h                        | 2 +-
 drivers/event/opdl/opdl_evdev.h                             | 2 +-
 drivers/event/skeleton/skeleton_eventdev.h                  | 4 ++--
 drivers/event/sw/sw_evdev.h                                 | 2 +-
 lib/librte_eventdev/{rte_eventdev_pmd.h => eventdev_pmd.h}  | 0
 .../{rte_eventdev_pmd_pci.h => eventdev_pmd_pci.h}          | 2 +-
 .../{rte_eventdev_pmd_vdev.h => eventdev_pmd_vdev.h}        | 2 +-
 lib/librte_eventdev/meson.build                             | 3 ---
 lib/librte_eventdev/rte_event_crypto_adapter.c              | 2 +-
 lib/librte_eventdev/rte_event_eth_rx_adapter.c              | 2 +-
 lib/librte_eventdev/rte_event_eth_tx_adapter.c              | 2 +-
 lib/librte_eventdev/rte_event_timer_adapter.c               | 2 +-
 lib/librte_eventdev/rte_eventdev.c                          | 2 +-
 26 files changed, 35 insertions(+), 32 deletions(-)
 rename lib/librte_eventdev/{rte_eventdev_pmd.h => eventdev_pmd.h} (100%)
 rename lib/librte_eventdev/{rte_eventdev_pmd_pci.h => eventdev_pmd_pci.h} (99%)
 rename lib/librte_eventdev/{rte_eventdev_pmd_vdev.h => eventdev_pmd_vdev.h} (98%)
doc/guides/rel_notes/release_21_02.rst +6 -0
index 3831d1ca1e..17fcfd661c 100644
@@ -151,6 +151,12 @@ Removed Items
   ``ethdev_pci.h`` respectively in the source tree, to reflect the fact that
   they are non-public headers.
 
+* The internal header files ``rte_eventdev_pmd.h``, ``rte_eventdev_pmd_vdev.h`` and
+  ``rte_eventdev_pmd_pci.h`` are no longer installed as part of the DPDK ``ninja
+  install`` action and are renamed to ``eventdev_pmd.h``, ``eventdev_pmd_vdev.h`` and
+  ``eventdev_pmd_pci.h`` respectively in the source tree, to reflect the fact that
+  they are non-public headers.
+
 * Removed support for NetXtreme devices belonging to ``BCM573xx and
   BCM5740x`` families. Specifically the support for the following Broadcom
   PCI device IDs ``0x16c8, 0x16c9, 0x16ca, 0x16ce, 0x16cf, 0x16df, 0x16d0,``
drivers/event/dlb/dlb.c +1 -1
index a65f70882f..64e6df7373 100644
@@ -31,7 +31,7 @@
 #include <rte_string_fns.h>
 
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd.h>
+#include <eventdev_pmd.h>
 
 #include "dlb_priv.h"
 #include "dlb_iface.h"
drivers/event/dlb/dlb_priv.h +2 -2
index 58ff4287df..272e17482f 100644
@@ -10,8 +10,8 @@
 
 #include <rte_bus_pci.h>
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd.h>
-#include <rte_eventdev_pmd_pci.h>
+#include <eventdev_pmd.h>
+#include <eventdev_pmd_pci.h>
 #include <rte_pci.h>
 
 #include "dlb_user.h"
drivers/event/dlb/rte_pmd_dlb.c +1 -1
index bc802d381a..8f56dc306a 100644
@@ -3,7 +3,7 @@
  */
 
 #include "rte_eventdev.h"
-#include "rte_eventdev_pmd.h"
+#include "eventdev_pmd.h"
 #include "rte_pmd_dlb.h"
 #include "dlb_priv.h"
 #include "dlb_inline_fns.h"
drivers/event/dlb2/dlb2.c +1 -1
index 5782960158..b28ec58bfb 100644
@@ -20,7 +20,7 @@
 #include <rte_dev.h>
 #include <rte_errno.h>
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd.h>
+#include <eventdev_pmd.h>
 #include <rte_io.h>
 #include <rte_kvargs.h>
 #include <rte_log.h>
drivers/event/dlb2/pf/dlb2_pf.c +2 -2
index 632c4e099f..1a7d8fc294 100644
@@ -26,8 +26,8 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd.h>
-#include <rte_eventdev_pmd_pci.h>
+#include <eventdev_pmd.h>
+#include <eventdev_pmd_pci.h>
 #include <rte_memory.h>
 #include <rte_string_fns.h>
 
drivers/event/dlb2/rte_pmd_dlb2.c +1 -1
index b09b585f0b..43990e46ac 100644
@@ -3,7 +3,7 @@
  */
 
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd.h>
+#include <eventdev_pmd.h>
 
 #include "rte_pmd_dlb2.h"
 #include "dlb2_priv.h"
drivers/event/dpaa/dpaa_eventdev.c +1 -1
index 01ddd0eb63..460375ca30 100644
@@ -24,7 +24,7 @@
 #include <rte_memzone.h>
 #include <rte_pci.h>
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_ethdev.h>
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_event_eth_tx_adapter.h>
drivers/event/dpaa/dpaa_eventdev.h +2 -2
index 0b3da83a4f..b4535c7b86 100644
@@ -5,8 +5,8 @@
 #ifndef __DPAA_EVENTDEV_H__
 #define __DPAA_EVENTDEV_H__
 
-#include <rte_eventdev_pmd.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_atomic.h>
 #include <rte_per_lcore.h>
 
drivers/event/dpaa2/dpaa2_eventdev.h +2 -2
index 785e52032e..bb87bdbab2 100644
@@ -5,8 +5,8 @@
 #ifndef __DPAA2_EVENTDEV_H__
 #define __DPAA2_EVENTDEV_H__
 
-#include <rte_eventdev_pmd.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_atomic.h>
 #include <mc/fsl_dpcon.h>
 #include <mc/fsl_mc_sys.h>
drivers/event/dsw/dsw_evdev.c +2 -2
index 933a5a559b..ae188f7e6b 100644
@@ -5,8 +5,8 @@
 #include <stdbool.h>
 
 #include <rte_cycles.h>
-#include <rte_eventdev_pmd.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_random.h>
 #include <rte_ring_elem.h>
 
drivers/event/octeontx/ssovf_evdev.h +1 -1
index 10163151cd..bb1056a955 100644
@@ -6,7 +6,7 @@
 #define __SSOVF_EVDEV_H__
 
 #include <rte_event_eth_tx_adapter.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_io.h>
 
 #include <octeontx_mbox.h>
drivers/event/octeontx2/otx2_evdev.c +1 -1
index 0fe014c24a..bb1ff456fb 100644
@@ -7,7 +7,7 @@
 #include <rte_bus_pci.h>
 #include <rte_common.h>
 #include <rte_eal.h>
-#include <rte_eventdev_pmd_pci.h>
+#include <eventdev_pmd_pci.h>
 #include <rte_kvargs.h>
 #include <rte_mbuf_pool_ops.h>
 #include <rte_pci.h>
drivers/event/octeontx2/otx2_evdev.h +1 -1
index 0513cb81c9..2971af73b6 100644
@@ -6,7 +6,7 @@
 #define __OTX2_EVDEV_H__
 
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd.h>
+#include <eventdev_pmd.h>
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_event_eth_tx_adapter.h>
 
drivers/event/opdl/opdl_evdev.h +1 -1
index 610b58b356..2dca0a8a98 100644
@@ -6,7 +6,7 @@
 #define _OPDL_EVDEV_H_
 
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_atomic.h>
 #include "opdl_ring.h"
 
drivers/event/skeleton/skeleton_eventdev.h +2 -2
index ba64b8aea4..9193f45f47 100644
@@ -5,8 +5,8 @@
 #ifndef __SKELETON_EVENTDEV_H__
 #define __SKELETON_EVENTDEV_H__
 
-#include <rte_eventdev_pmd_pci.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd_pci.h>
+#include <eventdev_pmd_vdev.h>
 
 #ifdef RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG
 #define PMD_DRV_LOG(level, fmt, args...) \
drivers/event/sw/sw_evdev.h +1 -1
index 1fc07b64fc..5ab6465c83 100644
@@ -7,7 +7,7 @@
 
 #include "sw_evdev_log.h"
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_atomic.h>
 
 #define SW_DEFAULT_CREDIT_QUANTA 32
lib/librte_eventdev/eventdev_pmd.h renamed from lib/librte_eventdev/rte_eventdev_pmd.h +0 -0
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev_pmd.h
rename to lib/librte_eventdev/eventdev_pmd.h
lib/librte_eventdev/eventdev_pmd_pci.h renamed from lib/librte_eventdev/rte_eventdev_pmd_pci.h +1 -1
similarity index 99%
rename from lib/librte_eventdev/rte_eventdev_pmd_pci.h
rename to lib/librte_eventdev/eventdev_pmd_pci.h
index 5f238bf496..d14ea634b8 100644
@@ -26,7 +26,7 @@ extern "C" {
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 
-#include "rte_eventdev_pmd.h"
+#include "eventdev_pmd.h"
 
 typedef int (*eventdev_pmd_pci_callback_t)(struct rte_eventdev *dev);
 
lib/librte_eventdev/eventdev_pmd_vdev.h renamed from lib/librte_eventdev/rte_eventdev_pmd_vdev.h +1 -1
similarity index 98%
rename from lib/librte_eventdev/rte_eventdev_pmd_vdev.h
rename to lib/librte_eventdev/eventdev_pmd_vdev.h
index 8c64a06743..bc0cf44c8c 100644
@@ -24,7 +24,7 @@ extern "C" {
 #include <rte_eal.h>
 #include <rte_bus_vdev.h>
 
-#include "rte_eventdev_pmd.h"
+#include "eventdev_pmd.h"
 
 /**
  * @internal
lib/librte_eventdev/meson.build +0 -3
index 0adc2cd2fd..79d36d37bb 100644
@@ -15,9 +15,6 @@ sources = files('rte_eventdev.c',
 		'rte_event_crypto_adapter.c',
 		'rte_event_eth_tx_adapter.c')
 headers = files('rte_eventdev.h',
-		'rte_eventdev_pmd.h',
-		'rte_eventdev_pmd_pci.h',
-		'rte_eventdev_pmd_vdev.h',
 		'rte_eventdev_trace.h',
 		'rte_eventdev_trace_fp.h',
 		'rte_event_ring.h',
lib/librte_eventdev/rte_event_crypto_adapter.c +1 -1
index b04312128a..d903cdd480 100644
@@ -15,7 +15,7 @@
 #include <rte_service_component.h>
 
 #include "rte_eventdev.h"
-#include "rte_eventdev_pmd.h"
+#include "eventdev_pmd.h"
 #include "rte_eventdev_trace.h"
 #include "rte_event_crypto_adapter.h"
 
lib/librte_eventdev/rte_event_eth_rx_adapter.c +1 -1
index 3c73046551..d8c635e999 100644
@@ -19,7 +19,7 @@
 #include <rte_interrupts.h>
 
 #include "rte_eventdev.h"
-#include "rte_eventdev_pmd.h"
+#include "eventdev_pmd.h"
 #include "rte_eventdev_trace.h"
 #include "rte_event_eth_rx_adapter.h"
 
lib/librte_eventdev/rte_event_eth_tx_adapter.c +1 -1
index cc27bbca32..5b4c42dcff 100644
@@ -5,7 +5,7 @@
 #include <rte_service_component.h>
 #include <rte_ethdev.h>
 
-#include "rte_eventdev_pmd.h"
+#include "eventdev_pmd.h"
 #include "rte_eventdev_trace.h"
 #include "rte_event_eth_tx_adapter.h"
 
lib/librte_eventdev/rte_event_timer_adapter.c +1 -1
index 4c5e49ea3b..dd7b83087d 100644
@@ -21,7 +21,7 @@
 #include <rte_cycles.h>
 
 #include "rte_eventdev.h"
-#include "rte_eventdev_pmd.h"
+#include "eventdev_pmd.h"
 #include "rte_eventdev_trace.h"
 #include "rte_event_timer_adapter.h"
 #include "rte_event_timer_adapter_pmd.h"
lib/librte_eventdev/rte_eventdev.c +1 -1
index afbadc535b..b57363f804 100644
@@ -35,7 +35,7 @@
 #include <rte_telemetry.h>
 
 #include "rte_eventdev.h"
-#include "rte_eventdev_pmd.h"
+#include "eventdev_pmd.h"
 #include "rte_eventdev_trace.h"
 
 static struct rte_eventdev rte_event_devices[RTE_EVENT_MAX_DEVS];
Signature · 1 line
2.27.0
#156 lore raw

Re: [dpdk-dev] [PATCH v7 06/10] eventdev: make driver-only headers private

There are many vendors (including some internal Microsoft projects) with drivers that are not in the DPDK tree. Breaking them is not something that should be done, and certainly not in a release that claims API/ABI compatibility.

Although these fields should not have been exposed
to user in normal header files, you can't just remove them now. Please revert this commit before 20.02 final release.

A better solution (like __rte_internal) can be added in the 21.11 release.

#157 lore raw

PATCH v7 7/10 build: separate out headers for include checking

In reply to Bruce Richardson

For some libraries, there may be some header files which are not for direct inclusion, but rather are to be included via other header files. To allow later checking of these files for missing includes, we separate out the indirect include files from the direct ones.

---
 doc/guides/contributing/coding_style.rst | 12 ++++++++++++
 lib/librte_eal/include/meson.build       |  2 +-
 lib/librte_eal/x86/include/meson.build   | 14 +++++++++-----
 lib/librte_ethdev/meson.build            |  5 +++--
 lib/librte_hash/meson.build              |  4 ++--
 lib/librte_ipsec/meson.build             |  3 ++-
 lib/librte_lpm/meson.build               |  2 +-
 lib/librte_regexdev/meson.build          |  2 +-
 lib/librte_ring/meson.build              |  4 +++-
 lib/librte_stack/meson.build             |  4 +++-
 lib/librte_table/meson.build             |  7 +++----
 lib/meson.build                          |  3 +++
 meson.build                              |  1 +
 meson_options.txt                        |  2 ++
 14 files changed, 46 insertions(+), 19 deletions(-)
doc/guides/contributing/coding_style.rst +12 -0
index bb3f3efcbc..734d1901b2 100644
@@ -891,6 +891,18 @@ headers
 	installed to $PREFIX/include when ``ninja install`` is run. As with
 	source files, these should be specified using the meson ``files()``
 	function.
+	When ``check_includes`` build option is set to ``true``, each header file
+	has additional checks performed on it, for example to ensure that it is
+	not missing any include statements for dependent headers.
+	For header files which are public, but only included indirectly in
+	applications, these checks can be skipped by using the ``indirect_headers``
+	variable rather than ``headers``.
+
+indirect_headers
+	**Default Value = []**.
+	As with ``headers`` option above, except that the files are not checked
+	for all needed include files as part of a DPDK build when
+	``check_includes`` is set to ``true``.
 
 includes:
 	**Default Value = []**.
lib/librte_eal/include/meson.build +1 -1
index 0dea342e1d..3969cf4ac7 100644
@@ -16,7 +16,6 @@ headers += files(
 	'rte_dev.h',
 	'rte_devargs.h',
 	'rte_eal.h',
-	'rte_eal_interrupts.h',
 	'rte_eal_memconfig.h',
 	'rte_eal_trace.h',
 	'rte_errno.h',
@@ -49,6 +48,7 @@ headers += files(
 	'rte_version.h',
 	'rte_vfio.h',
 )
+indirect_headers += files('rte_eal_interrupts.h')
 
 # special case install the generic headers, since they go in a subdir
 generic_headers = files(
lib/librte_eal/x86/include/meson.build +9 -5
index 549cc21a42..1a6ad0b173 100644
@@ -2,11 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 arch_headers = files(
-	'rte_atomic_32.h',
-	'rte_atomic_64.h',
 	'rte_atomic.h',
-	'rte_byteorder_32.h',
-	'rte_byteorder_64.h',
 	'rte_byteorder.h',
 	'rte_cpuflags.h',
 	'rte_cycles.h',
@@ -22,4 +18,12 @@ arch_headers = files(
 	'rte_ticketlock.h',
 	'rte_vect.h',
 )
-install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
+arch_indirect_headers = files(
+	'rte_atomic_32.h',
+	'rte_atomic_64.h',
+	'rte_byteorder_32.h',
+	'rte_byteorder_64.h',
+)
+install_headers(arch_headers + arch_indirect_headers,
+		subdir: get_option('include_subdir_arch'))
+dpdk_chkinc_headers += arch_headers
lib/librte_ethdev/meson.build +3 -2
index 829abd456b..c37b2e3772 100644
@@ -11,10 +11,8 @@ sources = files('ethdev_private.c',
 	'rte_tm.c')
 
 headers = files('rte_ethdev.h',
-	'rte_ethdev_core.h',
 	'rte_ethdev_trace.h',
 	'rte_ethdev_trace_fp.h',
-	'rte_eth_ctrl.h',
 	'rte_dev_info.h',
 	'rte_flow.h',
 	'rte_flow_driver.h',
@@ -22,5 +20,8 @@ headers = files('rte_ethdev.h',
 	'rte_mtr_driver.h',
 	'rte_tm.h',
 	'rte_tm_driver.h')
+indirect_headers += files(
+	'rte_ethdev_core.h',
+	'rte_eth_ctrl.h')
 
 deps += ['net', 'kvargs', 'meter', 'telemetry']
lib/librte_hash/meson.build +2 -2
index 0977a63fd2..242859f5ad 100644
@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-headers = files('rte_crc_arm64.h',
-	'rte_fbk_hash.h',
+headers = files('rte_fbk_hash.h',
 	'rte_hash_crc.h',
 	'rte_hash.h',
 	'rte_jhash.h',
 	'rte_thash.h')
+indirect_headers += files('rte_crc_arm64.h')
 
 sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c')
 deps += ['ring']
lib/librte_ipsec/meson.build +2 -1
index fc69970ec5..1497f573bb 100644
@@ -3,6 +3,7 @@
 
 sources = files('esp_inb.c', 'esp_outb.c', 'sa.c', 'ses.c', 'ipsec_sad.c')
 
-headers = files('rte_ipsec.h', 'rte_ipsec_group.h', 'rte_ipsec_sa.h', 'rte_ipsec_sad.h')
+headers = files('rte_ipsec.h', 'rte_ipsec_sa.h', 'rte_ipsec_sad.h')
+indirect_headers += files('rte_ipsec_group.h')
 
 deps += ['mbuf', 'net', 'cryptodev', 'security', 'hash']
lib/librte_lpm/meson.build +1 -1
index f93c866409..90cbf8646a 100644
@@ -5,6 +5,6 @@ sources = files('rte_lpm.c', 'rte_lpm6.c')
 headers = files('rte_lpm.h', 'rte_lpm6.h')
 # since header files have different names, we can install all vector headers
 # without worrying about which architecture we actually need
-headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h', 'rte_lpm_sve.h')
+indirect_headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h', 'rte_lpm_sve.h')
 deps += ['hash']
 deps += ['rcu']
lib/librte_regexdev/meson.build +1 -1
index c417b9caf0..1b3b6db22a 100644
@@ -3,6 +3,6 @@
 
 sources = files('rte_regexdev.c')
 headers = files('rte_regexdev.h',
-	'rte_regexdev_core.h',
 	'rte_regexdev_driver.h')
+indirect_headers += files('rte_regexdev_core.h')
 deps += ['mbuf']
lib/librte_ring/meson.build +3 -1
index f007893b5f..ea050d564a 100644
@@ -2,7 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('rte_ring.c')
-headers = files('rte_ring.h',
+headers = files('rte_ring.h')
+# most sub-headers are not for direct inclusion
+indirect_headers += files (
 		'rte_ring_core.h',
 		'rte_ring_elem.h',
 		'rte_ring_elem_pvt.h',
lib/librte_stack/meson.build +3 -1
index 8f82a40ec2..9ff33722b2 100644
@@ -2,7 +2,9 @@
 # Copyright(c) 2019 Intel Corporation
 
 sources = files('rte_stack.c', 'rte_stack_std.c', 'rte_stack_lf.c')
-headers = files('rte_stack.h',
+headers = files('rte_stack.h')
+# subheaders, not for direct inclusion by apps
+indirect_headers += files(
 		'rte_stack_std.h',
 		'rte_stack_lf.h',
 		'rte_stack_lf_generic.h',
lib/librte_table/meson.build +3 -4
index d69678386e..aa1e1d0385 100644
@@ -20,7 +20,6 @@ headers = files('rte_table.h',
 		'rte_table_hash.h',
 		'rte_table_hash_cuckoo.h',
 		'rte_table_hash_func.h',
-		'rte_table_hash_func_arm64.h',
 		'rte_lru.h',
 		'rte_table_array.h',
 		'rte_table_stub.h',
@@ -28,6 +27,6 @@ headers = files('rte_table.h',
 		'rte_swx_table_em.h',)
 deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
 
-if arch_subdir == 'x86'
-	headers += files('rte_lru_x86.h')
-endif
+indirect_headers += files('rte_lru_x86.h',
+		'rte_lru_arm64.h',
+		'rte_table_hash_func_arm64.h')
lib/meson.build +3 -0
index 44f0a62142..7712aa4977 100644
@@ -66,6 +66,7 @@ foreach l:libraries
 	use_function_versioning = false
 	sources = []
 	headers = []
+	indirect_headers = [] # public headers not directly included by apps
 	includes = []
 	cflags = default_cflags
 	objs = [] # other object files to link against, used e.g. for
@@ -103,6 +104,8 @@ foreach l:libraries
 		enabled_libs += name
 		dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
 		install_headers(headers)
+		install_headers(indirect_headers)
+		dpdk_chkinc_headers += headers
 
 		libname = 'rte_' + name
 		includes += include_directories(dir_name)
meson.build +1 -0
index 2b9c37eb42..e6e34d0a98 100644
@@ -16,6 +16,7 @@ cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
 dpdk_static_libraries = []
+dpdk_chkinc_headers = []
 dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
meson_options.txt +2 -0
index 4604328224..5c382487da 100644
@@ -1,5 +1,7 @@
 # Please keep these options sorted alphabetically.
 
+option('check_includes', type: 'boolean', value: false,
+	description: 'build "chkincs" to verify each header file can compile alone')
 option('disable_drivers', type: 'string', value: '',
 	description: 'Comma-separated list of drivers to explicitly disable.')
 option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
Signature · 1 line
2.27.0
#158 lore raw

PATCH v7 8/10 buildtools/chkincs: add app to verify header includes

In reply to Bruce Richardson

To verify that all DPDK headers are ok for inclusion directly in a C file, and are not missing any other pre-requisite headers, we can auto-generate for each header an empty C file that includes that header. Compiling these files will throw errors if any header has unmet dependencies.

To ensure ongoing compliance, we enable this build test as part of the default x86 build in "test-meson-builds.sh".

---
 MAINTAINERS                                 |  1 +
 buildtools/chkincs/gen_c_file_for_header.py | 12 +++++++
 buildtools/chkincs/main.c                   |  4 +++
 buildtools/chkincs/meson.build              | 36 +++++++++++++++++++++
 devtools/test-meson-builds.sh               |  2 +-
 doc/guides/rel_notes/release_21_02.rst      |  8 +++++
 meson.build                                 |  5 +++
 7 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100755 buildtools/chkincs/gen_c_file_for_header.py
 create mode 100644 buildtools/chkincs/main.c
 create mode 100644 buildtools/chkincs/meson.build
MAINTAINERS +1 -0
index 1a12916f56..aeefe3b1be 100644
@@ -98,6 +98,7 @@ F: Makefile
 F: meson.build
 F: meson_options.txt
 F: config/
+F: buildtools/chkincs/
 F: buildtools/call-sphinx-build.py
 F: buildtools/list-dir-globs.py
 F: buildtools/pkg-config/
buildtools/chkincs/gen_c_file_for_header.py new file +12 -0
new file mode 100755
index 0000000000..ed46948aea
@@ -0,0 +1,12 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+from sys import argv
+from os.path import abspath
+
+(h_file, c_file) = argv[1:]
+
+contents = '#include "' + abspath(h_file) + '"'
+with open(c_file, 'w') as cf:
+    cf.write(contents)
buildtools/chkincs/main.c new file +4 -0
new file mode 100644
index 0000000000..d25bb8852a
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+int main(void) { return 0; }
buildtools/chkincs/meson.build new file +36 -0
new file mode 100644
index 0000000000..f345e87551
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+if not get_option('check_includes')
+	build = false
+	subdir_done()
+endif
+
+if is_windows
+	# for windows, the shebang line in the script won't work.
+	error('option "check_includes" is not supported on windows')
+endif
+
+gen_c_file_for_header = find_program('gen_c_file_for_header.py')
+gen_c_files = generator(gen_c_file_for_header,
+	output: '@[email protected]',
+	arguments: ['@INPUT@', '@OUTPUT@'])
+
+cflags = machine_args
+cflags += '-Wno-unused-function' # needed if we include generic headers
+cflags += '-DALLOW_EXPERIMENTAL_API'
+
+sources = files('main.c')
+sources += gen_c_files.process(dpdk_chkinc_headers)
+
+deps = []
+foreach l:enabled_libs
+	deps += get_variable('static_rte_' + l)
+endforeach
+
+executable('chkincs', sources,
+	c_args: cflags,
+	include_directories: includes,
+	dependencies: deps,
+	link_whole: dpdk_static_libraries + dpdk_drivers,
+	install: false)
devtools/test-meson-builds.sh +1 -1
index efa91e0e40..a99a177e0c 100755
@@ -227,7 +227,7 @@ default_machine='nehalem'
 if ! check_cc_flags "-march=$default_machine" ; then
 	default_machine='corei7'
 fi
-build build-x86-default cc skipABI \
+build build-x86-default cc skipABI -Dcheck_includes=true \
 	-Dlibdir=lib -Dmachine=$default_machine $use_shared
 
 # 32-bit with default compiler
doc/guides/rel_notes/release_21_02.rst +8 -0
index 17fcfd661c..fc3bf51cb6 100644
@@ -132,6 +132,14 @@ New Features
   * Added support for aes-cbc sha256-128-hmac cipher combination in OCTEON TX2
     crypto PMD lookaside protocol offload for IPsec.
 
+* **Added support for build-time checking of header includes**
+
+  A new build option ``check_includes`` has been added, which, when enabled,
+  will perform build-time checking on DPDK public header files, to ensure none
+  are missing dependent header includes. This feature, disabled by default, is
+  intended for use by developers contributing to the DPDK SDK itself, and is
+  integrated into the build scripts and automated CI for patch contributions.
+
 
 Removed Items
 -------------
meson.build +5 -0
index e6e34d0a98..fcc4d4c900 100644
@@ -68,6 +68,11 @@ if get_option('enable_kmods')
 	subdir('kernel')
 endif
 
+# check header includes if requested
+if get_option('check_includes')
+	subdir('buildtools/chkincs')
+endif
+
 # write the build config
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
Signature · 1 line
2.27.0
#159 lore raw

Re: [dpdk-dev] [PATCH v7 08/10] buildtools/chkincs: add app to verify header includes

Quoted 16 lines · Bruce Richardson
buildtools/chkincs/meson.build new file +10 -0
new file mode 100644
index 0000000000..f345e87551
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+if not get_option('check_includes')
+       build = false
+       subdir_done()
+endif
+
+if is_windows
+       # for windows, the shebang line in the script won't work.

buildtools/chkincs/meson.build line 20

Quoted 10 lines
buildtools/chkincs/meson.build new file +10 -0
+       error('option "check_includes" is not supported on windows')
+endif
+
+gen_c_file_for_header = find_program('gen_c_file_for_header.py')
+gen_c_files = generator(gen_c_file_for_header,
+       output: '@[email protected]',
+       arguments: ['@INPUT@', '@OUTPUT@'])
+
+cflags = machine_args
+cflags += '-Wno-unused-function' # needed if we include generic headers

With http://patchwork.dpdk.org/patch/87567/, we have no direct inclusion of the generic headers remaining.
This flag could be removed.
WDYT?

buildtools/chkincs/meson.build line 25

Quoted 5 lines
buildtools/chkincs/meson.build new file +5 -0
+cflags += '-DALLOW_EXPERIMENTAL_API'
+
+sources = files('main.c')
+sources += gen_c_files.process(dpdk_chkinc_headers)
+

--
David Marchand

#160 lore raw

Re: [dpdk-dev] [PATCH v7 08/10] buildtools/chkincs: add app to verify header includes

Quoted 25 lines · David Marchand
Quoted 23 lines · Bruce Richardson
buildtools/chkincs/meson.build new file +17 -0
new file mode 100644
index 0000000000..f345e87551
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+if not get_option('check_includes')
+       build = false
+       subdir_done()
+endif
+
+if is_windows
+       # for windows, the shebang line in the script won't work.
+       error('option "check_includes" is not supported on windows')
+endif
+
+gen_c_file_for_header = find_program('gen_c_file_for_header.py')
+gen_c_files = generator(gen_c_file_for_header,
+       output: '@[email protected]',
+       arguments: ['@INPUT@', '@OUTPUT@'])
Quoted 9 lines

buildtools/chkincs/meson.build line 20

Quoted 3 lines
buildtools/chkincs/meson.build new file +3 -0
+
+cflags = machine_args
+cflags += '-Wno-unused-function' # needed if we include generic headers

With http://patchwork.dpdk.org/patch/87567/, we have no direct inclusion of the generic headers remaining.
This flag could be removed.
WDYT?

If it can be removed, it should be, IMHO.

/Bruce

#161 lore raw

PATCH v7 9/10 devtools: remove check-includes script

In reply to Bruce Richardson

The check-includes script allowed checking header files in a given directory to ensure that each header compiled alone without requiring any other header inclusions.

With header checking now being done by the chkincs app in the build system this script can be removed.

---
 MAINTAINERS                            |   1 -
 devtools/check-includes.sh             | 259 -------------------------
 doc/guides/rel_notes/release_21_02.rst |   3 +
 3 files changed, 3 insertions(+), 260 deletions(-)
 delete mode 100755 devtools/check-includes.sh
MAINTAINERS +0 -1
index aeefe3b1be..71c3413cfa 100644
@@ -81,7 +81,6 @@ F: devtools/check-dup-includes.sh
 F: devtools/check-maintainers.sh
 F: devtools/check-forbidden-tokens.awk
 F: devtools/check-git-log.sh
-F: devtools/check-includes.sh
 F: devtools/check-spdx-tag.sh
 F: devtools/check-symbol-maps.sh
 F: devtools/checkpatches.sh
devtools/check-includes.sh deleted +0 -259

259 lines not on this page · raw message

doc/guides/rel_notes/release_21_02.rst +3 -0
index fc3bf51cb6..5df712809c 100644
@@ -170,6 +170,9 @@ Removed Items
   PCI device IDs ``0x16c8, 0x16c9, 0x16ca, 0x16ce, 0x16cf, 0x16df, 0x16d0,``
   ``0x16d1, 0x16d2, 0x16d4, 0x16d5, 0x16e7, 0x16e8, 0x16e9`` has been removed.
 
+* The ``check-includes.sh`` script for checking DPDK header files has been
+  removed, being replaced by the ``check_includes`` build option described above.
+
 
 API Changes
 -----------
Signature · 1 line
2.27.0
#162 lore raw

PATCH v7 10/10 ci: add checking of includes to CI builds

In reply to Bruce Richardson

For CI builds, turn on the checking of includes.

---
 .ci/linux-build.sh | 1 +
 1 file changed, 1 insertion(+)
.ci/linux-build.sh +1 -0
index afa3689a09..fdbeb5a616 100755
@@ -57,6 +57,7 @@ fi
 OPTS="$OPTS -Dmachine=default"
 OPTS="$OPTS --default-library=$DEF_LIB"
 OPTS="$OPTS --buildtype=debugoptimized"
+OPTS="$OPTS -Dcheck_includes=true"
 meson build --werror $OPTS
 ninja -C build
 
Signature · 1 line
2.27.0
#164 lore raw

Re: [dpdk-dev] [PATCH v7 00/10] add checking of header includes

In reply to Bruce Richardson
Quoted 36 lines · Bruce Richardson

As a general principle, each header file should include any other headers it needs to provide data type definitions or macros. For example, any header using the uintX_t types in structures or function prototypes should include "stdint.h" to provide those type definitions.

In practice, while many, but not all, headers in DPDK did include all necessary headers, it was never actually checked that each header could be included in a C file and compiled without having any compiler errors about missing definitions. The script "check-includes.sh" could be used for this job, but it was not called out in the documentation, so many contributors may not have been aware of it's existance. It also was difficult to run from a source-code directory, as the script did not automatically allow finding of headers from one DPDK library directory to another [this was probably based on running it on a build created by the "make" build system, where all headers were in a single directory]. To attempt to have a build-system integrated replacement, this patchset adds a "chkincs" app in the buildtools directory to verify this on an ongoing basis.

This chkincs app does nothing when run, and is not installed as part of a DPDK "ninja install", it's for build-time checking only. Its source code consists of one C file per public DPDK header, where that C file contains nothing except an include for that header. Therefore, if any header is added to the lib folder which fails to compile when included alone, the build of chkincs will fail with a suitable error message. Since this compile checking is not needed on most builds of DPDK, the building of chkincs is disabled by default, but can be enabled by the "test_includes" meson option. To catch errors with patch submissions, the final patch of this series enables it for a single build in test-meson-builds script.

Future work could involve doing similar checks on headers for C++ compatibility, which was something done by the check-includes.sh script but which is missing here.

Quoted 5 lines

V7:
* fixed issue with compilers not supporting __has_attribute
* added patch to add missing headers to power library .h file
* added patch to make eventdev headers non-public
* renamed headers_no_chkincs to indirect_headers

I squashed patch 7/8 as commented by Thomas.
The series looks good.

Series applied, thanks Bruce.

Signature · 1 line
David Marchand