ensure headers have correct includes
Subsystems (6)
PATCH v6 4/8 ethdev: make driver-only headers private
In reply to Bruce RichardsonThe 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
lib/librte_ethdev/ethdev_pci.h renamed from lib/librte_ethdev/rte_ethdev_pci.h +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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
Re: [dpdk-dev] [PATCH v6 4/8] ethdev: make driver-only headers private
In reply to Bruce Richardson27/01/2021 18:33, Bruce Richardson:
Quoted 4 lines
The
rte_ethdev_driver.h,rte_ethdev_vdev.handrte_ethdev_pci.hfiles are for drivers only and should be a private to DPDK and not installed.Signed-off-by Bruce Richardson <[email protected]>
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.
Re: [dpdk-dev] [PATCH v6 4/8] ethdev: make driver-only headers private
In reply to Bruce RichardsonQuoted 5 lines · Bruce Richardson
doc/guides/rel_notes/release_21_02.rst +0
-0
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
Re: [dpdk-dev] [PATCH v6 4/8] ethdev: make driver-only headers private
In reply to Bruce RichardsonQuoted 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.handrte_ethdev_pci.hfiles are for drivers only and should be a private to DPDK and not installed.Signed-off-by Bruce Richardson <[email protected]>--- drivers/net/avp/avp_ethdev.c | 4 ++--drivers/net/avp/avp_ethdev.c +0
-0
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>
PATCH v6 5/8 build: separate out headers for include checking
In reply to Bruce RichardsonFor 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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.
Signed-off-by Bruce Richardson <[email protected]>
[...]
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?
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.
Signed-off-by Bruce Richardson <[email protected]>[...]
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.
PATCH v6 6/8 buildtools/chkincs: add app to verify header includes
In reply to Bruce RichardsonTo 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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".Signed-off-by Bruce Richardson <[email protected]>--- 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.buildMAINTAINERS +0
-0
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
-0Sample packet helper functions for unit test M: Reshma Pattan <[email protected]> F: app/test/sample_packet_forward.cbuildtools/chkincs/gen_c_file_for_header.py new file +12
-0@@ -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@@ -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@@ -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
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 compilerdoc/guides/rel_notes/release_21_02.rst +0
-0@@ -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
-0Removed Items -------------meson.build +5
-1@@ -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
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".Signed-off-by Bruce Richardson <[email protected]>--- 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.buildMAINTAINERS +0
-0@@ -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
-0Sample packet helper functions for unit test M: Reshma Pattan <[email protected]> F: app/test/sample_packet_forward.cbuildtools/chkincs/gen_c_file_for_header.py new file +12
-0@@ -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@@ -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@@ -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
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 compilerdoc/guides/rel_notes/release_21_02.rst +0
-0@@ -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.
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
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.
Re: [dpdk-dev] [PATCH v6 6/8] buildtools/chkincs: add app to verify header includes
In reply to David MarchandQuoted 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
PATCH v6 7/8 devtools: remove check-includes script
In reply to Bruce RichardsonThe 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
@@ -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
@@ -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
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?
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
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.
PATCH v6 8/8 ci: add checking of includes to CI builds
In reply to Bruce RichardsonFor CI builds, turn on the checking of includes.
--- .ci/linux-build.sh | 1 + 1 file changed, 1 insertion(+)
.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" meson build --werror $OPTS ninja -C build
--
2.27.0
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.
Signed-off-by Bruce Richardson <[email protected]>Acked-by Aaron Conole <[email protected]>--- .ci/linux-build.sh | 1 + 1 file changed, 1 insertion(+).ci/linux-build.sh +0
-0
.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?
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.
Signed-off-by Bruce Richardson <[email protected]> Acked-by: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..fdbeb5a616100755 ---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.
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.
Signed-off-by Bruce Richardson <[email protected]> Acked-by: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..fdbeb5a616100755 ---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
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.
Signed-off-by Bruce Richardson <[email protected]> Acked-by: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..fdbeb5a616100755 ---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
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.
Signed-off-by Bruce Richardson <[email protected]> Acked-by: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..fdbeb5a616100755 ---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.
Re: [dpdk-dev] [PATCH v6 0/8] add checking of header includes
In reply to Bruce RichardsonQuoted 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_ttypes 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.shscript 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 oldcheck_includesscript
* 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
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_ttypes 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.shscript 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 oldcheck_includesscript
* 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 oneth_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.
v7 cover add checking of header includes
In reply to Bruce RichardsonAs 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
PATCH v7 1/10 eal: add missing include to mcslock
Include 'rte_branch_prediction.h' to get the likely/unlikely macro definitions.
--- lib/librte_eal/include/generic/rte_mcslock.h | 1 + 1 file changed, 1 insertion(+)
lib/librte_eal/include/generic/rte_mcslock.h +1 -0
@@ -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
PATCH v7 2/10 eal: fix error attribute use for clang
In reply to Bruce RichardsonClang 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.
--- lib/librte_eal/include/rte_compat.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
lib/librte_eal/include/rte_compat.h +12 -1
@@ -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 !definedALLOW_INTERNAL_API &&__has_attribute (error)/* For GCC */ #define __rte_internal \ __attribute__((error("Symbol is not public ABI"), \ section(".text.internal"))) +#elif !definedALLOW_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
PATCH v7 3/10 power: fix missing header includes
In reply to Bruce RichardsonThe rte_power_guest_channel.h file did not include it's dependent headers, so add them.
---
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
@@ -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
PATCH v7 4/10 rib: fix missing header include
In reply to Bruce RichardsonThe rte_rib6 header was using RTE_MIN macro from rte_common.h but not including the header file.
--- lib/librte_rib/rte_rib6.h | 1 + 1 file changed, 1 insertion(+)
lib/librte_rib/rte_rib6.h +1 -0
@@ -20,6 +20,7 @@#include <rte_memcpy.h> #include <rte_compat.h> +#include <rte_common.h> #ifdef __cplusplusextern "C" {
Signature · 1 line
2.27.0
PATCH v7 5/10 ethdev: make driver-only headers private
In reply to Bruce RichardsonThe 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
lib/librte_ethdev/ethdev_pci.h renamed from lib/librte_ethdev/rte_ethdev_pci.h +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH v7 6/10 eventdev: make driver-only headers private
In reply to Bruce RichardsonThe 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
lib/librte_eventdev/eventdev_pmd_pci.h renamed from lib/librte_eventdev/rte_eventdev_pmd_pci.h +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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.
PATCH v7 7/10 build: separate out headers for include checking
In reply to Bruce RichardsonFor 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH v7 8/10 buildtools/chkincs: add app to verify header includes
In reply to Bruce RichardsonTo 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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@@ -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
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@@ -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 headersWith 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
PATCH v7 9/10 devtools: remove check-includes script
In reply to Bruce RichardsonThe 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
@@ -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
@@ -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
PATCH v7 10/10 ci: add checking of includes to CI builds
In reply to Bruce RichardsonFor CI builds, turn on the checking of includes.
--- .ci/linux-build.sh | 1 + 1 file changed, 1 insertion(+)
.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" meson build --werror $OPTS ninja -C build
Signature · 1 line
2.27.0
Re: [dpdk-dev] [PATCH v7 10/10] ci: add checking of includes to CI builds
Quoted 4 lines · Bruce Richardson
For CI builds, turn on the checking of includes.
Signed-off-by Bruce Richardson <[email protected]>---
Re: [dpdk-dev] [PATCH v7 00/10] add checking of header includes
In reply to Bruce RichardsonQuoted 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_ttypes 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.shscript 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
* renamedheaders_no_chkincstoindirect_headers
I squashed patch 7/8 as commented by Thomas.
The series looks good.
Series applied, thanks Bruce.
Signature · 1 line
David Marchand