allow pmdinfo to be inserted and parsed using MSVC
Subsystems (12)
cover allow pmdinfo to be inserted and parsed using MSVC
DPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead. However, when __COUNTER__ was used directly from a header file, __LINE__ had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the __LINE__ could be passed from the .c file to the macro defined in the header (which was originally using __COUNTER__).
With this patchset commands like the one below provide the same JSON output as would be obtained on Linux.
python usertools\dpdk-pmdinfo.py build\app\dpdk-testpmd.exe
Andre Muezerie (4):
eal: add macro to embed information in binaries
buildtools: use macro to embed information in binaries
usertools: parse strings from PE images
drivers: use macro to embed information in binaries
buildtools/gen-pmdinfo-cfile.py | 6 ++- buildtools/meson.build | 8 +++- buildtools/pmdinfogen.py | 5 +- drivers/baseband/acc/rte_acc100_pmd.c | 4 +- drivers/baseband/acc/rte_vrb_pmd.c | 4 +- .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 4 +- drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 4 +- drivers/baseband/la12xx/bbdev_la12xx.c | 2 +- drivers/baseband/null/bbdev_null.c | 2 +- .../baseband/turbo_sw/bbdev_turbo_software.c | 2 +- drivers/bus/auxiliary/bus_auxiliary_driver.h | 4 +- drivers/bus/cdx/bus_cdx_driver.h | 7 ++- drivers/bus/dpaa/bus_dpaa_driver.h | 4 +- drivers/bus/fslmc/bus_fslmc_driver.h | 8 ++-- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 2 +- drivers/bus/ifpga/bus_ifpga_driver.h | 4 +- drivers/bus/pci/bus_pci_driver.h | 4 +- drivers/bus/platform/bus_platform_driver.h | 4 +- drivers/bus/uacce/bus_uacce_driver.h | 4 +- drivers/bus/vdev/bus_vdev_driver.h | 4 +- drivers/bus/vmbus/bus_vmbus_driver.h | 4 +- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 2 +- drivers/common/qat/qat_device.c | 2 +- drivers/common/zsda/zsda_device.c | 2 +- drivers/compress/isal/isal_compress_pmd.c | 2 +- drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 2 +- drivers/compress/uadk/uadk_compress_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd.c | 2 +- drivers/crypto/armv8/rte_armv8_pmd.c | 2 +- drivers/crypto/bcmfs/bcmfs_device.c | 3 +- drivers/crypto/caam_jr/caam_jr.c | 2 +- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- drivers/crypto/ionic/ionic_crypto_vdev.c | 2 +- drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 3 +- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 3 +- drivers/crypto/ipsec_mb/pmd_chacha_poly.c | 3 +- drivers/crypto/ipsec_mb/pmd_kasumi.c | 2 +- drivers/crypto/ipsec_mb/pmd_snow3g.c | 2 +- drivers/crypto/ipsec_mb/pmd_zuc.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +- drivers/crypto/null/null_crypto_pmd.c | 2 +- drivers/crypto/octeontx/otx_cryptodev.c | 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 3 +- drivers/crypto/scheduler/scheduler_pmd.c | 3 +- drivers/crypto/uadk/uadk_crypto_pmd.c | 2 +- drivers/crypto/virtio/virtio_cryptodev.c | 2 +- drivers/crypto/virtio/virtio_user_cryptodev.c | 2 +- drivers/dma/cnxk/cnxk_dmadev.c | 2 +- drivers/dma/dpaa/dpaa_qdma.c | 2 +- drivers/dma/dpaa2/dpaa2_qdma.c | 2 +- drivers/dma/hisilicon/hisi_dmadev.c | 2 +- drivers/dma/idxd/idxd_pci.c | 2 +- drivers/dma/ioat/ioat_dmadev.c | 2 +- drivers/dma/odm/odm_dmadev.c | 2 +- drivers/dma/skeleton/skeleton_dmadev.c | 2 +- drivers/event/cnxk/cn10k_eventdev.c | 2 +- drivers/event/cnxk/cn20k_eventdev.c | 2 +- drivers/event/cnxk/cn9k_eventdev.c | 2 +- drivers/event/dlb2/pf/dlb2_pf.c | 4 +- drivers/event/dpaa/dpaa_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +- drivers/event/dsw/dsw_evdev.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 3 +- drivers/event/octeontx/ssovf_probe.c | 4 +- drivers/event/octeontx/timvf_probe.c | 2 +- drivers/event/opdl/opdl_evdev.c | 2 +- drivers/event/skeleton/skeleton_eventdev.c | 4 +- drivers/event/sw/sw_evdev.c | 2 +- drivers/gpu/cuda/cuda.c | 2 +- drivers/mempool/cnxk/cnxk_mempool.c | 2 +- drivers/mempool/octeontx/octeontx_fpavf.c | 2 +- drivers/ml/cnxk/cn10k_ml_dev.c | 2 +- drivers/ml/cnxk/mvtvm_ml_dev.c | 2 +- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- drivers/net/ark/ark_ethdev.c | 2 +- drivers/net/atlantic/atl_ethdev.c | 2 +- drivers/net/avp/avp_ethdev.c | 2 +- drivers/net/axgbe/axgbe_ethdev.c | 2 +- drivers/net/bnx2x/bnx2x_ethdev.c | 5 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/cnxk/cn10k_ethdev.c | 2 +- drivers/net/cnxk/cn20k_ethdev.c | 2 +- drivers/net/cnxk/cn9k_ethdev.c | 2 +- drivers/net/cnxk/cnxk_eswitch.c | 2 +- drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c | 2 +- drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_mux.c | 2 +- drivers/net/dpaa2/dpaa2_ptp.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enetc/enetc_ethdev.c | 2 +- drivers/net/enetfec/enet_ethdev.c | 2 +- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/gve/gve_ethdev.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/intel/cpfl/cpfl_ethdev.c | 2 +- drivers/net/intel/e1000/em_ethdev.c | 2 +- drivers/net/intel/e1000/igb_ethdev.c | 4 +- drivers/net/intel/e1000/igc_ethdev.c | 2 +- drivers/net/intel/fm10k/fm10k_ethdev.c | 2 +- drivers/net/intel/i40e/i40e_ethdev.c | 2 +- drivers/net/intel/iavf/iavf_ethdev.c | 2 +- drivers/net/intel/ice/ice_dcf_ethdev.c | 2 +- drivers/net/intel/ice/ice_ethdev.c | 2 +- drivers/net/intel/idpf/idpf_ethdev.c | 2 +- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 2 +- drivers/net/intel/ixgbe/ixgbe_ethdev.c | 4 +- drivers/net/ionic/ionic_dev_pci.c | 2 +- drivers/net/ionic/ionic_dev_vdev.c | 3 +- drivers/net/mana/mana.c | 2 +- drivers/net/memif/rte_eth_memif.c | 2 +- drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.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/nfb/nfb_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev_vf.c | 2 +- drivers/net/ntnic/ntnic_ethdev.c | 2 +- drivers/net/null/rte_eth_null.c | 2 +- drivers/net/octeon_ep/otx_ep_ethdev.c | 2 +- drivers/net/octeontx/base/octeontx_pkivf.c | 2 +- drivers/net/octeontx/base/octeontx_pkovf.c | 2 +- drivers/net/octeontx/octeontx_ethdev.c | 3 +- drivers/net/pcap/pcap_ethdev.c | 2 +- drivers/net/pfe/pfe_ethdev.c | 2 +- drivers/net/qede/qede_ethdev.c | 4 +- drivers/net/r8169/r8169_ethdev.c | 2 +- drivers/net/ring/rte_eth_ring.c | 2 +- drivers/net/sfc/sfc_ethdev.c | 2 +- drivers/net/softnic/rte_eth_softnic.c | 2 +- drivers/net/tap/rte_eth_tap.c | 4 +- drivers/net/thunderx/nicvf_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +- drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +- drivers/net/vhost/rte_eth_vhost.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/net/virtio/virtio_user_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/xsc/xsc_ethdev.c | 2 +- drivers/net/zxdh/zxdh_ethdev.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +- drivers/raw/cnxk_gpio/cnxk_gpio.c | 2 +- drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c | 2 +- drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 2 +- drivers/raw/gdtc/gdtc_rawdev.c | 2 +- drivers/raw/ifpga/afu_pmd_core.c | 2 +- drivers/raw/ifpga/ifpga_rawdev.c | 4 +- drivers/raw/ntb/ntb.c | 2 +- drivers/raw/skeleton/skeleton_rawdev.c | 2 +- drivers/regex/cn9k/cn9k_regexdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- drivers/vdpa/sfc/sfc_vdpa.c | 2 +- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 +++ lib/eal/include/rte_dev.h | 14 ++---- usertools/dpdk-pmdinfo.py | 47 ++++++++++++++++--- 182 files changed, 273 insertions(+), 228 deletions(-)
--
2.49.0.vfs.0.0
PATCH 1/4 eal: add macro to embed information in binaries
DPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
To assimilate these requirements/restrictions, macro RTE_INCLUDE is introduced in this patch.
--- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
lib/eal/common/eal_common_options.c +1 -1
@@ -135,7 +135,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;* Note: PLEASE DO NOT ALTER THIS without making a corresponding * change to usertools/dpdk-pmdinfo.py */ -static const char dpdk_solib_path[] __rte_used = +RTE_INCLUDE(const char, dpdk_solib_path)[] ="DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH ;TAILQ_HEAD (device_option_list, device_option);
lib/eal/include/rte_common.h +6 -0
@@ -231,6 +231,12 @@ typedef uint16_t unaligned_uint16_t;/** * Force symbol to be generated even if it appears to be unused. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_INCLUDE (type, name) __pragma(comment(linker, "/include:" RTE_STR(name))) type name +#else +#define RTE_INCLUDE (type, name) __attribute__((used)) type name +#endif +#ifdef RTE_TOOLCHAIN_MSVC #define __rte_used#else
Signature · 1 line
2.49.0.vfs.0.0
PATCH 2/4 buildtools: use macro to embed information in binaries
In reply to Andre MuezerieThe archiver tool from the MSVC toolset is lib.exe. It has different parameters then it's GNU counterpart "ar".
buildtools\meson.build was updated to use lib.exe when MSVC compiler is used. This is to allow the code to be built without requiring GNU "ar" to be installed in that scenario.
Script gen-pmdinfo-cfile.py was updated to use the correct parameters when using lib.exe.
buildtools/meson.build was updated to require Python module "pefile" on Windows. This module is used to parse symbols on Windows images. Windows images are in PE format (opposed to ELF on Linux).
--- buildtools/gen-pmdinfo-cfile.py | 6 +++++- buildtools/meson.build | 8 ++++++-- buildtools/pmdinfogen.py | 5 +++-- 3 files changed, 14 insertions(+), 5 deletions(-)
buildtools/gen-pmdinfo-cfile.py +5 -1
@@ -10,7 +10,11 @@ _, tmp_root, ar, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, + if ar == 'lib': + ar_options = ['/LIST', '/NOLOGO'] + else: + ar_options = ['t'] + for name in subprocess.run([ar] + ar_options + [archive], stdout=subprocess.PIPE, check=True).stdout.decode().splitlines(): if os.path.exists(name): paths.append(name)
buildtools/meson.build +6 -2
@@ -6,7 +6,9 @@ check_symbols = find_program('check-symbols.sh') ldflags_ibverbs_static = find_program('options-ibverbs-static.sh') python3_required_modules = [] -if host_machine.system() != 'windows' +if host_machine.system() == 'windows' + python3_required_modules = ['pefile'] +else python3_required_modules = ['elftools'] endif python3 = import('python').find_installation('python3', required: false, modules: python3_required_modules)
@@ -37,7 +39,9 @@ install_data([ pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()] pmdinfogen = py3 + files('pmdinfogen.py') if host_machine.system() == 'windows' - if cc.get_id() == 'gcc' + if cc.get_id() == 'msvc' + pmdinfo += 'lib' + elif cc.get_id() == 'gcc' pmdinfo += 'ar' else pmdinfo += 'llvm-ar'
buildtools/pmdinfogen.py +3 -2
@@ -192,7 +192,7 @@ def dump(self, file): dumped = json.dumps(self.__dict__) escaped = dumped.replace('"', '\\"') print( - 'const char %s_pmd_info[] __attribute__((used)) = "PMD_INFO_STRING= %s";' + 'RTE_INCLUDE(const char, %s_pmd_info)[] = "PMD_INFO_STRING= %s";' % (self.name, escaped), file=file, )
@@ -252,7 +252,8 @@ def open_output(path): def write_header(output): output.write( - "static __attribute__((unused)) const char *generator = \"%s\";\n" % sys.argv[0] + "#include <rte_common.h>\n" + "static __rte_unused const char *generator = \"%s\";\n" % sys.argv[0] )
Signature · 1 line
2.49.0.vfs.0.0
Re: [PATCH 2/4] buildtools: use macro to embed information in binaries
Quoted 3 lines · Andre Muezerie
buildtools/meson.build was updated to require Python module "pefile" on Windows. This module is used to parse symbols on Windows images. Windows images are in PE format (opposed to ELF on Linux).
It is not used on build stage and thus is not needed.
There is no documentation on dpdk-pmdinfo requirements
in doc/guides/tools/pmdinfo.rst or guides/linux_gsg/sys_reqs.rst, so you can either just drop this part or document requirements in patch 3/4.
Quoted 5 lines
buildtools/gen-pmdinfo-cfile.py +0
-0
buildtools/gen-pmdinfo-cfile.py line 18
Quoted 10 lines
buildtools/gen-pmdinfo-cfile.py +5
-1@@ -10,7 +10,11 @@ _, tmp_root, ar, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, + if ar == 'lib': + ar_options = ['/LIST', '/NOLOGO'] + else: + ar_options = ['t'] + for name in subprocess.run([ar] + ar_options + [archive], stdout=subprocess.PIPE, check=True).stdout.decode().splitlines():
Nit: I suggest renaming 'ar' to 'archiver' to avoid confusion with specifically 'ar'. Previously this variable could only refer to 'ar' flavors.
PATCH 3/4 usertools: parse strings from PE images
In reply to Andre MuezerieScript usertools\dpdk-pmdinfo.py was enhanced to also be able to parse symbols from sections in PE images.
--- usertools/dpdk-pmdinfo.py | 47 ++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 6 deletions(-)
usertools/dpdk-pmdinfo.py +41 -6
@@ -40,6 +40,12 @@ import elftools from elftools.elf.elffile import ELFError, ELFFile +def is_windows(): + return os.name == 'nt' + +if is_windows(): + import pefile + # ---------------------------------------------------------------------------- def main() -> int: # pylint: disable=missing-docstring
@@ -114,18 +120,23 @@ def parse_pmdinfo(paths: Iterable[Path], search_plugins: bool) -> List[dict]: A list of DPDK drivers info dictionaries. """ binaries = set(paths) - for p in paths: - binaries.update(get_needed_libs(p)) - if search_plugins: - # cast to list to avoid errors with update while iterating - binaries.update(list(get_plugin_libs(binaries))) + + if is_windows(): + section_name = ".rdata" + else: + section_name = ".rodata" + for p in paths: + binaries.update(get_needed_libs(p)) + if search_plugins: + # cast to list to avoid errors with update while iterating + binaries.update(list(get_plugin_libs(binaries))) drivers = [] for b in binaries: logging.debug("analyzing %s", b) try: - for s in get_elf_strings(b, ".rodata", "PMD_INFO_STRING="): + for s in get_section_strings(b, section_name, "PMD_INFO_STRING="): try: info = json.loads(s) scrub_pci_ids(info)
@@ -269,6 +280,30 @@ def get_elf_strings(path: Path, section: str, prefix: str) -> Iterator[str]: yield from find_strings(sec.data(), prefix) +# ---------------------------------------------------------------------------- +def get_pe_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named PE section in a file. + """ + pe = pefile.PE(path) + for sec in pe.sections: + section_name = sec.Name.decode().strip('\x00') + if section_name != section: + continue + yield from find_strings(sec.get_data(), prefix) + + +# ---------------------------------------------------------------------------- +def get_section_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named section in an ELF or PE file. + """ + if is_windows(): + yield from get_pe_strings(path, section, prefix) + else: + yield from get_elf_strings(path, section, prefix) + + # ---------------------------------------------------------------------------- LDD_LIB_RE = re.compile( r"""
Signature · 1 line
2.49.0.vfs.0.0
Re: [PATCH 3/4] usertools: parse strings from PE images
usertools/dpdk-pmdinfo.py line 41
Quoted 7 lines · Andre Muezerie
usertools/dpdk-pmdinfo.py +0
-0@@ -40,6 +40,12 @@ import elftools from elftools.elf.elffile import ELFError, ELFFile
If elftools is not needed on Windows it should not be imported, otherwise we'd have a bogus system requirement.
PATCH 4/4 drivers: use macro to embed information in binaries
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead. However, when __COUNTER__ was used directly from a header file, __LINE__ had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the __LINE__ could be passed from the .c file to the macro defined in the header (which was originally using __COUNTER__).
--- drivers/baseband/acc/rte_acc100_pmd.c | 4 ++-- drivers/baseband/acc/rte_vrb_pmd.c | 4 ++-- drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 4 ++-- drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 4 ++-- drivers/baseband/la12xx/bbdev_la12xx.c | 2 +- drivers/baseband/null/bbdev_null.c | 2 +- drivers/baseband/turbo_sw/bbdev_turbo_software.c | 2 +- drivers/bus/auxiliary/bus_auxiliary_driver.h | 4 ++-- drivers/bus/cdx/bus_cdx_driver.h | 7 +++---- drivers/bus/dpaa/bus_dpaa_driver.h | 4 ++-- drivers/bus/fslmc/bus_fslmc_driver.h | 8 ++++---- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 2 +- drivers/bus/ifpga/bus_ifpga_driver.h | 4 ++-- drivers/bus/pci/bus_pci_driver.h | 4 ++-- drivers/bus/platform/bus_platform_driver.h | 4 ++-- drivers/bus/uacce/bus_uacce_driver.h | 4 ++-- drivers/bus/vdev/bus_vdev_driver.h | 4 ++-- drivers/bus/vmbus/bus_vmbus_driver.h | 4 ++-- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 2 +- drivers/common/qat/qat_device.c | 2 +- drivers/common/zsda/zsda_device.c | 2 +- drivers/compress/isal/isal_compress_pmd.c | 2 +- drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 2 +- drivers/compress/uadk/uadk_compress_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd.c | 2 +- drivers/crypto/armv8/rte_armv8_pmd.c | 2 +- drivers/crypto/bcmfs/bcmfs_device.c | 3 +-- drivers/crypto/caam_jr/caam_jr.c | 2 +- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- drivers/crypto/ionic/ionic_crypto_vdev.c | 2 +- drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 3 +-- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 3 +-- drivers/crypto/ipsec_mb/pmd_chacha_poly.c | 3 ++- drivers/crypto/ipsec_mb/pmd_kasumi.c | 2 +- drivers/crypto/ipsec_mb/pmd_snow3g.c | 2 +- drivers/crypto/ipsec_mb/pmd_zuc.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +- drivers/crypto/null/null_crypto_pmd.c | 2 +- drivers/crypto/octeontx/otx_cryptodev.c | 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 3 +-- drivers/crypto/scheduler/scheduler_pmd.c | 3 +-- drivers/crypto/uadk/uadk_crypto_pmd.c | 2 +- drivers/crypto/virtio/virtio_cryptodev.c | 2 +- drivers/crypto/virtio/virtio_user_cryptodev.c | 2 +- drivers/dma/cnxk/cnxk_dmadev.c | 2 +- drivers/dma/dpaa/dpaa_qdma.c | 2 +- drivers/dma/dpaa2/dpaa2_qdma.c | 2 +- drivers/dma/hisilicon/hisi_dmadev.c | 2 +- drivers/dma/idxd/idxd_pci.c | 2 +- drivers/dma/ioat/ioat_dmadev.c | 2 +- drivers/dma/odm/odm_dmadev.c | 2 +- drivers/dma/skeleton/skeleton_dmadev.c | 2 +- drivers/event/cnxk/cn10k_eventdev.c | 2 +- drivers/event/cnxk/cn20k_eventdev.c | 2 +- drivers/event/cnxk/cn9k_eventdev.c | 2 +- drivers/event/dlb2/pf/dlb2_pf.c | 4 ++-- drivers/event/dpaa/dpaa_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +- drivers/event/dsw/dsw_evdev.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 3 ++- drivers/event/octeontx/ssovf_probe.c | 4 ++-- drivers/event/octeontx/timvf_probe.c | 2 +- drivers/event/opdl/opdl_evdev.c | 2 +- drivers/event/skeleton/skeleton_eventdev.c | 4 ++-- drivers/event/sw/sw_evdev.c | 2 +- drivers/gpu/cuda/cuda.c | 2 +- drivers/mempool/cnxk/cnxk_mempool.c | 2 +- drivers/mempool/octeontx/octeontx_fpavf.c | 2 +- drivers/ml/cnxk/cn10k_ml_dev.c | 2 +- drivers/ml/cnxk/mvtvm_ml_dev.c | 2 +- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- drivers/net/ark/ark_ethdev.c | 2 +- drivers/net/atlantic/atl_ethdev.c | 2 +- drivers/net/avp/avp_ethdev.c | 2 +- drivers/net/axgbe/axgbe_ethdev.c | 2 +- drivers/net/bnx2x/bnx2x_ethdev.c | 5 +++-- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/cnxk/cn10k_ethdev.c | 2 +- drivers/net/cnxk/cn20k_ethdev.c | 2 +- drivers/net/cnxk/cn9k_ethdev.c | 2 +- drivers/net/cnxk/cnxk_eswitch.c | 2 +- drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c | 2 +- drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_mux.c | 2 +- drivers/net/dpaa2/dpaa2_ptp.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enetc/enetc_ethdev.c | 2 +- drivers/net/enetfec/enet_ethdev.c | 2 +- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/gve/gve_ethdev.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/intel/cpfl/cpfl_ethdev.c | 2 +- drivers/net/intel/e1000/em_ethdev.c | 2 +- drivers/net/intel/e1000/igb_ethdev.c | 4 ++-- drivers/net/intel/e1000/igc_ethdev.c | 2 +- drivers/net/intel/fm10k/fm10k_ethdev.c | 2 +- drivers/net/intel/i40e/i40e_ethdev.c | 2 +- drivers/net/intel/iavf/iavf_ethdev.c | 2 +- drivers/net/intel/ice/ice_dcf_ethdev.c | 2 +- drivers/net/intel/ice/ice_ethdev.c | 2 +- drivers/net/intel/idpf/idpf_ethdev.c | 2 +- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 2 +- drivers/net/intel/ixgbe/ixgbe_ethdev.c | 4 ++-- drivers/net/ionic/ionic_dev_pci.c | 2 +- drivers/net/ionic/ionic_dev_vdev.c | 3 ++- drivers/net/mana/mana.c | 2 +- drivers/net/memif/rte_eth_memif.c | 2 +- drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.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/nfb/nfb_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev_vf.c | 2 +- drivers/net/ntnic/ntnic_ethdev.c | 2 +- drivers/net/null/rte_eth_null.c | 2 +- drivers/net/octeon_ep/otx_ep_ethdev.c | 2 +- drivers/net/octeontx/base/octeontx_pkivf.c | 2 +- drivers/net/octeontx/base/octeontx_pkovf.c | 2 +- drivers/net/octeontx/octeontx_ethdev.c | 3 ++- drivers/net/pcap/pcap_ethdev.c | 2 +- drivers/net/pfe/pfe_ethdev.c | 2 +- drivers/net/qede/qede_ethdev.c | 4 ++-- drivers/net/r8169/r8169_ethdev.c | 2 +- drivers/net/ring/rte_eth_ring.c | 2 +- drivers/net/sfc/sfc_ethdev.c | 2 +- drivers/net/softnic/rte_eth_softnic.c | 2 +- drivers/net/tap/rte_eth_tap.c | 4 ++-- drivers/net/thunderx/nicvf_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +- drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +- drivers/net/vhost/rte_eth_vhost.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/net/virtio/virtio_user_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/xsc/xsc_ethdev.c | 2 +- drivers/net/zxdh/zxdh_ethdev.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +- drivers/raw/cnxk_gpio/cnxk_gpio.c | 2 +- drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c | 2 +- drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 2 +- drivers/raw/gdtc/gdtc_rawdev.c | 2 +- drivers/raw/ifpga/afu_pmd_core.c | 2 +- drivers/raw/ifpga/ifpga_rawdev.c | 4 ++-- drivers/raw/ntb/ntb.c | 2 +- drivers/raw/skeleton/skeleton_rawdev.c | 2 +- drivers/regex/cn9k/cn9k_regexdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- drivers/vdpa/sfc/sfc_vdpa.c | 2 +- lib/eal/include/rte_dev.h | 14 +++++--------- 176 files changed, 211 insertions(+), 216 deletions(-)
drivers/baseband/acc/rte_acc100_pmd.c +2 -2
@@ -4082,9 +4082,9 @@ static struct rte_pci_driver acc100_pci_vf_driver = { .drv_flags = RTE_PCI_DRV_NEED_MAPPING }; -RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver); +RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ACC100PF_DRIVER_NAME , pci_id_acc100_pf_map); -RTE_PMD_REGISTER_PCI (ACC100VF_DRIVER_NAME , acc100_pci_vf_driver); +RTE_PMD_REGISTER_PCI (ACC100VF_DRIVER_NAME , acc100_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ACC100VF_DRIVER_NAME , pci_id_acc100_vf_map);/*
drivers/baseband/acc/rte_vrb_pmd.c +2 -2
@@ -4460,9 +4460,9 @@ static struct rte_pci_driver vrb_pci_vf_driver = { .drv_flags = RTE_PCI_DRV_NEED_MAPPING }; -RTE_PMD_REGISTER_PCI (VRB_PF_DRIVER_NAME , vrb_pci_pf_driver); +RTE_PMD_REGISTER_PCI (VRB_PF_DRIVER_NAME , vrb_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (VRB_PF_DRIVER_NAME , pci_id_vrb_pf_map); -RTE_PMD_REGISTER_PCI (VRB_VF_DRIVER_NAME , vrb_pci_vf_driver); +RTE_PMD_REGISTER_PCI (VRB_VF_DRIVER_NAME , vrb_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (VRB_VF_DRIVER_NAME , pci_id_vrb_vf_map);/* Initial configuration of a VRB1 device prior to running configure(). */
drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +2 -2
@@ -3424,7 +3424,7 @@ static struct rte_pci_driver fpga_5gnr_fec_pci_vf_driver = { }; -RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_PF_DRIVER_NAME , fpga_5gnr_fec_pci_pf_driver); +RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_PF_DRIVER_NAME , fpga_5gnr_fec_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_5GNR_FEC_PF_DRIVER_NAME , pci_id_fpga_5gnr_fec_pf_map); -RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_VF_DRIVER_NAME , fpga_5gnr_fec_pci_vf_driver); +RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_VF_DRIVER_NAME , fpga_5gnr_fec_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_5GNR_FEC_VF_DRIVER_NAME , pci_id_fpga_5gnr_fec_vf_map);
drivers/baseband/fpga_lte_fec/fpga_lte_fec.c +2 -2
@@ -2664,9 +2664,9 @@ static struct rte_pci_driver fpga_lte_fec_pci_vf_driver = { }; -RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_PF_DRIVER_NAME , fpga_lte_fec_pci_pf_driver); +RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_PF_DRIVER_NAME , fpga_lte_fec_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_LTE_FEC_PF_DRIVER_NAME , pci_id_fpga_lte_fec_pf_map); -RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_VF_DRIVER_NAME , fpga_lte_fec_pci_vf_driver); +RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_VF_DRIVER_NAME , fpga_lte_fec_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_LTE_FEC_VF_DRIVER_NAME , pci_id_fpga_lte_fec_vf_map);
drivers/baseband/la12xx/bbdev_la12xx.c +1 -1
@@ -1111,7 +1111,7 @@ static struct rte_vdev_driver bbdev_la12xx_pmd_drv = { .remove = la12xx_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_la12xx_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_la12xx_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,LA12XX_MAX_NB_QUEUES_ARG "=<int>" LA12XX_VDEV_MODEM_ID_ARG "=<int> " );
drivers/baseband/null/bbdev_null.c +1 -1
@@ -349,7 +349,7 @@ static struct rte_vdev_driver bbdev_null_pmd_drv = { .remove = null_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_null_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_null_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,BBDEV_NULL_MAX_NB_QUEUES_ARG "=<int> " BBDEV_NULL_SOCKET_ID_ARG "=<int>" );
drivers/baseband/turbo_sw/bbdev_turbo_software.c +1 -1
@@ -1985,7 +1985,7 @@ static struct rte_vdev_driver bbdev_turbo_sw_pmd_drv = { .remove = turbo_sw_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_turbo_sw_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_turbo_sw_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,TURBO_SW_MAX_NB_QUEUES_ARG "=<int> " TURBO_SW_SOCKET_ID_ARG "=<int>" );
drivers/bus/auxiliary/bus_auxiliary_driver.h +2 -2
@@ -162,13 +162,13 @@ __rte_internalvoid rte_auxiliary_register (struct rte_auxiliary_driver *driver);/** Helper for auxiliary device registration from driver instance */ -#define RTE_PMD_REGISTER_AUXILIARY (nm, auxiliary_drv) \ +#define RTE_PMD_REGISTER_AUXILIARY (nm, auxiliary_drv, idx) \ RTE_INIT(auxiliaryinitfn_ ##nm) \ { \ (auxiliary_drv).driver.name = RTE_STR(nm); \ rte_auxiliary_register(&(auxiliary_drv)); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx)/** * Unregister an auxiliary driver.
drivers/bus/cdx/bus_cdx_driver.h +3 -4
@@ -35,8 +35,7 @@ struct rte_cdx_bus;#define RTE_CDX_ANY_ID (0xffff)#define RTE_PMD_REGISTER_CDX_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, cdx_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, cdx_tbl_export))[] = RTE_STR(table)/** Device needs resource mapping */ #define RTE_CDX_DRV_NEED_MAPPING 0x0001
@@ -147,13 +146,13 @@ void rte_cdx_register(struct rte_cdx_driver *driver);/** * Helper for CDX device registration from driver (eth, crypto, raw) instance. */ -#define RTE_PMD_REGISTER_CDX (nm, cdx_drv) \ +#define RTE_PMD_REGISTER_CDX (nm, cdx_drv, idx) \ RTE_INIT(cdxinitfn_ ##nm) \ {\ (cdx_drv).driver.name = RTE_STR(nm);\ rte_cdx_register(&cdx_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx)/** * Enables VFIO Interrupts for CDX bus devices.
drivers/bus/dpaa/bus_dpaa_driver.h +2 -2
@@ -239,13 +239,13 @@ int rte_dpaa_portal_fq_close(struct qman_fq *fq);void dpaa_portal_finish (void *arg);/** Helper for DPAA device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_DPAA (nm, dpaa_drv) \ +#define RTE_PMD_REGISTER_DPAA (nm, dpaa_drv, idx) \ RTE_INIT(dpaainitfn_ ##nm) \ {\ (dpaa_drv).driver.name = RTE_STR(nm);\ rte_dpaa_driver_register(&dpaa_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)__rte_internal struct fm_eth_port_cfg *dpaa_get_eth_port_cfg(int dev_id);
drivers/bus/fslmc/bus_fslmc_driver.h +4 -4
@@ -199,13 +199,13 @@ __rte_internalvoid rte_fslmc_driver_unregister (struct rte_dpaa2_driver *driver);/** Helper for DPAA2 device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_DPAA2 (nm, dpaa2_drv) \ +#define RTE_PMD_REGISTER_DPAA2 (nm, dpaa2_drv, idx) \ RTE_INIT(dpaa2initfn_ ##nm) \ {\ (dpaa2_drv).driver.name = RTE_STR(nm);\ rte_fslmc_driver_register(&dpaa2_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** * Register a DPAA2 MC Object driver.
@@ -230,13 +230,13 @@ __rte_internaluint32_t rte_fslmc_get_device_count (enum rte_dpaa2_dev_type device_type);/** Helper for DPAA2 object registration */ -#define RTE_PMD_REGISTER_DPAA2_OBJECT (nm, dpaa2_obj) \ +#define RTE_PMD_REGISTER_DPAA2_OBJECT (nm, dpaa2_obj, idx) \ RTE_INIT(dpaa2objinitfn_ ##nm) \ {\ (dpaa2_obj).name = RTE_STR(nm);\ rte_fslmc_object_register(&dpaa2_obj); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c +1 -1
@@ -153,4 +153,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpbp_obj = { .close = dpaa2_close_dpbp_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpbp, rte_dpaa2_dpbp_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpbp, rte_dpaa2_dpbp_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dpci.c +1 -1
@@ -202,4 +202,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpci_obj = { .close = rte_dpaa2_close_dpci_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpci, rte_dpaa2_dpci_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpci, rte_dpaa2_dpci_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +1 -1
@@ -692,4 +692,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpio_obj = { .close = dpaa2_close_dpio_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpio, rte_dpaa2_dpio_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpio, rte_dpaa2_dpio_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dprc.c +1 -1
@@ -99,4 +99,4 @@ static struct rte_dpaa2_object rte_dpaa2_dprc_obj = { .create = rte_dpaa2_create_dprc_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dprc, rte_dpaa2_dprc_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dprc, rte_dpaa2_dprc_obj, __LINE__);
drivers/bus/ifpga/bus_ifpga_driver.h +2 -2
@@ -146,7 +146,7 @@ void rte_ifpga_driver_register(struct rte_afu_driver *driver);__rte_internal void rte_ifpga_driver_unregister(struct rte_afu_driver *driver); -#define RTE_PMD_REGISTER_AFU (nm, afudrv)\ +#define RTE_PMD_REGISTER_AFU (nm, afudrv, idx)\ static const char *afudrvinit_ ## nm ## _alias;\ RTE_INIT(afudrvinitfn_ ##afudrv)\ {\
@@ -154,7 +154,7 @@ RTE_INIT(afudrvinitfn_ ##afudrv)\ (afudrv).driver.alias = afudrvinit_ ## nm ## _alias;\ rte_ifpga_driver_register(&afudrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)#define RTE_PMD_REGISTER_AFU_ALIAS (nm, alias)\ static const char *afudrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/pci/bus_pci_driver.h +2 -2
@@ -165,13 +165,13 @@ __rte_internalvoid rte_pci_register (struct rte_pci_driver *driver);/** Helper for PCI device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_PCI (nm, pci_drv) \ +#define RTE_PMD_REGISTER_PCI (nm, pci_drv, idx) \ RTE_INIT(pciinitfn_ ##nm) \ {\ (pci_drv).driver.name = RTE_STR(nm);\ rte_pci_register(&pci_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** * Unregister a PCI driver.
drivers/bus/platform/bus_platform_driver.h +2 -2
@@ -130,7 +130,7 @@ struct rte_platform_driver { container_of(ptr, const struct rte_platform_device, device) /** Helper for platform driver registration. */ -#define RTE_PMD_REGISTER_PLATFORM (nm, platform_drv) \ +#define RTE_PMD_REGISTER_PLATFORM (nm, platform_drv, idx) \ static const char *pdrvinit_ ## nm ## _alias; \ RTE_INIT(pdrvinitfn_ ##nm) \ { \
@@ -138,7 +138,7 @@ RTE_INIT(pdrvinitfn_ ##nm) \ (platform_drv).driver.alias = pdrvinit_ ## nm ## _alias; \ rte_platform_register(&(platform_drv)); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** Helper for setting platform driver alias. */ #define RTE_PMD_REGISTER_ALIAS (nm, alias) \
drivers/bus/uacce/bus_uacce_driver.h +2 -2
@@ -239,13 +239,13 @@ void rte_uacce_unregister(struct rte_uacce_driver *driver);/** * Helper for UACCE device registration from driver instance. */ -#define RTE_PMD_REGISTER_UACCE (nm, uacce_drv) \ +#define RTE_PMD_REGISTER_UACCE (nm, uacce_drv, idx) \ RTE_INIT(uacceinitfn_ ##nm) \ {\ (uacce_drv).driver.name = RTE_STR(nm);\ rte_uacce_register(&uacce_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/bus/vdev/bus_vdev_driver.h +2 -2
@@ -131,7 +131,7 @@ void rte_vdev_register(struct rte_vdev_driver *driver);__rte_internal void rte_vdev_unregister(struct rte_vdev_driver *driver); -#define RTE_PMD_REGISTER_VDEV (nm, vdrv)\ +#define RTE_PMD_REGISTER_VDEV (nm, vdrv, idx)\ static const char *vdrvinit_ ## nm ## _alias;\ RTE_INIT(vdrvinitfn_ ##vdrv)\ {\
@@ -139,7 +139,7 @@ RTE_INIT(vdrvinitfn_ ##vdrv)\ (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\ rte_vdev_register(&vdrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)#define RTE_PMD_REGISTER_ALIAS (nm, alias)\ static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/vmbus/bus_vmbus_driver.h +2 -2
@@ -91,13 +91,13 @@ __rte_internalvoid rte_vmbus_unregister (struct rte_vmbus_driver *driver);/** Helper for VMBUS device registration from driver instance */ -#define RTE_PMD_REGISTER_VMBUS (nm, vmbus_drv) \ +#define RTE_PMD_REGISTER_VMBUS (nm, vmbus_drv, idx) \ RTE_INIT(vmbusinitfn_ ##nm) \ { \ (vmbus_drv).driver.name = RTE_STR(nm); \ rte_vmbus_register(&vmbus_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/common/mlx5/mlx5_common.c +1 -1
@@ -1452,4 +1452,4 @@ mlx5_devx_uar_prepare(struct mlx5_common_device *cdev, struct mlx5_uar *uar)return 0 ; } -RTE_PMD_EXPORT_NAME (mlx5_common_driver, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_driver, __LINE__);
drivers/common/mlx5/mlx5_common_pci.c +1 -1
@@ -245,4 +245,4 @@ RTE_FINI(mlx5_common_pci_finish) } } -RTE_PMD_EXPORT_NAME (mlx5_common_pci, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_pci, __LINE__);
drivers/common/nitrox/nitrox_device.c +1 -1
@@ -144,5 +144,5 @@ static struct rte_pci_driver nitrox_pmd = { .remove = nitrox_pci_remove, }; -RTE_PMD_REGISTER_PCI (nitrox, nitrox_pmd); +RTE_PMD_REGISTER_PCI (nitrox, nitrox_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (nitrox, pci_id_nitrox_map);
drivers/common/qat/qat_device.c +1 -1
@@ -504,6 +504,6 @@ static struct rte_pci_driver rte_qat_pmd = { .remove = qat_pci_remove }; -RTE_PMD_REGISTER_PCI (QAT_PCI_NAME , rte_qat_pmd); +RTE_PMD_REGISTER_PCI (QAT_PCI_NAME , rte_qat_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (QAT_PCI_NAME , pci_id_qat_map);RTE_PMD_REGISTER_KMOD_DEP (QAT_PCI_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/common/zsda/zsda_device.c +1 -1
@@ -203,7 +203,7 @@ static struct rte_pci_driver rte_zsda_pmd = { .probe = zsda_pci_probe, .remove = zsda_pci_remove }; -RTE_PMD_REGISTER_PCI (ZSDA_PCI_NAME , rte_zsda_pmd); +RTE_PMD_REGISTER_PCI (ZSDA_PCI_NAME , rte_zsda_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ZSDA_PCI_NAME , pci_id_zsda_map);RTE_PMD_REGISTER_KMOD_DEP (ZSDA_PCI_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/compress/isal/isal_compress_pmd.c +1 -1
@@ -751,7 +751,7 @@ static struct rte_vdev_driver compdev_isal_pmd_drv = { .remove = compdev_isal_remove_dev, }; -RTE_PMD_REGISTER_VDEV (COMPDEV_NAME_ISAL_PMD , compdev_isal_pmd_drv); +RTE_PMD_REGISTER_VDEV (COMPDEV_NAME_ISAL_PMD , compdev_isal_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (COMPDEV_NAME_ISAL_PMD ,"socket_id=<int>" );RTE_LOG_REGISTER_DEFAULT (isal_logtype_driver,INFO );
drivers/compress/mlx5/mlx5_compress.c +1 -1
@@ -937,6 +937,6 @@ RTE_INIT(rte_mlx5_compress_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_compress_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_COMPRESS_DRIVER_NAME , mlx5_compress_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_COMPRESS_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/compress/octeontx/otx_zip_pmd.c +1 -1
@@ -717,6 +717,6 @@ static struct rte_pci_driver octtx_zip_pmd = { .remove = zip_pci_remove, }; -RTE_PMD_REGISTER_PCI (COMPRESSDEV_NAME_ZIP_PMD , octtx_zip_pmd); +RTE_PMD_REGISTER_PCI (COMPRESSDEV_NAME_ZIP_PMD , octtx_zip_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (COMPRESSDEV_NAME_ZIP_PMD , pci_id_octtx_zipvf_table);RTE_LOG_REGISTER_DEFAULT (octtx_zip_logtype_driver,INFO );
drivers/compress/uadk/uadk_compress_pmd.c +1 -1
@@ -432,5 +432,5 @@ static struct rte_vdev_driver uadk_compress_pmd = { };#define UADK_COMPRESS_DRIVER_NAME compress_uadk -RTE_PMD_REGISTER_VDEV (UADK_COMPRESS_DRIVER_NAME , uadk_compress_pmd); +RTE_PMD_REGISTER_VDEV (UADK_COMPRESS_DRIVER_NAME , uadk_compress_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (uadk_compress_logtype,INFO );
drivers/compress/zlib/zlib_pmd.c +1 -1
@@ -425,5 +425,5 @@ static struct rte_vdev_driver zlib_pmd_drv = { .remove = zlib_remove }; -RTE_PMD_REGISTER_VDEV (COMPRESSDEV_NAME_ZLIB_PMD , zlib_pmd_drv); +RTE_PMD_REGISTER_VDEV (COMPRESSDEV_NAME_ZLIB_PMD , zlib_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (zlib_logtype_driver,INFO );
drivers/crypto/armv8/rte_armv8_pmd.c +1 -1
@@ -853,7 +853,7 @@ static struct cryptodev_driver armv8_crypto_drv;RTE_LOG_REGISTER_DEFAULT (crypto_armv8_log_type,ERR ); -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ARMV8_PMD , armv8_crypto_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ARMV8_PMD , armv8_crypto_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_ARMV8_PMD , cryptodev_armv8_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_ARMV8_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/bcmfs/bcmfs_device.c +1 -2
@@ -329,5 +329,4 @@ static struct rte_vdev_driver rte_bcmfs_pmd = { .remove = bcmfs_vdev_remove }; -RTE_PMD_REGISTER_VDEV (bcmfs_pmd, - rte_bcmfs_pmd); +RTE_PMD_REGISTER_VDEV (bcmfs_pmd, rte_bcmfs_pmd, __LINE__);
drivers/crypto/caam_jr/caam_jr.c +1 -1
@@ -2451,7 +2451,7 @@ static struct rte_vdev_driver cryptodev_caam_jr_drv = {static struct cryptodev_driver caam_jr_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CAAM_JR_PMD , cryptodev_caam_jr_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CAAM_JR_PMD , cryptodev_caam_jr_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_CAAM_JR_PMD ,"max_nb_queue_pairs=<int>" "socket_id=<int>" );
drivers/crypto/ccp/rte_ccp_pmd.c +1 -1
@@ -312,7 +312,7 @@ static struct rte_pci_driver cryptodev_ccp_pmd_drv = {static struct cryptodev_driver ccp_crypto_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CCP_PMD , cryptodev_ccp_pmd_drv); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CCP_PMD , cryptodev_ccp_pmd_drv, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CCP_PMD ,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_CCP_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/cnxk/cn10k_cryptodev.c +1 -1
@@ -158,7 +158,7 @@ static struct rte_pci_driver cn10k_cryptodev_pmd = {static struct cryptodev_driver cn10k_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN10K_PMD , cn10k_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN10K_PMD , cn10k_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_CN10K_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CN10K_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(cn10k_cryptodev_drv, cn10k_cryptodev_pmd.driver,
drivers/crypto/cnxk/cn9k_cryptodev.c +1 -1
@@ -159,7 +159,7 @@ static struct rte_pci_driver cn9k_cryptodev_pmd = {static struct cryptodev_driver cn9k_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN9K_PMD , cn9k_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN9K_PMD , cn9k_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_CN9K_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CN9K_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(cn9k_cryptodev_drv, cn9k_cryptodev_pmd.driver,
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +1 -1
@@ -4492,7 +4492,7 @@ static struct rte_dpaa2_driver rte_dpaa2_sec_driver = {static struct cryptodev_driver dpaa2_sec_crypto_drv; -RTE_PMD_REGISTER_DPAA2 (CRYPTODEV_NAME_DPAA2_SEC_PMD , rte_dpaa2_sec_driver); +RTE_PMD_REGISTER_DPAA2 (CRYPTODEV_NAME_DPAA2_SEC_PMD , rte_dpaa2_sec_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (dpaa2_sec_crypto_drv, rte_dpaa2_sec_driver.driver, cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_DPAA2_SEC_PMD,
drivers/crypto/dpaa_sec/dpaa_sec.c +1 -1
@@ -3877,7 +3877,7 @@ static struct rte_dpaa_driver rte_dpaa_sec_driver = {static struct cryptodev_driver dpaa_sec_crypto_drv; -RTE_PMD_REGISTER_DPAA (CRYPTODEV_NAME_DPAA_SEC_PMD , rte_dpaa_sec_driver); +RTE_PMD_REGISTER_DPAA (CRYPTODEV_NAME_DPAA_SEC_PMD , rte_dpaa_sec_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (dpaa_sec_crypto_drv, rte_dpaa_sec_driver.driver, dpaa_cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_DPAA_SEC_PMD,
drivers/crypto/ionic/ionic_crypto_vdev.c +1 -1
@@ -123,6 +123,6 @@ static struct rte_vdev_driver rte_vdev_iocpt_pmd = {static struct cryptodev_driver rte_vdev_iocpt_drv; -RTE_PMD_REGISTER_VDEV (crypto_ionic, rte_vdev_iocpt_pmd); +RTE_PMD_REGISTER_VDEV (crypto_ionic, rte_vdev_iocpt_pmd, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (rte_vdev_iocpt_drv, rte_vdev_iocpt_pmd.driver, iocpt_vdev_driver_id);
drivers/crypto/ipsec_mb/pmd_aesni_gcm.c +1 -2
@@ -785,8 +785,7 @@ static struct rte_vdev_driver cryptodev_aesni_gcm_pmd_drv = {static struct cryptodev_driver aesni_gcm_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_GCM_PMD , - cryptodev_aesni_gcm_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_GCM_PMD , cryptodev_aesni_gcm_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_AESNI_GCM_PMD , cryptodev_aesni_gcm_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_AESNI_GCM_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_aesni_mb.c +1 -2
@@ -2500,8 +2500,7 @@ static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = {static struct cryptodev_driver aesni_mb_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_MB_PMD , - cryptodev_aesni_mb_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_MB_PMD , cryptodev_aesni_mb_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_AESNI_MB_PMD , cryptodev_aesni_mb_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_AESNI_MB_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_chacha_poly.c +2 -1
@@ -41,7 +41,8 @@ static struct rte_vdev_driver cryptodev_chacha20_poly1305_pmd_drv = {static struct cryptodev_driver chacha20_poly1305_crypto_drv;RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CHACHA20_POLY1305_PMD , - cryptodev_chacha20_poly1305_pmd_drv); + cryptodev_chacha20_poly1305_pmd_drv, + __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_CHACHA20_POLY1305_PMD , cryptodev_chacha20_poly1305_pmd); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CHACHA20_POLY1305_PMD,
drivers/crypto/ipsec_mb/pmd_kasumi.c +1 -1
@@ -46,7 +46,7 @@ static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = {static struct cryptodev_driver kasumi_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_KASUMI_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_snow3g.c +1 -1
@@ -571,7 +571,7 @@ static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = {static struct cryptodev_driver snow3g_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_SNOW3G_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_zuc.c +1 -1
@@ -376,7 +376,7 @@ static struct rte_vdev_driver cryptodev_zuc_pmd_drv = {static struct cryptodev_driver zuc_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_ZUC_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/mlx5/mlx5_crypto.c +1 -1
@@ -514,6 +514,6 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(mlx5_cryptodev_driver, mlx5_drv, mlx5_crypto_driver_id); RTE_LOG_REGISTER_DEFAULT(mlx5_crypto_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_CRYPTO_DRIVER_NAME , mlx5_crypto_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_CRYPTO_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/crypto/mvsam/rte_mrvl_pmd.c +1 -1
@@ -1281,7 +1281,7 @@ static struct rte_vdev_driver cryptodev_mrvl_pmd_drv = {static struct cryptodev_driver mrvl_crypto_drv;/* Register the driver in constructor. */ -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_MRVL_PMD , cryptodev_mrvl_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_MRVL_PMD , cryptodev_mrvl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_MRVL_PMD ,"max_nb_queue_pairs=<int> " "max_nb_sessions=<int> "
drivers/crypto/null/null_crypto_pmd.c +1 -1
@@ -233,7 +233,7 @@ static struct rte_vdev_driver cryptodev_null_pmd_drv = {static struct cryptodev_driver null_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_NULL_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/octeontx/otx_cryptodev.c +1 -1
@@ -114,7 +114,7 @@ static struct rte_pci_driver otx_cryptodev_pmd = {static struct cryptodev_driver otx_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_OCTEONTX_PMD , otx_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_OCTEONTX_PMD , otx_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_OCTEONTX_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_OCTEONTX_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(otx_cryptodev_drv, otx_cryptodev_pmd.driver,
drivers/crypto/openssl/rte_openssl_pmd.c +1 -2
@@ -3709,8 +3709,7 @@ static struct rte_vdev_driver cryptodev_openssl_pmd_drv = {static struct cryptodev_driver openssl_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_OPENSSL_PMD , - cryptodev_openssl_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_OPENSSL_PMD , cryptodev_openssl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_OPENSSL_PMD ,"max_nb_queue_pairs=<int> " "socket_id=<int>" );
drivers/crypto/scheduler/scheduler_pmd.c +1 -2
@@ -618,8 +618,7 @@ static struct rte_vdev_driver cryptodev_scheduler_pmd_drv = {static struct cryptodev_driver scheduler_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SCHEDULER_PMD , - cryptodev_scheduler_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SCHEDULER_PMD , cryptodev_scheduler_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_SCHEDULER_PMD ,"max_nb_queue_pairs=<int> " "socket_id=<int> "
drivers/crypto/uadk/uadk_crypto_pmd.c +1 -1
@@ -1087,7 +1087,7 @@ static struct rte_vdev_driver uadk_crypto_pmd = {static struct cryptodev_driver uadk_crypto_drv;#define UADK_CRYPTO_DRIVER_NAME crypto_uadk -RTE_PMD_REGISTER_VDEV (UADK_CRYPTO_DRIVER_NAME , uadk_crypto_pmd); +RTE_PMD_REGISTER_VDEV (UADK_CRYPTO_DRIVER_NAME , uadk_crypto_pmd, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (uadk_crypto_drv, uadk_crypto_pmd.driver, uadk_cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(UADK_CRYPTO_DRIVER_NAME,
drivers/crypto/virtio/virtio_cryptodev.c +1 -1
@@ -1718,7 +1718,7 @@ static struct rte_pci_driver rte_virtio_crypto_driver = {static struct cryptodev_driver virtio_crypto_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_VIRTIO_PMD , rte_virtio_crypto_driver); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_VIRTIO_PMD , rte_virtio_crypto_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (virtio_crypto_drv, rte_virtio_crypto_driver.driver, cryptodev_virtio_driver_id);
drivers/crypto/virtio/virtio_user_cryptodev.c +1 -1
@@ -565,7 +565,7 @@ static struct cryptodev_driver virtio_crypto_drv;uint8_t cryptodev_virtio_user_driver_id; -RTE_PMD_REGISTER_VDEV (crypto_virtio_user, virtio_user_driver); +RTE_PMD_REGISTER_VDEV (crypto_virtio_user, virtio_user_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (virtio_crypto_drv, virtio_user_driver.driver, cryptodev_virtio_user_driver_id);
drivers/dma/cnxk/cnxk_dmadev.c +1 -1
@@ -628,6 +628,6 @@ static struct rte_pci_driver cnxk_dmadev = { .remove = cnxk_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_dmadev_pci_driver, cnxk_dmadev); +RTE_PMD_REGISTER_PCI (cnxk_dmadev_pci_driver, cnxk_dmadev, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_dmadev_pci_driver, cnxk_dma_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_dmadev_pci_driver,"vfio-pci" );
drivers/dma/dpaa/dpaa_qdma.c +1 -1
@@ -1475,6 +1475,6 @@ static struct rte_dpaa_driver rte_dpaa_qdma_pmd = { .remove = dpaa_qdma_remove, }; -RTE_PMD_REGISTER_DPAA (dpaa_qdma, rte_dpaa_qdma_pmd); +RTE_PMD_REGISTER_DPAA (dpaa_qdma, rte_dpaa_qdma_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dpaa_qdma,DPAA_DMA_ERROR_CHECK "=<int>" );RTE_LOG_REGISTER_DEFAULT (dpaa_qdma_logtype,INFO );
drivers/dma/dpaa2/dpaa2_qdma.c +1 -1
@@ -1752,7 +1752,7 @@ static struct rte_dpaa2_driver rte_dpaa2_qdma_pmd = { .remove = dpaa2_qdma_remove, }; -RTE_PMD_REGISTER_DPAA2 (dpaa2_qdma, rte_dpaa2_qdma_pmd); +RTE_PMD_REGISTER_DPAA2 (dpaa2_qdma, rte_dpaa2_qdma_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dpaa2_qdma,DPAA2_QDMA_FLE_PRE_POPULATE "=<int>" DPAA2_QDMA_DESC_DEBUG"=<int>"
drivers/dma/hisilicon/hisi_dmadev.c +1 -1
@@ -964,6 +964,6 @@ static struct rte_pci_driver hisi_dma_pmd_drv = { .remove = hisi_dma_remove, }; -RTE_PMD_REGISTER_PCI (dma_hisilicon, hisi_dma_pmd_drv); +RTE_PMD_REGISTER_PCI (dma_hisilicon, hisi_dma_pmd_drv, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (dma_hisilicon, pci_id_hisi_dma_map);RTE_PMD_REGISTER_KMOD_DEP (dma_hisilicon,"vfio-pci" );
drivers/dma/idxd/idxd_pci.c +1 -1
@@ -453,7 +453,7 @@ struct rte_pci_driver idxd_pmd_drv_pci = { .remove = idxd_dmadev_remove_pci, }; -RTE_PMD_REGISTER_PCI (IDXD_PMD_DMADEV_NAME_PCI , idxd_pmd_drv_pci); +RTE_PMD_REGISTER_PCI (IDXD_PMD_DMADEV_NAME_PCI , idxd_pmd_drv_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (IDXD_PMD_DMADEV_NAME_PCI , pci_id_idxd_map);RTE_PMD_REGISTER_KMOD_DEP (IDXD_PMD_DMADEV_NAME_PCI ,"vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (dmadev_idxd_pci,"max_queues=0" );
drivers/dma/ioat/ioat_dmadev.c +1 -1
@@ -762,6 +762,6 @@ static struct rte_pci_driver ioat_pmd_drv = { .remove = ioat_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (IOAT_PMD_NAME , ioat_pmd_drv); +RTE_PMD_REGISTER_PCI (IOAT_PMD_NAME , ioat_pmd_drv, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (IOAT_PMD_NAME , pci_id_ioat_map);RTE_PMD_REGISTER_KMOD_DEP (IOAT_PMD_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/dma/odm/odm_dmadev.c +1 -1
@@ -711,7 +711,7 @@ static struct rte_pci_driver odm_dmadev = { .remove = odm_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (PCI_DRIVER_NAME , odm_dmadev); +RTE_PMD_REGISTER_PCI (PCI_DRIVER_NAME , odm_dmadev, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (PCI_DRIVER_NAME , odm_dma_pci_map);RTE_PMD_REGISTER_KMOD_DEP (PCI_DRIVER_NAME ,"vfio-pci" );RTE_LOG_REGISTER_DEFAULT (odm_logtype,NOTICE );
drivers/dma/skeleton/skeleton_dmadev.c +1 -1
@@ -729,6 +729,6 @@ static struct rte_vdev_driver skeldma_pmd_drv = { .drv_flags = RTE_VDEV_DRV_NEED_IOVA_AS_VA, }; -RTE_PMD_REGISTER_VDEV (dma_skeleton, skeldma_pmd_drv); +RTE_PMD_REGISTER_VDEV (dma_skeleton, skeldma_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dma_skeleton,SKELDMA_ARG_LCORE "=<uint16> " );
drivers/event/cnxk/cn10k_eventdev.c +1 -1
@@ -1173,7 +1173,7 @@ static struct rte_pci_driver cn10k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn10k, cn10k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn10k, cn10k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn10k, cn10k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn10k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "=<int>"
drivers/event/cnxk/cn20k_eventdev.c +1 -1
@@ -1151,7 +1151,7 @@ static struct rte_pci_driver cn20k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn20k, cn20k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn20k, cn20k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn20k, cn20k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn20k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn20k,
drivers/event/cnxk/cn9k_eventdev.c +1 -1
@@ -1267,7 +1267,7 @@ static struct rte_pci_driver cn9k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn9k, cn9k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn9k, cn9k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn9k, cn9k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn9k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "=<int>"
drivers/event/dlb2/pf/dlb2_pf.c +2 -2
@@ -881,8 +881,8 @@ static struct rte_pci_driver pci_eventdev_dlb2_5_pmd = { .remove = event_dlb2_5_pci_remove, }; -RTE_PMD_REGISTER_PCI (event_dlb2_pf, pci_eventdev_dlb2_pmd); +RTE_PMD_REGISTER_PCI (event_dlb2_pf, pci_eventdev_dlb2_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_dlb2_pf, pci_id_dlb2_map); -RTE_PMD_REGISTER_PCI (event_dlb2_5_pf, pci_eventdev_dlb2_5_pmd); +RTE_PMD_REGISTER_PCI (event_dlb2_5_pf, pci_eventdev_dlb2_5_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_dlb2_5_pf, pci_id_dlb2_5_map);
drivers/event/dpaa/dpaa_eventdev.c +1 -1
@@ -1050,6 +1050,6 @@ static struct rte_vdev_driver vdev_eventdev_dpaa_pmd = { .remove = dpaa_event_dev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA_PMD , vdev_eventdev_dpaa_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA_PMD , vdev_eventdev_dpaa_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (EVENTDEV_NAME_DPAA_PMD ,DISABLE_INTR_MODE "=<int>" );
drivers/event/dpaa2/dpaa2_eventdev.c +1 -1
@@ -1198,5 +1198,5 @@ static struct rte_vdev_driver vdev_eventdev_dpaa2_pmd = { .remove = dpaa2_eventdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA2_PMD , vdev_eventdev_dpaa2_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA2_PMD , vdev_eventdev_dpaa2_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (dpaa2_logtype_event,NOTICE );
drivers/event/dpaa2/dpaa2_hw_dpcon.c +1 -1
@@ -140,4 +140,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpcon_obj = { .close = rte_dpaa2_close_dpcon_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpcon, rte_dpaa2_dpcon_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpcon, rte_dpaa2_dpcon_obj, __LINE__);
drivers/event/dsw/dsw_evdev.c +1 -1
@@ -486,5 +486,5 @@ static struct rte_vdev_driver evdev_dsw_pmd_drv = { .remove = dsw_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DSW_PMD , evdev_dsw_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DSW_PMD , evdev_dsw_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (event_dsw_logtype,NOTICE );
drivers/event/octeontx/ssovf_evdev.c +2 -1
@@ -971,4 +971,5 @@ static struct rte_vdev_driver vdev_ssovf_pmd = { .remove = ssovf_vdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OCTEONTX_PMD , vdev_ssovf_pmd); +/* Blank line to force unique __LINE__ with RTE_PMD_REGISTER_VDEV */ +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OCTEONTX_PMD , vdev_ssovf_pmd, __LINE__);
drivers/event/octeontx/ssovf_probe.c +2 -2
@@ -210,7 +210,7 @@ static struct rte_pci_driver pci_ssowvf = { .probe = ssowvf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_ssowvf, pci_ssowvf); +RTE_PMD_REGISTER_PCI (octeontx_ssowvf, pci_ssowvf, __LINE__);/* SSOVF pcie device aka event queue probe */
@@ -286,4 +286,4 @@ static struct rte_pci_driver pci_ssovf = { .probe = ssovf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_ssovf, pci_ssovf); +RTE_PMD_REGISTER_PCI (octeontx_ssovf, pci_ssovf, __LINE__);
drivers/event/octeontx/timvf_probe.c +1 -1
@@ -162,4 +162,4 @@ static struct rte_pci_driver pci_timvf = { .remove = NULL, }; -RTE_PMD_REGISTER_PCI (octeontx_timvf, pci_timvf); +RTE_PMD_REGISTER_PCI (octeontx_timvf, pci_timvf, __LINE__);
drivers/event/opdl/opdl_evdev.c +1 -1
@@ -763,6 +763,6 @@ static struct rte_vdev_driver evdev_opdl_pmd_drv = {RTE_LOG_REGISTER_SUFFIX (opdl_logtype_driver, driver,INFO ); -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OPDL_PMD , evdev_opdl_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OPDL_PMD , evdev_opdl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (event_opdl,NUMA_NODE_ARG "=<int>" DO_VALIDATION_ARG "=<int>" DO_TEST_ARG "=<int>" );
drivers/event/skeleton/skeleton_eventdev.c +2 -2
@@ -395,7 +395,7 @@ static struct rte_pci_driver pci_eventdev_skeleton_pmd = { .remove = event_skeleton_pci_remove, }; -RTE_PMD_REGISTER_PCI (event_skeleton_pci, pci_eventdev_skeleton_pmd); +RTE_PMD_REGISTER_PCI (event_skeleton_pci, pci_eventdev_skeleton_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_skeleton_pci, pci_id_skeleton_map);/* VDEV based event device */
@@ -448,5 +448,5 @@ static struct rte_vdev_driver vdev_eventdev_skeleton_pmd = { .remove = skeleton_eventdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SKELETON_PMD , vdev_eventdev_skeleton_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SKELETON_PMD , vdev_eventdev_skeleton_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (skeleton_eventdev_logtype,INFO );
drivers/event/sw/sw_evdev.c +1 -1
@@ -1142,7 +1142,7 @@ static struct rte_vdev_driver evdev_sw_pmd_drv = { .remove = sw_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SW_PMD , evdev_sw_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SW_PMD , evdev_sw_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (event_sw,NUMA_NODE_ARG "=<int> " SCHED_QUANTA_ARG "=<int>" CREDIT_QUANTA_ARG "=<int>" MIN_BURST_SIZE_ARG "=<int>" DEQ_BURST_SIZE_ARG "=<int>"
drivers/gpu/cuda/cuda.c +1 -1
@@ -1440,6 +1440,6 @@ static struct rte_pci_driver rte_cuda_driver = { .remove = cuda_gpu_remove, }; -RTE_PMD_REGISTER_PCI (gpu_cuda, rte_cuda_driver); +RTE_PMD_REGISTER_PCI (gpu_cuda, rte_cuda_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (gpu_cuda, pci_id_cuda_map);RTE_PMD_REGISTER_KMOD_DEP (gpu_cuda,"* nvidia & (nv_peer_mem | nvpeer_mem)" );
drivers/mempool/cnxk/cnxk_mempool.c +1 -1
@@ -197,7 +197,7 @@ static struct rte_pci_driver npa_pci = { .remove = npa_remove, }; -RTE_PMD_REGISTER_PCI (mempool_cnxk, npa_pci); +RTE_PMD_REGISTER_PCI (mempool_cnxk, npa_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (mempool_cnxk, npa_pci_map);RTE_PMD_REGISTER_KMOD_DEP (mempool_cnxk,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(mempool_cnxk,
drivers/mempool/octeontx/octeontx_fpavf.c +1 -1
@@ -822,4 +822,4 @@ static struct rte_pci_driver pci_fpavf = { .probe = fpavf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_fpavf, pci_fpavf); +RTE_PMD_REGISTER_PCI (octeontx_fpavf, pci_fpavf, __LINE__);
drivers/ml/cnxk/cn10k_ml_dev.c +1 -1
@@ -858,7 +858,7 @@ static struct rte_pci_driver cn10k_mldev_pmd = { .remove = cn10k_ml_pci_remove, }; -RTE_PMD_REGISTER_PCI (MLDEV_NAME_CN10K_PMD , cn10k_mldev_pmd); +RTE_PMD_REGISTER_PCI (MLDEV_NAME_CN10K_PMD , cn10k_mldev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLDEV_NAME_CN10K_PMD , pci_id_ml_table);RTE_PMD_REGISTER_KMOD_DEP (MLDEV_NAME_CN10K_PMD ,"vfio-pci" );
drivers/ml/cnxk/mvtvm_ml_dev.c +1 -1
@@ -189,7 +189,7 @@ mvtvm_ml_vdev_remove(struct rte_vdev_device *vdev)static struct rte_vdev_driver mvtvm_mldev_pmd = {.probe = mvtvm_ml_vdev_probe, .remove = mvtvm_ml_vdev_remove}; -RTE_PMD_REGISTER_VDEV (MLDEV_NAME_MVTVM_PMD , mvtvm_mldev_pmd); +RTE_PMD_REGISTER_VDEV (MLDEV_NAME_MVTVM_PMD , mvtvm_mldev_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (MLDEV_NAME_MVTVM_PMD ,MVTVM_ML_DEV_MAX_QPS "=<int>" MVTVM_ML_DEV_CACHE_MODEL_DATA "=<0|1>" );
drivers/net/af_packet/rte_eth_af_packet.c +1 -1
@@ -1266,7 +1266,7 @@ static struct rte_vdev_driver pmd_af_packet_drv = { .remove = rte_pmd_af_packet_remove, }; -RTE_PMD_REGISTER_VDEV (net_af_packet, pmd_af_packet_drv); +RTE_PMD_REGISTER_VDEV (net_af_packet, pmd_af_packet_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_af_packet, eth_af_packet);RTE_PMD_REGISTER_PARAM_STRING (net_af_packet, "iface=<string> "
drivers/net/af_xdp/rte_eth_af_xdp.c +1 -1
@@ -2559,7 +2559,7 @@ static struct rte_vdev_driver pmd_af_xdp_drv = { .remove = rte_pmd_af_xdp_remove, }; -RTE_PMD_REGISTER_VDEV (net_af_xdp, pmd_af_xdp_drv); +RTE_PMD_REGISTER_VDEV (net_af_xdp, pmd_af_xdp_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_af_xdp,"iface=<string> " "start_queue=<int> "
drivers/net/ark/ark_ethdev.c +1 -1
@@ -1004,7 +1004,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)return ret; } -RTE_PMD_REGISTER_PCI (net_ark, rte_ark_pmd); +RTE_PMD_REGISTER_PCI (net_ark, rte_ark_pmd, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (net_ark,"* igb_uio | uio_pci_generic " );RTE_PMD_REGISTER_PCI_TABLE (net_ark, pci_id_ark_map); RTE_PMD_REGISTER_PARAM_STRING(net_ark,
drivers/net/atlantic/atl_ethdev.c +1 -1
@@ -1906,7 +1906,7 @@ is_atlantic_supported(struct rte_eth_dev *dev)return is_device_supported (dev, &rte_atl_pmd); } -RTE_PMD_REGISTER_PCI (net_atlantic, rte_atl_pmd); +RTE_PMD_REGISTER_PCI (net_atlantic, rte_atl_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_atlantic, pci_id_atl_map);RTE_PMD_REGISTER_KMOD_DEP (net_atlantic,"* igb_uio | uio_pci_generic" );RTE_LOG_REGISTER_SUFFIX (atl_logtype_init, init,NOTICE );
drivers/net/avp/avp_ethdev.c +1 -1
@@ -2305,6 +2305,6 @@ avp_dev_stats_reset(struct rte_eth_dev *eth_dev)return 0 ; } -RTE_PMD_REGISTER_PCI (net_avp, rte_avp_pmd); +RTE_PMD_REGISTER_PCI (net_avp, rte_avp_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_avp, pci_id_avp_map);RTE_LOG_REGISTER_SUFFIX (avp_logtype_driver, driver,NOTICE );
drivers/net/axgbe/axgbe_ethdev.c +1 -1
@@ -2459,7 +2459,7 @@ static struct rte_pci_driver rte_axgbe_pmd = { .remove = eth_axgbe_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_axgbe, rte_axgbe_pmd); +RTE_PMD_REGISTER_PCI (net_axgbe, rte_axgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_axgbe, pci_id_axgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_axgbe,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (axgbe_logtype_init, init,NOTICE );
drivers/net/bnx2x/bnx2x_ethdev.c +3 -2
@@ -817,10 +817,11 @@ static struct rte_pci_driver rte_bnx2xvf_pmd = { .remove = eth_bnx2x_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_bnx2x, rte_bnx2x_pmd); +/* Blank line to force unique __LINE__ */ +RTE_PMD_REGISTER_PCI (net_bnx2x, rte_bnx2x_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnx2x, pci_id_bnx2x_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnx2x,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_bnx2xvf, rte_bnx2xvf_pmd); +RTE_PMD_REGISTER_PCI (net_bnx2xvf, rte_bnx2xvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnx2xvf, pci_id_bnx2xvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnx2xvf,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (bnx2x_logtype_init, init,NOTICE );
drivers/net/bnxt/bnxt_ethdev.c +1 -1
@@ -7107,6 +7107,6 @@ static bool bnxt_enable_ulp(struct bnxt *bp) }RTE_LOG_REGISTER_SUFFIX (bnxt_logtype_driver, driver,NOTICE ); -RTE_PMD_REGISTER_PCI (net_bnxt, bnxt_rte_pmd); +RTE_PMD_REGISTER_PCI (net_bnxt, bnxt_rte_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnxt, bnxt_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnxt,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/bonding/rte_eth_bond_pmd.c +1 -1
@@ -4272,7 +4272,7 @@ struct rte_vdev_driver pmd_bond_drv = { .remove = bond_remove, }; -RTE_PMD_REGISTER_VDEV (net_bonding, pmd_bond_drv); +RTE_PMD_REGISTER_VDEV (net_bonding, pmd_bond_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_bonding, eth_bond); RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
drivers/net/cnxk/cn10k_ethdev.c +1 -1
@@ -1017,6 +1017,6 @@ static struct rte_pci_driver cn10k_pci_nix = { .remove = cn10k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn10k, cn10k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn10k, cn10k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn10k, cn10k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn10k,"vfio-pci" );
drivers/net/cnxk/cn20k_ethdev.c +1 -1
@@ -971,6 +971,6 @@ static struct rte_pci_driver cn20k_pci_nix = { .remove = cn20k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn20k, cn20k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn20k, cn20k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn20k, cn20k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn20k,"vfio-pci" );
drivers/net/cnxk/cn9k_ethdev.c +1 -1
@@ -912,6 +912,6 @@ static struct rte_pci_driver cn9k_pci_nix = { .remove = cn9k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn9k, cn9k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn9k, cn9k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn9k, cn9k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn9k,"vfio-pci" );
drivers/net/cnxk/cnxk_eswitch.c +1 -1
@@ -795,6 +795,6 @@ static struct rte_pci_driver cnxk_eswitch_pci = { .remove = cnxk_eswitch_dev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_eswitch, cnxk_eswitch_pci); +RTE_PMD_REGISTER_PCI (cnxk_eswitch, cnxk_eswitch_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_eswitch, cnxk_eswitch_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_eswitch,"vfio-pci" );
drivers/net/cnxk/cnxk_ethdev_sec.c +1 -1
@@ -673,7 +673,7 @@ static struct rte_pci_driver cnxk_nix_inl_pci = { .remove = cnxk_nix_inl_dev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_nix_inl, cnxk_nix_inl_pci); +RTE_PMD_REGISTER_PCI (cnxk_nix_inl, cnxk_nix_inl_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_nix_inl, cnxk_nix_inl_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_nix_inl,"vfio-pci" );
drivers/net/cxgbe/cxgbe_ethdev.c +1 -1
@@ -1796,7 +1796,7 @@ static struct rte_pci_driver rte_cxgbe_pmd = { .remove = eth_cxgbe_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_cxgbe, rte_cxgbe_pmd); +RTE_PMD_REGISTER_PCI (net_cxgbe, rte_cxgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cxgbe, cxgb4_pci_tbl);RTE_PMD_REGISTER_KMOD_DEP (net_cxgbe,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cxgbe,
drivers/net/cxgbe/cxgbevf_ethdev.c +1 -1
@@ -206,7 +206,7 @@ static struct rte_pci_driver rte_cxgbevf_pmd = { .remove = eth_cxgbevf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_cxgbevf, rte_cxgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_cxgbevf, rte_cxgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cxgbevf, cxgb4vf_pci_tbl);RTE_PMD_REGISTER_KMOD_DEP (net_cxgbevf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cxgbevf,
drivers/net/dpaa/dpaa_ethdev.c +1 -1
@@ -2628,7 +2628,7 @@ static struct rte_dpaa_driver rte_dpaa_pmd = { .remove = rte_dpaa_remove, }; -RTE_PMD_REGISTER_DPAA (net_dpaa, rte_dpaa_pmd); +RTE_PMD_REGISTER_DPAA (net_dpaa, rte_dpaa_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_dpaa,DRIVER_IEEE1588 "=<int>" );RTE_LOG_REGISTER_DEFAULT (dpaa_logtype_pmd,NOTICE );
drivers/net/dpaa2/dpaa2_ethdev.c +1 -1
@@ -3068,7 +3068,7 @@ static struct rte_dpaa2_driver rte_dpaa2_pmd = { .remove = rte_dpaa2_remove, }; -RTE_PMD_REGISTER_DPAA2 (NET_DPAA2_PMD_DRIVER_NAME , rte_dpaa2_pmd); +RTE_PMD_REGISTER_DPAA2 (NET_DPAA2_PMD_DRIVER_NAME , rte_dpaa2_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (NET_DPAA2_PMD_DRIVER_NAME ,DRIVER_LOOPBACK_MODE "=<int> " DRIVER_NO_PREFETCH_MODE "=<int>"
drivers/net/dpaa2/dpaa2_mux.c +1 -1
@@ -606,4 +606,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpdmux_obj = { .close = dpaa2_close_dpdmux_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpdmux, rte_dpaa2_dpdmux_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpdmux, rte_dpaa2_dpdmux_obj, __LINE__);
drivers/net/dpaa2/dpaa2_ptp.c +1 -1
@@ -180,5 +180,5 @@ static struct rte_dpaa2_object rte_dpaa2_dprtc_obj = { .create = dpaa2_create_dprtc_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dprtc, rte_dpaa2_dprtc_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dprtc, rte_dpaa2_dprtc_obj, __LINE__);#endif
drivers/net/ena/ena_ethdev.c +1 -1
@@ -4014,7 +4014,7 @@ static struct rte_pci_driver rte_ena_pmd = { .remove = eth_ena_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ena, rte_ena_pmd); +RTE_PMD_REGISTER_PCI (net_ena, rte_ena_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ena, pci_id_ena_map);RTE_PMD_REGISTER_KMOD_DEP (net_ena,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ena,
drivers/net/enetc/enetc_ethdev.c +1 -1
@@ -965,7 +965,7 @@ static struct rte_pci_driver rte_enetc_pmd = { .remove = enetc_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_enetc, rte_enetc_pmd); +RTE_PMD_REGISTER_PCI (net_enetc, rte_enetc_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_enetc, pci_id_enetc_map);RTE_PMD_REGISTER_KMOD_DEP (net_enetc,"* vfio-pci" );RTE_LOG_REGISTER_DEFAULT (enetc_logtype_pmd,NOTICE );
drivers/net/enetfec/enet_ethdev.c +1 -1
@@ -689,5 +689,5 @@ static struct rte_vdev_driver pmd_enetfec_drv = { .remove = pmd_enetfec_remove, }; -RTE_PMD_REGISTER_VDEV (ENETFEC_NAME_PMD , pmd_enetfec_drv); +RTE_PMD_REGISTER_VDEV (ENETFEC_NAME_PMD , pmd_enetfec_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (enetfec_logtype_pmd,NOTICE );
drivers/net/enic/enic_ethdev.c +1 -1
@@ -1425,7 +1425,7 @@ int dev_is_enic(struct rte_eth_dev *dev)return dev->device->driver == &rte_enic_pmd.driver; } -RTE_PMD_REGISTER_PCI (net_enic, rte_enic_pmd); +RTE_PMD_REGISTER_PCI (net_enic, rte_enic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_enic, pci_id_enic_map);RTE_PMD_REGISTER_KMOD_DEP (net_enic,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_enic,
drivers/net/failsafe/failsafe.c +1 -1
@@ -396,6 +396,6 @@ static struct rte_vdev_driver failsafe_drv = { .remove = rte_pmd_failsafe_remove, }; -RTE_PMD_REGISTER_VDEV (net_failsafe, failsafe_drv); +RTE_PMD_REGISTER_VDEV (net_failsafe, failsafe_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_failsafe,PMD_FAILSAFE_PARAM_STRING );RTE_LOG_REGISTER_DEFAULT (failsafe_logtype,NOTICE )
drivers/net/gve/gve_ethdev.c +1 -1
@@ -1364,7 +1364,7 @@ static struct rte_pci_driver rte_gve_pmd = { .remove = gve_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_gve, rte_gve_pmd); +RTE_PMD_REGISTER_PCI (net_gve, rte_gve_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_gve, pci_id_gve_map);RTE_PMD_REGISTER_KMOD_DEP (net_gve,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (gve_logtype_driver, driver,NOTICE );
drivers/net/hinic/hinic_pmd_ethdev.c +1 -1
@@ -3255,6 +3255,6 @@ static struct rte_pci_driver rte_hinic_pmd = { .remove = hinic_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hinic, rte_hinic_pmd); +RTE_PMD_REGISTER_PCI (net_hinic, rte_hinic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hinic, pci_id_hinic_map);RTE_LOG_REGISTER_DEFAULT (hinic_logtype,INFO );
drivers/net/hns3/hns3_ethdev.c +1 -1
@@ -6688,7 +6688,7 @@ static struct rte_pci_driver rte_hns3_pmd = { .remove = eth_hns3_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hns3, rte_hns3_pmd); +RTE_PMD_REGISTER_PCI (net_hns3, rte_hns3_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hns3, pci_id_hns3_map);RTE_PMD_REGISTER_KMOD_DEP (net_hns3,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_hns3,
drivers/net/hns3/hns3_ethdev_vf.c +1 -1
@@ -2360,7 +2360,7 @@ static struct rte_pci_driver rte_hns3vf_pmd = { .remove = eth_hns3vf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hns3_vf, rte_hns3vf_pmd); +RTE_PMD_REGISTER_PCI (net_hns3_vf, rte_hns3vf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hns3_vf, pci_id_hns3vf_map);RTE_PMD_REGISTER_KMOD_DEP (net_hns3_vf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_hns3_vf,
drivers/net/intel/cpfl/cpfl_ethdev.c +1 -1
@@ -2876,7 +2876,7 @@ static struct rte_pci_driver rte_cpfl_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_cpfl, rte_cpfl_pmd); +RTE_PMD_REGISTER_PCI (net_cpfl, rte_cpfl_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cpfl, pci_id_cpfl_map);RTE_PMD_REGISTER_KMOD_DEP (net_cpfl,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cpfl,
drivers/net/intel/e1000/em_ethdev.c +1 -1
@@ -1956,6 +1956,6 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev,return 0 ; } -RTE_PMD_REGISTER_PCI (net_e1000_em, rte_em_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_em, rte_em_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_em, pci_id_em_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_em,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/e1000/igb_ethdev.c +2 -2
@@ -5626,9 +5626,9 @@ igb_filter_restore(struct rte_eth_dev *dev)return 0 ; } -RTE_PMD_REGISTER_PCI (net_e1000_igb, rte_igb_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_igb, rte_igb_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_igb, pci_id_igb_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_igb,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_e1000_igb_vf, rte_igbvf_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_igb_vf, rte_igbvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_igb_vf, pci_id_igbvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_igb_vf,"* igb_uio | vfio-pci" );
drivers/net/intel/e1000/igc_ethdev.c +1 -1
@@ -3000,6 +3000,6 @@ static struct rte_pci_driver rte_igc_pmd = { .remove = eth_igc_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_igc, rte_igc_pmd); +RTE_PMD_REGISTER_PCI (net_igc, rte_igc_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_igc, pci_id_igc_map);RTE_PMD_REGISTER_KMOD_DEP (net_igc,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/fm10k/fm10k_ethdev.c +1 -1
@@ -3313,7 +3313,7 @@ static struct rte_pci_driver rte_pmd_fm10k = { .remove = eth_fm10k_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_fm10k, rte_pmd_fm10k); +RTE_PMD_REGISTER_PCI (net_fm10k, rte_pmd_fm10k, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_fm10k, pci_id_fm10k_map);RTE_PMD_REGISTER_KMOD_DEP (net_fm10k,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (fm10k_logtype_init, init,NOTICE );
drivers/net/intel/i40e/i40e_ethdev.c +1 -1
@@ -756,7 +756,7 @@ i40e_write_global_rx_ctl(struct i40e_hw *hw, uint32_t reg_addr, dev->device->name, reg_addr, ori_reg_val, reg_val); } -RTE_PMD_REGISTER_PCI (net_i40e, rte_i40e_pmd); +RTE_PMD_REGISTER_PCI (net_i40e, rte_i40e_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_i40e, pci_id_i40e_map);RTE_PMD_REGISTER_KMOD_DEP (net_i40e,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/iavf/iavf_ethdev.c +1 -1
@@ -3194,7 +3194,7 @@ static struct rte_pci_driver rte_iavf_pmd = { .remove = eth_iavf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_iavf, rte_iavf_pmd); +RTE_PMD_REGISTER_PCI (net_iavf, rte_iavf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_iavf, pci_id_iavf_map);RTE_PMD_REGISTER_KMOD_DEP (net_iavf,"* igb_uio | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_iavf,"cap=dcf" );
drivers/net/intel/ice/ice_dcf_ethdev.c +1 -1
@@ -2152,7 +2152,7 @@ static struct rte_pci_driver rte_ice_dcf_pmd = { .remove = eth_ice_dcf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ice_dcf, rte_ice_dcf_pmd); +RTE_PMD_REGISTER_PCI (net_ice_dcf, rte_ice_dcf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ice_dcf, pci_id_ice_dcf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice_dcf,"* igb_uio | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice_dcf,"cap=dcf" );
drivers/net/intel/ice/ice_ethdev.c +1 -1
@@ -7254,7 +7254,7 @@ static struct rte_pci_driver rte_ice_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_ice, rte_ice_pmd); +RTE_PMD_REGISTER_PCI (net_ice, rte_ice_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ice,
drivers/net/intel/idpf/idpf_ethdev.c +1 -1
@@ -1477,7 +1477,7 @@ static struct rte_pci_driver rte_idpf_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd); +RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_idpf, pci_id_idpf_map);RTE_PMD_REGISTER_KMOD_DEP (net_idpf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_idpf,
drivers/net/intel/ipn3ke/ipn3ke_ethdev.c +1 -1
@@ -564,5 +564,5 @@ static struct rte_afu_driver afu_ipn3ke_driver = { .remove = ipn3ke_vswitch_remove, }; -RTE_PMD_REGISTER_AFU (net_ipn3ke_afu, afu_ipn3ke_driver); +RTE_PMD_REGISTER_AFU (net_ipn3ke_afu, afu_ipn3ke_driver, __LINE__);RTE_LOG_REGISTER_DEFAULT (ipn3ke_afu_logtype,NOTICE );
drivers/net/intel/ixgbe/ixgbe_ethdev.c +2 -2
@@ -8607,12 +8607,12 @@ ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev)ixgbe_enable_sec_tx_path_generic (hw); } -RTE_PMD_REGISTER_PCI (net_ixgbe, rte_ixgbe_pmd); +RTE_PMD_REGISTER_PCI (net_ixgbe, rte_ixgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ixgbe, pci_id_ixgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_ixgbe,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ixgbe,IXGBE_DEVARG_FIBER_SDP3_NOT_TX_DISABLE "=<0|1>" ); -RTE_PMD_REGISTER_PCI (net_ixgbe_vf, rte_ixgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_ixgbe_vf, rte_ixgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ixgbe_vf, pci_id_ixgbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ixgbe_vf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ixgbe_vf,
drivers/net/ionic/ionic_dev_pci.c +1 -1
@@ -265,7 +265,7 @@ static struct rte_pci_driver rte_pci_ionic_pmd = { .remove = eth_ionic_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ionic_pci, rte_pci_ionic_pmd); +RTE_PMD_REGISTER_PCI (net_ionic_pci, rte_pci_ionic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ionic_pci, pci_id_ionic_map);RTE_PMD_REGISTER_KMOD_DEP (net_ionic_pci,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ionic_pci,
drivers/net/ionic/ionic_dev_vdev.c +2 -1
@@ -144,4 +144,5 @@ static struct rte_vdev_driver rte_vdev_ionic_pmd = { .remove = eth_ionic_vdev_remove, }; -RTE_PMD_REGISTER_VDEV (net_ionic, rte_vdev_ionic_pmd); +/* Blank line to force unique __LINE__ */ +RTE_PMD_REGISTER_VDEV (net_ionic, rte_vdev_ionic_pmd, __LINE__);
drivers/net/mana/mana.c +1 -1
@@ -1648,7 +1648,7 @@ static struct rte_pci_driver mana_pci_driver = { .drv_flags = RTE_PCI_DRV_INTR_RMV, }; -RTE_PMD_REGISTER_PCI (net_mana, mana_pci_driver); +RTE_PMD_REGISTER_PCI (net_mana, mana_pci_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_mana, mana_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_mana,"* ib_uverbs & mana_ib" );RTE_LOG_REGISTER_SUFFIX (mana_logtype_init, init,NOTICE );
drivers/net/memif/rte_eth_memif.c +1 -1
@@ -2083,7 +2083,7 @@ static struct rte_vdev_driver pmd_memif_drv = { .remove = rte_pmd_memif_remove, }; -RTE_PMD_REGISTER_VDEV (net_memif, pmd_memif_drv); +RTE_PMD_REGISTER_VDEV (net_memif, pmd_memif_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_memif, ETH_MEMIF_ID_ARG "=<int>"
drivers/net/mlx4/mlx4.c +1 -1
@@ -1385,7 +1385,7 @@ RTE_INIT(rte_mlx4_pmd_init)rte_pci_register (&mlx4_driver); } -RTE_PMD_EXPORT_NAME (net_mlx4, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_mlx4, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_mlx4, mlx4_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_mlx4,"* ib_uverbs & mlx4_en & mlx4_core & mlx4_ib" );
drivers/net/mlx5/mlx5.c +1 -1
@@ -3819,6 +3819,6 @@ RTE_INIT(rte_mlx5_pmd_init)mlx5_class_driver_register (&mlx5_net_driver); } -RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_ETH_DRIVER_NAME , mlx5_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_ETH_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/net/mvneta/mvneta_ethdev.c +1 -1
@@ -993,6 +993,6 @@ static struct rte_vdev_driver pmd_mvneta_drv = { .remove = rte_pmd_mvneta_remove, }; -RTE_PMD_REGISTER_VDEV (net_mvneta, pmd_mvneta_drv); +RTE_PMD_REGISTER_VDEV (net_mvneta, pmd_mvneta_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_mvneta,"iface=<ifc>" );RTE_LOG_REGISTER_DEFAULT (mvneta_logtype,NOTICE );
drivers/net/mvpp2/mrvl_ethdev.c +1 -1
@@ -3319,6 +3319,6 @@ static struct rte_vdev_driver pmd_mrvl_drv = { .remove = rte_pmd_mrvl_remove, }; -RTE_PMD_REGISTER_VDEV (net_mvpp2, pmd_mrvl_drv); +RTE_PMD_REGISTER_VDEV (net_mvpp2, pmd_mrvl_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_mvpp2, eth_mvpp2);RTE_LOG_REGISTER_DEFAULT (mrvl_logtype,NOTICE );
drivers/net/netvsc/hn_ethdev.c +1 -1
@@ -1485,7 +1485,7 @@ static struct rte_vmbus_driver rte_netvsc_pmd = { .remove = eth_hn_remove, }; -RTE_PMD_REGISTER_VMBUS (net_netvsc, rte_netvsc_pmd); +RTE_PMD_REGISTER_VMBUS (net_netvsc, rte_netvsc_pmd, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (net_netvsc,"* uio_hv_generic" );RTE_LOG_REGISTER_SUFFIX (hn_logtype_init, init,NOTICE );RTE_LOG_REGISTER_SUFFIX (hn_logtype_driver, driver,NOTICE );
drivers/net/nfb/nfb_ethdev.c +1 -1
@@ -668,7 +668,7 @@ static struct rte_pci_driver nfb_eth_driver = { .remove = nfb_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (RTE_NFB_DRIVER_NAME , nfb_eth_driver); +RTE_PMD_REGISTER_PCI (RTE_NFB_DRIVER_NAME , nfb_eth_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (RTE_NFB_DRIVER_NAME , nfb_pci_id_table);RTE_PMD_REGISTER_KMOD_DEP (RTE_NFB_DRIVER_NAME ,"* nfb" );RTE_LOG_REGISTER_DEFAULT (nfb_logtype,NOTICE );
drivers/net/nfp/nfp_ethdev.c +1 -1
@@ -2904,7 +2904,7 @@ static struct rte_pci_driver rte_nfp_net_pf_pmd = { .remove = eth_nfp_pci_remove, }; -RTE_PMD_REGISTER_PCI (NFP_PF_DRIVER_NAME , rte_nfp_net_pf_pmd); +RTE_PMD_REGISTER_PCI (NFP_PF_DRIVER_NAME , rte_nfp_net_pf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (NFP_PF_DRIVER_NAME , pci_id_nfp_pf_net_map);RTE_PMD_REGISTER_KMOD_DEP (NFP_PF_DRIVER_NAME ,"* igb_uio | uio_pci_generic | vfio" ); RTE_PMD_REGISTER_PARAM_STRING(NFP_PF_DRIVER_NAME,
drivers/net/ngbe/ngbe_ethdev.c +1 -1
@@ -3294,7 +3294,7 @@ static const struct eth_dev_ops ngbe_eth_dev_ops = { .tx_done_cleanup = ngbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_ngbe, rte_ngbe_pmd); +RTE_PMD_REGISTER_PCI (net_ngbe, rte_ngbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ngbe, pci_id_ngbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_ngbe,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/ngbe/ngbe_ethdev_vf.c +1 -1
@@ -1348,6 +1348,6 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = { .tx_done_cleanup = ngbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_ngbe_vf, rte_ngbevf_pmd); +RTE_PMD_REGISTER_PCI (net_ngbe_vf, rte_ngbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ngbe_vf, pci_id_ngbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ngbe_vf,"* igb_uio | vfio-pci" );
drivers/net/ntnic/ntnic_ethdev.c +1 -1
@@ -2547,7 +2547,7 @@ static struct rte_pci_driver rte_nthw_pmd = { .remove = nthw_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ntnic, rte_nthw_pmd); +RTE_PMD_REGISTER_PCI (net_ntnic, rte_nthw_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ntnic, nthw_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_ntnic,"* vfio-pci" );
drivers/net/null/rte_eth_null.c +1 -1
@@ -771,7 +771,7 @@ static struct rte_vdev_driver pmd_null_drv = { .remove = rte_pmd_null_remove, }; -RTE_PMD_REGISTER_VDEV (net_null, pmd_null_drv); +RTE_PMD_REGISTER_VDEV (net_null, pmd_null_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_null, eth_null);RTE_PMD_REGISTER_PARAM_STRING (net_null, "size=<int> "
drivers/net/octeon_ep/otx_ep_ethdev.c +1 -1
@@ -900,7 +900,7 @@ static struct rte_pci_driver rte_otx_ep_pmd = { .remove = otx_ep_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_otx_ep, rte_otx_ep_pmd); +RTE_PMD_REGISTER_PCI (net_otx_ep, rte_otx_ep_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_otx_ep, pci_id_otx_ep_map);RTE_PMD_REGISTER_KMOD_DEP (net_otx_ep,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (otx_net_ep_logtype,NOTICE );
drivers/net/octeontx/base/octeontx_pkivf.c +1 -1
@@ -236,4 +236,4 @@ static struct rte_pci_driver pci_pkivf = { .probe = pkivf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_pkivf, pci_pkivf); +RTE_PMD_REGISTER_PCI (octeontx_pkivf, pci_pkivf, __LINE__);
drivers/net/octeontx/base/octeontx_pkovf.c +1 -1
@@ -637,4 +637,4 @@ static struct rte_pci_driver pci_pkovf = { .probe = pkovf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_pkovf, pci_pkovf); +RTE_PMD_REGISTER_PCI (octeontx_pkovf, pci_pkovf, __LINE__);
drivers/net/octeontx/octeontx_ethdev.c +2 -1
@@ -1899,6 +1899,7 @@ static struct rte_vdev_driver octeontx_pmd_drv = { .remove = octeontx_remove, }; -RTE_PMD_REGISTER_VDEV (OCTEONTX_PMD , octeontx_pmd_drv); +/* Blank line to force unique __LINE__ with RTE_PMD_REGISTER_VDEV */ +RTE_PMD_REGISTER_VDEV (OCTEONTX_PMD , octeontx_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (OCTEONTX_PMD , eth_octeontx);RTE_PMD_REGISTER_PARAM_STRING (OCTEONTX_PMD ,"nr_port=<int> " );
drivers/net/pcap/pcap_ethdev.c +1 -1
@@ -1650,7 +1650,7 @@ static struct rte_vdev_driver pmd_pcap_drv = { .remove = pmd_pcap_remove, }; -RTE_PMD_REGISTER_VDEV (net_pcap, pmd_pcap_drv); +RTE_PMD_REGISTER_VDEV (net_pcap, pmd_pcap_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_pcap, eth_pcap);RTE_PMD_REGISTER_PARAM_STRING (net_pcap, ETH_PCAP_RX_PCAP_ARG "=<string> "
drivers/net/pfe/pfe_ethdev.c +1 -1
@@ -1145,6 +1145,6 @@ struct rte_vdev_driver pmd_pfe_drv = { .remove = pmd_pfe_remove, }; -RTE_PMD_REGISTER_VDEV (PFE_NAME_PMD , pmd_pfe_drv); +RTE_PMD_REGISTER_VDEV (PFE_NAME_PMD , pmd_pfe_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (PFE_NAME_PMD ,PFE_VDEV_GEM_ID_ARG "=<int> " );RTE_LOG_REGISTER_DEFAULT (pfe_logtype_pmd,NOTICE );
drivers/net/qede/qede_ethdev.c +2 -2
@@ -2870,10 +2870,10 @@ static struct rte_pci_driver rte_qede_pmd = { .remove = qede_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_qede, rte_qede_pmd); +RTE_PMD_REGISTER_PCI (net_qede, rte_qede_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_qede, pci_id_qede_map);RTE_PMD_REGISTER_KMOD_DEP (net_qede,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_qede_vf, rte_qedevf_pmd); +RTE_PMD_REGISTER_PCI (net_qede_vf, rte_qedevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_qede_vf, pci_id_qedevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_qede_vf,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (qede_logtype_init, init,NOTICE );
drivers/net/r8169/r8169_ethdev.c +1 -1
@@ -778,7 +778,7 @@ static struct rte_pci_driver rte_r8169_pmd = { .remove = rtl_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_r8169, rte_r8169_pmd); +RTE_PMD_REGISTER_PCI (net_r8169, rte_r8169_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_r8169, pci_id_r8169_map);RTE_PMD_REGISTER_KMOD_DEP (net_r8169,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/ring/rte_eth_ring.c +1 -1
@@ -823,7 +823,7 @@ static struct rte_vdev_driver pmd_ring_drv = { .remove = rte_pmd_ring_remove, }; -RTE_PMD_REGISTER_VDEV (net_ring, pmd_ring_drv); +RTE_PMD_REGISTER_VDEV (net_ring, pmd_ring_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_ring, eth_ring);RTE_PMD_REGISTER_PARAM_STRING (net_ring,ETH_RING_NUMA_NODE_ACTION_ARG "=name:node:action(ATTACH|CREATE)" );
drivers/net/sfc/sfc_ethdev.c +1 -1
@@ -3614,7 +3614,7 @@ static struct rte_pci_driver sfc_efx_pmd = { .remove = sfc_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_sfc_efx, sfc_efx_pmd); +RTE_PMD_REGISTER_PCI (net_sfc_efx, sfc_efx_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_sfc_efx, pci_id_sfc_efx_map);RTE_PMD_REGISTER_KMOD_DEP (net_sfc_efx,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx,
drivers/net/softnic/rte_eth_softnic.c +1 -1
@@ -510,7 +510,7 @@ static struct rte_vdev_driver pmd_softnic_drv = { .remove = pmd_remove, }; -RTE_PMD_REGISTER_VDEV (net_softnic, pmd_softnic_drv); +RTE_PMD_REGISTER_VDEV (net_softnic, pmd_softnic_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_softnic,PMD_PARAM_FIRMWARE "=<string> " PMD_PARAM_CONN_PORT "=<uint16> "
drivers/net/tap/rte_eth_tap.c +2 -2
@@ -2565,8 +2565,8 @@ static struct rte_vdev_driver pmd_tap_drv = { .remove = rte_pmd_tap_remove, }; -RTE_PMD_REGISTER_VDEV (net_tap, pmd_tap_drv); -RTE_PMD_REGISTER_VDEV (net_tun, pmd_tun_drv); +RTE_PMD_REGISTER_VDEV (net_tap, pmd_tap_drv, __LINE__); +RTE_PMD_REGISTER_VDEV (net_tun, pmd_tun_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_tap, eth_tap);RTE_PMD_REGISTER_PARAM_STRING (net_tun,ETH_TAP_IFACE_ARG "=<string> " );
drivers/net/thunderx/nicvf_ethdev.c +1 -1
@@ -2409,7 +2409,7 @@ static struct rte_pci_driver rte_nicvf_pmd = { .remove = nicvf_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_thunderx, rte_nicvf_pmd); +RTE_PMD_REGISTER_PCI (net_thunderx, rte_nicvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_thunderx, pci_id_nicvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_thunderx,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_thunderx,SKIP_DATA_BYTES "=<int>" );
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -5665,7 +5665,7 @@ static const struct eth_dev_ops txgbe_eth_dev_ops = { .tx_done_cleanup = txgbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_txgbe, rte_txgbe_pmd); +RTE_PMD_REGISTER_PCI (net_txgbe, rte_txgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_txgbe, pci_id_txgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_txgbe,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_txgbe,
drivers/net/txgbe/txgbe_ethdev_vf.c +1 -1
@@ -1387,6 +1387,6 @@ static const struct eth_dev_ops txgbevf_eth_dev_ops = { .tx_done_cleanup = txgbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_txgbe_vf, rte_txgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_txgbe_vf, rte_txgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_txgbe_vf, pci_id_txgbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_txgbe_vf,"* igb_uio | vfio-pci" );
drivers/net/vdev_netvsc/vdev_netvsc.c +1 -1
@@ -760,7 +760,7 @@ static struct rte_vdev_driver vdev_netvsc_vdev = { .remove = vdev_netvsc_vdev_remove, }; -RTE_PMD_REGISTER_VDEV (VDEV_NETVSC_DRIVER , vdev_netvsc_vdev); +RTE_PMD_REGISTER_VDEV (VDEV_NETVSC_DRIVER , vdev_netvsc_vdev, __LINE__);RTE_PMD_REGISTER_ALIAS (VDEV_NETVSC_DRIVER , eth_vdev_netvsc);RTE_PMD_REGISTER_PARAM_STRING (net_vdev_netvsc, VDEV_NETVSC_ARG_IFACE "=<string> "
drivers/net/vhost/rte_eth_vhost.c +1 -1
@@ -1772,7 +1772,7 @@ static struct rte_vdev_driver pmd_vhost_drv = { .remove = rte_pmd_vhost_remove, }; -RTE_PMD_REGISTER_VDEV (net_vhost, pmd_vhost_drv); +RTE_PMD_REGISTER_VDEV (net_vhost, pmd_vhost_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_vhost, eth_vhost);RTE_PMD_REGISTER_PARAM_STRING (net_vhost, "iface=<ifc> "
drivers/net/virtio/virtio_pci_ethdev.c +1 -1
@@ -239,4 +239,4 @@ RTE_INIT(rte_virtio_net_pci_pmd_init)RTE_PMD_REGISTER_PCI_TABLE (net_virtio, pci_id_virtio_map);RTE_PMD_REGISTER_KMOD_DEP (net_virtio,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_EXPORT_NAME (net_virtio, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_virtio, __LINE__);
drivers/net/virtio/virtio_user_ethdev.c +1 -1
@@ -811,7 +811,7 @@ static struct rte_vdev_driver virtio_user_driver = { .dma_unmap = virtio_user_pmd_dma_unmap, }; -RTE_PMD_REGISTER_VDEV (net_virtio_user, virtio_user_driver); +RTE_PMD_REGISTER_VDEV (net_virtio_user, virtio_user_driver, __LINE__);RTE_PMD_REGISTER_ALIAS (net_virtio_user, virtio_user);RTE_PMD_REGISTER_PARAM_STRING (net_virtio_user, "path=<path> "
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -1
@@ -1966,7 +1966,7 @@ vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)return 0 ; } -RTE_PMD_REGISTER_PCI (net_vmxnet3, rte_vmxnet3_pmd); +RTE_PMD_REGISTER_PCI (net_vmxnet3, rte_vmxnet3_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_vmxnet3, pci_id_vmxnet3_map);RTE_PMD_REGISTER_KMOD_DEP (net_vmxnet3,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (vmxnet3_logtype_init, init,NOTICE );
drivers/net/xsc/xsc_ethdev.c +1 -1
@@ -919,7 +919,7 @@ static struct rte_pci_driver xsc_ethdev_pci_driver = { .remove = xsc_ethdev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_xsc, xsc_ethdev_pci_driver); +RTE_PMD_REGISTER_PCI (net_xsc, xsc_ethdev_pci_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_xsc, xsc_ethdev_pci_id_map);RTE_PMD_REGISTER_PARAM_STRING (net_xsc, XSC_PPH_MODE_ARG "=<x>"
drivers/net/zxdh/zxdh_ethdev.c +1 -1
@@ -2051,7 +2051,7 @@ static struct rte_pci_driver zxdh_pmd = { .remove = zxdh_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_zxdh, zxdh_pmd); +RTE_PMD_REGISTER_PCI (net_zxdh, zxdh_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_zxdh, pci_id_zxdh_map);RTE_PMD_REGISTER_KMOD_DEP (net_zxdh,"* vfio-pci" );RTE_LOG_REGISTER_SUFFIX (zxdh_logtype_driver, driver,NOTICE );
drivers/raw/cnxk_bphy/cnxk_bphy.c +1 -1
@@ -406,7 +406,7 @@ static struct rte_pci_driver cnxk_bphy_rawdev_pmd = { .remove = bphy_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd); +RTE_PMD_REGISTER_PCI (bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (bphy_rawdev_pci_driver, pci_bphy_map);RTE_PMD_REGISTER_KMOD_DEP (bphy_rawdev_pci_driver,"vfio-pci" );RTE_LOG_REGISTER_SUFFIX (cnxk_logtype_bphy, bphy,INFO );
drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c +1 -1
@@ -379,6 +379,6 @@ static struct rte_pci_driver bphy_cgx_rawdev_pmd = { .remove = cnxk_bphy_cgx_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_bphy_cgx_rawdev_pci_driver, bphy_cgx_rawdev_pmd); +RTE_PMD_REGISTER_PCI (cnxk_bphy_cgx_rawdev_pci_driver, bphy_cgx_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_bphy_cgx_rawdev_pci_driver, cnxk_bphy_cgx_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_bphy_cgx_rawdev_pci_driver,"vfio-pci" );
drivers/raw/cnxk_gpio/cnxk_gpio.c +1 -1
@@ -847,7 +847,7 @@ static struct rte_vdev_driver cnxk_gpio_drv = { .remove = cnxk_gpio_remove, }; -RTE_PMD_REGISTER_VDEV (cnxk_gpio, cnxk_gpio_drv); +RTE_PMD_REGISTER_VDEV (cnxk_gpio, cnxk_gpio_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (cnxk_gpio,"gpiochip=<int> " "allowlist=<list>" );
drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c +1 -1
@@ -267,7 +267,7 @@ static struct rte_pci_driver cnxk_rvu_lf_rawdev_pmd = { .remove = rvu_lf_remove, }; -RTE_PMD_REGISTER_PCI (rvu_lf_rawdev_pci_driver, cnxk_rvu_lf_rawdev_pmd); +RTE_PMD_REGISTER_PCI (rvu_lf_rawdev_pci_driver, cnxk_rvu_lf_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (rvu_lf_rawdev_pci_driver, pci_rvu_lf_map);RTE_PMD_REGISTER_KMOD_DEP (rvu_lf_rawdev_pci_driver,"vfio-pci" );RTE_LOG_REGISTER_SUFFIX (cnxk_logtype_rvu_lf, rvu_lf,INFO );
drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c +1 -1
@@ -287,5 +287,5 @@ static struct rte_vdev_driver dpaa2_cmdif_drv = { .remove = dpaa2_cmdif_remove }; -RTE_PMD_REGISTER_VDEV (DPAA2_CMDIF_PMD_NAME , dpaa2_cmdif_drv); +RTE_PMD_REGISTER_VDEV (DPAA2_CMDIF_PMD_NAME , dpaa2_cmdif_drv, __LINE__);RTE_LOG_REGISTER (dpaa2_cmdif_logtype, pmd.raw.dpaa2.cmdif,INFO );
drivers/raw/gdtc/gdtc_rawdev.c +1 -1
@@ -913,6 +913,6 @@ static struct rte_pci_driver zxdh_gdma_rawdev_pmd = { .remove = zxdh_gdma_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_pmd); +RTE_PMD_REGISTER_PCI (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_map);RTE_LOG_REGISTER_DEFAULT (zxdh_gdma_rawdev_logtype,NOTICE );
drivers/raw/ifpga/afu_pmd_core.c +1 -1
@@ -391,7 +391,7 @@ static struct rte_afu_driver afu_pmd = { .remove = afu_rawdev_remove }; -RTE_PMD_REGISTER_AFU (afu_rawdev_driver, afu_pmd); +RTE_PMD_REGISTER_AFU (afu_rawdev_driver, afu_pmd, __LINE__);static void update_uuid_map (void ) {
drivers/raw/ifpga/ifpga_rawdev.c +2 -2
@@ -1687,7 +1687,7 @@ static struct rte_pci_driver rte_ifpga_rawdev_pmd = { .remove = ifpga_rawdev_pci_remove, }; -RTE_PMD_REGISTER_PCI (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd); +RTE_PMD_REGISTER_PCI (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);RTE_PMD_REGISTER_KMOD_DEP (ifpga_rawdev_pci_driver,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (ifpga_rawdev_logtype,NOTICE );
@@ -1897,7 +1897,7 @@ static struct rte_vdev_driver ifpga_cfg_driver = { .remove = ifpga_cfg_remove, }; -RTE_PMD_REGISTER_VDEV (ifpga_rawdev_cfg, ifpga_cfg_driver); +RTE_PMD_REGISTER_VDEV (ifpga_rawdev_cfg, ifpga_cfg_driver, __LINE__);RTE_PMD_REGISTER_ALIAS (ifpga_rawdev_cfg, ifpga_cfg);RTE_PMD_REGISTER_PARAM_STRING (ifpga_rawdev_cfg, "ifpga=<string> "
drivers/raw/ntb/ntb.c +1 -1
@@ -1550,7 +1550,7 @@ static struct rte_pci_driver rte_ntb_pmd = { .remove = ntb_remove, }; -RTE_PMD_REGISTER_PCI (raw_ntb, rte_ntb_pmd); +RTE_PMD_REGISTER_PCI (raw_ntb, rte_ntb_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (raw_ntb, pci_id_ntb_map);RTE_PMD_REGISTER_KMOD_DEP (raw_ntb,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (ntb_logtype,INFO );
drivers/raw/skeleton/skeleton_rawdev.c +1 -1
@@ -774,5 +774,5 @@ static struct rte_vdev_driver skeleton_pmd_drv = { .remove = skeleton_rawdev_remove }; -RTE_PMD_REGISTER_VDEV (SKELETON_PMD_RAWDEV_NAME , skeleton_pmd_drv); +RTE_PMD_REGISTER_VDEV (SKELETON_PMD_RAWDEV_NAME , skeleton_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (skeleton_pmd_logtype,INFO );
drivers/regex/cn9k/cn9k_regexdev.c +1 -1
@@ -930,5 +930,5 @@ static struct rte_pci_driver cn9k_regexdev_pmd = { }; -RTE_PMD_REGISTER_PCI (REGEXDEV_NAME_CN9K_PMD , cn9k_regexdev_pmd); +RTE_PMD_REGISTER_PCI (REGEXDEV_NAME_CN9K_PMD , cn9k_regexdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (REGEXDEV_NAME_CN9K_PMD , pci_id_ree_table);
drivers/regex/mlx5/mlx5_regex.c +1 -1
@@ -183,6 +183,6 @@ RTE_INIT(rte_mlx5_regex_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_regex_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_REGEX_DRIVER_NAME , mlx5_regex_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_REGEX_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/vdpa/ifc/ifcvf_vdpa.c +1 -1
@@ -1886,6 +1886,6 @@ static struct rte_pci_driver rte_ifcvf_vdpa = { .remove = ifcvf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ifcvf, rte_ifcvf_vdpa); +RTE_PMD_REGISTER_PCI (net_ifcvf, rte_ifcvf_vdpa, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ifcvf, pci_id_ifcvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ifcvf,"* vfio-pci" );
drivers/vdpa/mlx5/mlx5_vdpa.c +1 -1
@@ -1003,6 +1003,6 @@ RTE_INIT(rte_mlx5_vdpa_init)mlx5_class_driver_register (&mlx5_vdpa_driver); } -RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_VDPA_DRIVER_NAME , mlx5_vdpa_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_VDPA_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/vdpa/sfc/sfc_vdpa.c +1 -1
@@ -358,7 +358,7 @@ static struct rte_pci_driver rte_sfc_vdpa = { .remove = sfc_vdpa_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_sfc_vdpa, rte_sfc_vdpa); +RTE_PMD_REGISTER_PCI (net_sfc_vdpa, rte_sfc_vdpa, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);RTE_PMD_REGISTER_KMOD_DEP (net_sfc_vdpa,"* vfio-pci" );RTE_LOG_REGISTER_SUFFIX (sfc_vdpa_logtype_driver, driver,NOTICE );
lib/eal/include/rte_dev.h +5 -9
@@ -232,21 +232,18 @@ int rte_dev_remove(struct rte_device *dev);*/ typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const void *data); -#define RTE_PMD_EXPORT_NAME_ARRAY (n, idx) n##idx[] +#define RTE_PMD_COMPOST_NAME (n, idx) n##idx#define RTE_PMD_EXPORT_NAME (name, idx) \ -static const char RTE_PMD_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ -__rte_used = RTE_STR(name) +RTE_INCLUDE(const char, RTE_PMD_COMPOST_NAME(this_pmd_name, idx))[] = RTE_STR(name)#define DRV_EXP_TAG (name, tag) __##name##_##tag#define RTE_PMD_REGISTER_PCI_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, pci_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, pci_tbl_export))[] = RTE_STR(table)#define RTE_PMD_REGISTER_PARAM_STRING (name, str) \ -static const char DRV_EXP_TAG(name, param_string_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, param_string_export))[] = str/** * Advertise the list of kernel modules required to run this driver
@@ -270,8 +267,7 @@ __rte_used = str* - "* igb_uio | uio_pci_generic | vfio" */ #define RTE_PMD_REGISTER_KMOD_DEP (name, str) \ -static const char DRV_EXP_TAG(name, kmod_dep_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, kmod_dep_export))[] = str/** * Iteration context.
Signature · 1 line
2.49.0.vfs.0.0
v2 cover allow pmdinfo to be inserted and parsed using MSVC
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead. However, when __COUNTER__ was used directly from a header file, __LINE__ had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the __LINE__ could be passed from the .c file to the macro defined in the header (which was originally using __COUNTER__).
With this patchset commands like the one below provide the same JSON output as would be obtained on Linux.
python usertools\dpdk-pmdinfo.py build\app\dpdk-testpmd.exe
v2:
- dpdk-pmdinfo.py: not importing elftools on Windows
- not requiring "pefile" Python module during build
- gen-pmdinfo-cfile.py: renamed "ar" to "archiver"
Andre Muezerie (4):
eal: add macro to embed information in binaries
buildtools: use macro to embed information in binaries
usertools: parse strings from PE images
drivers: use macro to embed information in binaries
buildtools/gen-pmdinfo-cfile.py | 10 +++- buildtools/meson.build | 4 +- buildtools/pmdinfogen.py | 5 +- drivers/baseband/acc/rte_acc100_pmd.c | 4 +- drivers/baseband/acc/rte_vrb_pmd.c | 4 +- .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 4 +- drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 4 +- drivers/baseband/la12xx/bbdev_la12xx.c | 2 +- drivers/baseband/null/bbdev_null.c | 2 +- .../baseband/turbo_sw/bbdev_turbo_software.c | 2 +- drivers/bus/auxiliary/bus_auxiliary_driver.h | 4 +- drivers/bus/cdx/bus_cdx_driver.h | 7 +-- drivers/bus/dpaa/bus_dpaa_driver.h | 4 +- drivers/bus/fslmc/bus_fslmc_driver.h | 8 +-- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 2 +- drivers/bus/ifpga/bus_ifpga_driver.h | 4 +- drivers/bus/pci/bus_pci_driver.h | 4 +- drivers/bus/platform/bus_platform_driver.h | 4 +- drivers/bus/uacce/bus_uacce_driver.h | 4 +- drivers/bus/vdev/bus_vdev_driver.h | 4 +- drivers/bus/vmbus/bus_vmbus_driver.h | 4 +- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 2 +- drivers/common/qat/qat_device.c | 2 +- drivers/common/zsda/zsda_device.c | 2 +- drivers/compress/isal/isal_compress_pmd.c | 2 +- drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 2 +- drivers/compress/uadk/uadk_compress_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd.c | 2 +- drivers/crypto/armv8/rte_armv8_pmd.c | 2 +- drivers/crypto/bcmfs/bcmfs_device.c | 3 +- drivers/crypto/caam_jr/caam_jr.c | 2 +- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- drivers/crypto/ionic/ionic_crypto_vdev.c | 2 +- drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 3 +- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 3 +- drivers/crypto/ipsec_mb/pmd_chacha_poly.c | 3 +- drivers/crypto/ipsec_mb/pmd_kasumi.c | 2 +- drivers/crypto/ipsec_mb/pmd_snow3g.c | 2 +- drivers/crypto/ipsec_mb/pmd_zuc.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +- drivers/crypto/null/null_crypto_pmd.c | 2 +- drivers/crypto/octeontx/otx_cryptodev.c | 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 3 +- drivers/crypto/scheduler/scheduler_pmd.c | 3 +- drivers/crypto/uadk/uadk_crypto_pmd.c | 2 +- drivers/crypto/virtio/virtio_cryptodev.c | 2 +- drivers/crypto/virtio/virtio_user_cryptodev.c | 2 +- drivers/dma/cnxk/cnxk_dmadev.c | 2 +- drivers/dma/dpaa/dpaa_qdma.c | 2 +- drivers/dma/dpaa2/dpaa2_qdma.c | 2 +- drivers/dma/hisilicon/hisi_dmadev.c | 2 +- drivers/dma/idxd/idxd_pci.c | 2 +- drivers/dma/ioat/ioat_dmadev.c | 2 +- drivers/dma/odm/odm_dmadev.c | 2 +- drivers/dma/skeleton/skeleton_dmadev.c | 2 +- drivers/event/cnxk/cn10k_eventdev.c | 2 +- drivers/event/cnxk/cn20k_eventdev.c | 2 +- drivers/event/cnxk/cn9k_eventdev.c | 2 +- drivers/event/dlb2/pf/dlb2_pf.c | 4 +- drivers/event/dpaa/dpaa_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +- drivers/event/dsw/dsw_evdev.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 3 +- drivers/event/octeontx/ssovf_probe.c | 4 +- drivers/event/octeontx/timvf_probe.c | 2 +- drivers/event/opdl/opdl_evdev.c | 2 +- drivers/event/skeleton/skeleton_eventdev.c | 4 +- drivers/event/sw/sw_evdev.c | 2 +- drivers/gpu/cuda/cuda.c | 2 +- drivers/mempool/cnxk/cnxk_mempool.c | 2 +- drivers/mempool/octeontx/octeontx_fpavf.c | 2 +- drivers/ml/cnxk/cn10k_ml_dev.c | 2 +- drivers/ml/cnxk/mvtvm_ml_dev.c | 2 +- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- drivers/net/ark/ark_ethdev.c | 2 +- drivers/net/atlantic/atl_ethdev.c | 2 +- drivers/net/avp/avp_ethdev.c | 2 +- drivers/net/axgbe/axgbe_ethdev.c | 2 +- drivers/net/bnx2x/bnx2x_ethdev.c | 5 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/cnxk/cn10k_ethdev.c | 2 +- drivers/net/cnxk/cn20k_ethdev.c | 2 +- drivers/net/cnxk/cn9k_ethdev.c | 2 +- drivers/net/cnxk/cnxk_eswitch.c | 2 +- drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c | 2 +- drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_mux.c | 2 +- drivers/net/dpaa2/dpaa2_ptp.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enetc/enetc_ethdev.c | 2 +- drivers/net/enetfec/enet_ethdev.c | 2 +- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/gve/gve_ethdev.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/intel/cpfl/cpfl_ethdev.c | 2 +- drivers/net/intel/e1000/em_ethdev.c | 2 +- drivers/net/intel/e1000/igb_ethdev.c | 4 +- drivers/net/intel/e1000/igc_ethdev.c | 2 +- drivers/net/intel/fm10k/fm10k_ethdev.c | 2 +- drivers/net/intel/i40e/i40e_ethdev.c | 2 +- drivers/net/intel/iavf/iavf_ethdev.c | 2 +- drivers/net/intel/ice/ice_dcf_ethdev.c | 2 +- drivers/net/intel/ice/ice_ethdev.c | 2 +- drivers/net/intel/idpf/idpf_ethdev.c | 2 +- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 2 +- drivers/net/intel/ixgbe/ixgbe_ethdev.c | 4 +- drivers/net/ionic/ionic_dev_pci.c | 2 +- drivers/net/ionic/ionic_dev_vdev.c | 3 +- drivers/net/mana/mana.c | 2 +- drivers/net/memif/rte_eth_memif.c | 2 +- drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.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/nfb/nfb_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev_vf.c | 2 +- drivers/net/ntnic/ntnic_ethdev.c | 2 +- drivers/net/null/rte_eth_null.c | 2 +- drivers/net/octeon_ep/otx_ep_ethdev.c | 2 +- drivers/net/octeontx/base/octeontx_pkivf.c | 2 +- drivers/net/octeontx/base/octeontx_pkovf.c | 2 +- drivers/net/octeontx/octeontx_ethdev.c | 3 +- drivers/net/pcap/pcap_ethdev.c | 2 +- drivers/net/pfe/pfe_ethdev.c | 2 +- drivers/net/qede/qede_ethdev.c | 4 +- drivers/net/r8169/r8169_ethdev.c | 2 +- drivers/net/ring/rte_eth_ring.c | 2 +- drivers/net/sfc/sfc_ethdev.c | 2 +- drivers/net/softnic/rte_eth_softnic.c | 2 +- drivers/net/tap/rte_eth_tap.c | 4 +- drivers/net/thunderx/nicvf_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +- drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +- drivers/net/vhost/rte_eth_vhost.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/net/virtio/virtio_user_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/xsc/xsc_ethdev.c | 2 +- drivers/net/zxdh/zxdh_ethdev.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +- drivers/raw/cnxk_gpio/cnxk_gpio.c | 2 +- drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c | 2 +- drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 2 +- drivers/raw/gdtc/gdtc_rawdev.c | 2 +- drivers/raw/ifpga/afu_pmd_core.c | 2 +- drivers/raw/ifpga/ifpga_rawdev.c | 4 +- drivers/raw/ntb/ntb.c | 2 +- drivers/raw/skeleton/skeleton_rawdev.c | 2 +- drivers/regex/cn9k/cn9k_regexdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- drivers/vdpa/sfc/sfc_vdpa.c | 2 +- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 ++ lib/eal/include/rte_dev.h | 14 ++--- usertools/dpdk-pmdinfo.py | 55 +++++++++++++++---- 182 files changed, 276 insertions(+), 233 deletions(-)
--
2.49.0.vfs.0.0
PATCH v2 1/4 eal: add macro to embed information in binaries
DPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
To assimilate these requirements/restrictions, macro RTE_INCLUDE is introduced in this patch.
--- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
lib/eal/common/eal_common_options.c +1 -1
@@ -135,7 +135,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;* Note: PLEASE DO NOT ALTER THIS without making a corresponding * change to usertools/dpdk-pmdinfo.py */ -static const char dpdk_solib_path[] __rte_used = +RTE_INCLUDE(const char, dpdk_solib_path)[] ="DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH ;TAILQ_HEAD (device_option_list, device_option);
lib/eal/include/rte_common.h +6 -0
@@ -231,6 +231,12 @@ typedef uint16_t unaligned_uint16_t;/** * Force symbol to be generated even if it appears to be unused. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_INCLUDE (type, name) __pragma(comment(linker, "/include:" RTE_STR(name))) type name +#else +#define RTE_INCLUDE (type, name) __attribute__((used)) type name +#endif +#ifdef RTE_TOOLCHAIN_MSVC #define __rte_used#else
Signature · 1 line
2.49.0.vfs.0.0
PATCH v2 2/4 buildtools: use macro to embed information in binaries
In reply to Andre MuezerieThe archiver tool from the MSVC toolset is lib.exe. It has different parameters then it's GNU counterpart "ar".
buildtools\meson.build was updated to use lib.exe when MSVC compiler is used. This is to allow the code to be built without requiring GNU "ar" to be installed in that scenario.
Script gen-pmdinfo-cfile.py was updated to use the correct parameters when using lib.exe.
--- buildtools/gen-pmdinfo-cfile.py | 10 +++++++--- buildtools/meson.build | 4 +++- buildtools/pmdinfogen.py | 5 +++-- 3 files changed, 13 insertions(+), 6 deletions(-)
buildtools/gen-pmdinfo-cfile.py +7 -3
@@ -7,15 +7,19 @@ import sys import tempfile -_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv +_, tmp_root, archiver, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, + if archiver == 'lib': + archiver_options = ['/LIST', '/NOLOGO'] + else: + archiver_options = ['t'] + for name in subprocess.run([archiver] + archiver_options + [archive], stdout=subprocess.PIPE, check=True).stdout.decode().splitlines(): if os.path.exists(name): paths.append(name) else: - subprocess.run([ar, "x", os.path.abspath(archive), name], + subprocess.run([archiver, "x", os.path.abspath(archive), name], check=True, cwd=temp) paths.append(os.path.join(temp, name)) subprocess.run(pmdinfogen + paths + [output], check=True)
buildtools/meson.build +3 -1
@@ -37,7 +37,9 @@ install_data([ pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()] pmdinfogen = py3 + files('pmdinfogen.py') if host_machine.system() == 'windows' - if cc.get_id() == 'gcc' + if cc.get_id() == 'msvc' + pmdinfo += 'lib' + elif cc.get_id() == 'gcc' pmdinfo += 'ar' else pmdinfo += 'llvm-ar'
buildtools/pmdinfogen.py +3 -2
@@ -192,7 +192,7 @@ def dump(self, file): dumped = json.dumps(self.__dict__) escaped = dumped.replace('"', '\\"') print( - 'const char %s_pmd_info[] __attribute__((used)) = "PMD_INFO_STRING= %s";' + 'RTE_INCLUDE(const char, %s_pmd_info)[] = "PMD_INFO_STRING= %s";' % (self.name, escaped), file=file, )
@@ -252,7 +252,8 @@ def open_output(path): def write_header(output): output.write( - "static __attribute__((unused)) const char *generator = \"%s\";\n" % sys.argv[0] + "#include <rte_common.h>\n" + "static __rte_unused const char *generator = \"%s\";\n" % sys.argv[0] )
Signature · 1 line
2.49.0.vfs.0.0
Re: [PATCH v2 2/4] buildtools: use macro to embed information in binaries
Quoted 9 lines · Andre Muezerie
buildtools/gen-pmdinfo-cfile.py +5
-2-_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv +_, tmp_root, archiver, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, + if archiver == 'lib': + archiver_options = ['/LIST', '/NOLOGO'] + else: + archiver_options = ['t']
buildtools/gen-pmdinfo-cfile.py line 25
Quoted 10 lines
buildtools/gen-pmdinfo-cfile.py +2
-1+ for name in subprocess.run([archiver] + archiver_options + [archive], stdout=subprocess.PIPE, check=True).stdout.decode().splitlines(): if os.path.exists(name): paths.append(name) else: - subprocess.run([ar, "x", os.path.abspath(archive), name], + subprocess.run([archiver, "x", os.path.abspath(archive), name], check=True, cwd=temp) paths.append(os.path.join(temp, name)) subprocess.run(pmdinfogen + paths + [output], check=True)
Does lib.exe support x? Can't find this option in the doc:
https://learn.microsoft.com/en-us/cpp/build/reference/running-lib?view=msvc-170
Re: [PATCH v2 2/4] buildtools: use macro to embed information in binaries
Quoted 14 lines · Dmitry Kozlyuk
Quoted 13 lines · Andre Muezerie
buildtools/gen-pmdinfo-cfile.py +6
-2-_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv +_, tmp_root, archiver, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, + if archiver == 'lib': + archiver_options = ['/LIST', '/NOLOGO'] + else: + archiver_options = ['t'] + for name in subprocess.run([archiver] + archiver_options + [archive], stdout=subprocess.PIPE, check=True).stdout.decode().splitlines(): if os.path.exists(name): paths.append(name)
Quoted 8 lines
buildtools/gen-pmdinfo-cfile.py line 25
Quoted 6 lines
else:
buildtools/gen-pmdinfo-cfile.py +1
-1- subprocess.run([ar, "x", os.path.abspath(archive), name], + subprocess.run([archiver, "x", os.path.abspath(archive), name], check=True, cwd=temp) paths.append(os.path.join(temp, name)) subprocess.run(pmdinfogen + paths + [output], check=True)Does
lib.exesupportx? Can't find this option in the doc:
https://learn.microsoft.com/en-us/cpp/build/reference/running-lib?view=msvc-170
It does not. I'll update this in the next series.
PATCH v2 3/4 usertools: parse strings from PE images
In reply to Andre MuezerieScript usertools\dpdk-pmdinfo.py was enhanced to also be able to parse symbols from sections in PE images.
--- usertools/dpdk-pmdinfo.py | 55 ++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 10 deletions(-)
usertools/dpdk-pmdinfo.py +45 -10
@@ -37,8 +37,14 @@ from pathlib import Path from typing import Iterable, Iterator, List, Union -import elftools -from elftools.elf.elffile import ELFError, ELFFile +def is_windows(): + return os.name == 'nt' + +if is_windows(): + import pefile +else: + import elftools + from elftools.elf.elffile import ELFError, ELFFile # ----------------------------------------------------------------------------
@@ -114,18 +120,23 @@ def parse_pmdinfo(paths: Iterable[Path], search_plugins: bool) -> List[dict]: A list of DPDK drivers info dictionaries. """ binaries = set(paths) - for p in paths: - binaries.update(get_needed_libs(p)) - if search_plugins: - # cast to list to avoid errors with update while iterating - binaries.update(list(get_plugin_libs(binaries))) + + if is_windows(): + section_name = ".rdata" + else: + section_name = ".rodata" + for p in paths: + binaries.update(get_needed_libs(p)) + if search_plugins: + # cast to list to avoid errors with update while iterating + binaries.update(list(get_plugin_libs(binaries))) drivers = [] for b in binaries: logging.debug("analyzing %s", b) try: - for s in get_elf_strings(b, ".rodata", "PMD_INFO_STRING="): + for s in get_section_strings(b, section_name, "PMD_INFO_STRING="): try: info = json.loads(s) scrub_pci_ids(info)
@@ -232,8 +243,8 @@ def elftools_version(): return (0, 24) return (int(match[1]), int(match[2])) - -ELFTOOLS_VERSION = elftools_version() +if not is_windows(): + ELFTOOLS_VERSION = elftools_version() def from_elftools(s: Union[bytes, str]) -> str:
@@ -269,6 +280,30 @@ def get_elf_strings(path: Path, section: str, prefix: str) -> Iterator[str]: yield from find_strings(sec.data(), prefix) +# ---------------------------------------------------------------------------- +def get_pe_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named PE section in a file. + """ + pe = pefile.PE(path) + for sec in pe.sections: + section_name = sec.Name.decode().strip('\x00') + if section_name != section: + continue + yield from find_strings(sec.get_data(), prefix) + + +# ---------------------------------------------------------------------------- +def get_section_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named section in an ELF or PE file. + """ + if is_windows(): + yield from get_pe_strings(path, section, prefix) + else: + yield from get_elf_strings(path, section, prefix) + + # ---------------------------------------------------------------------------- LDD_LIB_RE = re.compile( r"""
Signature · 1 line
2.49.0.vfs.0.0
Re: [PATCH v2 3/4] usertools: parse strings from PE images
Hi Andre,
Thanks for the respin. Could you format the code using ruff/black before sending a v3?
Andre Muezerie, Apr 15, 2025 at 03:21:
Quoted 13 lines
Script usertools\dpdk-pmdinfo.py was enhanced to also be able to parse symbols from sections in PE images.
Signed-off-by Andre Muezerie <[email protected]>--- usertools/dpdk-pmdinfo.py | 55 ++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 10 deletions(-)usertools/dpdk-pmdinfo.py +0
-0
usertools/dpdk-pmdinfo.py line 41
Quoted 7 lines
usertools/dpdk-pmdinfo.py +2
-2@@ -37,8 +37,14 @@ from pathlib import Path from typing import Iterable, Iterator, List, Union -import elftools -from elftools.elf.elffile import ELFError, ELFFile +def is_windows(): + return os.name == 'nt'
Defining a function before imports is awkward and probably overkill. Can you replace all is_windows() calls with os.name == "nt"?
usertools/dpdk-pmdinfo.py line 43
Quoted 2 lines
usertools/dpdk-pmdinfo.py +2
-0+ +if is_windows():
if os.name == "nt":
Quoted 8 lines
usertools/dpdk-pmdinfo.py +4
-0+ import pefile +else: + import elftools + from elftools.elf.elffile import ELFError, ELFFile # ----------------------------------------------------------------------------
usertools/dpdk-pmdinfo.py def parse_pmdinfo(paths: Iterable[Path], search_plugins: bool) -> List[dict]: · line 124
Quoted 10 lines
usertools/dpdk-pmdinfo.py +2
-5@@ -114,18 +120,23 @@ def parse_pmdinfo(paths: Iterable[Path], search_plugins: bool) -> List[dict]: A list of DPDK drivers info dictionaries. """ binaries = set(paths) - for p in paths: - binaries.update(get_needed_libs(p)) - if search_plugins: - # cast to list to avoid errors with update while iterating - binaries.update(list(get_plugin_libs(binaries))) + + if is_windows():
if os.name == "nt":
Quoted 20 lines
usertools/dpdk-pmdinfo.py +9
-1+ section_name = ".rdata" + else: + section_name = ".rodata" + for p in paths: + binaries.update(get_needed_libs(p)) + if search_plugins: + # cast to list to avoid errors with update while iterating + binaries.update(list(get_plugin_libs(binaries))) drivers = [] for b in binaries: logging.debug("analyzing %s", b) try: - for s in get_elf_strings(b, ".rodata", "PMD_INFO_STRING="): + for s in get_section_strings(b, section_name, "PMD_INFO_STRING="): try: info = json.loads(s) scrub_pci_ids(info)
usertools/dpdk-pmdinfo.py def elftools_version(): · line 246
Quoted 6 lines
usertools/dpdk-pmdinfo.py +1
-2@@ -232,8 +243,8 @@ def elftools_version(): return (0, 24) return (int(match[1]), int(match[2])) - -ELFTOOLS_VERSION = elftools_version() +if not is_windows():
if os.name != "nt":
Quoted 17 lines
usertools/dpdk-pmdinfo.py +10
-0+ ELFTOOLS_VERSION = elftools_version() def from_elftools(s: Union[bytes, str]) -> str:@@ -269,6 +280,30 @@ def get_elf_strings(path: Path, section: str, prefix: str) -> Iterator[str]: yield from find_strings(sec.data(), prefix) +# ---------------------------------------------------------------------------- +def get_pe_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named PE section in a file. + """ + pe = pefile.PE(path) + for sec in pe.sections: + section_name = sec.Name.decode().strip('\x00') + if section_name != section:
usertools/dpdk-pmdinfo.py def get_elf_strings(path: Path, section: str, prefix: str) -> Iterator[str]: · line 301
Quoted 10 lines
usertools/dpdk-pmdinfo.py +10
-0+ continue + yield from find_strings(sec.get_data(), prefix) + + +# ---------------------------------------------------------------------------- +def get_section_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named section in an ELF or PE file. + """ + if is_windows():
if os.name == "nt":
Quoted 8 lines
usertools/dpdk-pmdinfo.py +5
-0+ yield from get_pe_strings(path, section, prefix) + else: + yield from get_elf_strings(path, section, prefix) + + # ---------------------------------------------------------------------------- LDD_LIB_RE = re.compile( r"""
PATCH v2 4/4 drivers: use macro to embed information in binaries
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead. However, when __COUNTER__ was used directly from a header file, __LINE__ had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the __LINE__ could be passed from the .c file to the macro defined in the header (which was originally using __COUNTER__).
--- drivers/baseband/acc/rte_acc100_pmd.c | 4 ++-- drivers/baseband/acc/rte_vrb_pmd.c | 4 ++-- drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 4 ++-- drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 4 ++-- drivers/baseband/la12xx/bbdev_la12xx.c | 2 +- drivers/baseband/null/bbdev_null.c | 2 +- drivers/baseband/turbo_sw/bbdev_turbo_software.c | 2 +- drivers/bus/auxiliary/bus_auxiliary_driver.h | 4 ++-- drivers/bus/cdx/bus_cdx_driver.h | 7 +++---- drivers/bus/dpaa/bus_dpaa_driver.h | 4 ++-- drivers/bus/fslmc/bus_fslmc_driver.h | 8 ++++---- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 2 +- drivers/bus/ifpga/bus_ifpga_driver.h | 4 ++-- drivers/bus/pci/bus_pci_driver.h | 4 ++-- drivers/bus/platform/bus_platform_driver.h | 4 ++-- drivers/bus/uacce/bus_uacce_driver.h | 4 ++-- drivers/bus/vdev/bus_vdev_driver.h | 4 ++-- drivers/bus/vmbus/bus_vmbus_driver.h | 4 ++-- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 2 +- drivers/common/qat/qat_device.c | 2 +- drivers/common/zsda/zsda_device.c | 2 +- drivers/compress/isal/isal_compress_pmd.c | 2 +- drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 2 +- drivers/compress/uadk/uadk_compress_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd.c | 2 +- drivers/crypto/armv8/rte_armv8_pmd.c | 2 +- drivers/crypto/bcmfs/bcmfs_device.c | 3 +-- drivers/crypto/caam_jr/caam_jr.c | 2 +- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- drivers/crypto/ionic/ionic_crypto_vdev.c | 2 +- drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 3 +-- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 3 +-- drivers/crypto/ipsec_mb/pmd_chacha_poly.c | 3 ++- drivers/crypto/ipsec_mb/pmd_kasumi.c | 2 +- drivers/crypto/ipsec_mb/pmd_snow3g.c | 2 +- drivers/crypto/ipsec_mb/pmd_zuc.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +- drivers/crypto/null/null_crypto_pmd.c | 2 +- drivers/crypto/octeontx/otx_cryptodev.c | 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 3 +-- drivers/crypto/scheduler/scheduler_pmd.c | 3 +-- drivers/crypto/uadk/uadk_crypto_pmd.c | 2 +- drivers/crypto/virtio/virtio_cryptodev.c | 2 +- drivers/crypto/virtio/virtio_user_cryptodev.c | 2 +- drivers/dma/cnxk/cnxk_dmadev.c | 2 +- drivers/dma/dpaa/dpaa_qdma.c | 2 +- drivers/dma/dpaa2/dpaa2_qdma.c | 2 +- drivers/dma/hisilicon/hisi_dmadev.c | 2 +- drivers/dma/idxd/idxd_pci.c | 2 +- drivers/dma/ioat/ioat_dmadev.c | 2 +- drivers/dma/odm/odm_dmadev.c | 2 +- drivers/dma/skeleton/skeleton_dmadev.c | 2 +- drivers/event/cnxk/cn10k_eventdev.c | 2 +- drivers/event/cnxk/cn20k_eventdev.c | 2 +- drivers/event/cnxk/cn9k_eventdev.c | 2 +- drivers/event/dlb2/pf/dlb2_pf.c | 4 ++-- drivers/event/dpaa/dpaa_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +- drivers/event/dsw/dsw_evdev.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 3 ++- drivers/event/octeontx/ssovf_probe.c | 4 ++-- drivers/event/octeontx/timvf_probe.c | 2 +- drivers/event/opdl/opdl_evdev.c | 2 +- drivers/event/skeleton/skeleton_eventdev.c | 4 ++-- drivers/event/sw/sw_evdev.c | 2 +- drivers/gpu/cuda/cuda.c | 2 +- drivers/mempool/cnxk/cnxk_mempool.c | 2 +- drivers/mempool/octeontx/octeontx_fpavf.c | 2 +- drivers/ml/cnxk/cn10k_ml_dev.c | 2 +- drivers/ml/cnxk/mvtvm_ml_dev.c | 2 +- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- drivers/net/ark/ark_ethdev.c | 2 +- drivers/net/atlantic/atl_ethdev.c | 2 +- drivers/net/avp/avp_ethdev.c | 2 +- drivers/net/axgbe/axgbe_ethdev.c | 2 +- drivers/net/bnx2x/bnx2x_ethdev.c | 5 +++-- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/cnxk/cn10k_ethdev.c | 2 +- drivers/net/cnxk/cn20k_ethdev.c | 2 +- drivers/net/cnxk/cn9k_ethdev.c | 2 +- drivers/net/cnxk/cnxk_eswitch.c | 2 +- drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c | 2 +- drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_mux.c | 2 +- drivers/net/dpaa2/dpaa2_ptp.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enetc/enetc_ethdev.c | 2 +- drivers/net/enetfec/enet_ethdev.c | 2 +- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/gve/gve_ethdev.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/intel/cpfl/cpfl_ethdev.c | 2 +- drivers/net/intel/e1000/em_ethdev.c | 2 +- drivers/net/intel/e1000/igb_ethdev.c | 4 ++-- drivers/net/intel/e1000/igc_ethdev.c | 2 +- drivers/net/intel/fm10k/fm10k_ethdev.c | 2 +- drivers/net/intel/i40e/i40e_ethdev.c | 2 +- drivers/net/intel/iavf/iavf_ethdev.c | 2 +- drivers/net/intel/ice/ice_dcf_ethdev.c | 2 +- drivers/net/intel/ice/ice_ethdev.c | 2 +- drivers/net/intel/idpf/idpf_ethdev.c | 2 +- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 2 +- drivers/net/intel/ixgbe/ixgbe_ethdev.c | 4 ++-- drivers/net/ionic/ionic_dev_pci.c | 2 +- drivers/net/ionic/ionic_dev_vdev.c | 3 ++- drivers/net/mana/mana.c | 2 +- drivers/net/memif/rte_eth_memif.c | 2 +- drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.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/nfb/nfb_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev_vf.c | 2 +- drivers/net/ntnic/ntnic_ethdev.c | 2 +- drivers/net/null/rte_eth_null.c | 2 +- drivers/net/octeon_ep/otx_ep_ethdev.c | 2 +- drivers/net/octeontx/base/octeontx_pkivf.c | 2 +- drivers/net/octeontx/base/octeontx_pkovf.c | 2 +- drivers/net/octeontx/octeontx_ethdev.c | 3 ++- drivers/net/pcap/pcap_ethdev.c | 2 +- drivers/net/pfe/pfe_ethdev.c | 2 +- drivers/net/qede/qede_ethdev.c | 4 ++-- drivers/net/r8169/r8169_ethdev.c | 2 +- drivers/net/ring/rte_eth_ring.c | 2 +- drivers/net/sfc/sfc_ethdev.c | 2 +- drivers/net/softnic/rte_eth_softnic.c | 2 +- drivers/net/tap/rte_eth_tap.c | 4 ++-- drivers/net/thunderx/nicvf_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +- drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +- drivers/net/vhost/rte_eth_vhost.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/net/virtio/virtio_user_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/xsc/xsc_ethdev.c | 2 +- drivers/net/zxdh/zxdh_ethdev.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +- drivers/raw/cnxk_gpio/cnxk_gpio.c | 2 +- drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c | 2 +- drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 2 +- drivers/raw/gdtc/gdtc_rawdev.c | 2 +- drivers/raw/ifpga/afu_pmd_core.c | 2 +- drivers/raw/ifpga/ifpga_rawdev.c | 4 ++-- drivers/raw/ntb/ntb.c | 2 +- drivers/raw/skeleton/skeleton_rawdev.c | 2 +- drivers/regex/cn9k/cn9k_regexdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- drivers/vdpa/sfc/sfc_vdpa.c | 2 +- lib/eal/include/rte_dev.h | 14 +++++--------- 176 files changed, 211 insertions(+), 216 deletions(-)
drivers/baseband/acc/rte_acc100_pmd.c +2 -2
@@ -4082,9 +4082,9 @@ static struct rte_pci_driver acc100_pci_vf_driver = { .drv_flags = RTE_PCI_DRV_NEED_MAPPING }; -RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver); +RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ACC100PF_DRIVER_NAME , pci_id_acc100_pf_map); -RTE_PMD_REGISTER_PCI (ACC100VF_DRIVER_NAME , acc100_pci_vf_driver); +RTE_PMD_REGISTER_PCI (ACC100VF_DRIVER_NAME , acc100_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ACC100VF_DRIVER_NAME , pci_id_acc100_vf_map);/*
drivers/baseband/acc/rte_vrb_pmd.c +2 -2
@@ -4460,9 +4460,9 @@ static struct rte_pci_driver vrb_pci_vf_driver = { .drv_flags = RTE_PCI_DRV_NEED_MAPPING }; -RTE_PMD_REGISTER_PCI (VRB_PF_DRIVER_NAME , vrb_pci_pf_driver); +RTE_PMD_REGISTER_PCI (VRB_PF_DRIVER_NAME , vrb_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (VRB_PF_DRIVER_NAME , pci_id_vrb_pf_map); -RTE_PMD_REGISTER_PCI (VRB_VF_DRIVER_NAME , vrb_pci_vf_driver); +RTE_PMD_REGISTER_PCI (VRB_VF_DRIVER_NAME , vrb_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (VRB_VF_DRIVER_NAME , pci_id_vrb_vf_map);/* Initial configuration of a VRB1 device prior to running configure(). */
drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +2 -2
@@ -3424,7 +3424,7 @@ static struct rte_pci_driver fpga_5gnr_fec_pci_vf_driver = { }; -RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_PF_DRIVER_NAME , fpga_5gnr_fec_pci_pf_driver); +RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_PF_DRIVER_NAME , fpga_5gnr_fec_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_5GNR_FEC_PF_DRIVER_NAME , pci_id_fpga_5gnr_fec_pf_map); -RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_VF_DRIVER_NAME , fpga_5gnr_fec_pci_vf_driver); +RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_VF_DRIVER_NAME , fpga_5gnr_fec_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_5GNR_FEC_VF_DRIVER_NAME , pci_id_fpga_5gnr_fec_vf_map);
drivers/baseband/fpga_lte_fec/fpga_lte_fec.c +2 -2
@@ -2664,9 +2664,9 @@ static struct rte_pci_driver fpga_lte_fec_pci_vf_driver = { }; -RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_PF_DRIVER_NAME , fpga_lte_fec_pci_pf_driver); +RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_PF_DRIVER_NAME , fpga_lte_fec_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_LTE_FEC_PF_DRIVER_NAME , pci_id_fpga_lte_fec_pf_map); -RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_VF_DRIVER_NAME , fpga_lte_fec_pci_vf_driver); +RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_VF_DRIVER_NAME , fpga_lte_fec_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_LTE_FEC_VF_DRIVER_NAME , pci_id_fpga_lte_fec_vf_map);
drivers/baseband/la12xx/bbdev_la12xx.c +1 -1
@@ -1111,7 +1111,7 @@ static struct rte_vdev_driver bbdev_la12xx_pmd_drv = { .remove = la12xx_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_la12xx_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_la12xx_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,LA12XX_MAX_NB_QUEUES_ARG "=<int>" LA12XX_VDEV_MODEM_ID_ARG "=<int> " );
drivers/baseband/null/bbdev_null.c +1 -1
@@ -349,7 +349,7 @@ static struct rte_vdev_driver bbdev_null_pmd_drv = { .remove = null_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_null_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_null_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,BBDEV_NULL_MAX_NB_QUEUES_ARG "=<int> " BBDEV_NULL_SOCKET_ID_ARG "=<int>" );
drivers/baseband/turbo_sw/bbdev_turbo_software.c +1 -1
@@ -1985,7 +1985,7 @@ static struct rte_vdev_driver bbdev_turbo_sw_pmd_drv = { .remove = turbo_sw_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_turbo_sw_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_turbo_sw_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,TURBO_SW_MAX_NB_QUEUES_ARG "=<int> " TURBO_SW_SOCKET_ID_ARG "=<int>" );
drivers/bus/auxiliary/bus_auxiliary_driver.h +2 -2
@@ -162,13 +162,13 @@ __rte_internalvoid rte_auxiliary_register (struct rte_auxiliary_driver *driver);/** Helper for auxiliary device registration from driver instance */ -#define RTE_PMD_REGISTER_AUXILIARY (nm, auxiliary_drv) \ +#define RTE_PMD_REGISTER_AUXILIARY (nm, auxiliary_drv, idx) \ RTE_INIT(auxiliaryinitfn_ ##nm) \ { \ (auxiliary_drv).driver.name = RTE_STR(nm); \ rte_auxiliary_register(&(auxiliary_drv)); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx)/** * Unregister an auxiliary driver.
drivers/bus/cdx/bus_cdx_driver.h +3 -4
@@ -35,8 +35,7 @@ struct rte_cdx_bus;#define RTE_CDX_ANY_ID (0xffff)#define RTE_PMD_REGISTER_CDX_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, cdx_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, cdx_tbl_export))[] = RTE_STR(table)/** Device needs resource mapping */ #define RTE_CDX_DRV_NEED_MAPPING 0x0001
@@ -147,13 +146,13 @@ void rte_cdx_register(struct rte_cdx_driver *driver);/** * Helper for CDX device registration from driver (eth, crypto, raw) instance. */ -#define RTE_PMD_REGISTER_CDX (nm, cdx_drv) \ +#define RTE_PMD_REGISTER_CDX (nm, cdx_drv, idx) \ RTE_INIT(cdxinitfn_ ##nm) \ {\ (cdx_drv).driver.name = RTE_STR(nm);\ rte_cdx_register(&cdx_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx)/** * Enables VFIO Interrupts for CDX bus devices.
drivers/bus/dpaa/bus_dpaa_driver.h +2 -2
@@ -239,13 +239,13 @@ int rte_dpaa_portal_fq_close(struct qman_fq *fq);void dpaa_portal_finish (void *arg);/** Helper for DPAA device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_DPAA (nm, dpaa_drv) \ +#define RTE_PMD_REGISTER_DPAA (nm, dpaa_drv, idx) \ RTE_INIT(dpaainitfn_ ##nm) \ {\ (dpaa_drv).driver.name = RTE_STR(nm);\ rte_dpaa_driver_register(&dpaa_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)__rte_internal struct fm_eth_port_cfg *dpaa_get_eth_port_cfg(int dev_id);
drivers/bus/fslmc/bus_fslmc_driver.h +4 -4
@@ -199,13 +199,13 @@ __rte_internalvoid rte_fslmc_driver_unregister (struct rte_dpaa2_driver *driver);/** Helper for DPAA2 device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_DPAA2 (nm, dpaa2_drv) \ +#define RTE_PMD_REGISTER_DPAA2 (nm, dpaa2_drv, idx) \ RTE_INIT(dpaa2initfn_ ##nm) \ {\ (dpaa2_drv).driver.name = RTE_STR(nm);\ rte_fslmc_driver_register(&dpaa2_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** * Register a DPAA2 MC Object driver.
@@ -230,13 +230,13 @@ __rte_internaluint32_t rte_fslmc_get_device_count (enum rte_dpaa2_dev_type device_type);/** Helper for DPAA2 object registration */ -#define RTE_PMD_REGISTER_DPAA2_OBJECT (nm, dpaa2_obj) \ +#define RTE_PMD_REGISTER_DPAA2_OBJECT (nm, dpaa2_obj, idx) \ RTE_INIT(dpaa2objinitfn_ ##nm) \ {\ (dpaa2_obj).name = RTE_STR(nm);\ rte_fslmc_object_register(&dpaa2_obj); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c +1 -1
@@ -153,4 +153,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpbp_obj = { .close = dpaa2_close_dpbp_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpbp, rte_dpaa2_dpbp_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpbp, rte_dpaa2_dpbp_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dpci.c +1 -1
@@ -202,4 +202,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpci_obj = { .close = rte_dpaa2_close_dpci_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpci, rte_dpaa2_dpci_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpci, rte_dpaa2_dpci_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +1 -1
@@ -692,4 +692,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpio_obj = { .close = dpaa2_close_dpio_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpio, rte_dpaa2_dpio_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpio, rte_dpaa2_dpio_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dprc.c +1 -1
@@ -99,4 +99,4 @@ static struct rte_dpaa2_object rte_dpaa2_dprc_obj = { .create = rte_dpaa2_create_dprc_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dprc, rte_dpaa2_dprc_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dprc, rte_dpaa2_dprc_obj, __LINE__);
drivers/bus/ifpga/bus_ifpga_driver.h +2 -2
@@ -146,7 +146,7 @@ void rte_ifpga_driver_register(struct rte_afu_driver *driver);__rte_internal void rte_ifpga_driver_unregister(struct rte_afu_driver *driver); -#define RTE_PMD_REGISTER_AFU (nm, afudrv)\ +#define RTE_PMD_REGISTER_AFU (nm, afudrv, idx)\ static const char *afudrvinit_ ## nm ## _alias;\ RTE_INIT(afudrvinitfn_ ##afudrv)\ {\
@@ -154,7 +154,7 @@ RTE_INIT(afudrvinitfn_ ##afudrv)\ (afudrv).driver.alias = afudrvinit_ ## nm ## _alias;\ rte_ifpga_driver_register(&afudrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)#define RTE_PMD_REGISTER_AFU_ALIAS (nm, alias)\ static const char *afudrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/pci/bus_pci_driver.h +2 -2
@@ -165,13 +165,13 @@ __rte_internalvoid rte_pci_register (struct rte_pci_driver *driver);/** Helper for PCI device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_PCI (nm, pci_drv) \ +#define RTE_PMD_REGISTER_PCI (nm, pci_drv, idx) \ RTE_INIT(pciinitfn_ ##nm) \ {\ (pci_drv).driver.name = RTE_STR(nm);\ rte_pci_register(&pci_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** * Unregister a PCI driver.
drivers/bus/platform/bus_platform_driver.h +2 -2
@@ -130,7 +130,7 @@ struct rte_platform_driver { container_of(ptr, const struct rte_platform_device, device) /** Helper for platform driver registration. */ -#define RTE_PMD_REGISTER_PLATFORM (nm, platform_drv) \ +#define RTE_PMD_REGISTER_PLATFORM (nm, platform_drv, idx) \ static const char *pdrvinit_ ## nm ## _alias; \ RTE_INIT(pdrvinitfn_ ##nm) \ { \
@@ -138,7 +138,7 @@ RTE_INIT(pdrvinitfn_ ##nm) \ (platform_drv).driver.alias = pdrvinit_ ## nm ## _alias; \ rte_platform_register(&(platform_drv)); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** Helper for setting platform driver alias. */ #define RTE_PMD_REGISTER_ALIAS (nm, alias) \
drivers/bus/uacce/bus_uacce_driver.h +2 -2
@@ -239,13 +239,13 @@ void rte_uacce_unregister(struct rte_uacce_driver *driver);/** * Helper for UACCE device registration from driver instance. */ -#define RTE_PMD_REGISTER_UACCE (nm, uacce_drv) \ +#define RTE_PMD_REGISTER_UACCE (nm, uacce_drv, idx) \ RTE_INIT(uacceinitfn_ ##nm) \ {\ (uacce_drv).driver.name = RTE_STR(nm);\ rte_uacce_register(&uacce_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/bus/vdev/bus_vdev_driver.h +2 -2
@@ -131,7 +131,7 @@ void rte_vdev_register(struct rte_vdev_driver *driver);__rte_internal void rte_vdev_unregister(struct rte_vdev_driver *driver); -#define RTE_PMD_REGISTER_VDEV (nm, vdrv)\ +#define RTE_PMD_REGISTER_VDEV (nm, vdrv, idx)\ static const char *vdrvinit_ ## nm ## _alias;\ RTE_INIT(vdrvinitfn_ ##vdrv)\ {\
@@ -139,7 +139,7 @@ RTE_INIT(vdrvinitfn_ ##vdrv)\ (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\ rte_vdev_register(&vdrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)#define RTE_PMD_REGISTER_ALIAS (nm, alias)\ static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/vmbus/bus_vmbus_driver.h +2 -2
@@ -91,13 +91,13 @@ __rte_internalvoid rte_vmbus_unregister (struct rte_vmbus_driver *driver);/** Helper for VMBUS device registration from driver instance */ -#define RTE_PMD_REGISTER_VMBUS (nm, vmbus_drv) \ +#define RTE_PMD_REGISTER_VMBUS (nm, vmbus_drv, idx) \ RTE_INIT(vmbusinitfn_ ##nm) \ { \ (vmbus_drv).driver.name = RTE_STR(nm); \ rte_vmbus_register(&vmbus_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/common/mlx5/mlx5_common.c +1 -1
@@ -1452,4 +1452,4 @@ mlx5_devx_uar_prepare(struct mlx5_common_device *cdev, struct mlx5_uar *uar)return 0 ; } -RTE_PMD_EXPORT_NAME (mlx5_common_driver, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_driver, __LINE__);
drivers/common/mlx5/mlx5_common_pci.c +1 -1
@@ -245,4 +245,4 @@ RTE_FINI(mlx5_common_pci_finish) } } -RTE_PMD_EXPORT_NAME (mlx5_common_pci, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_pci, __LINE__);
drivers/common/nitrox/nitrox_device.c +1 -1
@@ -144,5 +144,5 @@ static struct rte_pci_driver nitrox_pmd = { .remove = nitrox_pci_remove, }; -RTE_PMD_REGISTER_PCI (nitrox, nitrox_pmd); +RTE_PMD_REGISTER_PCI (nitrox, nitrox_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (nitrox, pci_id_nitrox_map);
drivers/common/qat/qat_device.c +1 -1
@@ -504,6 +504,6 @@ static struct rte_pci_driver rte_qat_pmd = { .remove = qat_pci_remove }; -RTE_PMD_REGISTER_PCI (QAT_PCI_NAME , rte_qat_pmd); +RTE_PMD_REGISTER_PCI (QAT_PCI_NAME , rte_qat_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (QAT_PCI_NAME , pci_id_qat_map);RTE_PMD_REGISTER_KMOD_DEP (QAT_PCI_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/common/zsda/zsda_device.c +1 -1
@@ -203,7 +203,7 @@ static struct rte_pci_driver rte_zsda_pmd = { .probe = zsda_pci_probe, .remove = zsda_pci_remove }; -RTE_PMD_REGISTER_PCI (ZSDA_PCI_NAME , rte_zsda_pmd); +RTE_PMD_REGISTER_PCI (ZSDA_PCI_NAME , rte_zsda_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ZSDA_PCI_NAME , pci_id_zsda_map);RTE_PMD_REGISTER_KMOD_DEP (ZSDA_PCI_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/compress/isal/isal_compress_pmd.c +1 -1
@@ -751,7 +751,7 @@ static struct rte_vdev_driver compdev_isal_pmd_drv = { .remove = compdev_isal_remove_dev, }; -RTE_PMD_REGISTER_VDEV (COMPDEV_NAME_ISAL_PMD , compdev_isal_pmd_drv); +RTE_PMD_REGISTER_VDEV (COMPDEV_NAME_ISAL_PMD , compdev_isal_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (COMPDEV_NAME_ISAL_PMD ,"socket_id=<int>" );RTE_LOG_REGISTER_DEFAULT (isal_logtype_driver,INFO );
drivers/compress/mlx5/mlx5_compress.c +1 -1
@@ -937,6 +937,6 @@ RTE_INIT(rte_mlx5_compress_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_compress_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_COMPRESS_DRIVER_NAME , mlx5_compress_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_COMPRESS_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/compress/octeontx/otx_zip_pmd.c +1 -1
@@ -717,6 +717,6 @@ static struct rte_pci_driver octtx_zip_pmd = { .remove = zip_pci_remove, }; -RTE_PMD_REGISTER_PCI (COMPRESSDEV_NAME_ZIP_PMD , octtx_zip_pmd); +RTE_PMD_REGISTER_PCI (COMPRESSDEV_NAME_ZIP_PMD , octtx_zip_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (COMPRESSDEV_NAME_ZIP_PMD , pci_id_octtx_zipvf_table);RTE_LOG_REGISTER_DEFAULT (octtx_zip_logtype_driver,INFO );
drivers/compress/uadk/uadk_compress_pmd.c +1 -1
@@ -432,5 +432,5 @@ static struct rte_vdev_driver uadk_compress_pmd = { };#define UADK_COMPRESS_DRIVER_NAME compress_uadk -RTE_PMD_REGISTER_VDEV (UADK_COMPRESS_DRIVER_NAME , uadk_compress_pmd); +RTE_PMD_REGISTER_VDEV (UADK_COMPRESS_DRIVER_NAME , uadk_compress_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (uadk_compress_logtype,INFO );
drivers/compress/zlib/zlib_pmd.c +1 -1
@@ -425,5 +425,5 @@ static struct rte_vdev_driver zlib_pmd_drv = { .remove = zlib_remove }; -RTE_PMD_REGISTER_VDEV (COMPRESSDEV_NAME_ZLIB_PMD , zlib_pmd_drv); +RTE_PMD_REGISTER_VDEV (COMPRESSDEV_NAME_ZLIB_PMD , zlib_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (zlib_logtype_driver,INFO );
drivers/crypto/armv8/rte_armv8_pmd.c +1 -1
@@ -853,7 +853,7 @@ static struct cryptodev_driver armv8_crypto_drv;RTE_LOG_REGISTER_DEFAULT (crypto_armv8_log_type,ERR ); -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ARMV8_PMD , armv8_crypto_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ARMV8_PMD , armv8_crypto_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_ARMV8_PMD , cryptodev_armv8_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_ARMV8_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/bcmfs/bcmfs_device.c +1 -2
@@ -329,5 +329,4 @@ static struct rte_vdev_driver rte_bcmfs_pmd = { .remove = bcmfs_vdev_remove }; -RTE_PMD_REGISTER_VDEV (bcmfs_pmd, - rte_bcmfs_pmd); +RTE_PMD_REGISTER_VDEV (bcmfs_pmd, rte_bcmfs_pmd, __LINE__);
drivers/crypto/caam_jr/caam_jr.c +1 -1
@@ -2451,7 +2451,7 @@ static struct rte_vdev_driver cryptodev_caam_jr_drv = {static struct cryptodev_driver caam_jr_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CAAM_JR_PMD , cryptodev_caam_jr_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CAAM_JR_PMD , cryptodev_caam_jr_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_CAAM_JR_PMD ,"max_nb_queue_pairs=<int>" "socket_id=<int>" );
drivers/crypto/ccp/rte_ccp_pmd.c +1 -1
@@ -312,7 +312,7 @@ static struct rte_pci_driver cryptodev_ccp_pmd_drv = {static struct cryptodev_driver ccp_crypto_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CCP_PMD , cryptodev_ccp_pmd_drv); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CCP_PMD , cryptodev_ccp_pmd_drv, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CCP_PMD ,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_CCP_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/cnxk/cn10k_cryptodev.c +1 -1
@@ -158,7 +158,7 @@ static struct rte_pci_driver cn10k_cryptodev_pmd = {static struct cryptodev_driver cn10k_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN10K_PMD , cn10k_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN10K_PMD , cn10k_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_CN10K_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CN10K_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(cn10k_cryptodev_drv, cn10k_cryptodev_pmd.driver,
drivers/crypto/cnxk/cn9k_cryptodev.c +1 -1
@@ -159,7 +159,7 @@ static struct rte_pci_driver cn9k_cryptodev_pmd = {static struct cryptodev_driver cn9k_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN9K_PMD , cn9k_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN9K_PMD , cn9k_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_CN9K_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CN9K_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(cn9k_cryptodev_drv, cn9k_cryptodev_pmd.driver,
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +1 -1
@@ -4492,7 +4492,7 @@ static struct rte_dpaa2_driver rte_dpaa2_sec_driver = {static struct cryptodev_driver dpaa2_sec_crypto_drv; -RTE_PMD_REGISTER_DPAA2 (CRYPTODEV_NAME_DPAA2_SEC_PMD , rte_dpaa2_sec_driver); +RTE_PMD_REGISTER_DPAA2 (CRYPTODEV_NAME_DPAA2_SEC_PMD , rte_dpaa2_sec_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (dpaa2_sec_crypto_drv, rte_dpaa2_sec_driver.driver, cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_DPAA2_SEC_PMD,
drivers/crypto/dpaa_sec/dpaa_sec.c +1 -1
@@ -3877,7 +3877,7 @@ static struct rte_dpaa_driver rte_dpaa_sec_driver = {static struct cryptodev_driver dpaa_sec_crypto_drv; -RTE_PMD_REGISTER_DPAA (CRYPTODEV_NAME_DPAA_SEC_PMD , rte_dpaa_sec_driver); +RTE_PMD_REGISTER_DPAA (CRYPTODEV_NAME_DPAA_SEC_PMD , rte_dpaa_sec_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (dpaa_sec_crypto_drv, rte_dpaa_sec_driver.driver, dpaa_cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_DPAA_SEC_PMD,
drivers/crypto/ionic/ionic_crypto_vdev.c +1 -1
@@ -123,6 +123,6 @@ static struct rte_vdev_driver rte_vdev_iocpt_pmd = {static struct cryptodev_driver rte_vdev_iocpt_drv; -RTE_PMD_REGISTER_VDEV (crypto_ionic, rte_vdev_iocpt_pmd); +RTE_PMD_REGISTER_VDEV (crypto_ionic, rte_vdev_iocpt_pmd, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (rte_vdev_iocpt_drv, rte_vdev_iocpt_pmd.driver, iocpt_vdev_driver_id);
drivers/crypto/ipsec_mb/pmd_aesni_gcm.c +1 -2
@@ -785,8 +785,7 @@ static struct rte_vdev_driver cryptodev_aesni_gcm_pmd_drv = {static struct cryptodev_driver aesni_gcm_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_GCM_PMD , - cryptodev_aesni_gcm_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_GCM_PMD , cryptodev_aesni_gcm_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_AESNI_GCM_PMD , cryptodev_aesni_gcm_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_AESNI_GCM_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_aesni_mb.c +1 -2
@@ -2500,8 +2500,7 @@ static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = {static struct cryptodev_driver aesni_mb_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_MB_PMD , - cryptodev_aesni_mb_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_MB_PMD , cryptodev_aesni_mb_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_AESNI_MB_PMD , cryptodev_aesni_mb_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_AESNI_MB_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_chacha_poly.c +2 -1
@@ -41,7 +41,8 @@ static struct rte_vdev_driver cryptodev_chacha20_poly1305_pmd_drv = {static struct cryptodev_driver chacha20_poly1305_crypto_drv;RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CHACHA20_POLY1305_PMD , - cryptodev_chacha20_poly1305_pmd_drv); + cryptodev_chacha20_poly1305_pmd_drv, + __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_CHACHA20_POLY1305_PMD , cryptodev_chacha20_poly1305_pmd); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CHACHA20_POLY1305_PMD,
drivers/crypto/ipsec_mb/pmd_kasumi.c +1 -1
@@ -46,7 +46,7 @@ static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = {static struct cryptodev_driver kasumi_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_KASUMI_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_snow3g.c +1 -1
@@ -571,7 +571,7 @@ static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = {static struct cryptodev_driver snow3g_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_SNOW3G_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_zuc.c +1 -1
@@ -376,7 +376,7 @@ static struct rte_vdev_driver cryptodev_zuc_pmd_drv = {static struct cryptodev_driver zuc_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_ZUC_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/mlx5/mlx5_crypto.c +1 -1
@@ -514,6 +514,6 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(mlx5_cryptodev_driver, mlx5_drv, mlx5_crypto_driver_id); RTE_LOG_REGISTER_DEFAULT(mlx5_crypto_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_CRYPTO_DRIVER_NAME , mlx5_crypto_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_CRYPTO_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/crypto/mvsam/rte_mrvl_pmd.c +1 -1
@@ -1281,7 +1281,7 @@ static struct rte_vdev_driver cryptodev_mrvl_pmd_drv = {static struct cryptodev_driver mrvl_crypto_drv;/* Register the driver in constructor. */ -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_MRVL_PMD , cryptodev_mrvl_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_MRVL_PMD , cryptodev_mrvl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_MRVL_PMD ,"max_nb_queue_pairs=<int> " "max_nb_sessions=<int> "
drivers/crypto/null/null_crypto_pmd.c +1 -1
@@ -233,7 +233,7 @@ static struct rte_vdev_driver cryptodev_null_pmd_drv = {static struct cryptodev_driver null_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_NULL_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/octeontx/otx_cryptodev.c +1 -1
@@ -114,7 +114,7 @@ static struct rte_pci_driver otx_cryptodev_pmd = {static struct cryptodev_driver otx_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_OCTEONTX_PMD , otx_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_OCTEONTX_PMD , otx_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_OCTEONTX_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_OCTEONTX_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(otx_cryptodev_drv, otx_cryptodev_pmd.driver,
drivers/crypto/openssl/rte_openssl_pmd.c +1 -2
@@ -3709,8 +3709,7 @@ static struct rte_vdev_driver cryptodev_openssl_pmd_drv = {static struct cryptodev_driver openssl_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_OPENSSL_PMD , - cryptodev_openssl_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_OPENSSL_PMD , cryptodev_openssl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_OPENSSL_PMD ,"max_nb_queue_pairs=<int> " "socket_id=<int>" );
drivers/crypto/scheduler/scheduler_pmd.c +1 -2
@@ -618,8 +618,7 @@ static struct rte_vdev_driver cryptodev_scheduler_pmd_drv = {static struct cryptodev_driver scheduler_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SCHEDULER_PMD , - cryptodev_scheduler_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SCHEDULER_PMD , cryptodev_scheduler_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_SCHEDULER_PMD ,"max_nb_queue_pairs=<int> " "socket_id=<int> "
drivers/crypto/uadk/uadk_crypto_pmd.c +1 -1
@@ -1087,7 +1087,7 @@ static struct rte_vdev_driver uadk_crypto_pmd = {static struct cryptodev_driver uadk_crypto_drv;#define UADK_CRYPTO_DRIVER_NAME crypto_uadk -RTE_PMD_REGISTER_VDEV (UADK_CRYPTO_DRIVER_NAME , uadk_crypto_pmd); +RTE_PMD_REGISTER_VDEV (UADK_CRYPTO_DRIVER_NAME , uadk_crypto_pmd, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (uadk_crypto_drv, uadk_crypto_pmd.driver, uadk_cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(UADK_CRYPTO_DRIVER_NAME,
drivers/crypto/virtio/virtio_cryptodev.c +1 -1
@@ -1718,7 +1718,7 @@ static struct rte_pci_driver rte_virtio_crypto_driver = {static struct cryptodev_driver virtio_crypto_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_VIRTIO_PMD , rte_virtio_crypto_driver); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_VIRTIO_PMD , rte_virtio_crypto_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (virtio_crypto_drv, rte_virtio_crypto_driver.driver, cryptodev_virtio_driver_id);
drivers/crypto/virtio/virtio_user_cryptodev.c +1 -1
@@ -565,7 +565,7 @@ static struct cryptodev_driver virtio_crypto_drv;uint8_t cryptodev_virtio_user_driver_id; -RTE_PMD_REGISTER_VDEV (crypto_virtio_user, virtio_user_driver); +RTE_PMD_REGISTER_VDEV (crypto_virtio_user, virtio_user_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (virtio_crypto_drv, virtio_user_driver.driver, cryptodev_virtio_user_driver_id);
drivers/dma/cnxk/cnxk_dmadev.c +1 -1
@@ -628,6 +628,6 @@ static struct rte_pci_driver cnxk_dmadev = { .remove = cnxk_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_dmadev_pci_driver, cnxk_dmadev); +RTE_PMD_REGISTER_PCI (cnxk_dmadev_pci_driver, cnxk_dmadev, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_dmadev_pci_driver, cnxk_dma_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_dmadev_pci_driver,"vfio-pci" );
drivers/dma/dpaa/dpaa_qdma.c +1 -1
@@ -1475,6 +1475,6 @@ static struct rte_dpaa_driver rte_dpaa_qdma_pmd = { .remove = dpaa_qdma_remove, }; -RTE_PMD_REGISTER_DPAA (dpaa_qdma, rte_dpaa_qdma_pmd); +RTE_PMD_REGISTER_DPAA (dpaa_qdma, rte_dpaa_qdma_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dpaa_qdma,DPAA_DMA_ERROR_CHECK "=<int>" );RTE_LOG_REGISTER_DEFAULT (dpaa_qdma_logtype,INFO );
drivers/dma/dpaa2/dpaa2_qdma.c +1 -1
@@ -1752,7 +1752,7 @@ static struct rte_dpaa2_driver rte_dpaa2_qdma_pmd = { .remove = dpaa2_qdma_remove, }; -RTE_PMD_REGISTER_DPAA2 (dpaa2_qdma, rte_dpaa2_qdma_pmd); +RTE_PMD_REGISTER_DPAA2 (dpaa2_qdma, rte_dpaa2_qdma_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dpaa2_qdma,DPAA2_QDMA_FLE_PRE_POPULATE "=<int>" DPAA2_QDMA_DESC_DEBUG"=<int>"
drivers/dma/hisilicon/hisi_dmadev.c +1 -1
@@ -964,6 +964,6 @@ static struct rte_pci_driver hisi_dma_pmd_drv = { .remove = hisi_dma_remove, }; -RTE_PMD_REGISTER_PCI (dma_hisilicon, hisi_dma_pmd_drv); +RTE_PMD_REGISTER_PCI (dma_hisilicon, hisi_dma_pmd_drv, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (dma_hisilicon, pci_id_hisi_dma_map);RTE_PMD_REGISTER_KMOD_DEP (dma_hisilicon,"vfio-pci" );
drivers/dma/idxd/idxd_pci.c +1 -1
@@ -453,7 +453,7 @@ struct rte_pci_driver idxd_pmd_drv_pci = { .remove = idxd_dmadev_remove_pci, }; -RTE_PMD_REGISTER_PCI (IDXD_PMD_DMADEV_NAME_PCI , idxd_pmd_drv_pci); +RTE_PMD_REGISTER_PCI (IDXD_PMD_DMADEV_NAME_PCI , idxd_pmd_drv_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (IDXD_PMD_DMADEV_NAME_PCI , pci_id_idxd_map);RTE_PMD_REGISTER_KMOD_DEP (IDXD_PMD_DMADEV_NAME_PCI ,"vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (dmadev_idxd_pci,"max_queues=0" );
drivers/dma/ioat/ioat_dmadev.c +1 -1
@@ -762,6 +762,6 @@ static struct rte_pci_driver ioat_pmd_drv = { .remove = ioat_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (IOAT_PMD_NAME , ioat_pmd_drv); +RTE_PMD_REGISTER_PCI (IOAT_PMD_NAME , ioat_pmd_drv, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (IOAT_PMD_NAME , pci_id_ioat_map);RTE_PMD_REGISTER_KMOD_DEP (IOAT_PMD_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/dma/odm/odm_dmadev.c +1 -1
@@ -711,7 +711,7 @@ static struct rte_pci_driver odm_dmadev = { .remove = odm_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (PCI_DRIVER_NAME , odm_dmadev); +RTE_PMD_REGISTER_PCI (PCI_DRIVER_NAME , odm_dmadev, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (PCI_DRIVER_NAME , odm_dma_pci_map);RTE_PMD_REGISTER_KMOD_DEP (PCI_DRIVER_NAME ,"vfio-pci" );RTE_LOG_REGISTER_DEFAULT (odm_logtype,NOTICE );
drivers/dma/skeleton/skeleton_dmadev.c +1 -1
@@ -729,6 +729,6 @@ static struct rte_vdev_driver skeldma_pmd_drv = { .drv_flags = RTE_VDEV_DRV_NEED_IOVA_AS_VA, }; -RTE_PMD_REGISTER_VDEV (dma_skeleton, skeldma_pmd_drv); +RTE_PMD_REGISTER_VDEV (dma_skeleton, skeldma_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dma_skeleton,SKELDMA_ARG_LCORE "=<uint16> " );
drivers/event/cnxk/cn10k_eventdev.c +1 -1
@@ -1173,7 +1173,7 @@ static struct rte_pci_driver cn10k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn10k, cn10k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn10k, cn10k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn10k, cn10k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn10k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "=<int>"
drivers/event/cnxk/cn20k_eventdev.c +1 -1
@@ -1151,7 +1151,7 @@ static struct rte_pci_driver cn20k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn20k, cn20k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn20k, cn20k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn20k, cn20k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn20k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn20k,
drivers/event/cnxk/cn9k_eventdev.c +1 -1
@@ -1267,7 +1267,7 @@ static struct rte_pci_driver cn9k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn9k, cn9k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn9k, cn9k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn9k, cn9k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn9k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "=<int>"
drivers/event/dlb2/pf/dlb2_pf.c +2 -2
@@ -881,8 +881,8 @@ static struct rte_pci_driver pci_eventdev_dlb2_5_pmd = { .remove = event_dlb2_5_pci_remove, }; -RTE_PMD_REGISTER_PCI (event_dlb2_pf, pci_eventdev_dlb2_pmd); +RTE_PMD_REGISTER_PCI (event_dlb2_pf, pci_eventdev_dlb2_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_dlb2_pf, pci_id_dlb2_map); -RTE_PMD_REGISTER_PCI (event_dlb2_5_pf, pci_eventdev_dlb2_5_pmd); +RTE_PMD_REGISTER_PCI (event_dlb2_5_pf, pci_eventdev_dlb2_5_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_dlb2_5_pf, pci_id_dlb2_5_map);
drivers/event/dpaa/dpaa_eventdev.c +1 -1
@@ -1050,6 +1050,6 @@ static struct rte_vdev_driver vdev_eventdev_dpaa_pmd = { .remove = dpaa_event_dev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA_PMD , vdev_eventdev_dpaa_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA_PMD , vdev_eventdev_dpaa_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (EVENTDEV_NAME_DPAA_PMD ,DISABLE_INTR_MODE "=<int>" );
drivers/event/dpaa2/dpaa2_eventdev.c +1 -1
@@ -1198,5 +1198,5 @@ static struct rte_vdev_driver vdev_eventdev_dpaa2_pmd = { .remove = dpaa2_eventdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA2_PMD , vdev_eventdev_dpaa2_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA2_PMD , vdev_eventdev_dpaa2_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (dpaa2_logtype_event,NOTICE );
drivers/event/dpaa2/dpaa2_hw_dpcon.c +1 -1
@@ -140,4 +140,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpcon_obj = { .close = rte_dpaa2_close_dpcon_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpcon, rte_dpaa2_dpcon_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpcon, rte_dpaa2_dpcon_obj, __LINE__);
drivers/event/dsw/dsw_evdev.c +1 -1
@@ -486,5 +486,5 @@ static struct rte_vdev_driver evdev_dsw_pmd_drv = { .remove = dsw_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DSW_PMD , evdev_dsw_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DSW_PMD , evdev_dsw_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (event_dsw_logtype,NOTICE );
drivers/event/octeontx/ssovf_evdev.c +2 -1
@@ -971,4 +971,5 @@ static struct rte_vdev_driver vdev_ssovf_pmd = { .remove = ssovf_vdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OCTEONTX_PMD , vdev_ssovf_pmd); +/* Blank line to force unique __LINE__ with RTE_PMD_REGISTER_VDEV */ +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OCTEONTX_PMD , vdev_ssovf_pmd, __LINE__);
drivers/event/octeontx/ssovf_probe.c +2 -2
@@ -210,7 +210,7 @@ static struct rte_pci_driver pci_ssowvf = { .probe = ssowvf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_ssowvf, pci_ssowvf); +RTE_PMD_REGISTER_PCI (octeontx_ssowvf, pci_ssowvf, __LINE__);/* SSOVF pcie device aka event queue probe */
@@ -286,4 +286,4 @@ static struct rte_pci_driver pci_ssovf = { .probe = ssovf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_ssovf, pci_ssovf); +RTE_PMD_REGISTER_PCI (octeontx_ssovf, pci_ssovf, __LINE__);
drivers/event/octeontx/timvf_probe.c +1 -1
@@ -162,4 +162,4 @@ static struct rte_pci_driver pci_timvf = { .remove = NULL, }; -RTE_PMD_REGISTER_PCI (octeontx_timvf, pci_timvf); +RTE_PMD_REGISTER_PCI (octeontx_timvf, pci_timvf, __LINE__);
drivers/event/opdl/opdl_evdev.c +1 -1
@@ -763,6 +763,6 @@ static struct rte_vdev_driver evdev_opdl_pmd_drv = {RTE_LOG_REGISTER_SUFFIX (opdl_logtype_driver, driver,INFO ); -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OPDL_PMD , evdev_opdl_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OPDL_PMD , evdev_opdl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (event_opdl,NUMA_NODE_ARG "=<int>" DO_VALIDATION_ARG "=<int>" DO_TEST_ARG "=<int>" );
drivers/event/skeleton/skeleton_eventdev.c +2 -2
@@ -395,7 +395,7 @@ static struct rte_pci_driver pci_eventdev_skeleton_pmd = { .remove = event_skeleton_pci_remove, }; -RTE_PMD_REGISTER_PCI (event_skeleton_pci, pci_eventdev_skeleton_pmd); +RTE_PMD_REGISTER_PCI (event_skeleton_pci, pci_eventdev_skeleton_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_skeleton_pci, pci_id_skeleton_map);/* VDEV based event device */
@@ -448,5 +448,5 @@ static struct rte_vdev_driver vdev_eventdev_skeleton_pmd = { .remove = skeleton_eventdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SKELETON_PMD , vdev_eventdev_skeleton_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SKELETON_PMD , vdev_eventdev_skeleton_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (skeleton_eventdev_logtype,INFO );
drivers/event/sw/sw_evdev.c +1 -1
@@ -1142,7 +1142,7 @@ static struct rte_vdev_driver evdev_sw_pmd_drv = { .remove = sw_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SW_PMD , evdev_sw_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SW_PMD , evdev_sw_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (event_sw,NUMA_NODE_ARG "=<int> " SCHED_QUANTA_ARG "=<int>" CREDIT_QUANTA_ARG "=<int>" MIN_BURST_SIZE_ARG "=<int>" DEQ_BURST_SIZE_ARG "=<int>"
drivers/gpu/cuda/cuda.c +1 -1
@@ -1440,6 +1440,6 @@ static struct rte_pci_driver rte_cuda_driver = { .remove = cuda_gpu_remove, }; -RTE_PMD_REGISTER_PCI (gpu_cuda, rte_cuda_driver); +RTE_PMD_REGISTER_PCI (gpu_cuda, rte_cuda_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (gpu_cuda, pci_id_cuda_map);RTE_PMD_REGISTER_KMOD_DEP (gpu_cuda,"* nvidia & (nv_peer_mem | nvpeer_mem)" );
drivers/mempool/cnxk/cnxk_mempool.c +1 -1
@@ -197,7 +197,7 @@ static struct rte_pci_driver npa_pci = { .remove = npa_remove, }; -RTE_PMD_REGISTER_PCI (mempool_cnxk, npa_pci); +RTE_PMD_REGISTER_PCI (mempool_cnxk, npa_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (mempool_cnxk, npa_pci_map);RTE_PMD_REGISTER_KMOD_DEP (mempool_cnxk,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(mempool_cnxk,
drivers/mempool/octeontx/octeontx_fpavf.c +1 -1
@@ -822,4 +822,4 @@ static struct rte_pci_driver pci_fpavf = { .probe = fpavf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_fpavf, pci_fpavf); +RTE_PMD_REGISTER_PCI (octeontx_fpavf, pci_fpavf, __LINE__);
drivers/ml/cnxk/cn10k_ml_dev.c +1 -1
@@ -858,7 +858,7 @@ static struct rte_pci_driver cn10k_mldev_pmd = { .remove = cn10k_ml_pci_remove, }; -RTE_PMD_REGISTER_PCI (MLDEV_NAME_CN10K_PMD , cn10k_mldev_pmd); +RTE_PMD_REGISTER_PCI (MLDEV_NAME_CN10K_PMD , cn10k_mldev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLDEV_NAME_CN10K_PMD , pci_id_ml_table);RTE_PMD_REGISTER_KMOD_DEP (MLDEV_NAME_CN10K_PMD ,"vfio-pci" );
drivers/ml/cnxk/mvtvm_ml_dev.c +1 -1
@@ -189,7 +189,7 @@ mvtvm_ml_vdev_remove(struct rte_vdev_device *vdev)static struct rte_vdev_driver mvtvm_mldev_pmd = {.probe = mvtvm_ml_vdev_probe, .remove = mvtvm_ml_vdev_remove}; -RTE_PMD_REGISTER_VDEV (MLDEV_NAME_MVTVM_PMD , mvtvm_mldev_pmd); +RTE_PMD_REGISTER_VDEV (MLDEV_NAME_MVTVM_PMD , mvtvm_mldev_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (MLDEV_NAME_MVTVM_PMD ,MVTVM_ML_DEV_MAX_QPS "=<int>" MVTVM_ML_DEV_CACHE_MODEL_DATA "=<0|1>" );
drivers/net/af_packet/rte_eth_af_packet.c +1 -1
@@ -1266,7 +1266,7 @@ static struct rte_vdev_driver pmd_af_packet_drv = { .remove = rte_pmd_af_packet_remove, }; -RTE_PMD_REGISTER_VDEV (net_af_packet, pmd_af_packet_drv); +RTE_PMD_REGISTER_VDEV (net_af_packet, pmd_af_packet_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_af_packet, eth_af_packet);RTE_PMD_REGISTER_PARAM_STRING (net_af_packet, "iface=<string> "
drivers/net/af_xdp/rte_eth_af_xdp.c +1 -1
@@ -2559,7 +2559,7 @@ static struct rte_vdev_driver pmd_af_xdp_drv = { .remove = rte_pmd_af_xdp_remove, }; -RTE_PMD_REGISTER_VDEV (net_af_xdp, pmd_af_xdp_drv); +RTE_PMD_REGISTER_VDEV (net_af_xdp, pmd_af_xdp_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_af_xdp,"iface=<string> " "start_queue=<int> "
drivers/net/ark/ark_ethdev.c +1 -1
@@ -1004,7 +1004,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)return ret; } -RTE_PMD_REGISTER_PCI (net_ark, rte_ark_pmd); +RTE_PMD_REGISTER_PCI (net_ark, rte_ark_pmd, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (net_ark,"* igb_uio | uio_pci_generic " );RTE_PMD_REGISTER_PCI_TABLE (net_ark, pci_id_ark_map); RTE_PMD_REGISTER_PARAM_STRING(net_ark,
drivers/net/atlantic/atl_ethdev.c +1 -1
@@ -1906,7 +1906,7 @@ is_atlantic_supported(struct rte_eth_dev *dev)return is_device_supported (dev, &rte_atl_pmd); } -RTE_PMD_REGISTER_PCI (net_atlantic, rte_atl_pmd); +RTE_PMD_REGISTER_PCI (net_atlantic, rte_atl_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_atlantic, pci_id_atl_map);RTE_PMD_REGISTER_KMOD_DEP (net_atlantic,"* igb_uio | uio_pci_generic" );RTE_LOG_REGISTER_SUFFIX (atl_logtype_init, init,NOTICE );
drivers/net/avp/avp_ethdev.c +1 -1
@@ -2305,6 +2305,6 @@ avp_dev_stats_reset(struct rte_eth_dev *eth_dev)return 0 ; } -RTE_PMD_REGISTER_PCI (net_avp, rte_avp_pmd); +RTE_PMD_REGISTER_PCI (net_avp, rte_avp_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_avp, pci_id_avp_map);RTE_LOG_REGISTER_SUFFIX (avp_logtype_driver, driver,NOTICE );
drivers/net/axgbe/axgbe_ethdev.c +1 -1
@@ -2459,7 +2459,7 @@ static struct rte_pci_driver rte_axgbe_pmd = { .remove = eth_axgbe_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_axgbe, rte_axgbe_pmd); +RTE_PMD_REGISTER_PCI (net_axgbe, rte_axgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_axgbe, pci_id_axgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_axgbe,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (axgbe_logtype_init, init,NOTICE );
drivers/net/bnx2x/bnx2x_ethdev.c +3 -2
@@ -817,10 +817,11 @@ static struct rte_pci_driver rte_bnx2xvf_pmd = { .remove = eth_bnx2x_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_bnx2x, rte_bnx2x_pmd); +/* Blank line to force unique __LINE__ */ +RTE_PMD_REGISTER_PCI (net_bnx2x, rte_bnx2x_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnx2x, pci_id_bnx2x_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnx2x,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_bnx2xvf, rte_bnx2xvf_pmd); +RTE_PMD_REGISTER_PCI (net_bnx2xvf, rte_bnx2xvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnx2xvf, pci_id_bnx2xvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnx2xvf,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (bnx2x_logtype_init, init,NOTICE );
drivers/net/bnxt/bnxt_ethdev.c +1 -1
@@ -7107,6 +7107,6 @@ static bool bnxt_enable_ulp(struct bnxt *bp) }RTE_LOG_REGISTER_SUFFIX (bnxt_logtype_driver, driver,NOTICE ); -RTE_PMD_REGISTER_PCI (net_bnxt, bnxt_rte_pmd); +RTE_PMD_REGISTER_PCI (net_bnxt, bnxt_rte_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnxt, bnxt_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnxt,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/bonding/rte_eth_bond_pmd.c +1 -1
@@ -4272,7 +4272,7 @@ struct rte_vdev_driver pmd_bond_drv = { .remove = bond_remove, }; -RTE_PMD_REGISTER_VDEV (net_bonding, pmd_bond_drv); +RTE_PMD_REGISTER_VDEV (net_bonding, pmd_bond_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_bonding, eth_bond); RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
drivers/net/cnxk/cn10k_ethdev.c +1 -1
@@ -1017,6 +1017,6 @@ static struct rte_pci_driver cn10k_pci_nix = { .remove = cn10k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn10k, cn10k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn10k, cn10k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn10k, cn10k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn10k,"vfio-pci" );
drivers/net/cnxk/cn20k_ethdev.c +1 -1
@@ -971,6 +971,6 @@ static struct rte_pci_driver cn20k_pci_nix = { .remove = cn20k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn20k, cn20k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn20k, cn20k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn20k, cn20k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn20k,"vfio-pci" );
drivers/net/cnxk/cn9k_ethdev.c +1 -1
@@ -912,6 +912,6 @@ static struct rte_pci_driver cn9k_pci_nix = { .remove = cn9k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn9k, cn9k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn9k, cn9k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn9k, cn9k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn9k,"vfio-pci" );
drivers/net/cnxk/cnxk_eswitch.c +1 -1
@@ -795,6 +795,6 @@ static struct rte_pci_driver cnxk_eswitch_pci = { .remove = cnxk_eswitch_dev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_eswitch, cnxk_eswitch_pci); +RTE_PMD_REGISTER_PCI (cnxk_eswitch, cnxk_eswitch_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_eswitch, cnxk_eswitch_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_eswitch,"vfio-pci" );
drivers/net/cnxk/cnxk_ethdev_sec.c +1 -1
@@ -673,7 +673,7 @@ static struct rte_pci_driver cnxk_nix_inl_pci = { .remove = cnxk_nix_inl_dev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_nix_inl, cnxk_nix_inl_pci); +RTE_PMD_REGISTER_PCI (cnxk_nix_inl, cnxk_nix_inl_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_nix_inl, cnxk_nix_inl_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_nix_inl,"vfio-pci" );
drivers/net/cxgbe/cxgbe_ethdev.c +1 -1
@@ -1796,7 +1796,7 @@ static struct rte_pci_driver rte_cxgbe_pmd = { .remove = eth_cxgbe_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_cxgbe, rte_cxgbe_pmd); +RTE_PMD_REGISTER_PCI (net_cxgbe, rte_cxgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cxgbe, cxgb4_pci_tbl);RTE_PMD_REGISTER_KMOD_DEP (net_cxgbe,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cxgbe,
drivers/net/cxgbe/cxgbevf_ethdev.c +1 -1
@@ -206,7 +206,7 @@ static struct rte_pci_driver rte_cxgbevf_pmd = { .remove = eth_cxgbevf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_cxgbevf, rte_cxgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_cxgbevf, rte_cxgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cxgbevf, cxgb4vf_pci_tbl);RTE_PMD_REGISTER_KMOD_DEP (net_cxgbevf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cxgbevf,
drivers/net/dpaa/dpaa_ethdev.c +1 -1
@@ -2628,7 +2628,7 @@ static struct rte_dpaa_driver rte_dpaa_pmd = { .remove = rte_dpaa_remove, }; -RTE_PMD_REGISTER_DPAA (net_dpaa, rte_dpaa_pmd); +RTE_PMD_REGISTER_DPAA (net_dpaa, rte_dpaa_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_dpaa,DRIVER_IEEE1588 "=<int>" );RTE_LOG_REGISTER_DEFAULT (dpaa_logtype_pmd,NOTICE );
drivers/net/dpaa2/dpaa2_ethdev.c +1 -1
@@ -3068,7 +3068,7 @@ static struct rte_dpaa2_driver rte_dpaa2_pmd = { .remove = rte_dpaa2_remove, }; -RTE_PMD_REGISTER_DPAA2 (NET_DPAA2_PMD_DRIVER_NAME , rte_dpaa2_pmd); +RTE_PMD_REGISTER_DPAA2 (NET_DPAA2_PMD_DRIVER_NAME , rte_dpaa2_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (NET_DPAA2_PMD_DRIVER_NAME ,DRIVER_LOOPBACK_MODE "=<int> " DRIVER_NO_PREFETCH_MODE "=<int>"
drivers/net/dpaa2/dpaa2_mux.c +1 -1
@@ -606,4 +606,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpdmux_obj = { .close = dpaa2_close_dpdmux_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpdmux, rte_dpaa2_dpdmux_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpdmux, rte_dpaa2_dpdmux_obj, __LINE__);
drivers/net/dpaa2/dpaa2_ptp.c +1 -1
@@ -180,5 +180,5 @@ static struct rte_dpaa2_object rte_dpaa2_dprtc_obj = { .create = dpaa2_create_dprtc_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dprtc, rte_dpaa2_dprtc_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dprtc, rte_dpaa2_dprtc_obj, __LINE__);#endif
drivers/net/ena/ena_ethdev.c +1 -1
@@ -4014,7 +4014,7 @@ static struct rte_pci_driver rte_ena_pmd = { .remove = eth_ena_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ena, rte_ena_pmd); +RTE_PMD_REGISTER_PCI (net_ena, rte_ena_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ena, pci_id_ena_map);RTE_PMD_REGISTER_KMOD_DEP (net_ena,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ena,
drivers/net/enetc/enetc_ethdev.c +1 -1
@@ -965,7 +965,7 @@ static struct rte_pci_driver rte_enetc_pmd = { .remove = enetc_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_enetc, rte_enetc_pmd); +RTE_PMD_REGISTER_PCI (net_enetc, rte_enetc_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_enetc, pci_id_enetc_map);RTE_PMD_REGISTER_KMOD_DEP (net_enetc,"* vfio-pci" );RTE_LOG_REGISTER_DEFAULT (enetc_logtype_pmd,NOTICE );
drivers/net/enetfec/enet_ethdev.c +1 -1
@@ -689,5 +689,5 @@ static struct rte_vdev_driver pmd_enetfec_drv = { .remove = pmd_enetfec_remove, }; -RTE_PMD_REGISTER_VDEV (ENETFEC_NAME_PMD , pmd_enetfec_drv); +RTE_PMD_REGISTER_VDEV (ENETFEC_NAME_PMD , pmd_enetfec_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (enetfec_logtype_pmd,NOTICE );
drivers/net/enic/enic_ethdev.c +1 -1
@@ -1425,7 +1425,7 @@ int dev_is_enic(struct rte_eth_dev *dev)return dev->device->driver == &rte_enic_pmd.driver; } -RTE_PMD_REGISTER_PCI (net_enic, rte_enic_pmd); +RTE_PMD_REGISTER_PCI (net_enic, rte_enic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_enic, pci_id_enic_map);RTE_PMD_REGISTER_KMOD_DEP (net_enic,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_enic,
drivers/net/failsafe/failsafe.c +1 -1
@@ -396,6 +396,6 @@ static struct rte_vdev_driver failsafe_drv = { .remove = rte_pmd_failsafe_remove, }; -RTE_PMD_REGISTER_VDEV (net_failsafe, failsafe_drv); +RTE_PMD_REGISTER_VDEV (net_failsafe, failsafe_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_failsafe,PMD_FAILSAFE_PARAM_STRING );RTE_LOG_REGISTER_DEFAULT (failsafe_logtype,NOTICE )
drivers/net/gve/gve_ethdev.c +1 -1
@@ -1364,7 +1364,7 @@ static struct rte_pci_driver rte_gve_pmd = { .remove = gve_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_gve, rte_gve_pmd); +RTE_PMD_REGISTER_PCI (net_gve, rte_gve_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_gve, pci_id_gve_map);RTE_PMD_REGISTER_KMOD_DEP (net_gve,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (gve_logtype_driver, driver,NOTICE );
drivers/net/hinic/hinic_pmd_ethdev.c +1 -1
@@ -3255,6 +3255,6 @@ static struct rte_pci_driver rte_hinic_pmd = { .remove = hinic_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hinic, rte_hinic_pmd); +RTE_PMD_REGISTER_PCI (net_hinic, rte_hinic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hinic, pci_id_hinic_map);RTE_LOG_REGISTER_DEFAULT (hinic_logtype,INFO );
drivers/net/hns3/hns3_ethdev.c +1 -1
@@ -6688,7 +6688,7 @@ static struct rte_pci_driver rte_hns3_pmd = { .remove = eth_hns3_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hns3, rte_hns3_pmd); +RTE_PMD_REGISTER_PCI (net_hns3, rte_hns3_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hns3, pci_id_hns3_map);RTE_PMD_REGISTER_KMOD_DEP (net_hns3,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_hns3,
drivers/net/hns3/hns3_ethdev_vf.c +1 -1
@@ -2360,7 +2360,7 @@ static struct rte_pci_driver rte_hns3vf_pmd = { .remove = eth_hns3vf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hns3_vf, rte_hns3vf_pmd); +RTE_PMD_REGISTER_PCI (net_hns3_vf, rte_hns3vf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hns3_vf, pci_id_hns3vf_map);RTE_PMD_REGISTER_KMOD_DEP (net_hns3_vf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_hns3_vf,
drivers/net/intel/cpfl/cpfl_ethdev.c +1 -1
@@ -2876,7 +2876,7 @@ static struct rte_pci_driver rte_cpfl_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_cpfl, rte_cpfl_pmd); +RTE_PMD_REGISTER_PCI (net_cpfl, rte_cpfl_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cpfl, pci_id_cpfl_map);RTE_PMD_REGISTER_KMOD_DEP (net_cpfl,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cpfl,
drivers/net/intel/e1000/em_ethdev.c +1 -1
@@ -1956,6 +1956,6 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev,return 0 ; } -RTE_PMD_REGISTER_PCI (net_e1000_em, rte_em_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_em, rte_em_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_em, pci_id_em_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_em,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/e1000/igb_ethdev.c +2 -2
@@ -5626,9 +5626,9 @@ igb_filter_restore(struct rte_eth_dev *dev)return 0 ; } -RTE_PMD_REGISTER_PCI (net_e1000_igb, rte_igb_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_igb, rte_igb_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_igb, pci_id_igb_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_igb,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_e1000_igb_vf, rte_igbvf_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_igb_vf, rte_igbvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_igb_vf, pci_id_igbvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_igb_vf,"* igb_uio | vfio-pci" );
drivers/net/intel/e1000/igc_ethdev.c +1 -1
@@ -3000,6 +3000,6 @@ static struct rte_pci_driver rte_igc_pmd = { .remove = eth_igc_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_igc, rte_igc_pmd); +RTE_PMD_REGISTER_PCI (net_igc, rte_igc_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_igc, pci_id_igc_map);RTE_PMD_REGISTER_KMOD_DEP (net_igc,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/fm10k/fm10k_ethdev.c +1 -1
@@ -3313,7 +3313,7 @@ static struct rte_pci_driver rte_pmd_fm10k = { .remove = eth_fm10k_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_fm10k, rte_pmd_fm10k); +RTE_PMD_REGISTER_PCI (net_fm10k, rte_pmd_fm10k, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_fm10k, pci_id_fm10k_map);RTE_PMD_REGISTER_KMOD_DEP (net_fm10k,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (fm10k_logtype_init, init,NOTICE );
drivers/net/intel/i40e/i40e_ethdev.c +1 -1
@@ -756,7 +756,7 @@ i40e_write_global_rx_ctl(struct i40e_hw *hw, uint32_t reg_addr, dev->device->name, reg_addr, ori_reg_val, reg_val); } -RTE_PMD_REGISTER_PCI (net_i40e, rte_i40e_pmd); +RTE_PMD_REGISTER_PCI (net_i40e, rte_i40e_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_i40e, pci_id_i40e_map);RTE_PMD_REGISTER_KMOD_DEP (net_i40e,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/iavf/iavf_ethdev.c +1 -1
@@ -3194,7 +3194,7 @@ static struct rte_pci_driver rte_iavf_pmd = { .remove = eth_iavf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_iavf, rte_iavf_pmd); +RTE_PMD_REGISTER_PCI (net_iavf, rte_iavf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_iavf, pci_id_iavf_map);RTE_PMD_REGISTER_KMOD_DEP (net_iavf,"* igb_uio | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_iavf,"cap=dcf" );
drivers/net/intel/ice/ice_dcf_ethdev.c +1 -1
@@ -2152,7 +2152,7 @@ static struct rte_pci_driver rte_ice_dcf_pmd = { .remove = eth_ice_dcf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ice_dcf, rte_ice_dcf_pmd); +RTE_PMD_REGISTER_PCI (net_ice_dcf, rte_ice_dcf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ice_dcf, pci_id_ice_dcf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice_dcf,"* igb_uio | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice_dcf,"cap=dcf" );
drivers/net/intel/ice/ice_ethdev.c +1 -1
@@ -7254,7 +7254,7 @@ static struct rte_pci_driver rte_ice_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_ice, rte_ice_pmd); +RTE_PMD_REGISTER_PCI (net_ice, rte_ice_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ice,
drivers/net/intel/idpf/idpf_ethdev.c +1 -1
@@ -1477,7 +1477,7 @@ static struct rte_pci_driver rte_idpf_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd); +RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_idpf, pci_id_idpf_map);RTE_PMD_REGISTER_KMOD_DEP (net_idpf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_idpf,
drivers/net/intel/ipn3ke/ipn3ke_ethdev.c +1 -1
@@ -564,5 +564,5 @@ static struct rte_afu_driver afu_ipn3ke_driver = { .remove = ipn3ke_vswitch_remove, }; -RTE_PMD_REGISTER_AFU (net_ipn3ke_afu, afu_ipn3ke_driver); +RTE_PMD_REGISTER_AFU (net_ipn3ke_afu, afu_ipn3ke_driver, __LINE__);RTE_LOG_REGISTER_DEFAULT (ipn3ke_afu_logtype,NOTICE );
drivers/net/intel/ixgbe/ixgbe_ethdev.c +2 -2
@@ -8607,12 +8607,12 @@ ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev)ixgbe_enable_sec_tx_path_generic (hw); } -RTE_PMD_REGISTER_PCI (net_ixgbe, rte_ixgbe_pmd); +RTE_PMD_REGISTER_PCI (net_ixgbe, rte_ixgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ixgbe, pci_id_ixgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_ixgbe,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ixgbe,IXGBE_DEVARG_FIBER_SDP3_NOT_TX_DISABLE "=<0|1>" ); -RTE_PMD_REGISTER_PCI (net_ixgbe_vf, rte_ixgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_ixgbe_vf, rte_ixgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ixgbe_vf, pci_id_ixgbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ixgbe_vf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ixgbe_vf,
drivers/net/ionic/ionic_dev_pci.c +1 -1
@@ -265,7 +265,7 @@ static struct rte_pci_driver rte_pci_ionic_pmd = { .remove = eth_ionic_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ionic_pci, rte_pci_ionic_pmd); +RTE_PMD_REGISTER_PCI (net_ionic_pci, rte_pci_ionic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ionic_pci, pci_id_ionic_map);RTE_PMD_REGISTER_KMOD_DEP (net_ionic_pci,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ionic_pci,
drivers/net/ionic/ionic_dev_vdev.c +2 -1
@@ -144,4 +144,5 @@ static struct rte_vdev_driver rte_vdev_ionic_pmd = { .remove = eth_ionic_vdev_remove, }; -RTE_PMD_REGISTER_VDEV (net_ionic, rte_vdev_ionic_pmd); +/* Blank line to force unique __LINE__ */ +RTE_PMD_REGISTER_VDEV (net_ionic, rte_vdev_ionic_pmd, __LINE__);
drivers/net/mana/mana.c +1 -1
@@ -1648,7 +1648,7 @@ static struct rte_pci_driver mana_pci_driver = { .drv_flags = RTE_PCI_DRV_INTR_RMV, }; -RTE_PMD_REGISTER_PCI (net_mana, mana_pci_driver); +RTE_PMD_REGISTER_PCI (net_mana, mana_pci_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_mana, mana_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_mana,"* ib_uverbs & mana_ib" );RTE_LOG_REGISTER_SUFFIX (mana_logtype_init, init,NOTICE );
drivers/net/memif/rte_eth_memif.c +1 -1
@@ -2083,7 +2083,7 @@ static struct rte_vdev_driver pmd_memif_drv = { .remove = rte_pmd_memif_remove, }; -RTE_PMD_REGISTER_VDEV (net_memif, pmd_memif_drv); +RTE_PMD_REGISTER_VDEV (net_memif, pmd_memif_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_memif, ETH_MEMIF_ID_ARG "=<int>"
drivers/net/mlx4/mlx4.c +1 -1
@@ -1385,7 +1385,7 @@ RTE_INIT(rte_mlx4_pmd_init)rte_pci_register (&mlx4_driver); } -RTE_PMD_EXPORT_NAME (net_mlx4, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_mlx4, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_mlx4, mlx4_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_mlx4,"* ib_uverbs & mlx4_en & mlx4_core & mlx4_ib" );
drivers/net/mlx5/mlx5.c +1 -1
@@ -3819,6 +3819,6 @@ RTE_INIT(rte_mlx5_pmd_init)mlx5_class_driver_register (&mlx5_net_driver); } -RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_ETH_DRIVER_NAME , mlx5_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_ETH_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/net/mvneta/mvneta_ethdev.c +1 -1
@@ -993,6 +993,6 @@ static struct rte_vdev_driver pmd_mvneta_drv = { .remove = rte_pmd_mvneta_remove, }; -RTE_PMD_REGISTER_VDEV (net_mvneta, pmd_mvneta_drv); +RTE_PMD_REGISTER_VDEV (net_mvneta, pmd_mvneta_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_mvneta,"iface=<ifc>" );RTE_LOG_REGISTER_DEFAULT (mvneta_logtype,NOTICE );
drivers/net/mvpp2/mrvl_ethdev.c +1 -1
@@ -3319,6 +3319,6 @@ static struct rte_vdev_driver pmd_mrvl_drv = { .remove = rte_pmd_mrvl_remove, }; -RTE_PMD_REGISTER_VDEV (net_mvpp2, pmd_mrvl_drv); +RTE_PMD_REGISTER_VDEV (net_mvpp2, pmd_mrvl_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_mvpp2, eth_mvpp2);RTE_LOG_REGISTER_DEFAULT (mrvl_logtype,NOTICE );
drivers/net/netvsc/hn_ethdev.c +1 -1
@@ -1485,7 +1485,7 @@ static struct rte_vmbus_driver rte_netvsc_pmd = { .remove = eth_hn_remove, }; -RTE_PMD_REGISTER_VMBUS (net_netvsc, rte_netvsc_pmd); +RTE_PMD_REGISTER_VMBUS (net_netvsc, rte_netvsc_pmd, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (net_netvsc,"* uio_hv_generic" );RTE_LOG_REGISTER_SUFFIX (hn_logtype_init, init,NOTICE );RTE_LOG_REGISTER_SUFFIX (hn_logtype_driver, driver,NOTICE );
drivers/net/nfb/nfb_ethdev.c +1 -1
@@ -668,7 +668,7 @@ static struct rte_pci_driver nfb_eth_driver = { .remove = nfb_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (RTE_NFB_DRIVER_NAME , nfb_eth_driver); +RTE_PMD_REGISTER_PCI (RTE_NFB_DRIVER_NAME , nfb_eth_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (RTE_NFB_DRIVER_NAME , nfb_pci_id_table);RTE_PMD_REGISTER_KMOD_DEP (RTE_NFB_DRIVER_NAME ,"* nfb" );RTE_LOG_REGISTER_DEFAULT (nfb_logtype,NOTICE );
drivers/net/nfp/nfp_ethdev.c +1 -1
@@ -2904,7 +2904,7 @@ static struct rte_pci_driver rte_nfp_net_pf_pmd = { .remove = eth_nfp_pci_remove, }; -RTE_PMD_REGISTER_PCI (NFP_PF_DRIVER_NAME , rte_nfp_net_pf_pmd); +RTE_PMD_REGISTER_PCI (NFP_PF_DRIVER_NAME , rte_nfp_net_pf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (NFP_PF_DRIVER_NAME , pci_id_nfp_pf_net_map);RTE_PMD_REGISTER_KMOD_DEP (NFP_PF_DRIVER_NAME ,"* igb_uio | uio_pci_generic | vfio" ); RTE_PMD_REGISTER_PARAM_STRING(NFP_PF_DRIVER_NAME,
drivers/net/ngbe/ngbe_ethdev.c +1 -1
@@ -3294,7 +3294,7 @@ static const struct eth_dev_ops ngbe_eth_dev_ops = { .tx_done_cleanup = ngbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_ngbe, rte_ngbe_pmd); +RTE_PMD_REGISTER_PCI (net_ngbe, rte_ngbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ngbe, pci_id_ngbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_ngbe,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/ngbe/ngbe_ethdev_vf.c +1 -1
@@ -1348,6 +1348,6 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = { .tx_done_cleanup = ngbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_ngbe_vf, rte_ngbevf_pmd); +RTE_PMD_REGISTER_PCI (net_ngbe_vf, rte_ngbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ngbe_vf, pci_id_ngbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ngbe_vf,"* igb_uio | vfio-pci" );
drivers/net/ntnic/ntnic_ethdev.c +1 -1
@@ -2547,7 +2547,7 @@ static struct rte_pci_driver rte_nthw_pmd = { .remove = nthw_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ntnic, rte_nthw_pmd); +RTE_PMD_REGISTER_PCI (net_ntnic, rte_nthw_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ntnic, nthw_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_ntnic,"* vfio-pci" );
drivers/net/null/rte_eth_null.c +1 -1
@@ -771,7 +771,7 @@ static struct rte_vdev_driver pmd_null_drv = { .remove = rte_pmd_null_remove, }; -RTE_PMD_REGISTER_VDEV (net_null, pmd_null_drv); +RTE_PMD_REGISTER_VDEV (net_null, pmd_null_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_null, eth_null);RTE_PMD_REGISTER_PARAM_STRING (net_null, "size=<int> "
drivers/net/octeon_ep/otx_ep_ethdev.c +1 -1
@@ -900,7 +900,7 @@ static struct rte_pci_driver rte_otx_ep_pmd = { .remove = otx_ep_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_otx_ep, rte_otx_ep_pmd); +RTE_PMD_REGISTER_PCI (net_otx_ep, rte_otx_ep_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_otx_ep, pci_id_otx_ep_map);RTE_PMD_REGISTER_KMOD_DEP (net_otx_ep,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (otx_net_ep_logtype,NOTICE );
drivers/net/octeontx/base/octeontx_pkivf.c +1 -1
@@ -236,4 +236,4 @@ static struct rte_pci_driver pci_pkivf = { .probe = pkivf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_pkivf, pci_pkivf); +RTE_PMD_REGISTER_PCI (octeontx_pkivf, pci_pkivf, __LINE__);
drivers/net/octeontx/base/octeontx_pkovf.c +1 -1
@@ -637,4 +637,4 @@ static struct rte_pci_driver pci_pkovf = { .probe = pkovf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_pkovf, pci_pkovf); +RTE_PMD_REGISTER_PCI (octeontx_pkovf, pci_pkovf, __LINE__);
drivers/net/octeontx/octeontx_ethdev.c +2 -1
@@ -1899,6 +1899,7 @@ static struct rte_vdev_driver octeontx_pmd_drv = { .remove = octeontx_remove, }; -RTE_PMD_REGISTER_VDEV (OCTEONTX_PMD , octeontx_pmd_drv); +/* Blank line to force unique __LINE__ with RTE_PMD_REGISTER_VDEV */ +RTE_PMD_REGISTER_VDEV (OCTEONTX_PMD , octeontx_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (OCTEONTX_PMD , eth_octeontx);RTE_PMD_REGISTER_PARAM_STRING (OCTEONTX_PMD ,"nr_port=<int> " );
drivers/net/pcap/pcap_ethdev.c +1 -1
@@ -1650,7 +1650,7 @@ static struct rte_vdev_driver pmd_pcap_drv = { .remove = pmd_pcap_remove, }; -RTE_PMD_REGISTER_VDEV (net_pcap, pmd_pcap_drv); +RTE_PMD_REGISTER_VDEV (net_pcap, pmd_pcap_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_pcap, eth_pcap);RTE_PMD_REGISTER_PARAM_STRING (net_pcap, ETH_PCAP_RX_PCAP_ARG "=<string> "
drivers/net/pfe/pfe_ethdev.c +1 -1
@@ -1145,6 +1145,6 @@ struct rte_vdev_driver pmd_pfe_drv = { .remove = pmd_pfe_remove, }; -RTE_PMD_REGISTER_VDEV (PFE_NAME_PMD , pmd_pfe_drv); +RTE_PMD_REGISTER_VDEV (PFE_NAME_PMD , pmd_pfe_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (PFE_NAME_PMD ,PFE_VDEV_GEM_ID_ARG "=<int> " );RTE_LOG_REGISTER_DEFAULT (pfe_logtype_pmd,NOTICE );
drivers/net/qede/qede_ethdev.c +2 -2
@@ -2870,10 +2870,10 @@ static struct rte_pci_driver rte_qede_pmd = { .remove = qede_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_qede, rte_qede_pmd); +RTE_PMD_REGISTER_PCI (net_qede, rte_qede_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_qede, pci_id_qede_map);RTE_PMD_REGISTER_KMOD_DEP (net_qede,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_qede_vf, rte_qedevf_pmd); +RTE_PMD_REGISTER_PCI (net_qede_vf, rte_qedevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_qede_vf, pci_id_qedevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_qede_vf,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (qede_logtype_init, init,NOTICE );
drivers/net/r8169/r8169_ethdev.c +1 -1
@@ -778,7 +778,7 @@ static struct rte_pci_driver rte_r8169_pmd = { .remove = rtl_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_r8169, rte_r8169_pmd); +RTE_PMD_REGISTER_PCI (net_r8169, rte_r8169_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_r8169, pci_id_r8169_map);RTE_PMD_REGISTER_KMOD_DEP (net_r8169,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/ring/rte_eth_ring.c +1 -1
@@ -823,7 +823,7 @@ static struct rte_vdev_driver pmd_ring_drv = { .remove = rte_pmd_ring_remove, }; -RTE_PMD_REGISTER_VDEV (net_ring, pmd_ring_drv); +RTE_PMD_REGISTER_VDEV (net_ring, pmd_ring_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_ring, eth_ring);RTE_PMD_REGISTER_PARAM_STRING (net_ring,ETH_RING_NUMA_NODE_ACTION_ARG "=name:node:action(ATTACH|CREATE)" );
drivers/net/sfc/sfc_ethdev.c +1 -1
@@ -3614,7 +3614,7 @@ static struct rte_pci_driver sfc_efx_pmd = { .remove = sfc_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_sfc_efx, sfc_efx_pmd); +RTE_PMD_REGISTER_PCI (net_sfc_efx, sfc_efx_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_sfc_efx, pci_id_sfc_efx_map);RTE_PMD_REGISTER_KMOD_DEP (net_sfc_efx,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx,
drivers/net/softnic/rte_eth_softnic.c +1 -1
@@ -510,7 +510,7 @@ static struct rte_vdev_driver pmd_softnic_drv = { .remove = pmd_remove, }; -RTE_PMD_REGISTER_VDEV (net_softnic, pmd_softnic_drv); +RTE_PMD_REGISTER_VDEV (net_softnic, pmd_softnic_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_softnic,PMD_PARAM_FIRMWARE "=<string> " PMD_PARAM_CONN_PORT "=<uint16> "
drivers/net/tap/rte_eth_tap.c +2 -2
@@ -2565,8 +2565,8 @@ static struct rte_vdev_driver pmd_tap_drv = { .remove = rte_pmd_tap_remove, }; -RTE_PMD_REGISTER_VDEV (net_tap, pmd_tap_drv); -RTE_PMD_REGISTER_VDEV (net_tun, pmd_tun_drv); +RTE_PMD_REGISTER_VDEV (net_tap, pmd_tap_drv, __LINE__); +RTE_PMD_REGISTER_VDEV (net_tun, pmd_tun_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_tap, eth_tap);RTE_PMD_REGISTER_PARAM_STRING (net_tun,ETH_TAP_IFACE_ARG "=<string> " );
drivers/net/thunderx/nicvf_ethdev.c +1 -1
@@ -2409,7 +2409,7 @@ static struct rte_pci_driver rte_nicvf_pmd = { .remove = nicvf_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_thunderx, rte_nicvf_pmd); +RTE_PMD_REGISTER_PCI (net_thunderx, rte_nicvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_thunderx, pci_id_nicvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_thunderx,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_thunderx,SKIP_DATA_BYTES "=<int>" );
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -5665,7 +5665,7 @@ static const struct eth_dev_ops txgbe_eth_dev_ops = { .tx_done_cleanup = txgbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_txgbe, rte_txgbe_pmd); +RTE_PMD_REGISTER_PCI (net_txgbe, rte_txgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_txgbe, pci_id_txgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_txgbe,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_txgbe,
drivers/net/txgbe/txgbe_ethdev_vf.c +1 -1
@@ -1387,6 +1387,6 @@ static const struct eth_dev_ops txgbevf_eth_dev_ops = { .tx_done_cleanup = txgbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_txgbe_vf, rte_txgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_txgbe_vf, rte_txgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_txgbe_vf, pci_id_txgbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_txgbe_vf,"* igb_uio | vfio-pci" );
drivers/net/vdev_netvsc/vdev_netvsc.c +1 -1
@@ -760,7 +760,7 @@ static struct rte_vdev_driver vdev_netvsc_vdev = { .remove = vdev_netvsc_vdev_remove, }; -RTE_PMD_REGISTER_VDEV (VDEV_NETVSC_DRIVER , vdev_netvsc_vdev); +RTE_PMD_REGISTER_VDEV (VDEV_NETVSC_DRIVER , vdev_netvsc_vdev, __LINE__);RTE_PMD_REGISTER_ALIAS (VDEV_NETVSC_DRIVER , eth_vdev_netvsc);RTE_PMD_REGISTER_PARAM_STRING (net_vdev_netvsc, VDEV_NETVSC_ARG_IFACE "=<string> "
drivers/net/vhost/rte_eth_vhost.c +1 -1
@@ -1772,7 +1772,7 @@ static struct rte_vdev_driver pmd_vhost_drv = { .remove = rte_pmd_vhost_remove, }; -RTE_PMD_REGISTER_VDEV (net_vhost, pmd_vhost_drv); +RTE_PMD_REGISTER_VDEV (net_vhost, pmd_vhost_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_vhost, eth_vhost);RTE_PMD_REGISTER_PARAM_STRING (net_vhost, "iface=<ifc> "
drivers/net/virtio/virtio_pci_ethdev.c +1 -1
@@ -239,4 +239,4 @@ RTE_INIT(rte_virtio_net_pci_pmd_init)RTE_PMD_REGISTER_PCI_TABLE (net_virtio, pci_id_virtio_map);RTE_PMD_REGISTER_KMOD_DEP (net_virtio,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_EXPORT_NAME (net_virtio, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_virtio, __LINE__);
drivers/net/virtio/virtio_user_ethdev.c +1 -1
@@ -811,7 +811,7 @@ static struct rte_vdev_driver virtio_user_driver = { .dma_unmap = virtio_user_pmd_dma_unmap, }; -RTE_PMD_REGISTER_VDEV (net_virtio_user, virtio_user_driver); +RTE_PMD_REGISTER_VDEV (net_virtio_user, virtio_user_driver, __LINE__);RTE_PMD_REGISTER_ALIAS (net_virtio_user, virtio_user);RTE_PMD_REGISTER_PARAM_STRING (net_virtio_user, "path=<path> "
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -1
@@ -1966,7 +1966,7 @@ vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)return 0 ; } -RTE_PMD_REGISTER_PCI (net_vmxnet3, rte_vmxnet3_pmd); +RTE_PMD_REGISTER_PCI (net_vmxnet3, rte_vmxnet3_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_vmxnet3, pci_id_vmxnet3_map);RTE_PMD_REGISTER_KMOD_DEP (net_vmxnet3,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (vmxnet3_logtype_init, init,NOTICE );
drivers/net/xsc/xsc_ethdev.c +1 -1
@@ -919,7 +919,7 @@ static struct rte_pci_driver xsc_ethdev_pci_driver = { .remove = xsc_ethdev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_xsc, xsc_ethdev_pci_driver); +RTE_PMD_REGISTER_PCI (net_xsc, xsc_ethdev_pci_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_xsc, xsc_ethdev_pci_id_map);RTE_PMD_REGISTER_PARAM_STRING (net_xsc, XSC_PPH_MODE_ARG "=<x>"
drivers/net/zxdh/zxdh_ethdev.c +1 -1
@@ -2051,7 +2051,7 @@ static struct rte_pci_driver zxdh_pmd = { .remove = zxdh_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_zxdh, zxdh_pmd); +RTE_PMD_REGISTER_PCI (net_zxdh, zxdh_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_zxdh, pci_id_zxdh_map);RTE_PMD_REGISTER_KMOD_DEP (net_zxdh,"* vfio-pci" );RTE_LOG_REGISTER_SUFFIX (zxdh_logtype_driver, driver,NOTICE );
drivers/raw/cnxk_bphy/cnxk_bphy.c +1 -1
@@ -406,7 +406,7 @@ static struct rte_pci_driver cnxk_bphy_rawdev_pmd = { .remove = bphy_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd); +RTE_PMD_REGISTER_PCI (bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (bphy_rawdev_pci_driver, pci_bphy_map);RTE_PMD_REGISTER_KMOD_DEP (bphy_rawdev_pci_driver,"vfio-pci" );RTE_LOG_REGISTER_SUFFIX (cnxk_logtype_bphy, bphy,INFO );
drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c +1 -1
@@ -379,6 +379,6 @@ static struct rte_pci_driver bphy_cgx_rawdev_pmd = { .remove = cnxk_bphy_cgx_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_bphy_cgx_rawdev_pci_driver, bphy_cgx_rawdev_pmd); +RTE_PMD_REGISTER_PCI (cnxk_bphy_cgx_rawdev_pci_driver, bphy_cgx_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_bphy_cgx_rawdev_pci_driver, cnxk_bphy_cgx_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_bphy_cgx_rawdev_pci_driver,"vfio-pci" );
drivers/raw/cnxk_gpio/cnxk_gpio.c +1 -1
@@ -847,7 +847,7 @@ static struct rte_vdev_driver cnxk_gpio_drv = { .remove = cnxk_gpio_remove, }; -RTE_PMD_REGISTER_VDEV (cnxk_gpio, cnxk_gpio_drv); +RTE_PMD_REGISTER_VDEV (cnxk_gpio, cnxk_gpio_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (cnxk_gpio,"gpiochip=<int> " "allowlist=<list>" );
drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c +1 -1
@@ -267,7 +267,7 @@ static struct rte_pci_driver cnxk_rvu_lf_rawdev_pmd = { .remove = rvu_lf_remove, }; -RTE_PMD_REGISTER_PCI (rvu_lf_rawdev_pci_driver, cnxk_rvu_lf_rawdev_pmd); +RTE_PMD_REGISTER_PCI (rvu_lf_rawdev_pci_driver, cnxk_rvu_lf_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (rvu_lf_rawdev_pci_driver, pci_rvu_lf_map);RTE_PMD_REGISTER_KMOD_DEP (rvu_lf_rawdev_pci_driver,"vfio-pci" );RTE_LOG_REGISTER_SUFFIX (cnxk_logtype_rvu_lf, rvu_lf,INFO );
drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c +1 -1
@@ -287,5 +287,5 @@ static struct rte_vdev_driver dpaa2_cmdif_drv = { .remove = dpaa2_cmdif_remove }; -RTE_PMD_REGISTER_VDEV (DPAA2_CMDIF_PMD_NAME , dpaa2_cmdif_drv); +RTE_PMD_REGISTER_VDEV (DPAA2_CMDIF_PMD_NAME , dpaa2_cmdif_drv, __LINE__);RTE_LOG_REGISTER (dpaa2_cmdif_logtype, pmd.raw.dpaa2.cmdif,INFO );
drivers/raw/gdtc/gdtc_rawdev.c +1 -1
@@ -913,6 +913,6 @@ static struct rte_pci_driver zxdh_gdma_rawdev_pmd = { .remove = zxdh_gdma_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_pmd); +RTE_PMD_REGISTER_PCI (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_map);RTE_LOG_REGISTER_DEFAULT (zxdh_gdma_rawdev_logtype,NOTICE );
drivers/raw/ifpga/afu_pmd_core.c +1 -1
@@ -391,7 +391,7 @@ static struct rte_afu_driver afu_pmd = { .remove = afu_rawdev_remove }; -RTE_PMD_REGISTER_AFU (afu_rawdev_driver, afu_pmd); +RTE_PMD_REGISTER_AFU (afu_rawdev_driver, afu_pmd, __LINE__);static void update_uuid_map (void ) {
drivers/raw/ifpga/ifpga_rawdev.c +2 -2
@@ -1687,7 +1687,7 @@ static struct rte_pci_driver rte_ifpga_rawdev_pmd = { .remove = ifpga_rawdev_pci_remove, }; -RTE_PMD_REGISTER_PCI (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd); +RTE_PMD_REGISTER_PCI (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);RTE_PMD_REGISTER_KMOD_DEP (ifpga_rawdev_pci_driver,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (ifpga_rawdev_logtype,NOTICE );
@@ -1897,7 +1897,7 @@ static struct rte_vdev_driver ifpga_cfg_driver = { .remove = ifpga_cfg_remove, }; -RTE_PMD_REGISTER_VDEV (ifpga_rawdev_cfg, ifpga_cfg_driver); +RTE_PMD_REGISTER_VDEV (ifpga_rawdev_cfg, ifpga_cfg_driver, __LINE__);RTE_PMD_REGISTER_ALIAS (ifpga_rawdev_cfg, ifpga_cfg);RTE_PMD_REGISTER_PARAM_STRING (ifpga_rawdev_cfg, "ifpga=<string> "
drivers/raw/ntb/ntb.c +1 -1
@@ -1550,7 +1550,7 @@ static struct rte_pci_driver rte_ntb_pmd = { .remove = ntb_remove, }; -RTE_PMD_REGISTER_PCI (raw_ntb, rte_ntb_pmd); +RTE_PMD_REGISTER_PCI (raw_ntb, rte_ntb_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (raw_ntb, pci_id_ntb_map);RTE_PMD_REGISTER_KMOD_DEP (raw_ntb,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (ntb_logtype,INFO );
drivers/raw/skeleton/skeleton_rawdev.c +1 -1
@@ -774,5 +774,5 @@ static struct rte_vdev_driver skeleton_pmd_drv = { .remove = skeleton_rawdev_remove }; -RTE_PMD_REGISTER_VDEV (SKELETON_PMD_RAWDEV_NAME , skeleton_pmd_drv); +RTE_PMD_REGISTER_VDEV (SKELETON_PMD_RAWDEV_NAME , skeleton_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (skeleton_pmd_logtype,INFO );
drivers/regex/cn9k/cn9k_regexdev.c +1 -1
@@ -930,5 +930,5 @@ static struct rte_pci_driver cn9k_regexdev_pmd = { }; -RTE_PMD_REGISTER_PCI (REGEXDEV_NAME_CN9K_PMD , cn9k_regexdev_pmd); +RTE_PMD_REGISTER_PCI (REGEXDEV_NAME_CN9K_PMD , cn9k_regexdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (REGEXDEV_NAME_CN9K_PMD , pci_id_ree_table);
drivers/regex/mlx5/mlx5_regex.c +1 -1
@@ -183,6 +183,6 @@ RTE_INIT(rte_mlx5_regex_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_regex_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_REGEX_DRIVER_NAME , mlx5_regex_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_REGEX_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/vdpa/ifc/ifcvf_vdpa.c +1 -1
@@ -1886,6 +1886,6 @@ static struct rte_pci_driver rte_ifcvf_vdpa = { .remove = ifcvf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ifcvf, rte_ifcvf_vdpa); +RTE_PMD_REGISTER_PCI (net_ifcvf, rte_ifcvf_vdpa, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ifcvf, pci_id_ifcvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ifcvf,"* vfio-pci" );
drivers/vdpa/mlx5/mlx5_vdpa.c +1 -1
@@ -1003,6 +1003,6 @@ RTE_INIT(rte_mlx5_vdpa_init)mlx5_class_driver_register (&mlx5_vdpa_driver); } -RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_VDPA_DRIVER_NAME , mlx5_vdpa_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_VDPA_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/vdpa/sfc/sfc_vdpa.c +1 -1
@@ -358,7 +358,7 @@ static struct rte_pci_driver rte_sfc_vdpa = { .remove = sfc_vdpa_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_sfc_vdpa, rte_sfc_vdpa); +RTE_PMD_REGISTER_PCI (net_sfc_vdpa, rte_sfc_vdpa, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);RTE_PMD_REGISTER_KMOD_DEP (net_sfc_vdpa,"* vfio-pci" );RTE_LOG_REGISTER_SUFFIX (sfc_vdpa_logtype_driver, driver,NOTICE );
lib/eal/include/rte_dev.h +5 -9
@@ -232,21 +232,18 @@ int rte_dev_remove(struct rte_device *dev);*/ typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const void *data); -#define RTE_PMD_EXPORT_NAME_ARRAY (n, idx) n##idx[] +#define RTE_PMD_COMPOST_NAME (n, idx) n##idx#define RTE_PMD_EXPORT_NAME (name, idx) \ -static const char RTE_PMD_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ -__rte_used = RTE_STR(name) +RTE_INCLUDE(const char, RTE_PMD_COMPOST_NAME(this_pmd_name, idx))[] = RTE_STR(name)#define DRV_EXP_TAG (name, tag) __##name##_##tag#define RTE_PMD_REGISTER_PCI_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, pci_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, pci_tbl_export))[] = RTE_STR(table)#define RTE_PMD_REGISTER_PARAM_STRING (name, str) \ -static const char DRV_EXP_TAG(name, param_string_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, param_string_export))[] = str/** * Advertise the list of kernel modules required to run this driver
@@ -270,8 +267,7 @@ __rte_used = str* - "* igb_uio | uio_pci_generic | vfio" */ #define RTE_PMD_REGISTER_KMOD_DEP (name, str) \ -static const char DRV_EXP_TAG(name, kmod_dep_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, kmod_dep_export))[] = str/** * Iteration context.
Signature · 1 line
2.49.0.vfs.0.0
Re: [PATCH v2 4/4] drivers: use macro to embed information in binaries
drivers/baseband/acc/rte_acc100_pmd.c static struct rte_pci_driver acc100_pci_vf_driver = { · line 4085
Quoted 10 lines · On Mon, 14 Apr 2025 18:21:36 -0700 Andre Muezerie…
drivers/baseband/acc/rte_acc100_pmd.c +1
-1@@ -4082,9 +4082,9 @@ static struct rte_pci_driver acc100_pci_vf_driver = { .drv_flags = RTE_PCI_DRV_NEED_MAPPING }; -RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver); +RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver, __LINE__);
Rather than changing so many drivers, can't you just use __LINE__ in the macro?
Re: [PATCH v2 4/4] drivers: use macro to embed information in binaries
Quoted 11 lines · Stephen Hemminger
Quoted 8 lines · On Mon, 14 Apr 2025 18:21:36 -0700 Andre Muezerie…
drivers/baseband/acc/rte_acc100_pmd.c +0
-0@@ -4082,9 +4082,9 @@ static struct rte_pci_driver acc100_pci_vf_driver = { .drv_flags = RTE_PCI_DRV_NEED_MAPPING };
Quoted 4 lines
drivers/baseband/acc/rte_acc100_pmd.c static struct rte_pci_driver acc100_pci_vf_driver = { · line 4085
Quoted 2 lines
drivers/baseband/acc/rte_acc100_pmd.c +1
-1-RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver); +RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver, __LINE__);Rather than changing so many drivers, can't you just use
__LINE__in the macro?
Yes, that's possible, and would be better. I sent out a V4 with these changes.
v3 cover allow pmdinfo to be inserted and parsed using MSVC
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead. However, when __COUNTER__ was used directly from a header file, __LINE__ had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the __LINE__ could be passed from the .c file to the macro defined in the header (which was originally using __COUNTER__).
With this patchset commands like the one below provide the same JSON output as would be obtained on Linux.
python usertools\dpdk-pmdinfo.py build\app\dpdk-testpmd.exe
v3:
- ge-pmdinfo-cfile.py: fixed archiver's syntax to extract object from library
- dpdk-pmdinfo.py: removed is_windows() and replaced with os.name == "nt"
v2:
- dpdk-pmdinfo.py: not importing elftools on Windows
- not requiring "pefile" Python module during build
- gen-pmdinfo-cfile.py: renamed "ar" to "archiver"
Andre Muezerie (4):
eal: add macro to embed information in binaries
buildtools: use macro to embed information in binaries
usertools: parse strings from PE images
drivers: use macro to embed information in binaries
buildtools/gen-pmdinfo-cfile.py | 24 +++++++-- buildtools/meson.build | 4 +- buildtools/pmdinfogen.py | 11 ++-- drivers/baseband/acc/rte_acc100_pmd.c | 4 +- drivers/baseband/acc/rte_vrb_pmd.c | 4 +- .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 4 +- drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 4 +- drivers/baseband/la12xx/bbdev_la12xx.c | 2 +- drivers/baseband/null/bbdev_null.c | 2 +- .../baseband/turbo_sw/bbdev_turbo_software.c | 2 +- drivers/bus/auxiliary/bus_auxiliary_driver.h | 4 +- drivers/bus/cdx/bus_cdx_driver.h | 7 ++- drivers/bus/dpaa/bus_dpaa_driver.h | 4 +- drivers/bus/fslmc/bus_fslmc_driver.h | 8 +-- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 2 +- drivers/bus/ifpga/bus_ifpga_driver.h | 4 +- drivers/bus/pci/bus_pci_driver.h | 4 +- drivers/bus/platform/bus_platform_driver.h | 4 +- drivers/bus/uacce/bus_uacce_driver.h | 4 +- drivers/bus/vdev/bus_vdev_driver.h | 4 +- drivers/bus/vmbus/bus_vmbus_driver.h | 4 +- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 2 +- drivers/common/qat/qat_device.c | 2 +- drivers/common/zsda/zsda_device.c | 2 +- drivers/compress/isal/isal_compress_pmd.c | 2 +- drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 2 +- drivers/compress/uadk/uadk_compress_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd.c | 2 +- drivers/crypto/armv8/rte_armv8_pmd.c | 2 +- drivers/crypto/bcmfs/bcmfs_device.c | 3 +- drivers/crypto/caam_jr/caam_jr.c | 2 +- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- drivers/crypto/ionic/ionic_crypto_vdev.c | 2 +- drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 3 +- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 3 +- drivers/crypto/ipsec_mb/pmd_chacha_poly.c | 3 +- drivers/crypto/ipsec_mb/pmd_kasumi.c | 2 +- drivers/crypto/ipsec_mb/pmd_snow3g.c | 2 +- drivers/crypto/ipsec_mb/pmd_zuc.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +- drivers/crypto/null/null_crypto_pmd.c | 2 +- drivers/crypto/octeontx/otx_cryptodev.c | 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 3 +- drivers/crypto/scheduler/scheduler_pmd.c | 3 +- drivers/crypto/uadk/uadk_crypto_pmd.c | 2 +- drivers/crypto/virtio/virtio_cryptodev.c | 2 +- drivers/crypto/virtio/virtio_user_cryptodev.c | 2 +- drivers/dma/cnxk/cnxk_dmadev.c | 2 +- drivers/dma/dpaa/dpaa_qdma.c | 2 +- drivers/dma/dpaa2/dpaa2_qdma.c | 2 +- drivers/dma/hisilicon/hisi_dmadev.c | 2 +- drivers/dma/idxd/idxd_pci.c | 2 +- drivers/dma/ioat/ioat_dmadev.c | 2 +- drivers/dma/odm/odm_dmadev.c | 2 +- drivers/dma/skeleton/skeleton_dmadev.c | 2 +- drivers/event/cnxk/cn10k_eventdev.c | 2 +- drivers/event/cnxk/cn20k_eventdev.c | 2 +- drivers/event/cnxk/cn9k_eventdev.c | 2 +- drivers/event/dlb2/pf/dlb2_pf.c | 4 +- drivers/event/dpaa/dpaa_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +- drivers/event/dsw/dsw_evdev.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 3 +- drivers/event/octeontx/ssovf_probe.c | 4 +- drivers/event/octeontx/timvf_probe.c | 2 +- drivers/event/opdl/opdl_evdev.c | 2 +- drivers/event/skeleton/skeleton_eventdev.c | 4 +- drivers/event/sw/sw_evdev.c | 2 +- drivers/gpu/cuda/cuda.c | 2 +- drivers/mempool/cnxk/cnxk_mempool.c | 2 +- drivers/mempool/octeontx/octeontx_fpavf.c | 2 +- drivers/ml/cnxk/cn10k_ml_dev.c | 2 +- drivers/ml/cnxk/mvtvm_ml_dev.c | 2 +- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- drivers/net/ark/ark_ethdev.c | 2 +- drivers/net/atlantic/atl_ethdev.c | 2 +- drivers/net/avp/avp_ethdev.c | 2 +- drivers/net/axgbe/axgbe_ethdev.c | 2 +- drivers/net/bnx2x/bnx2x_ethdev.c | 5 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/cnxk/cn10k_ethdev.c | 2 +- drivers/net/cnxk/cn20k_ethdev.c | 2 +- drivers/net/cnxk/cn9k_ethdev.c | 2 +- drivers/net/cnxk/cnxk_eswitch.c | 2 +- drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c | 2 +- drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_mux.c | 2 +- drivers/net/dpaa2/dpaa2_ptp.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enetc/enetc_ethdev.c | 2 +- drivers/net/enetfec/enet_ethdev.c | 2 +- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/gve/gve_ethdev.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/intel/cpfl/cpfl_ethdev.c | 2 +- drivers/net/intel/e1000/em_ethdev.c | 2 +- drivers/net/intel/e1000/igb_ethdev.c | 4 +- drivers/net/intel/e1000/igc_ethdev.c | 2 +- drivers/net/intel/fm10k/fm10k_ethdev.c | 2 +- drivers/net/intel/i40e/i40e_ethdev.c | 2 +- drivers/net/intel/iavf/iavf_ethdev.c | 2 +- drivers/net/intel/ice/ice_dcf_ethdev.c | 2 +- drivers/net/intel/ice/ice_ethdev.c | 2 +- drivers/net/intel/idpf/idpf_ethdev.c | 2 +- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 2 +- drivers/net/intel/ixgbe/ixgbe_ethdev.c | 4 +- drivers/net/ionic/ionic_dev_pci.c | 2 +- drivers/net/ionic/ionic_dev_vdev.c | 3 +- drivers/net/mana/mana.c | 2 +- drivers/net/memif/rte_eth_memif.c | 2 +- drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.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/nfb/nfb_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev_vf.c | 2 +- drivers/net/ntnic/ntnic_ethdev.c | 2 +- drivers/net/null/rte_eth_null.c | 2 +- drivers/net/octeon_ep/otx_ep_ethdev.c | 2 +- drivers/net/octeontx/base/octeontx_pkivf.c | 2 +- drivers/net/octeontx/base/octeontx_pkovf.c | 2 +- drivers/net/octeontx/octeontx_ethdev.c | 3 +- drivers/net/pcap/pcap_ethdev.c | 2 +- drivers/net/pfe/pfe_ethdev.c | 2 +- drivers/net/qede/qede_ethdev.c | 4 +- drivers/net/r8169/r8169_ethdev.c | 2 +- drivers/net/ring/rte_eth_ring.c | 2 +- drivers/net/sfc/sfc_ethdev.c | 2 +- drivers/net/softnic/rte_eth_softnic.c | 2 +- drivers/net/tap/rte_eth_tap.c | 4 +- drivers/net/thunderx/nicvf_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +- drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +- drivers/net/vhost/rte_eth_vhost.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/net/virtio/virtio_user_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/xsc/xsc_ethdev.c | 2 +- drivers/net/zxdh/zxdh_ethdev.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +- drivers/raw/cnxk_gpio/cnxk_gpio.c | 2 +- drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c | 2 +- drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 2 +- drivers/raw/gdtc/gdtc_rawdev.c | 2 +- drivers/raw/ifpga/afu_pmd_core.c | 2 +- drivers/raw/ifpga/ifpga_rawdev.c | 4 +- drivers/raw/ntb/ntb.c | 2 +- drivers/raw/skeleton/skeleton_rawdev.c | 2 +- drivers/regex/cn9k/cn9k_regexdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- drivers/vdpa/sfc/sfc_vdpa.c | 2 +- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 +++ lib/eal/include/rte_dev.h | 14 ++--- usertools/dpdk-pmdinfo.py | 53 +++++++++++++++---- 182 files changed, 289 insertions(+), 238 deletions(-)
--
2.49.0.vfs.0.0
PATCH v3 1/4 eal: add macro to embed information in binaries
DPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
To assimilate these requirements/restrictions, macro RTE_INCLUDE is introduced in this patch.
--- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
lib/eal/common/eal_common_options.c +1 -1
@@ -135,7 +135,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;* Note: PLEASE DO NOT ALTER THIS without making a corresponding * change to usertools/dpdk-pmdinfo.py */ -static const char dpdk_solib_path[] __rte_used = +RTE_INCLUDE(const char, dpdk_solib_path)[] ="DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH ;TAILQ_HEAD (device_option_list, device_option);
lib/eal/include/rte_common.h +6 -0
@@ -231,6 +231,12 @@ typedef uint16_t unaligned_uint16_t;/** * Force symbol to be generated even if it appears to be unused. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_INCLUDE (type, name) __pragma(comment(linker, "/include:" RTE_STR(name))) type name +#else +#define RTE_INCLUDE (type, name) __attribute__((used)) type name +#endif +#ifdef RTE_TOOLCHAIN_MSVC #define __rte_used#else
Signature · 1 line
2.49.0.vfs.0.0
PATCH v3 2/4 buildtools: use macro to embed information in binaries
In reply to Andre MuezerieThe archiver tool from the MSVC toolset is lib.exe. It has different parameters then it's GNU counterpart "ar".
buildtools\meson.build was updated to use lib.exe when MSVC compiler is used. This is to allow the code to be built without requiring GNU "ar" to be installed in that scenario.
Script gen-pmdinfo-cfile.py was updated to use the correct parameters when using lib.exe.
--- buildtools/gen-pmdinfo-cfile.py | 24 +++++++++++++++++++----- buildtools/meson.build | 4 +++- buildtools/pmdinfogen.py | 11 ++++++----- 3 files changed, 28 insertions(+), 11 deletions(-)
buildtools/gen-pmdinfo-cfile.py +19 -5
@@ -7,15 +7,29 @@ import sys import tempfile -_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv +_, tmp_root, archiver, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, - check=True).stdout.decode().splitlines(): + if archiver == "lib": + archiver_options = ["/LIST", "/NOLOGO"] + else: + archiver_options = ["t"] + for name in ( + subprocess.run( + [archiver] + archiver_options + [archive], + stdout=subprocess.PIPE, + check=True, + ) + .stdout.decode() + .splitlines() + ): if os.path.exists(name): paths.append(name) else: - subprocess.run([ar, "x", os.path.abspath(archive), name], - check=True, cwd=temp) + if archiver == "lib": + run_args = [archiver, f"/EXTRACT:{name}", os.path.abspath(archive)] + else: + run_args = [archiver, "x", os.path.abspath(archive), name] + subprocess.run(run_args, check=True, cwd=temp) paths.append(os.path.join(temp, name)) subprocess.run(pmdinfogen + paths + [output], check=True)
buildtools/meson.build +3 -1
@@ -37,7 +37,9 @@ install_data([ pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()] pmdinfogen = py3 + files('pmdinfogen.py') if host_machine.system() == 'windows' - if cc.get_id() == 'gcc' + if cc.get_id() == 'msvc' + pmdinfo += 'lib' + elif cc.get_id() == 'gcc' pmdinfo += 'ar' else pmdinfo += 'llvm-ar'
buildtools/pmdinfogen.py +6 -5
@@ -87,7 +87,7 @@ def get_value(self, offset, size): @property def string_value(self): value = self._symbol.get_value(0) - return coff.decode_asciiz(value) if value else '' + return coff.decode_asciiz(value) if value else "" class COFFImage:
@@ -192,7 +192,7 @@ def dump(self, file): dumped = json.dumps(self.__dict__) escaped = dumped.replace('"', '\\"') print( - 'const char %s_pmd_info[] __attribute__((used)) = "PMD_INFO_STRING= %s";' + 'RTE_INCLUDE(const char, %s_pmd_info)[] = "PMD_INFO_STRING= %s";' % (self.name, escaped), file=file, )
@@ -215,7 +215,7 @@ def parse_args(): parser = argparse.ArgumentParser() parser.add_argument("format", help="object file format, 'elf' or 'coff'") parser.add_argument( - "input", nargs='+', help="input object file path or '-' for stdin" + "input", nargs="+", help="input object file path or '-' for stdin" ) parser.add_argument("output", help="output C file path or '-' for stdout") return parser.parse_args()
@@ -252,13 +252,14 @@ def open_output(path): def write_header(output): output.write( - "static __attribute__((unused)) const char *generator = \"%s\";\n" % sys.argv[0] + "#include <rte_common.h>\n" + 'static __rte_unused const char *generator = "%s";\n' % sys.argv[0] ) def main(): args = parse_args() - if args.input.count('-') > 1: + if args.input.count("-") > 1: raise Exception("'-' input cannot be used multiple times") if args.format == "elf" and "ELFFile" not in globals(): raise Exception("elftools module not found")
Signature · 1 line
2.49.0.vfs.0.0
PATCH v3 3/4 usertools: parse strings from PE images
In reply to Andre MuezerieScript usertools\dpdk-pmdinfo.py was enhanced to also be able to parse symbols from sections in PE images.
--- usertools/dpdk-pmdinfo.py | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-)
usertools/dpdk-pmdinfo.py +43 -10
@@ -37,8 +37,11 @@ from pathlib import Path from typing import Iterable, Iterator, List, Union -import elftools -from elftools.elf.elffile import ELFError, ELFFile +if os.name == "nt": + import pefile +else: + import elftools + from elftools.elf.elffile import ELFError, ELFFile # ----------------------------------------------------------------------------
@@ -114,18 +117,23 @@ def parse_pmdinfo(paths: Iterable[Path], search_plugins: bool) -> List[dict]: A list of DPDK drivers info dictionaries. """ binaries = set(paths) - for p in paths: - binaries.update(get_needed_libs(p)) - if search_plugins: - # cast to list to avoid errors with update while iterating - binaries.update(list(get_plugin_libs(binaries))) + + if os.name == "nt": + section_name = ".rdata" + else: + section_name = ".rodata" + for p in paths: + binaries.update(get_needed_libs(p)) + if search_plugins: + # cast to list to avoid errors with update while iterating + binaries.update(list(get_plugin_libs(binaries))) drivers = [] for b in binaries: logging.debug("analyzing %s", b) try: - for s in get_elf_strings(b, ".rodata", "PMD_INFO_STRING="): + for s in get_section_strings(b, section_name, "PMD_INFO_STRING="): try: info = json.loads(s) scrub_pci_ids(info)
@@ -214,7 +222,7 @@ def find_strings(buf: bytes, prefix: str) -> Iterator[str]: # end of string s = view[start:i].tobytes().decode("ascii") if s.startswith(prefix): - yield s[len(prefix):] + yield s[len(prefix) :] # There can be byte sequences where a non-printable byte # follows a printable one. Ignore that. start = None
@@ -233,7 +241,8 @@ def elftools_version(): return (int(match[1]), int(match[2])) -ELFTOOLS_VERSION = elftools_version() +if os.name != "nt": + ELFTOOLS_VERSION = elftools_version() def from_elftools(s: Union[bytes, str]) -> str:
@@ -269,6 +278,30 @@ def get_elf_strings(path: Path, section: str, prefix: str) -> Iterator[str]: yield from find_strings(sec.data(), prefix) +# ---------------------------------------------------------------------------- +def get_pe_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named PE section in a file. + """ + pe = pefile.PE(path) + for sec in pe.sections: + section_name = sec.Name.decode().strip("\x00") + if section_name != section: + continue + yield from find_strings(sec.get_data(), prefix) + + +# ---------------------------------------------------------------------------- +def get_section_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named section in an ELF or PE file. + """ + if os.name == "nt": + yield from get_pe_strings(path, section, prefix) + else: + yield from get_elf_strings(path, section, prefix) + + # ---------------------------------------------------------------------------- LDD_LIB_RE = re.compile( r"""
Signature · 1 line
2.49.0.vfs.0.0
PATCH v3 4/4 drivers: use macro to embed information in binaries
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead. However, when __COUNTER__ was used directly from a header file, __LINE__ had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the __LINE__ could be passed from the .c file to the macro defined in the header (which was originally using __COUNTER__).
--- drivers/baseband/acc/rte_acc100_pmd.c | 4 ++-- drivers/baseband/acc/rte_vrb_pmd.c | 4 ++-- drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 4 ++-- drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 4 ++-- drivers/baseband/la12xx/bbdev_la12xx.c | 2 +- drivers/baseband/null/bbdev_null.c | 2 +- drivers/baseband/turbo_sw/bbdev_turbo_software.c | 2 +- drivers/bus/auxiliary/bus_auxiliary_driver.h | 4 ++-- drivers/bus/cdx/bus_cdx_driver.h | 7 +++---- drivers/bus/dpaa/bus_dpaa_driver.h | 4 ++-- drivers/bus/fslmc/bus_fslmc_driver.h | 8 ++++---- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dprc.c | 2 +- drivers/bus/ifpga/bus_ifpga_driver.h | 4 ++-- drivers/bus/pci/bus_pci_driver.h | 4 ++-- drivers/bus/platform/bus_platform_driver.h | 4 ++-- drivers/bus/uacce/bus_uacce_driver.h | 4 ++-- drivers/bus/vdev/bus_vdev_driver.h | 4 ++-- drivers/bus/vmbus/bus_vmbus_driver.h | 4 ++-- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 2 +- drivers/common/qat/qat_device.c | 2 +- drivers/common/zsda/zsda_device.c | 2 +- drivers/compress/isal/isal_compress_pmd.c | 2 +- drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 2 +- drivers/compress/uadk/uadk_compress_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd.c | 2 +- drivers/crypto/armv8/rte_armv8_pmd.c | 2 +- drivers/crypto/bcmfs/bcmfs_device.c | 3 +-- drivers/crypto/caam_jr/caam_jr.c | 2 +- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- drivers/crypto/cnxk/cn10k_cryptodev.c | 2 +- drivers/crypto/cnxk/cn9k_cryptodev.c | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- drivers/crypto/ionic/ionic_crypto_vdev.c | 2 +- drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 3 +-- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 3 +-- drivers/crypto/ipsec_mb/pmd_chacha_poly.c | 3 ++- drivers/crypto/ipsec_mb/pmd_kasumi.c | 2 +- drivers/crypto/ipsec_mb/pmd_snow3g.c | 2 +- drivers/crypto/ipsec_mb/pmd_zuc.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/crypto/mvsam/rte_mrvl_pmd.c | 2 +- drivers/crypto/null/null_crypto_pmd.c | 2 +- drivers/crypto/octeontx/otx_cryptodev.c | 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 3 +-- drivers/crypto/scheduler/scheduler_pmd.c | 3 +-- drivers/crypto/uadk/uadk_crypto_pmd.c | 2 +- drivers/crypto/virtio/virtio_cryptodev.c | 2 +- drivers/crypto/virtio/virtio_user_cryptodev.c | 2 +- drivers/dma/cnxk/cnxk_dmadev.c | 2 +- drivers/dma/dpaa/dpaa_qdma.c | 2 +- drivers/dma/dpaa2/dpaa2_qdma.c | 2 +- drivers/dma/hisilicon/hisi_dmadev.c | 2 +- drivers/dma/idxd/idxd_pci.c | 2 +- drivers/dma/ioat/ioat_dmadev.c | 2 +- drivers/dma/odm/odm_dmadev.c | 2 +- drivers/dma/skeleton/skeleton_dmadev.c | 2 +- drivers/event/cnxk/cn10k_eventdev.c | 2 +- drivers/event/cnxk/cn20k_eventdev.c | 2 +- drivers/event/cnxk/cn9k_eventdev.c | 2 +- drivers/event/dlb2/pf/dlb2_pf.c | 4 ++-- drivers/event/dpaa/dpaa_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +- drivers/event/dsw/dsw_evdev.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 3 ++- drivers/event/octeontx/ssovf_probe.c | 4 ++-- drivers/event/octeontx/timvf_probe.c | 2 +- drivers/event/opdl/opdl_evdev.c | 2 +- drivers/event/skeleton/skeleton_eventdev.c | 4 ++-- drivers/event/sw/sw_evdev.c | 2 +- drivers/gpu/cuda/cuda.c | 2 +- drivers/mempool/cnxk/cnxk_mempool.c | 2 +- drivers/mempool/octeontx/octeontx_fpavf.c | 2 +- drivers/ml/cnxk/cn10k_ml_dev.c | 2 +- drivers/ml/cnxk/mvtvm_ml_dev.c | 2 +- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- drivers/net/ark/ark_ethdev.c | 2 +- drivers/net/atlantic/atl_ethdev.c | 2 +- drivers/net/avp/avp_ethdev.c | 2 +- drivers/net/axgbe/axgbe_ethdev.c | 2 +- drivers/net/bnx2x/bnx2x_ethdev.c | 5 +++-- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/cnxk/cn10k_ethdev.c | 2 +- drivers/net/cnxk/cn20k_ethdev.c | 2 +- drivers/net/cnxk/cn9k_ethdev.c | 2 +- drivers/net/cnxk/cnxk_eswitch.c | 2 +- drivers/net/cnxk/cnxk_ethdev_sec.c | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c | 2 +- drivers/net/cxgbe/cxgbevf_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_mux.c | 2 +- drivers/net/dpaa2/dpaa2_ptp.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enetc/enetc_ethdev.c | 2 +- drivers/net/enetfec/enet_ethdev.c | 2 +- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/gve/gve_ethdev.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/intel/cpfl/cpfl_ethdev.c | 2 +- drivers/net/intel/e1000/em_ethdev.c | 2 +- drivers/net/intel/e1000/igb_ethdev.c | 4 ++-- drivers/net/intel/e1000/igc_ethdev.c | 2 +- drivers/net/intel/fm10k/fm10k_ethdev.c | 2 +- drivers/net/intel/i40e/i40e_ethdev.c | 2 +- drivers/net/intel/iavf/iavf_ethdev.c | 2 +- drivers/net/intel/ice/ice_dcf_ethdev.c | 2 +- drivers/net/intel/ice/ice_ethdev.c | 2 +- drivers/net/intel/idpf/idpf_ethdev.c | 2 +- drivers/net/intel/ipn3ke/ipn3ke_ethdev.c | 2 +- drivers/net/intel/ixgbe/ixgbe_ethdev.c | 4 ++-- drivers/net/ionic/ionic_dev_pci.c | 2 +- drivers/net/ionic/ionic_dev_vdev.c | 3 ++- drivers/net/mana/mana.c | 2 +- drivers/net/memif/rte_eth_memif.c | 2 +- drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.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/nfb/nfb_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev.c | 2 +- drivers/net/ngbe/ngbe_ethdev_vf.c | 2 +- drivers/net/ntnic/ntnic_ethdev.c | 2 +- drivers/net/null/rte_eth_null.c | 2 +- drivers/net/octeon_ep/otx_ep_ethdev.c | 2 +- drivers/net/octeontx/base/octeontx_pkivf.c | 2 +- drivers/net/octeontx/base/octeontx_pkovf.c | 2 +- drivers/net/octeontx/octeontx_ethdev.c | 3 ++- drivers/net/pcap/pcap_ethdev.c | 2 +- drivers/net/pfe/pfe_ethdev.c | 2 +- drivers/net/qede/qede_ethdev.c | 4 ++-- drivers/net/r8169/r8169_ethdev.c | 2 +- drivers/net/ring/rte_eth_ring.c | 2 +- drivers/net/sfc/sfc_ethdev.c | 2 +- drivers/net/softnic/rte_eth_softnic.c | 2 +- drivers/net/tap/rte_eth_tap.c | 4 ++-- drivers/net/thunderx/nicvf_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev.c | 2 +- drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +- drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +- drivers/net/vhost/rte_eth_vhost.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/net/virtio/virtio_user_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/xsc/xsc_ethdev.c | 2 +- drivers/net/zxdh/zxdh_ethdev.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +- drivers/raw/cnxk_gpio/cnxk_gpio.c | 2 +- drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c | 2 +- drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 2 +- drivers/raw/gdtc/gdtc_rawdev.c | 2 +- drivers/raw/ifpga/afu_pmd_core.c | 2 +- drivers/raw/ifpga/ifpga_rawdev.c | 4 ++-- drivers/raw/ntb/ntb.c | 2 +- drivers/raw/skeleton/skeleton_rawdev.c | 2 +- drivers/regex/cn9k/cn9k_regexdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- drivers/vdpa/sfc/sfc_vdpa.c | 2 +- lib/eal/include/rte_dev.h | 14 +++++--------- 176 files changed, 211 insertions(+), 216 deletions(-)
drivers/baseband/acc/rte_acc100_pmd.c +2 -2
@@ -4082,9 +4082,9 @@ static struct rte_pci_driver acc100_pci_vf_driver = { .drv_flags = RTE_PCI_DRV_NEED_MAPPING }; -RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver); +RTE_PMD_REGISTER_PCI (ACC100PF_DRIVER_NAME , acc100_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ACC100PF_DRIVER_NAME , pci_id_acc100_pf_map); -RTE_PMD_REGISTER_PCI (ACC100VF_DRIVER_NAME , acc100_pci_vf_driver); +RTE_PMD_REGISTER_PCI (ACC100VF_DRIVER_NAME , acc100_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ACC100VF_DRIVER_NAME , pci_id_acc100_vf_map);/*
drivers/baseband/acc/rte_vrb_pmd.c +2 -2
@@ -4460,9 +4460,9 @@ static struct rte_pci_driver vrb_pci_vf_driver = { .drv_flags = RTE_PCI_DRV_NEED_MAPPING }; -RTE_PMD_REGISTER_PCI (VRB_PF_DRIVER_NAME , vrb_pci_pf_driver); +RTE_PMD_REGISTER_PCI (VRB_PF_DRIVER_NAME , vrb_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (VRB_PF_DRIVER_NAME , pci_id_vrb_pf_map); -RTE_PMD_REGISTER_PCI (VRB_VF_DRIVER_NAME , vrb_pci_vf_driver); +RTE_PMD_REGISTER_PCI (VRB_VF_DRIVER_NAME , vrb_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (VRB_VF_DRIVER_NAME , pci_id_vrb_vf_map);/* Initial configuration of a VRB1 device prior to running configure(). */
drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c +2 -2
@@ -3424,7 +3424,7 @@ static struct rte_pci_driver fpga_5gnr_fec_pci_vf_driver = { }; -RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_PF_DRIVER_NAME , fpga_5gnr_fec_pci_pf_driver); +RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_PF_DRIVER_NAME , fpga_5gnr_fec_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_5GNR_FEC_PF_DRIVER_NAME , pci_id_fpga_5gnr_fec_pf_map); -RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_VF_DRIVER_NAME , fpga_5gnr_fec_pci_vf_driver); +RTE_PMD_REGISTER_PCI (FPGA_5GNR_FEC_VF_DRIVER_NAME , fpga_5gnr_fec_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_5GNR_FEC_VF_DRIVER_NAME , pci_id_fpga_5gnr_fec_vf_map);
drivers/baseband/fpga_lte_fec/fpga_lte_fec.c +2 -2
@@ -2664,9 +2664,9 @@ static struct rte_pci_driver fpga_lte_fec_pci_vf_driver = { }; -RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_PF_DRIVER_NAME , fpga_lte_fec_pci_pf_driver); +RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_PF_DRIVER_NAME , fpga_lte_fec_pci_pf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_LTE_FEC_PF_DRIVER_NAME , pci_id_fpga_lte_fec_pf_map); -RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_VF_DRIVER_NAME , fpga_lte_fec_pci_vf_driver); +RTE_PMD_REGISTER_PCI (FPGA_LTE_FEC_VF_DRIVER_NAME , fpga_lte_fec_pci_vf_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (FPGA_LTE_FEC_VF_DRIVER_NAME , pci_id_fpga_lte_fec_vf_map);
drivers/baseband/la12xx/bbdev_la12xx.c +1 -1
@@ -1111,7 +1111,7 @@ static struct rte_vdev_driver bbdev_la12xx_pmd_drv = { .remove = la12xx_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_la12xx_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_la12xx_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,LA12XX_MAX_NB_QUEUES_ARG "=<int>" LA12XX_VDEV_MODEM_ID_ARG "=<int> " );
drivers/baseband/null/bbdev_null.c +1 -1
@@ -349,7 +349,7 @@ static struct rte_vdev_driver bbdev_null_pmd_drv = { .remove = null_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_null_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_null_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,BBDEV_NULL_MAX_NB_QUEUES_ARG "=<int> " BBDEV_NULL_SOCKET_ID_ARG "=<int>" );
drivers/baseband/turbo_sw/bbdev_turbo_software.c +1 -1
@@ -1985,7 +1985,7 @@ static struct rte_vdev_driver bbdev_turbo_sw_pmd_drv = { .remove = turbo_sw_bbdev_remove }; -RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_turbo_sw_pmd_drv); +RTE_PMD_REGISTER_VDEV (DRIVER_NAME , bbdev_turbo_sw_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (DRIVER_NAME ,TURBO_SW_MAX_NB_QUEUES_ARG "=<int> " TURBO_SW_SOCKET_ID_ARG "=<int>" );
drivers/bus/auxiliary/bus_auxiliary_driver.h +2 -2
@@ -162,13 +162,13 @@ __rte_internalvoid rte_auxiliary_register (struct rte_auxiliary_driver *driver);/** Helper for auxiliary device registration from driver instance */ -#define RTE_PMD_REGISTER_AUXILIARY (nm, auxiliary_drv) \ +#define RTE_PMD_REGISTER_AUXILIARY (nm, auxiliary_drv, idx) \ RTE_INIT(auxiliaryinitfn_ ##nm) \ { \ (auxiliary_drv).driver.name = RTE_STR(nm); \ rte_auxiliary_register(&(auxiliary_drv)); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx)/** * Unregister an auxiliary driver.
drivers/bus/cdx/bus_cdx_driver.h +3 -4
@@ -35,8 +35,7 @@ struct rte_cdx_bus;#define RTE_CDX_ANY_ID (0xffff)#define RTE_PMD_REGISTER_CDX_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, cdx_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, cdx_tbl_export))[] = RTE_STR(table)/** Device needs resource mapping */ #define RTE_CDX_DRV_NEED_MAPPING 0x0001
@@ -147,13 +146,13 @@ void rte_cdx_register(struct rte_cdx_driver *driver);/** * Helper for CDX device registration from driver (eth, crypto, raw) instance. */ -#define RTE_PMD_REGISTER_CDX (nm, cdx_drv) \ +#define RTE_PMD_REGISTER_CDX (nm, cdx_drv, idx) \ RTE_INIT(cdxinitfn_ ##nm) \ {\ (cdx_drv).driver.name = RTE_STR(nm);\ rte_cdx_register(&cdx_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx)/** * Enables VFIO Interrupts for CDX bus devices.
drivers/bus/dpaa/bus_dpaa_driver.h +2 -2
@@ -239,13 +239,13 @@ int rte_dpaa_portal_fq_close(struct qman_fq *fq);void dpaa_portal_finish (void *arg);/** Helper for DPAA device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_DPAA (nm, dpaa_drv) \ +#define RTE_PMD_REGISTER_DPAA (nm, dpaa_drv, idx) \ RTE_INIT(dpaainitfn_ ##nm) \ {\ (dpaa_drv).driver.name = RTE_STR(nm);\ rte_dpaa_driver_register(&dpaa_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)__rte_internal struct fm_eth_port_cfg *dpaa_get_eth_port_cfg(int dev_id);
drivers/bus/fslmc/bus_fslmc_driver.h +4 -4
@@ -199,13 +199,13 @@ __rte_internalvoid rte_fslmc_driver_unregister (struct rte_dpaa2_driver *driver);/** Helper for DPAA2 device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_DPAA2 (nm, dpaa2_drv) \ +#define RTE_PMD_REGISTER_DPAA2 (nm, dpaa2_drv, idx) \ RTE_INIT(dpaa2initfn_ ##nm) \ {\ (dpaa2_drv).driver.name = RTE_STR(nm);\ rte_fslmc_driver_register(&dpaa2_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** * Register a DPAA2 MC Object driver.
@@ -230,13 +230,13 @@ __rte_internaluint32_t rte_fslmc_get_device_count (enum rte_dpaa2_dev_type device_type);/** Helper for DPAA2 object registration */ -#define RTE_PMD_REGISTER_DPAA2_OBJECT (nm, dpaa2_obj) \ +#define RTE_PMD_REGISTER_DPAA2_OBJECT (nm, dpaa2_obj, idx) \ RTE_INIT(dpaa2objinitfn_ ##nm) \ {\ (dpaa2_obj).name = RTE_STR(nm);\ rte_fslmc_object_register(&dpaa2_obj); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c +1 -1
@@ -153,4 +153,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpbp_obj = { .close = dpaa2_close_dpbp_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpbp, rte_dpaa2_dpbp_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpbp, rte_dpaa2_dpbp_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dpci.c +1 -1
@@ -202,4 +202,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpci_obj = { .close = rte_dpaa2_close_dpci_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpci, rte_dpaa2_dpci_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpci, rte_dpaa2_dpci_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +1 -1
@@ -692,4 +692,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpio_obj = { .close = dpaa2_close_dpio_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpio, rte_dpaa2_dpio_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpio, rte_dpaa2_dpio_obj, __LINE__);
drivers/bus/fslmc/portal/dpaa2_hw_dprc.c +1 -1
@@ -99,4 +99,4 @@ static struct rte_dpaa2_object rte_dpaa2_dprc_obj = { .create = rte_dpaa2_create_dprc_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dprc, rte_dpaa2_dprc_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dprc, rte_dpaa2_dprc_obj, __LINE__);
drivers/bus/ifpga/bus_ifpga_driver.h +2 -2
@@ -146,7 +146,7 @@ void rte_ifpga_driver_register(struct rte_afu_driver *driver);__rte_internal void rte_ifpga_driver_unregister(struct rte_afu_driver *driver); -#define RTE_PMD_REGISTER_AFU (nm, afudrv)\ +#define RTE_PMD_REGISTER_AFU (nm, afudrv, idx)\ static const char *afudrvinit_ ## nm ## _alias;\ RTE_INIT(afudrvinitfn_ ##afudrv)\ {\
@@ -154,7 +154,7 @@ RTE_INIT(afudrvinitfn_ ##afudrv)\ (afudrv).driver.alias = afudrvinit_ ## nm ## _alias;\ rte_ifpga_driver_register(&afudrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)#define RTE_PMD_REGISTER_AFU_ALIAS (nm, alias)\ static const char *afudrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/pci/bus_pci_driver.h +2 -2
@@ -165,13 +165,13 @@ __rte_internalvoid rte_pci_register (struct rte_pci_driver *driver);/** Helper for PCI device registration from driver (eth, crypto) instance */ -#define RTE_PMD_REGISTER_PCI (nm, pci_drv) \ +#define RTE_PMD_REGISTER_PCI (nm, pci_drv, idx) \ RTE_INIT(pciinitfn_ ##nm) \ {\ (pci_drv).driver.name = RTE_STR(nm);\ rte_pci_register(&pci_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** * Unregister a PCI driver.
drivers/bus/platform/bus_platform_driver.h +2 -2
@@ -130,7 +130,7 @@ struct rte_platform_driver { container_of(ptr, const struct rte_platform_device, device) /** Helper for platform driver registration. */ -#define RTE_PMD_REGISTER_PLATFORM (nm, platform_drv) \ +#define RTE_PMD_REGISTER_PLATFORM (nm, platform_drv, idx) \ static const char *pdrvinit_ ## nm ## _alias; \ RTE_INIT(pdrvinitfn_ ##nm) \ { \
@@ -138,7 +138,7 @@ RTE_INIT(pdrvinitfn_ ##nm) \ (platform_drv).driver.alias = pdrvinit_ ## nm ## _alias; \ rte_platform_register(&(platform_drv)); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)/** Helper for setting platform driver alias. */ #define RTE_PMD_REGISTER_ALIAS (nm, alias) \
drivers/bus/uacce/bus_uacce_driver.h +2 -2
@@ -239,13 +239,13 @@ void rte_uacce_unregister(struct rte_uacce_driver *driver);/** * Helper for UACCE device registration from driver instance. */ -#define RTE_PMD_REGISTER_UACCE (nm, uacce_drv) \ +#define RTE_PMD_REGISTER_UACCE (nm, uacce_drv, idx) \ RTE_INIT(uacceinitfn_ ##nm) \ {\ (uacce_drv).driver.name = RTE_STR(nm);\ rte_uacce_register(&uacce_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/bus/vdev/bus_vdev_driver.h +2 -2
@@ -131,7 +131,7 @@ void rte_vdev_register(struct rte_vdev_driver *driver);__rte_internal void rte_vdev_unregister(struct rte_vdev_driver *driver); -#define RTE_PMD_REGISTER_VDEV (nm, vdrv)\ +#define RTE_PMD_REGISTER_VDEV (nm, vdrv, idx)\ static const char *vdrvinit_ ## nm ## _alias;\ RTE_INIT(vdrvinitfn_ ##vdrv)\ {\
@@ -139,7 +139,7 @@ RTE_INIT(vdrvinitfn_ ##vdrv)\ (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\ rte_vdev_register(&vdrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, idx)#define RTE_PMD_REGISTER_ALIAS (nm, alias)\ static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/vmbus/bus_vmbus_driver.h +2 -2
@@ -91,13 +91,13 @@ __rte_internalvoid rte_vmbus_unregister (struct rte_vmbus_driver *driver);/** Helper for VMBUS device registration from driver instance */ -#define RTE_PMD_REGISTER_VMBUS (nm, vmbus_drv) \ +#define RTE_PMD_REGISTER_VMBUS (nm, vmbus_drv, idx) \ RTE_INIT(vmbusinitfn_ ##nm) \ { \ (vmbus_drv).driver.name = RTE_STR(nm); \ rte_vmbus_register(&vmbus_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, idx) #ifdef __cplusplus }
drivers/common/mlx5/mlx5_common.c +1 -1
@@ -1452,4 +1452,4 @@ mlx5_devx_uar_prepare(struct mlx5_common_device *cdev, struct mlx5_uar *uar)return 0 ; } -RTE_PMD_EXPORT_NAME (mlx5_common_driver, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_driver, __LINE__);
drivers/common/mlx5/mlx5_common_pci.c +1 -1
@@ -245,4 +245,4 @@ RTE_FINI(mlx5_common_pci_finish) } } -RTE_PMD_EXPORT_NAME (mlx5_common_pci, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_pci, __LINE__);
drivers/common/nitrox/nitrox_device.c +1 -1
@@ -144,5 +144,5 @@ static struct rte_pci_driver nitrox_pmd = { .remove = nitrox_pci_remove, }; -RTE_PMD_REGISTER_PCI (nitrox, nitrox_pmd); +RTE_PMD_REGISTER_PCI (nitrox, nitrox_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (nitrox, pci_id_nitrox_map);
drivers/common/qat/qat_device.c +1 -1
@@ -504,6 +504,6 @@ static struct rte_pci_driver rte_qat_pmd = { .remove = qat_pci_remove }; -RTE_PMD_REGISTER_PCI (QAT_PCI_NAME , rte_qat_pmd); +RTE_PMD_REGISTER_PCI (QAT_PCI_NAME , rte_qat_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (QAT_PCI_NAME , pci_id_qat_map);RTE_PMD_REGISTER_KMOD_DEP (QAT_PCI_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/common/zsda/zsda_device.c +1 -1
@@ -203,7 +203,7 @@ static struct rte_pci_driver rte_zsda_pmd = { .probe = zsda_pci_probe, .remove = zsda_pci_remove }; -RTE_PMD_REGISTER_PCI (ZSDA_PCI_NAME , rte_zsda_pmd); +RTE_PMD_REGISTER_PCI (ZSDA_PCI_NAME , rte_zsda_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ZSDA_PCI_NAME , pci_id_zsda_map);RTE_PMD_REGISTER_KMOD_DEP (ZSDA_PCI_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/compress/isal/isal_compress_pmd.c +1 -1
@@ -751,7 +751,7 @@ static struct rte_vdev_driver compdev_isal_pmd_drv = { .remove = compdev_isal_remove_dev, }; -RTE_PMD_REGISTER_VDEV (COMPDEV_NAME_ISAL_PMD , compdev_isal_pmd_drv); +RTE_PMD_REGISTER_VDEV (COMPDEV_NAME_ISAL_PMD , compdev_isal_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (COMPDEV_NAME_ISAL_PMD ,"socket_id=<int>" );RTE_LOG_REGISTER_DEFAULT (isal_logtype_driver,INFO );
drivers/compress/mlx5/mlx5_compress.c +1 -1
@@ -937,6 +937,6 @@ RTE_INIT(rte_mlx5_compress_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_compress_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_COMPRESS_DRIVER_NAME , mlx5_compress_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_COMPRESS_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/compress/octeontx/otx_zip_pmd.c +1 -1
@@ -717,6 +717,6 @@ static struct rte_pci_driver octtx_zip_pmd = { .remove = zip_pci_remove, }; -RTE_PMD_REGISTER_PCI (COMPRESSDEV_NAME_ZIP_PMD , octtx_zip_pmd); +RTE_PMD_REGISTER_PCI (COMPRESSDEV_NAME_ZIP_PMD , octtx_zip_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (COMPRESSDEV_NAME_ZIP_PMD , pci_id_octtx_zipvf_table);RTE_LOG_REGISTER_DEFAULT (octtx_zip_logtype_driver,INFO );
drivers/compress/uadk/uadk_compress_pmd.c +1 -1
@@ -432,5 +432,5 @@ static struct rte_vdev_driver uadk_compress_pmd = { };#define UADK_COMPRESS_DRIVER_NAME compress_uadk -RTE_PMD_REGISTER_VDEV (UADK_COMPRESS_DRIVER_NAME , uadk_compress_pmd); +RTE_PMD_REGISTER_VDEV (UADK_COMPRESS_DRIVER_NAME , uadk_compress_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (uadk_compress_logtype,INFO );
drivers/compress/zlib/zlib_pmd.c +1 -1
@@ -425,5 +425,5 @@ static struct rte_vdev_driver zlib_pmd_drv = { .remove = zlib_remove }; -RTE_PMD_REGISTER_VDEV (COMPRESSDEV_NAME_ZLIB_PMD , zlib_pmd_drv); +RTE_PMD_REGISTER_VDEV (COMPRESSDEV_NAME_ZLIB_PMD , zlib_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (zlib_logtype_driver,INFO );
drivers/crypto/armv8/rte_armv8_pmd.c +1 -1
@@ -853,7 +853,7 @@ static struct cryptodev_driver armv8_crypto_drv;RTE_LOG_REGISTER_DEFAULT (crypto_armv8_log_type,ERR ); -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ARMV8_PMD , armv8_crypto_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ARMV8_PMD , armv8_crypto_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_ARMV8_PMD , cryptodev_armv8_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_ARMV8_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/bcmfs/bcmfs_device.c +1 -2
@@ -329,5 +329,4 @@ static struct rte_vdev_driver rte_bcmfs_pmd = { .remove = bcmfs_vdev_remove }; -RTE_PMD_REGISTER_VDEV (bcmfs_pmd, - rte_bcmfs_pmd); +RTE_PMD_REGISTER_VDEV (bcmfs_pmd, rte_bcmfs_pmd, __LINE__);
drivers/crypto/caam_jr/caam_jr.c +1 -1
@@ -2451,7 +2451,7 @@ static struct rte_vdev_driver cryptodev_caam_jr_drv = {static struct cryptodev_driver caam_jr_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CAAM_JR_PMD , cryptodev_caam_jr_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CAAM_JR_PMD , cryptodev_caam_jr_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_CAAM_JR_PMD ,"max_nb_queue_pairs=<int>" "socket_id=<int>" );
drivers/crypto/ccp/rte_ccp_pmd.c +1 -1
@@ -312,7 +312,7 @@ static struct rte_pci_driver cryptodev_ccp_pmd_drv = {static struct cryptodev_driver ccp_crypto_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CCP_PMD , cryptodev_ccp_pmd_drv); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CCP_PMD , cryptodev_ccp_pmd_drv, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CCP_PMD ,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_CCP_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/cnxk/cn10k_cryptodev.c +1 -1
@@ -158,7 +158,7 @@ static struct rte_pci_driver cn10k_cryptodev_pmd = {static struct cryptodev_driver cn10k_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN10K_PMD , cn10k_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN10K_PMD , cn10k_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_CN10K_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CN10K_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(cn10k_cryptodev_drv, cn10k_cryptodev_pmd.driver,
drivers/crypto/cnxk/cn9k_cryptodev.c +1 -1
@@ -159,7 +159,7 @@ static struct rte_pci_driver cn9k_cryptodev_pmd = {static struct cryptodev_driver cn9k_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN9K_PMD , cn9k_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_CN9K_PMD , cn9k_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_CN9K_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_CN9K_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(cn9k_cryptodev_drv, cn9k_cryptodev_pmd.driver,
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +1 -1
@@ -4492,7 +4492,7 @@ static struct rte_dpaa2_driver rte_dpaa2_sec_driver = {static struct cryptodev_driver dpaa2_sec_crypto_drv; -RTE_PMD_REGISTER_DPAA2 (CRYPTODEV_NAME_DPAA2_SEC_PMD , rte_dpaa2_sec_driver); +RTE_PMD_REGISTER_DPAA2 (CRYPTODEV_NAME_DPAA2_SEC_PMD , rte_dpaa2_sec_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (dpaa2_sec_crypto_drv, rte_dpaa2_sec_driver.driver, cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_DPAA2_SEC_PMD,
drivers/crypto/dpaa_sec/dpaa_sec.c +1 -1
@@ -3877,7 +3877,7 @@ static struct rte_dpaa_driver rte_dpaa_sec_driver = {static struct cryptodev_driver dpaa_sec_crypto_drv; -RTE_PMD_REGISTER_DPAA (CRYPTODEV_NAME_DPAA_SEC_PMD , rte_dpaa_sec_driver); +RTE_PMD_REGISTER_DPAA (CRYPTODEV_NAME_DPAA_SEC_PMD , rte_dpaa_sec_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (dpaa_sec_crypto_drv, rte_dpaa_sec_driver.driver, dpaa_cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_DPAA_SEC_PMD,
drivers/crypto/ionic/ionic_crypto_vdev.c +1 -1
@@ -123,6 +123,6 @@ static struct rte_vdev_driver rte_vdev_iocpt_pmd = {static struct cryptodev_driver rte_vdev_iocpt_drv; -RTE_PMD_REGISTER_VDEV (crypto_ionic, rte_vdev_iocpt_pmd); +RTE_PMD_REGISTER_VDEV (crypto_ionic, rte_vdev_iocpt_pmd, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (rte_vdev_iocpt_drv, rte_vdev_iocpt_pmd.driver, iocpt_vdev_driver_id);
drivers/crypto/ipsec_mb/pmd_aesni_gcm.c +1 -2
@@ -785,8 +785,7 @@ static struct rte_vdev_driver cryptodev_aesni_gcm_pmd_drv = {static struct cryptodev_driver aesni_gcm_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_GCM_PMD , - cryptodev_aesni_gcm_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_GCM_PMD , cryptodev_aesni_gcm_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_AESNI_GCM_PMD , cryptodev_aesni_gcm_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_AESNI_GCM_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_aesni_mb.c +1 -2
@@ -2500,8 +2500,7 @@ static struct rte_vdev_driver cryptodev_aesni_mb_pmd_drv = {static struct cryptodev_driver aesni_mb_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_MB_PMD , - cryptodev_aesni_mb_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_AESNI_MB_PMD , cryptodev_aesni_mb_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_AESNI_MB_PMD , cryptodev_aesni_mb_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_AESNI_MB_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_chacha_poly.c +2 -1
@@ -41,7 +41,8 @@ static struct rte_vdev_driver cryptodev_chacha20_poly1305_pmd_drv = {static struct cryptodev_driver chacha20_poly1305_crypto_drv;RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_CHACHA20_POLY1305_PMD , - cryptodev_chacha20_poly1305_pmd_drv); + cryptodev_chacha20_poly1305_pmd_drv, + __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_CHACHA20_POLY1305_PMD , cryptodev_chacha20_poly1305_pmd); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CHACHA20_POLY1305_PMD,
drivers/crypto/ipsec_mb/pmd_kasumi.c +1 -1
@@ -46,7 +46,7 @@ static struct rte_vdev_driver cryptodev_kasumi_pmd_drv = {static struct cryptodev_driver kasumi_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_KASUMI_PMD , cryptodev_kasumi_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_KASUMI_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_snow3g.c +1 -1
@@ -571,7 +571,7 @@ static struct rte_vdev_driver cryptodev_snow3g_pmd_drv = {static struct cryptodev_driver snow3g_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_SNOW3G_PMD , cryptodev_snow3g_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_SNOW3G_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/ipsec_mb/pmd_zuc.c +1 -1
@@ -376,7 +376,7 @@ static struct rte_vdev_driver cryptodev_zuc_pmd_drv = {static struct cryptodev_driver zuc_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_ZUC_PMD , cryptodev_zuc_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_ZUC_PMD ,"max_nb_queue_pairs=<int> socket_id=<int>" );
drivers/crypto/mlx5/mlx5_crypto.c +1 -1
@@ -514,6 +514,6 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(mlx5_cryptodev_driver, mlx5_drv, mlx5_crypto_driver_id); RTE_LOG_REGISTER_DEFAULT(mlx5_crypto_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_CRYPTO_DRIVER_NAME , mlx5_crypto_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_CRYPTO_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/crypto/mvsam/rte_mrvl_pmd.c +1 -1
@@ -1281,7 +1281,7 @@ static struct rte_vdev_driver cryptodev_mrvl_pmd_drv = {static struct cryptodev_driver mrvl_crypto_drv;/* Register the driver in constructor. */ -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_MRVL_PMD , cryptodev_mrvl_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_MRVL_PMD , cryptodev_mrvl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_MRVL_PMD ,"max_nb_queue_pairs=<int> " "max_nb_sessions=<int> "
drivers/crypto/null/null_crypto_pmd.c +1 -1
@@ -233,7 +233,7 @@ static struct rte_vdev_driver cryptodev_null_pmd_drv = {static struct cryptodev_driver null_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (CRYPTODEV_NAME_NULL_PMD , cryptodev_null_pmd);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_NULL_PMD , "max_nb_queue_pairs=<int> "
drivers/crypto/octeontx/otx_cryptodev.c +1 -1
@@ -114,7 +114,7 @@ static struct rte_pci_driver otx_cryptodev_pmd = {static struct cryptodev_driver otx_cryptodev_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_OCTEONTX_PMD , otx_cryptodev_pmd); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_OCTEONTX_PMD , otx_cryptodev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (CRYPTODEV_NAME_OCTEONTX_PMD , pci_id_cpt_table);RTE_PMD_REGISTER_KMOD_DEP (CRYPTODEV_NAME_OCTEONTX_PMD ,"vfio-pci" ); RTE_PMD_REGISTER_CRYPTO_DRIVER(otx_cryptodev_drv, otx_cryptodev_pmd.driver,
drivers/crypto/openssl/rte_openssl_pmd.c +1 -2
@@ -3709,8 +3709,7 @@ static struct rte_vdev_driver cryptodev_openssl_pmd_drv = {static struct cryptodev_driver openssl_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_OPENSSL_PMD , - cryptodev_openssl_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_OPENSSL_PMD , cryptodev_openssl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_OPENSSL_PMD ,"max_nb_queue_pairs=<int> " "socket_id=<int>" );
drivers/crypto/scheduler/scheduler_pmd.c +1 -2
@@ -618,8 +618,7 @@ static struct rte_vdev_driver cryptodev_scheduler_pmd_drv = {static struct cryptodev_driver scheduler_crypto_drv; -RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SCHEDULER_PMD , - cryptodev_scheduler_pmd_drv); +RTE_PMD_REGISTER_VDEV (CRYPTODEV_NAME_SCHEDULER_PMD , cryptodev_scheduler_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (CRYPTODEV_NAME_SCHEDULER_PMD ,"max_nb_queue_pairs=<int> " "socket_id=<int> "
drivers/crypto/uadk/uadk_crypto_pmd.c +1 -1
@@ -1087,7 +1087,7 @@ static struct rte_vdev_driver uadk_crypto_pmd = {static struct cryptodev_driver uadk_crypto_drv;#define UADK_CRYPTO_DRIVER_NAME crypto_uadk -RTE_PMD_REGISTER_VDEV (UADK_CRYPTO_DRIVER_NAME , uadk_crypto_pmd); +RTE_PMD_REGISTER_VDEV (UADK_CRYPTO_DRIVER_NAME , uadk_crypto_pmd, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (uadk_crypto_drv, uadk_crypto_pmd.driver, uadk_cryptodev_driver_id); RTE_PMD_REGISTER_PARAM_STRING(UADK_CRYPTO_DRIVER_NAME,
drivers/crypto/virtio/virtio_cryptodev.c +1 -1
@@ -1718,7 +1718,7 @@ static struct rte_pci_driver rte_virtio_crypto_driver = {static struct cryptodev_driver virtio_crypto_drv; -RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_VIRTIO_PMD , rte_virtio_crypto_driver); +RTE_PMD_REGISTER_PCI (CRYPTODEV_NAME_VIRTIO_PMD , rte_virtio_crypto_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (virtio_crypto_drv, rte_virtio_crypto_driver.driver, cryptodev_virtio_driver_id);
drivers/crypto/virtio/virtio_user_cryptodev.c +1 -1
@@ -565,7 +565,7 @@ static struct cryptodev_driver virtio_crypto_drv;uint8_t cryptodev_virtio_user_driver_id; -RTE_PMD_REGISTER_VDEV (crypto_virtio_user, virtio_user_driver); +RTE_PMD_REGISTER_VDEV (crypto_virtio_user, virtio_user_driver, __LINE__);RTE_PMD_REGISTER_CRYPTO_DRIVER (virtio_crypto_drv, virtio_user_driver.driver, cryptodev_virtio_user_driver_id);
drivers/dma/cnxk/cnxk_dmadev.c +1 -1
@@ -628,6 +628,6 @@ static struct rte_pci_driver cnxk_dmadev = { .remove = cnxk_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_dmadev_pci_driver, cnxk_dmadev); +RTE_PMD_REGISTER_PCI (cnxk_dmadev_pci_driver, cnxk_dmadev, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_dmadev_pci_driver, cnxk_dma_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_dmadev_pci_driver,"vfio-pci" );
drivers/dma/dpaa/dpaa_qdma.c +1 -1
@@ -1475,6 +1475,6 @@ static struct rte_dpaa_driver rte_dpaa_qdma_pmd = { .remove = dpaa_qdma_remove, }; -RTE_PMD_REGISTER_DPAA (dpaa_qdma, rte_dpaa_qdma_pmd); +RTE_PMD_REGISTER_DPAA (dpaa_qdma, rte_dpaa_qdma_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dpaa_qdma,DPAA_DMA_ERROR_CHECK "=<int>" );RTE_LOG_REGISTER_DEFAULT (dpaa_qdma_logtype,INFO );
drivers/dma/dpaa2/dpaa2_qdma.c +1 -1
@@ -1752,7 +1752,7 @@ static struct rte_dpaa2_driver rte_dpaa2_qdma_pmd = { .remove = dpaa2_qdma_remove, }; -RTE_PMD_REGISTER_DPAA2 (dpaa2_qdma, rte_dpaa2_qdma_pmd); +RTE_PMD_REGISTER_DPAA2 (dpaa2_qdma, rte_dpaa2_qdma_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dpaa2_qdma,DPAA2_QDMA_FLE_PRE_POPULATE "=<int>" DPAA2_QDMA_DESC_DEBUG"=<int>"
drivers/dma/hisilicon/hisi_dmadev.c +1 -1
@@ -964,6 +964,6 @@ static struct rte_pci_driver hisi_dma_pmd_drv = { .remove = hisi_dma_remove, }; -RTE_PMD_REGISTER_PCI (dma_hisilicon, hisi_dma_pmd_drv); +RTE_PMD_REGISTER_PCI (dma_hisilicon, hisi_dma_pmd_drv, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (dma_hisilicon, pci_id_hisi_dma_map);RTE_PMD_REGISTER_KMOD_DEP (dma_hisilicon,"vfio-pci" );
drivers/dma/idxd/idxd_pci.c +1 -1
@@ -453,7 +453,7 @@ struct rte_pci_driver idxd_pmd_drv_pci = { .remove = idxd_dmadev_remove_pci, }; -RTE_PMD_REGISTER_PCI (IDXD_PMD_DMADEV_NAME_PCI , idxd_pmd_drv_pci); +RTE_PMD_REGISTER_PCI (IDXD_PMD_DMADEV_NAME_PCI , idxd_pmd_drv_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (IDXD_PMD_DMADEV_NAME_PCI , pci_id_idxd_map);RTE_PMD_REGISTER_KMOD_DEP (IDXD_PMD_DMADEV_NAME_PCI ,"vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (dmadev_idxd_pci,"max_queues=0" );
drivers/dma/ioat/ioat_dmadev.c +1 -1
@@ -762,6 +762,6 @@ static struct rte_pci_driver ioat_pmd_drv = { .remove = ioat_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (IOAT_PMD_NAME , ioat_pmd_drv); +RTE_PMD_REGISTER_PCI (IOAT_PMD_NAME , ioat_pmd_drv, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (IOAT_PMD_NAME , pci_id_ioat_map);RTE_PMD_REGISTER_KMOD_DEP (IOAT_PMD_NAME ,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/dma/odm/odm_dmadev.c +1 -1
@@ -711,7 +711,7 @@ static struct rte_pci_driver odm_dmadev = { .remove = odm_dmadev_remove, }; -RTE_PMD_REGISTER_PCI (PCI_DRIVER_NAME , odm_dmadev); +RTE_PMD_REGISTER_PCI (PCI_DRIVER_NAME , odm_dmadev, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (PCI_DRIVER_NAME , odm_dma_pci_map);RTE_PMD_REGISTER_KMOD_DEP (PCI_DRIVER_NAME ,"vfio-pci" );RTE_LOG_REGISTER_DEFAULT (odm_logtype,NOTICE );
drivers/dma/skeleton/skeleton_dmadev.c +1 -1
@@ -729,6 +729,6 @@ static struct rte_vdev_driver skeldma_pmd_drv = { .drv_flags = RTE_VDEV_DRV_NEED_IOVA_AS_VA, }; -RTE_PMD_REGISTER_VDEV (dma_skeleton, skeldma_pmd_drv); +RTE_PMD_REGISTER_VDEV (dma_skeleton, skeldma_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (dma_skeleton,SKELDMA_ARG_LCORE "=<uint16> " );
drivers/event/cnxk/cn10k_eventdev.c +1 -1
@@ -1173,7 +1173,7 @@ static struct rte_pci_driver cn10k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn10k, cn10k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn10k, cn10k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn10k, cn10k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn10k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn10k, CNXK_SSO_XAE_CNT "=<int>"
drivers/event/cnxk/cn20k_eventdev.c +1 -1
@@ -1151,7 +1151,7 @@ static struct rte_pci_driver cn20k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn20k, cn20k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn20k, cn20k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn20k, cn20k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn20k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn20k,
drivers/event/cnxk/cn9k_eventdev.c +1 -1
@@ -1267,7 +1267,7 @@ static struct rte_pci_driver cn9k_pci_sso = { .remove = cnxk_sso_remove, }; -RTE_PMD_REGISTER_PCI (event_cn9k, cn9k_pci_sso); +RTE_PMD_REGISTER_PCI (event_cn9k, cn9k_pci_sso, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_cn9k, cn9k_pci_sso_map);RTE_PMD_REGISTER_KMOD_DEP (event_cn9k,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "=<int>"
drivers/event/dlb2/pf/dlb2_pf.c +2 -2
@@ -881,8 +881,8 @@ static struct rte_pci_driver pci_eventdev_dlb2_5_pmd = { .remove = event_dlb2_5_pci_remove, }; -RTE_PMD_REGISTER_PCI (event_dlb2_pf, pci_eventdev_dlb2_pmd); +RTE_PMD_REGISTER_PCI (event_dlb2_pf, pci_eventdev_dlb2_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_dlb2_pf, pci_id_dlb2_map); -RTE_PMD_REGISTER_PCI (event_dlb2_5_pf, pci_eventdev_dlb2_5_pmd); +RTE_PMD_REGISTER_PCI (event_dlb2_5_pf, pci_eventdev_dlb2_5_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_dlb2_5_pf, pci_id_dlb2_5_map);
drivers/event/dpaa/dpaa_eventdev.c +1 -1
@@ -1050,6 +1050,6 @@ static struct rte_vdev_driver vdev_eventdev_dpaa_pmd = { .remove = dpaa_event_dev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA_PMD , vdev_eventdev_dpaa_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA_PMD , vdev_eventdev_dpaa_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (EVENTDEV_NAME_DPAA_PMD ,DISABLE_INTR_MODE "=<int>" );
drivers/event/dpaa2/dpaa2_eventdev.c +1 -1
@@ -1198,5 +1198,5 @@ static struct rte_vdev_driver vdev_eventdev_dpaa2_pmd = { .remove = dpaa2_eventdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA2_PMD , vdev_eventdev_dpaa2_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DPAA2_PMD , vdev_eventdev_dpaa2_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (dpaa2_logtype_event,NOTICE );
drivers/event/dpaa2/dpaa2_hw_dpcon.c +1 -1
@@ -140,4 +140,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpcon_obj = { .close = rte_dpaa2_close_dpcon_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpcon, rte_dpaa2_dpcon_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpcon, rte_dpaa2_dpcon_obj, __LINE__);
drivers/event/dsw/dsw_evdev.c +1 -1
@@ -486,5 +486,5 @@ static struct rte_vdev_driver evdev_dsw_pmd_drv = { .remove = dsw_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DSW_PMD , evdev_dsw_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_DSW_PMD , evdev_dsw_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (event_dsw_logtype,NOTICE );
drivers/event/octeontx/ssovf_evdev.c +2 -1
@@ -971,4 +971,5 @@ static struct rte_vdev_driver vdev_ssovf_pmd = { .remove = ssovf_vdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OCTEONTX_PMD , vdev_ssovf_pmd); +/* Blank line to force unique __LINE__ with RTE_PMD_REGISTER_VDEV */ +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OCTEONTX_PMD , vdev_ssovf_pmd, __LINE__);
drivers/event/octeontx/ssovf_probe.c +2 -2
@@ -210,7 +210,7 @@ static struct rte_pci_driver pci_ssowvf = { .probe = ssowvf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_ssowvf, pci_ssowvf); +RTE_PMD_REGISTER_PCI (octeontx_ssowvf, pci_ssowvf, __LINE__);/* SSOVF pcie device aka event queue probe */
@@ -286,4 +286,4 @@ static struct rte_pci_driver pci_ssovf = { .probe = ssovf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_ssovf, pci_ssovf); +RTE_PMD_REGISTER_PCI (octeontx_ssovf, pci_ssovf, __LINE__);
drivers/event/octeontx/timvf_probe.c +1 -1
@@ -162,4 +162,4 @@ static struct rte_pci_driver pci_timvf = { .remove = NULL, }; -RTE_PMD_REGISTER_PCI (octeontx_timvf, pci_timvf); +RTE_PMD_REGISTER_PCI (octeontx_timvf, pci_timvf, __LINE__);
drivers/event/opdl/opdl_evdev.c +1 -1
@@ -763,6 +763,6 @@ static struct rte_vdev_driver evdev_opdl_pmd_drv = {RTE_LOG_REGISTER_SUFFIX (opdl_logtype_driver, driver,INFO ); -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OPDL_PMD , evdev_opdl_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OPDL_PMD , evdev_opdl_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (event_opdl,NUMA_NODE_ARG "=<int>" DO_VALIDATION_ARG "=<int>" DO_TEST_ARG "=<int>" );
drivers/event/skeleton/skeleton_eventdev.c +2 -2
@@ -395,7 +395,7 @@ static struct rte_pci_driver pci_eventdev_skeleton_pmd = { .remove = event_skeleton_pci_remove, }; -RTE_PMD_REGISTER_PCI (event_skeleton_pci, pci_eventdev_skeleton_pmd); +RTE_PMD_REGISTER_PCI (event_skeleton_pci, pci_eventdev_skeleton_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (event_skeleton_pci, pci_id_skeleton_map);/* VDEV based event device */
@@ -448,5 +448,5 @@ static struct rte_vdev_driver vdev_eventdev_skeleton_pmd = { .remove = skeleton_eventdev_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SKELETON_PMD , vdev_eventdev_skeleton_pmd); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SKELETON_PMD , vdev_eventdev_skeleton_pmd, __LINE__);RTE_LOG_REGISTER_DEFAULT (skeleton_eventdev_logtype,INFO );
drivers/event/sw/sw_evdev.c +1 -1
@@ -1142,7 +1142,7 @@ static struct rte_vdev_driver evdev_sw_pmd_drv = { .remove = sw_remove }; -RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SW_PMD , evdev_sw_pmd_drv); +RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_SW_PMD , evdev_sw_pmd_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (event_sw,NUMA_NODE_ARG "=<int> " SCHED_QUANTA_ARG "=<int>" CREDIT_QUANTA_ARG "=<int>" MIN_BURST_SIZE_ARG "=<int>" DEQ_BURST_SIZE_ARG "=<int>"
drivers/gpu/cuda/cuda.c +1 -1
@@ -1440,6 +1440,6 @@ static struct rte_pci_driver rte_cuda_driver = { .remove = cuda_gpu_remove, }; -RTE_PMD_REGISTER_PCI (gpu_cuda, rte_cuda_driver); +RTE_PMD_REGISTER_PCI (gpu_cuda, rte_cuda_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (gpu_cuda, pci_id_cuda_map);RTE_PMD_REGISTER_KMOD_DEP (gpu_cuda,"* nvidia & (nv_peer_mem | nvpeer_mem)" );
drivers/mempool/cnxk/cnxk_mempool.c +1 -1
@@ -197,7 +197,7 @@ static struct rte_pci_driver npa_pci = { .remove = npa_remove, }; -RTE_PMD_REGISTER_PCI (mempool_cnxk, npa_pci); +RTE_PMD_REGISTER_PCI (mempool_cnxk, npa_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (mempool_cnxk, npa_pci_map);RTE_PMD_REGISTER_KMOD_DEP (mempool_cnxk,"vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(mempool_cnxk,
drivers/mempool/octeontx/octeontx_fpavf.c +1 -1
@@ -822,4 +822,4 @@ static struct rte_pci_driver pci_fpavf = { .probe = fpavf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_fpavf, pci_fpavf); +RTE_PMD_REGISTER_PCI (octeontx_fpavf, pci_fpavf, __LINE__);
drivers/ml/cnxk/cn10k_ml_dev.c +1 -1
@@ -858,7 +858,7 @@ static struct rte_pci_driver cn10k_mldev_pmd = { .remove = cn10k_ml_pci_remove, }; -RTE_PMD_REGISTER_PCI (MLDEV_NAME_CN10K_PMD , cn10k_mldev_pmd); +RTE_PMD_REGISTER_PCI (MLDEV_NAME_CN10K_PMD , cn10k_mldev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLDEV_NAME_CN10K_PMD , pci_id_ml_table);RTE_PMD_REGISTER_KMOD_DEP (MLDEV_NAME_CN10K_PMD ,"vfio-pci" );
drivers/ml/cnxk/mvtvm_ml_dev.c +1 -1
@@ -189,7 +189,7 @@ mvtvm_ml_vdev_remove(struct rte_vdev_device *vdev)static struct rte_vdev_driver mvtvm_mldev_pmd = {.probe = mvtvm_ml_vdev_probe, .remove = mvtvm_ml_vdev_remove}; -RTE_PMD_REGISTER_VDEV (MLDEV_NAME_MVTVM_PMD , mvtvm_mldev_pmd); +RTE_PMD_REGISTER_VDEV (MLDEV_NAME_MVTVM_PMD , mvtvm_mldev_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (MLDEV_NAME_MVTVM_PMD ,MVTVM_ML_DEV_MAX_QPS "=<int>" MVTVM_ML_DEV_CACHE_MODEL_DATA "=<0|1>" );
drivers/net/af_packet/rte_eth_af_packet.c +1 -1
@@ -1266,7 +1266,7 @@ static struct rte_vdev_driver pmd_af_packet_drv = { .remove = rte_pmd_af_packet_remove, }; -RTE_PMD_REGISTER_VDEV (net_af_packet, pmd_af_packet_drv); +RTE_PMD_REGISTER_VDEV (net_af_packet, pmd_af_packet_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_af_packet, eth_af_packet);RTE_PMD_REGISTER_PARAM_STRING (net_af_packet, "iface=<string> "
drivers/net/af_xdp/rte_eth_af_xdp.c +1 -1
@@ -2559,7 +2559,7 @@ static struct rte_vdev_driver pmd_af_xdp_drv = { .remove = rte_pmd_af_xdp_remove, }; -RTE_PMD_REGISTER_VDEV (net_af_xdp, pmd_af_xdp_drv); +RTE_PMD_REGISTER_VDEV (net_af_xdp, pmd_af_xdp_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_af_xdp,"iface=<string> " "start_queue=<int> "
drivers/net/ark/ark_ethdev.c +1 -1
@@ -1004,7 +1004,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)return ret; } -RTE_PMD_REGISTER_PCI (net_ark, rte_ark_pmd); +RTE_PMD_REGISTER_PCI (net_ark, rte_ark_pmd, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (net_ark,"* igb_uio | uio_pci_generic " );RTE_PMD_REGISTER_PCI_TABLE (net_ark, pci_id_ark_map); RTE_PMD_REGISTER_PARAM_STRING(net_ark,
drivers/net/atlantic/atl_ethdev.c +1 -1
@@ -1906,7 +1906,7 @@ is_atlantic_supported(struct rte_eth_dev *dev)return is_device_supported (dev, &rte_atl_pmd); } -RTE_PMD_REGISTER_PCI (net_atlantic, rte_atl_pmd); +RTE_PMD_REGISTER_PCI (net_atlantic, rte_atl_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_atlantic, pci_id_atl_map);RTE_PMD_REGISTER_KMOD_DEP (net_atlantic,"* igb_uio | uio_pci_generic" );RTE_LOG_REGISTER_SUFFIX (atl_logtype_init, init,NOTICE );
drivers/net/avp/avp_ethdev.c +1 -1
@@ -2305,6 +2305,6 @@ avp_dev_stats_reset(struct rte_eth_dev *eth_dev)return 0 ; } -RTE_PMD_REGISTER_PCI (net_avp, rte_avp_pmd); +RTE_PMD_REGISTER_PCI (net_avp, rte_avp_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_avp, pci_id_avp_map);RTE_LOG_REGISTER_SUFFIX (avp_logtype_driver, driver,NOTICE );
drivers/net/axgbe/axgbe_ethdev.c +1 -1
@@ -2459,7 +2459,7 @@ static struct rte_pci_driver rte_axgbe_pmd = { .remove = eth_axgbe_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_axgbe, rte_axgbe_pmd); +RTE_PMD_REGISTER_PCI (net_axgbe, rte_axgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_axgbe, pci_id_axgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_axgbe,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (axgbe_logtype_init, init,NOTICE );
drivers/net/bnx2x/bnx2x_ethdev.c +3 -2
@@ -817,10 +817,11 @@ static struct rte_pci_driver rte_bnx2xvf_pmd = { .remove = eth_bnx2x_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_bnx2x, rte_bnx2x_pmd); +/* Blank line to force unique __LINE__ */ +RTE_PMD_REGISTER_PCI (net_bnx2x, rte_bnx2x_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnx2x, pci_id_bnx2x_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnx2x,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_bnx2xvf, rte_bnx2xvf_pmd); +RTE_PMD_REGISTER_PCI (net_bnx2xvf, rte_bnx2xvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnx2xvf, pci_id_bnx2xvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnx2xvf,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (bnx2x_logtype_init, init,NOTICE );
drivers/net/bnxt/bnxt_ethdev.c +1 -1
@@ -7107,6 +7107,6 @@ static bool bnxt_enable_ulp(struct bnxt *bp) }RTE_LOG_REGISTER_SUFFIX (bnxt_logtype_driver, driver,NOTICE ); -RTE_PMD_REGISTER_PCI (net_bnxt, bnxt_rte_pmd); +RTE_PMD_REGISTER_PCI (net_bnxt, bnxt_rte_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_bnxt, bnxt_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_bnxt,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/bonding/rte_eth_bond_pmd.c +1 -1
@@ -4272,7 +4272,7 @@ struct rte_vdev_driver pmd_bond_drv = { .remove = bond_remove, }; -RTE_PMD_REGISTER_VDEV (net_bonding, pmd_bond_drv); +RTE_PMD_REGISTER_VDEV (net_bonding, pmd_bond_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_bonding, eth_bond); RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
drivers/net/cnxk/cn10k_ethdev.c +1 -1
@@ -1017,6 +1017,6 @@ static struct rte_pci_driver cn10k_pci_nix = { .remove = cn10k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn10k, cn10k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn10k, cn10k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn10k, cn10k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn10k,"vfio-pci" );
drivers/net/cnxk/cn20k_ethdev.c +1 -1
@@ -971,6 +971,6 @@ static struct rte_pci_driver cn20k_pci_nix = { .remove = cn20k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn20k, cn20k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn20k, cn20k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn20k, cn20k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn20k,"vfio-pci" );
drivers/net/cnxk/cn9k_ethdev.c +1 -1
@@ -912,6 +912,6 @@ static struct rte_pci_driver cn9k_pci_nix = { .remove = cn9k_nix_remove, }; -RTE_PMD_REGISTER_PCI (net_cn9k, cn9k_pci_nix); +RTE_PMD_REGISTER_PCI (net_cn9k, cn9k_pci_nix, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cn9k, cn9k_pci_nix_map);RTE_PMD_REGISTER_KMOD_DEP (net_cn9k,"vfio-pci" );
drivers/net/cnxk/cnxk_eswitch.c +1 -1
@@ -795,6 +795,6 @@ static struct rte_pci_driver cnxk_eswitch_pci = { .remove = cnxk_eswitch_dev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_eswitch, cnxk_eswitch_pci); +RTE_PMD_REGISTER_PCI (cnxk_eswitch, cnxk_eswitch_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_eswitch, cnxk_eswitch_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_eswitch,"vfio-pci" );
drivers/net/cnxk/cnxk_ethdev_sec.c +1 -1
@@ -673,7 +673,7 @@ static struct rte_pci_driver cnxk_nix_inl_pci = { .remove = cnxk_nix_inl_dev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_nix_inl, cnxk_nix_inl_pci); +RTE_PMD_REGISTER_PCI (cnxk_nix_inl, cnxk_nix_inl_pci, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_nix_inl, cnxk_nix_inl_pci_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_nix_inl,"vfio-pci" );
drivers/net/cxgbe/cxgbe_ethdev.c +1 -1
@@ -1796,7 +1796,7 @@ static struct rte_pci_driver rte_cxgbe_pmd = { .remove = eth_cxgbe_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_cxgbe, rte_cxgbe_pmd); +RTE_PMD_REGISTER_PCI (net_cxgbe, rte_cxgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cxgbe, cxgb4_pci_tbl);RTE_PMD_REGISTER_KMOD_DEP (net_cxgbe,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cxgbe,
drivers/net/cxgbe/cxgbevf_ethdev.c +1 -1
@@ -206,7 +206,7 @@ static struct rte_pci_driver rte_cxgbevf_pmd = { .remove = eth_cxgbevf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_cxgbevf, rte_cxgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_cxgbevf, rte_cxgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cxgbevf, cxgb4vf_pci_tbl);RTE_PMD_REGISTER_KMOD_DEP (net_cxgbevf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cxgbevf,
drivers/net/dpaa/dpaa_ethdev.c +1 -1
@@ -2628,7 +2628,7 @@ static struct rte_dpaa_driver rte_dpaa_pmd = { .remove = rte_dpaa_remove, }; -RTE_PMD_REGISTER_DPAA (net_dpaa, rte_dpaa_pmd); +RTE_PMD_REGISTER_DPAA (net_dpaa, rte_dpaa_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_dpaa,DRIVER_IEEE1588 "=<int>" );RTE_LOG_REGISTER_DEFAULT (dpaa_logtype_pmd,NOTICE );
drivers/net/dpaa2/dpaa2_ethdev.c +1 -1
@@ -3068,7 +3068,7 @@ static struct rte_dpaa2_driver rte_dpaa2_pmd = { .remove = rte_dpaa2_remove, }; -RTE_PMD_REGISTER_DPAA2 (NET_DPAA2_PMD_DRIVER_NAME , rte_dpaa2_pmd); +RTE_PMD_REGISTER_DPAA2 (NET_DPAA2_PMD_DRIVER_NAME , rte_dpaa2_pmd, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (NET_DPAA2_PMD_DRIVER_NAME ,DRIVER_LOOPBACK_MODE "=<int> " DRIVER_NO_PREFETCH_MODE "=<int>"
drivers/net/dpaa2/dpaa2_mux.c +1 -1
@@ -606,4 +606,4 @@ static struct rte_dpaa2_object rte_dpaa2_dpdmux_obj = { .close = dpaa2_close_dpdmux_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dpdmux, rte_dpaa2_dpdmux_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dpdmux, rte_dpaa2_dpdmux_obj, __LINE__);
drivers/net/dpaa2/dpaa2_ptp.c +1 -1
@@ -180,5 +180,5 @@ static struct rte_dpaa2_object rte_dpaa2_dprtc_obj = { .create = dpaa2_create_dprtc_device, }; -RTE_PMD_REGISTER_DPAA2_OBJECT (dprtc, rte_dpaa2_dprtc_obj); +RTE_PMD_REGISTER_DPAA2_OBJECT (dprtc, rte_dpaa2_dprtc_obj, __LINE__);#endif
drivers/net/ena/ena_ethdev.c +1 -1
@@ -4014,7 +4014,7 @@ static struct rte_pci_driver rte_ena_pmd = { .remove = eth_ena_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ena, rte_ena_pmd); +RTE_PMD_REGISTER_PCI (net_ena, rte_ena_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ena, pci_id_ena_map);RTE_PMD_REGISTER_KMOD_DEP (net_ena,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ena,
drivers/net/enetc/enetc_ethdev.c +1 -1
@@ -965,7 +965,7 @@ static struct rte_pci_driver rte_enetc_pmd = { .remove = enetc_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_enetc, rte_enetc_pmd); +RTE_PMD_REGISTER_PCI (net_enetc, rte_enetc_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_enetc, pci_id_enetc_map);RTE_PMD_REGISTER_KMOD_DEP (net_enetc,"* vfio-pci" );RTE_LOG_REGISTER_DEFAULT (enetc_logtype_pmd,NOTICE );
drivers/net/enetfec/enet_ethdev.c +1 -1
@@ -689,5 +689,5 @@ static struct rte_vdev_driver pmd_enetfec_drv = { .remove = pmd_enetfec_remove, }; -RTE_PMD_REGISTER_VDEV (ENETFEC_NAME_PMD , pmd_enetfec_drv); +RTE_PMD_REGISTER_VDEV (ENETFEC_NAME_PMD , pmd_enetfec_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (enetfec_logtype_pmd,NOTICE );
drivers/net/enic/enic_ethdev.c +1 -1
@@ -1425,7 +1425,7 @@ int dev_is_enic(struct rte_eth_dev *dev)return dev->device->driver == &rte_enic_pmd.driver; } -RTE_PMD_REGISTER_PCI (net_enic, rte_enic_pmd); +RTE_PMD_REGISTER_PCI (net_enic, rte_enic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_enic, pci_id_enic_map);RTE_PMD_REGISTER_KMOD_DEP (net_enic,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_enic,
drivers/net/failsafe/failsafe.c +1 -1
@@ -396,6 +396,6 @@ static struct rte_vdev_driver failsafe_drv = { .remove = rte_pmd_failsafe_remove, }; -RTE_PMD_REGISTER_VDEV (net_failsafe, failsafe_drv); +RTE_PMD_REGISTER_VDEV (net_failsafe, failsafe_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_failsafe,PMD_FAILSAFE_PARAM_STRING );RTE_LOG_REGISTER_DEFAULT (failsafe_logtype,NOTICE )
drivers/net/gve/gve_ethdev.c +1 -1
@@ -1364,7 +1364,7 @@ static struct rte_pci_driver rte_gve_pmd = { .remove = gve_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_gve, rte_gve_pmd); +RTE_PMD_REGISTER_PCI (net_gve, rte_gve_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_gve, pci_id_gve_map);RTE_PMD_REGISTER_KMOD_DEP (net_gve,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (gve_logtype_driver, driver,NOTICE );
drivers/net/hinic/hinic_pmd_ethdev.c +1 -1
@@ -3255,6 +3255,6 @@ static struct rte_pci_driver rte_hinic_pmd = { .remove = hinic_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hinic, rte_hinic_pmd); +RTE_PMD_REGISTER_PCI (net_hinic, rte_hinic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hinic, pci_id_hinic_map);RTE_LOG_REGISTER_DEFAULT (hinic_logtype,INFO );
drivers/net/hns3/hns3_ethdev.c +1 -1
@@ -6688,7 +6688,7 @@ static struct rte_pci_driver rte_hns3_pmd = { .remove = eth_hns3_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hns3, rte_hns3_pmd); +RTE_PMD_REGISTER_PCI (net_hns3, rte_hns3_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hns3, pci_id_hns3_map);RTE_PMD_REGISTER_KMOD_DEP (net_hns3,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_hns3,
drivers/net/hns3/hns3_ethdev_vf.c +1 -1
@@ -2360,7 +2360,7 @@ static struct rte_pci_driver rte_hns3vf_pmd = { .remove = eth_hns3vf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_hns3_vf, rte_hns3vf_pmd); +RTE_PMD_REGISTER_PCI (net_hns3_vf, rte_hns3vf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_hns3_vf, pci_id_hns3vf_map);RTE_PMD_REGISTER_KMOD_DEP (net_hns3_vf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_hns3_vf,
drivers/net/intel/cpfl/cpfl_ethdev.c +1 -1
@@ -2876,7 +2876,7 @@ static struct rte_pci_driver rte_cpfl_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_cpfl, rte_cpfl_pmd); +RTE_PMD_REGISTER_PCI (net_cpfl, rte_cpfl_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_cpfl, pci_id_cpfl_map);RTE_PMD_REGISTER_KMOD_DEP (net_cpfl,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_cpfl,
drivers/net/intel/e1000/em_ethdev.c +1 -1
@@ -1956,6 +1956,6 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev,return 0 ; } -RTE_PMD_REGISTER_PCI (net_e1000_em, rte_em_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_em, rte_em_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_em, pci_id_em_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_em,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/e1000/igb_ethdev.c +2 -2
@@ -5626,9 +5626,9 @@ igb_filter_restore(struct rte_eth_dev *dev)return 0 ; } -RTE_PMD_REGISTER_PCI (net_e1000_igb, rte_igb_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_igb, rte_igb_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_igb, pci_id_igb_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_igb,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_e1000_igb_vf, rte_igbvf_pmd); +RTE_PMD_REGISTER_PCI (net_e1000_igb_vf, rte_igbvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_e1000_igb_vf, pci_id_igbvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_e1000_igb_vf,"* igb_uio | vfio-pci" );
drivers/net/intel/e1000/igc_ethdev.c +1 -1
@@ -3000,6 +3000,6 @@ static struct rte_pci_driver rte_igc_pmd = { .remove = eth_igc_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_igc, rte_igc_pmd); +RTE_PMD_REGISTER_PCI (net_igc, rte_igc_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_igc, pci_id_igc_map);RTE_PMD_REGISTER_KMOD_DEP (net_igc,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/fm10k/fm10k_ethdev.c +1 -1
@@ -3313,7 +3313,7 @@ static struct rte_pci_driver rte_pmd_fm10k = { .remove = eth_fm10k_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_fm10k, rte_pmd_fm10k); +RTE_PMD_REGISTER_PCI (net_fm10k, rte_pmd_fm10k, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_fm10k, pci_id_fm10k_map);RTE_PMD_REGISTER_KMOD_DEP (net_fm10k,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (fm10k_logtype_init, init,NOTICE );
drivers/net/intel/i40e/i40e_ethdev.c +1 -1
@@ -756,7 +756,7 @@ i40e_write_global_rx_ctl(struct i40e_hw *hw, uint32_t reg_addr, dev->device->name, reg_addr, ori_reg_val, reg_val); } -RTE_PMD_REGISTER_PCI (net_i40e, rte_i40e_pmd); +RTE_PMD_REGISTER_PCI (net_i40e, rte_i40e_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_i40e, pci_id_i40e_map);RTE_PMD_REGISTER_KMOD_DEP (net_i40e,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/intel/iavf/iavf_ethdev.c +1 -1
@@ -3194,7 +3194,7 @@ static struct rte_pci_driver rte_iavf_pmd = { .remove = eth_iavf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_iavf, rte_iavf_pmd); +RTE_PMD_REGISTER_PCI (net_iavf, rte_iavf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_iavf, pci_id_iavf_map);RTE_PMD_REGISTER_KMOD_DEP (net_iavf,"* igb_uio | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_iavf,"cap=dcf" );
drivers/net/intel/ice/ice_dcf_ethdev.c +1 -1
@@ -2152,7 +2152,7 @@ static struct rte_pci_driver rte_ice_dcf_pmd = { .remove = eth_ice_dcf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ice_dcf, rte_ice_dcf_pmd); +RTE_PMD_REGISTER_PCI (net_ice_dcf, rte_ice_dcf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ice_dcf, pci_id_ice_dcf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice_dcf,"* igb_uio | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice_dcf,"cap=dcf" );
drivers/net/intel/ice/ice_ethdev.c +1 -1
@@ -7254,7 +7254,7 @@ static struct rte_pci_driver rte_ice_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_ice, rte_ice_pmd); +RTE_PMD_REGISTER_PCI (net_ice, rte_ice_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ice,
drivers/net/intel/idpf/idpf_ethdev.c +1 -1
@@ -1477,7 +1477,7 @@ static struct rte_pci_driver rte_idpf_pmd = {* Invoked once at EAL init time. * Register itself as the [Poll Mode] Driver of PCI devices. */ -RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd); +RTE_PMD_REGISTER_PCI (net_idpf, rte_idpf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_idpf, pci_id_idpf_map);RTE_PMD_REGISTER_KMOD_DEP (net_idpf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_idpf,
drivers/net/intel/ipn3ke/ipn3ke_ethdev.c +1 -1
@@ -564,5 +564,5 @@ static struct rte_afu_driver afu_ipn3ke_driver = { .remove = ipn3ke_vswitch_remove, }; -RTE_PMD_REGISTER_AFU (net_ipn3ke_afu, afu_ipn3ke_driver); +RTE_PMD_REGISTER_AFU (net_ipn3ke_afu, afu_ipn3ke_driver, __LINE__);RTE_LOG_REGISTER_DEFAULT (ipn3ke_afu_logtype,NOTICE );
drivers/net/intel/ixgbe/ixgbe_ethdev.c +2 -2
@@ -8607,12 +8607,12 @@ ixgbe_dev_macsec_register_disable(struct rte_eth_dev *dev)ixgbe_enable_sec_tx_path_generic (hw); } -RTE_PMD_REGISTER_PCI (net_ixgbe, rte_ixgbe_pmd); +RTE_PMD_REGISTER_PCI (net_ixgbe, rte_ixgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ixgbe, pci_id_ixgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_ixgbe,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ixgbe,IXGBE_DEVARG_FIBER_SDP3_NOT_TX_DISABLE "=<0|1>" ); -RTE_PMD_REGISTER_PCI (net_ixgbe_vf, rte_ixgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_ixgbe_vf, rte_ixgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ixgbe_vf, pci_id_ixgbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ixgbe_vf,"* igb_uio | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ixgbe_vf,
drivers/net/ionic/ionic_dev_pci.c +1 -1
@@ -265,7 +265,7 @@ static struct rte_pci_driver rte_pci_ionic_pmd = { .remove = eth_ionic_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ionic_pci, rte_pci_ionic_pmd); +RTE_PMD_REGISTER_PCI (net_ionic_pci, rte_pci_ionic_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ionic_pci, pci_id_ionic_map);RTE_PMD_REGISTER_KMOD_DEP (net_ionic_pci,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_ionic_pci,
drivers/net/ionic/ionic_dev_vdev.c +2 -1
@@ -144,4 +144,5 @@ static struct rte_vdev_driver rte_vdev_ionic_pmd = { .remove = eth_ionic_vdev_remove, }; -RTE_PMD_REGISTER_VDEV (net_ionic, rte_vdev_ionic_pmd); +/* Blank line to force unique __LINE__ */ +RTE_PMD_REGISTER_VDEV (net_ionic, rte_vdev_ionic_pmd, __LINE__);
drivers/net/mana/mana.c +1 -1
@@ -1648,7 +1648,7 @@ static struct rte_pci_driver mana_pci_driver = { .drv_flags = RTE_PCI_DRV_INTR_RMV, }; -RTE_PMD_REGISTER_PCI (net_mana, mana_pci_driver); +RTE_PMD_REGISTER_PCI (net_mana, mana_pci_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_mana, mana_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_mana,"* ib_uverbs & mana_ib" );RTE_LOG_REGISTER_SUFFIX (mana_logtype_init, init,NOTICE );
drivers/net/memif/rte_eth_memif.c +1 -1
@@ -2083,7 +2083,7 @@ static struct rte_vdev_driver pmd_memif_drv = { .remove = rte_pmd_memif_remove, }; -RTE_PMD_REGISTER_VDEV (net_memif, pmd_memif_drv); +RTE_PMD_REGISTER_VDEV (net_memif, pmd_memif_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_memif, ETH_MEMIF_ID_ARG "=<int>"
drivers/net/mlx4/mlx4.c +1 -1
@@ -1385,7 +1385,7 @@ RTE_INIT(rte_mlx4_pmd_init)rte_pci_register (&mlx4_driver); } -RTE_PMD_EXPORT_NAME (net_mlx4, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_mlx4, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_mlx4, mlx4_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_mlx4,"* ib_uverbs & mlx4_en & mlx4_core & mlx4_ib" );
drivers/net/mlx5/mlx5.c +1 -1
@@ -3819,6 +3819,6 @@ RTE_INIT(rte_mlx5_pmd_init)mlx5_class_driver_register (&mlx5_net_driver); } -RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_ETH_DRIVER_NAME , mlx5_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_ETH_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/net/mvneta/mvneta_ethdev.c +1 -1
@@ -993,6 +993,6 @@ static struct rte_vdev_driver pmd_mvneta_drv = { .remove = rte_pmd_mvneta_remove, }; -RTE_PMD_REGISTER_VDEV (net_mvneta, pmd_mvneta_drv); +RTE_PMD_REGISTER_VDEV (net_mvneta, pmd_mvneta_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_mvneta,"iface=<ifc>" );RTE_LOG_REGISTER_DEFAULT (mvneta_logtype,NOTICE );
drivers/net/mvpp2/mrvl_ethdev.c +1 -1
@@ -3319,6 +3319,6 @@ static struct rte_vdev_driver pmd_mrvl_drv = { .remove = rte_pmd_mrvl_remove, }; -RTE_PMD_REGISTER_VDEV (net_mvpp2, pmd_mrvl_drv); +RTE_PMD_REGISTER_VDEV (net_mvpp2, pmd_mrvl_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_mvpp2, eth_mvpp2);RTE_LOG_REGISTER_DEFAULT (mrvl_logtype,NOTICE );
drivers/net/netvsc/hn_ethdev.c +1 -1
@@ -1485,7 +1485,7 @@ static struct rte_vmbus_driver rte_netvsc_pmd = { .remove = eth_hn_remove, }; -RTE_PMD_REGISTER_VMBUS (net_netvsc, rte_netvsc_pmd); +RTE_PMD_REGISTER_VMBUS (net_netvsc, rte_netvsc_pmd, __LINE__);RTE_PMD_REGISTER_KMOD_DEP (net_netvsc,"* uio_hv_generic" );RTE_LOG_REGISTER_SUFFIX (hn_logtype_init, init,NOTICE );RTE_LOG_REGISTER_SUFFIX (hn_logtype_driver, driver,NOTICE );
drivers/net/nfb/nfb_ethdev.c +1 -1
@@ -668,7 +668,7 @@ static struct rte_pci_driver nfb_eth_driver = { .remove = nfb_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (RTE_NFB_DRIVER_NAME , nfb_eth_driver); +RTE_PMD_REGISTER_PCI (RTE_NFB_DRIVER_NAME , nfb_eth_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (RTE_NFB_DRIVER_NAME , nfb_pci_id_table);RTE_PMD_REGISTER_KMOD_DEP (RTE_NFB_DRIVER_NAME ,"* nfb" );RTE_LOG_REGISTER_DEFAULT (nfb_logtype,NOTICE );
drivers/net/nfp/nfp_ethdev.c +1 -1
@@ -2904,7 +2904,7 @@ static struct rte_pci_driver rte_nfp_net_pf_pmd = { .remove = eth_nfp_pci_remove, }; -RTE_PMD_REGISTER_PCI (NFP_PF_DRIVER_NAME , rte_nfp_net_pf_pmd); +RTE_PMD_REGISTER_PCI (NFP_PF_DRIVER_NAME , rte_nfp_net_pf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (NFP_PF_DRIVER_NAME , pci_id_nfp_pf_net_map);RTE_PMD_REGISTER_KMOD_DEP (NFP_PF_DRIVER_NAME ,"* igb_uio | uio_pci_generic | vfio" ); RTE_PMD_REGISTER_PARAM_STRING(NFP_PF_DRIVER_NAME,
drivers/net/ngbe/ngbe_ethdev.c +1 -1
@@ -3294,7 +3294,7 @@ static const struct eth_dev_ops ngbe_eth_dev_ops = { .tx_done_cleanup = ngbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_ngbe, rte_ngbe_pmd); +RTE_PMD_REGISTER_PCI (net_ngbe, rte_ngbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ngbe, pci_id_ngbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_ngbe,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/ngbe/ngbe_ethdev_vf.c +1 -1
@@ -1348,6 +1348,6 @@ static const struct eth_dev_ops ngbevf_eth_dev_ops = { .tx_done_cleanup = ngbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_ngbe_vf, rte_ngbevf_pmd); +RTE_PMD_REGISTER_PCI (net_ngbe_vf, rte_ngbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ngbe_vf, pci_id_ngbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ngbe_vf,"* igb_uio | vfio-pci" );
drivers/net/ntnic/ntnic_ethdev.c +1 -1
@@ -2547,7 +2547,7 @@ static struct rte_pci_driver rte_nthw_pmd = { .remove = nthw_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ntnic, rte_nthw_pmd); +RTE_PMD_REGISTER_PCI (net_ntnic, rte_nthw_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ntnic, nthw_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_ntnic,"* vfio-pci" );
drivers/net/null/rte_eth_null.c +1 -1
@@ -771,7 +771,7 @@ static struct rte_vdev_driver pmd_null_drv = { .remove = rte_pmd_null_remove, }; -RTE_PMD_REGISTER_VDEV (net_null, pmd_null_drv); +RTE_PMD_REGISTER_VDEV (net_null, pmd_null_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_null, eth_null);RTE_PMD_REGISTER_PARAM_STRING (net_null, "size=<int> "
drivers/net/octeon_ep/otx_ep_ethdev.c +1 -1
@@ -900,7 +900,7 @@ static struct rte_pci_driver rte_otx_ep_pmd = { .remove = otx_ep_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_otx_ep, rte_otx_ep_pmd); +RTE_PMD_REGISTER_PCI (net_otx_ep, rte_otx_ep_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_otx_ep, pci_id_otx_ep_map);RTE_PMD_REGISTER_KMOD_DEP (net_otx_ep,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (otx_net_ep_logtype,NOTICE );
drivers/net/octeontx/base/octeontx_pkivf.c +1 -1
@@ -236,4 +236,4 @@ static struct rte_pci_driver pci_pkivf = { .probe = pkivf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_pkivf, pci_pkivf); +RTE_PMD_REGISTER_PCI (octeontx_pkivf, pci_pkivf, __LINE__);
drivers/net/octeontx/base/octeontx_pkovf.c +1 -1
@@ -637,4 +637,4 @@ static struct rte_pci_driver pci_pkovf = { .probe = pkovf_probe, }; -RTE_PMD_REGISTER_PCI (octeontx_pkovf, pci_pkovf); +RTE_PMD_REGISTER_PCI (octeontx_pkovf, pci_pkovf, __LINE__);
drivers/net/octeontx/octeontx_ethdev.c +2 -1
@@ -1899,6 +1899,7 @@ static struct rte_vdev_driver octeontx_pmd_drv = { .remove = octeontx_remove, }; -RTE_PMD_REGISTER_VDEV (OCTEONTX_PMD , octeontx_pmd_drv); +/* Blank line to force unique __LINE__ with RTE_PMD_REGISTER_VDEV */ +RTE_PMD_REGISTER_VDEV (OCTEONTX_PMD , octeontx_pmd_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (OCTEONTX_PMD , eth_octeontx);RTE_PMD_REGISTER_PARAM_STRING (OCTEONTX_PMD ,"nr_port=<int> " );
drivers/net/pcap/pcap_ethdev.c +1 -1
@@ -1650,7 +1650,7 @@ static struct rte_vdev_driver pmd_pcap_drv = { .remove = pmd_pcap_remove, }; -RTE_PMD_REGISTER_VDEV (net_pcap, pmd_pcap_drv); +RTE_PMD_REGISTER_VDEV (net_pcap, pmd_pcap_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_pcap, eth_pcap);RTE_PMD_REGISTER_PARAM_STRING (net_pcap, ETH_PCAP_RX_PCAP_ARG "=<string> "
drivers/net/pfe/pfe_ethdev.c +1 -1
@@ -1145,6 +1145,6 @@ struct rte_vdev_driver pmd_pfe_drv = { .remove = pmd_pfe_remove, }; -RTE_PMD_REGISTER_VDEV (PFE_NAME_PMD , pmd_pfe_drv); +RTE_PMD_REGISTER_VDEV (PFE_NAME_PMD , pmd_pfe_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (PFE_NAME_PMD ,PFE_VDEV_GEM_ID_ARG "=<int> " );RTE_LOG_REGISTER_DEFAULT (pfe_logtype_pmd,NOTICE );
drivers/net/qede/qede_ethdev.c +2 -2
@@ -2870,10 +2870,10 @@ static struct rte_pci_driver rte_qede_pmd = { .remove = qede_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_qede, rte_qede_pmd); +RTE_PMD_REGISTER_PCI (net_qede, rte_qede_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_qede, pci_id_qede_map);RTE_PMD_REGISTER_KMOD_DEP (net_qede,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_REGISTER_PCI (net_qede_vf, rte_qedevf_pmd); +RTE_PMD_REGISTER_PCI (net_qede_vf, rte_qedevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_qede_vf, pci_id_qedevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_qede_vf,"* igb_uio | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (qede_logtype_init, init,NOTICE );
drivers/net/r8169/r8169_ethdev.c +1 -1
@@ -778,7 +778,7 @@ static struct rte_pci_driver rte_r8169_pmd = { .remove = rtl_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_r8169, rte_r8169_pmd); +RTE_PMD_REGISTER_PCI (net_r8169, rte_r8169_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_r8169, pci_id_r8169_map);RTE_PMD_REGISTER_KMOD_DEP (net_r8169,"* igb_uio | uio_pci_generic | vfio-pci" );
drivers/net/ring/rte_eth_ring.c +1 -1
@@ -823,7 +823,7 @@ static struct rte_vdev_driver pmd_ring_drv = { .remove = rte_pmd_ring_remove, }; -RTE_PMD_REGISTER_VDEV (net_ring, pmd_ring_drv); +RTE_PMD_REGISTER_VDEV (net_ring, pmd_ring_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_ring, eth_ring);RTE_PMD_REGISTER_PARAM_STRING (net_ring,ETH_RING_NUMA_NODE_ACTION_ARG "=name:node:action(ATTACH|CREATE)" );
drivers/net/sfc/sfc_ethdev.c +1 -1
@@ -3614,7 +3614,7 @@ static struct rte_pci_driver sfc_efx_pmd = { .remove = sfc_eth_dev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_sfc_efx, sfc_efx_pmd); +RTE_PMD_REGISTER_PCI (net_sfc_efx, sfc_efx_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_sfc_efx, pci_id_sfc_efx_map);RTE_PMD_REGISTER_KMOD_DEP (net_sfc_efx,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx,
drivers/net/softnic/rte_eth_softnic.c +1 -1
@@ -510,7 +510,7 @@ static struct rte_vdev_driver pmd_softnic_drv = { .remove = pmd_remove, }; -RTE_PMD_REGISTER_VDEV (net_softnic, pmd_softnic_drv); +RTE_PMD_REGISTER_VDEV (net_softnic, pmd_softnic_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (net_softnic,PMD_PARAM_FIRMWARE "=<string> " PMD_PARAM_CONN_PORT "=<uint16> "
drivers/net/tap/rte_eth_tap.c +2 -2
@@ -2565,8 +2565,8 @@ static struct rte_vdev_driver pmd_tap_drv = { .remove = rte_pmd_tap_remove, }; -RTE_PMD_REGISTER_VDEV (net_tap, pmd_tap_drv); -RTE_PMD_REGISTER_VDEV (net_tun, pmd_tun_drv); +RTE_PMD_REGISTER_VDEV (net_tap, pmd_tap_drv, __LINE__); +RTE_PMD_REGISTER_VDEV (net_tun, pmd_tun_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_tap, eth_tap);RTE_PMD_REGISTER_PARAM_STRING (net_tun,ETH_TAP_IFACE_ARG "=<string> " );
drivers/net/thunderx/nicvf_ethdev.c +1 -1
@@ -2409,7 +2409,7 @@ static struct rte_pci_driver rte_nicvf_pmd = { .remove = nicvf_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_thunderx, rte_nicvf_pmd); +RTE_PMD_REGISTER_PCI (net_thunderx, rte_nicvf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_thunderx, pci_id_nicvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_thunderx,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_thunderx,SKIP_DATA_BYTES "=<int>" );
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -5665,7 +5665,7 @@ static const struct eth_dev_ops txgbe_eth_dev_ops = { .tx_done_cleanup = txgbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_txgbe, rte_txgbe_pmd); +RTE_PMD_REGISTER_PCI (net_txgbe, rte_txgbe_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_txgbe, pci_id_txgbe_map);RTE_PMD_REGISTER_KMOD_DEP (net_txgbe,"* igb_uio | uio_pci_generic | vfio-pci" ); RTE_PMD_REGISTER_PARAM_STRING(net_txgbe,
drivers/net/txgbe/txgbe_ethdev_vf.c +1 -1
@@ -1387,6 +1387,6 @@ static const struct eth_dev_ops txgbevf_eth_dev_ops = { .tx_done_cleanup = txgbe_dev_tx_done_cleanup, }; -RTE_PMD_REGISTER_PCI (net_txgbe_vf, rte_txgbevf_pmd); +RTE_PMD_REGISTER_PCI (net_txgbe_vf, rte_txgbevf_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_txgbe_vf, pci_id_txgbevf_map);RTE_PMD_REGISTER_KMOD_DEP (net_txgbe_vf,"* igb_uio | vfio-pci" );
drivers/net/vdev_netvsc/vdev_netvsc.c +1 -1
@@ -760,7 +760,7 @@ static struct rte_vdev_driver vdev_netvsc_vdev = { .remove = vdev_netvsc_vdev_remove, }; -RTE_PMD_REGISTER_VDEV (VDEV_NETVSC_DRIVER , vdev_netvsc_vdev); +RTE_PMD_REGISTER_VDEV (VDEV_NETVSC_DRIVER , vdev_netvsc_vdev, __LINE__);RTE_PMD_REGISTER_ALIAS (VDEV_NETVSC_DRIVER , eth_vdev_netvsc);RTE_PMD_REGISTER_PARAM_STRING (net_vdev_netvsc, VDEV_NETVSC_ARG_IFACE "=<string> "
drivers/net/vhost/rte_eth_vhost.c +1 -1
@@ -1772,7 +1772,7 @@ static struct rte_vdev_driver pmd_vhost_drv = { .remove = rte_pmd_vhost_remove, }; -RTE_PMD_REGISTER_VDEV (net_vhost, pmd_vhost_drv); +RTE_PMD_REGISTER_VDEV (net_vhost, pmd_vhost_drv, __LINE__);RTE_PMD_REGISTER_ALIAS (net_vhost, eth_vhost);RTE_PMD_REGISTER_PARAM_STRING (net_vhost, "iface=<ifc> "
drivers/net/virtio/virtio_pci_ethdev.c +1 -1
@@ -239,4 +239,4 @@ RTE_INIT(rte_virtio_net_pci_pmd_init)RTE_PMD_REGISTER_PCI_TABLE (net_virtio, pci_id_virtio_map);RTE_PMD_REGISTER_KMOD_DEP (net_virtio,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_EXPORT_NAME (net_virtio, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_virtio, __LINE__);
drivers/net/virtio/virtio_user_ethdev.c +1 -1
@@ -811,7 +811,7 @@ static struct rte_vdev_driver virtio_user_driver = { .dma_unmap = virtio_user_pmd_dma_unmap, }; -RTE_PMD_REGISTER_VDEV (net_virtio_user, virtio_user_driver); +RTE_PMD_REGISTER_VDEV (net_virtio_user, virtio_user_driver, __LINE__);RTE_PMD_REGISTER_ALIAS (net_virtio_user, virtio_user);RTE_PMD_REGISTER_PARAM_STRING (net_virtio_user, "path=<path> "
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -1
@@ -1966,7 +1966,7 @@ vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)return 0 ; } -RTE_PMD_REGISTER_PCI (net_vmxnet3, rte_vmxnet3_pmd); +RTE_PMD_REGISTER_PCI (net_vmxnet3, rte_vmxnet3_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_vmxnet3, pci_id_vmxnet3_map);RTE_PMD_REGISTER_KMOD_DEP (net_vmxnet3,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_SUFFIX (vmxnet3_logtype_init, init,NOTICE );
drivers/net/xsc/xsc_ethdev.c +1 -1
@@ -919,7 +919,7 @@ static struct rte_pci_driver xsc_ethdev_pci_driver = { .remove = xsc_ethdev_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_xsc, xsc_ethdev_pci_driver); +RTE_PMD_REGISTER_PCI (net_xsc, xsc_ethdev_pci_driver, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_xsc, xsc_ethdev_pci_id_map);RTE_PMD_REGISTER_PARAM_STRING (net_xsc, XSC_PPH_MODE_ARG "=<x>"
drivers/net/zxdh/zxdh_ethdev.c +1 -1
@@ -2051,7 +2051,7 @@ static struct rte_pci_driver zxdh_pmd = { .remove = zxdh_eth_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_zxdh, zxdh_pmd); +RTE_PMD_REGISTER_PCI (net_zxdh, zxdh_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_zxdh, pci_id_zxdh_map);RTE_PMD_REGISTER_KMOD_DEP (net_zxdh,"* vfio-pci" );RTE_LOG_REGISTER_SUFFIX (zxdh_logtype_driver, driver,NOTICE );
drivers/raw/cnxk_bphy/cnxk_bphy.c +1 -1
@@ -406,7 +406,7 @@ static struct rte_pci_driver cnxk_bphy_rawdev_pmd = { .remove = bphy_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd); +RTE_PMD_REGISTER_PCI (bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (bphy_rawdev_pci_driver, pci_bphy_map);RTE_PMD_REGISTER_KMOD_DEP (bphy_rawdev_pci_driver,"vfio-pci" );RTE_LOG_REGISTER_SUFFIX (cnxk_logtype_bphy, bphy,INFO );
drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c +1 -1
@@ -379,6 +379,6 @@ static struct rte_pci_driver bphy_cgx_rawdev_pmd = { .remove = cnxk_bphy_cgx_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (cnxk_bphy_cgx_rawdev_pci_driver, bphy_cgx_rawdev_pmd); +RTE_PMD_REGISTER_PCI (cnxk_bphy_cgx_rawdev_pci_driver, bphy_cgx_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (cnxk_bphy_cgx_rawdev_pci_driver, cnxk_bphy_cgx_map);RTE_PMD_REGISTER_KMOD_DEP (cnxk_bphy_cgx_rawdev_pci_driver,"vfio-pci" );
drivers/raw/cnxk_gpio/cnxk_gpio.c +1 -1
@@ -847,7 +847,7 @@ static struct rte_vdev_driver cnxk_gpio_drv = { .remove = cnxk_gpio_remove, }; -RTE_PMD_REGISTER_VDEV (cnxk_gpio, cnxk_gpio_drv); +RTE_PMD_REGISTER_VDEV (cnxk_gpio, cnxk_gpio_drv, __LINE__);RTE_PMD_REGISTER_PARAM_STRING (cnxk_gpio,"gpiochip=<int> " "allowlist=<list>" );
drivers/raw/cnxk_rvu_lf/cnxk_rvu_lf.c +1 -1
@@ -267,7 +267,7 @@ static struct rte_pci_driver cnxk_rvu_lf_rawdev_pmd = { .remove = rvu_lf_remove, }; -RTE_PMD_REGISTER_PCI (rvu_lf_rawdev_pci_driver, cnxk_rvu_lf_rawdev_pmd); +RTE_PMD_REGISTER_PCI (rvu_lf_rawdev_pci_driver, cnxk_rvu_lf_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (rvu_lf_rawdev_pci_driver, pci_rvu_lf_map);RTE_PMD_REGISTER_KMOD_DEP (rvu_lf_rawdev_pci_driver,"vfio-pci" );RTE_LOG_REGISTER_SUFFIX (cnxk_logtype_rvu_lf, rvu_lf,INFO );
drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c +1 -1
@@ -287,5 +287,5 @@ static struct rte_vdev_driver dpaa2_cmdif_drv = { .remove = dpaa2_cmdif_remove }; -RTE_PMD_REGISTER_VDEV (DPAA2_CMDIF_PMD_NAME , dpaa2_cmdif_drv); +RTE_PMD_REGISTER_VDEV (DPAA2_CMDIF_PMD_NAME , dpaa2_cmdif_drv, __LINE__);RTE_LOG_REGISTER (dpaa2_cmdif_logtype, pmd.raw.dpaa2.cmdif,INFO );
drivers/raw/gdtc/gdtc_rawdev.c +1 -1
@@ -913,6 +913,6 @@ static struct rte_pci_driver zxdh_gdma_rawdev_pmd = { .remove = zxdh_gdma_rawdev_remove, }; -RTE_PMD_REGISTER_PCI (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_pmd); +RTE_PMD_REGISTER_PCI (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (zxdh_gdma_rawdev_pci_driver, zxdh_gdma_rawdev_map);RTE_LOG_REGISTER_DEFAULT (zxdh_gdma_rawdev_logtype,NOTICE );
drivers/raw/ifpga/afu_pmd_core.c +1 -1
@@ -391,7 +391,7 @@ static struct rte_afu_driver afu_pmd = { .remove = afu_rawdev_remove }; -RTE_PMD_REGISTER_AFU (afu_rawdev_driver, afu_pmd); +RTE_PMD_REGISTER_AFU (afu_rawdev_driver, afu_pmd, __LINE__);static void update_uuid_map (void ) {
drivers/raw/ifpga/ifpga_rawdev.c +2 -2
@@ -1687,7 +1687,7 @@ static struct rte_pci_driver rte_ifpga_rawdev_pmd = { .remove = ifpga_rawdev_pci_remove, }; -RTE_PMD_REGISTER_PCI (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd); +RTE_PMD_REGISTER_PCI (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);RTE_PMD_REGISTER_KMOD_DEP (ifpga_rawdev_pci_driver,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (ifpga_rawdev_logtype,NOTICE );
@@ -1897,7 +1897,7 @@ static struct rte_vdev_driver ifpga_cfg_driver = { .remove = ifpga_cfg_remove, }; -RTE_PMD_REGISTER_VDEV (ifpga_rawdev_cfg, ifpga_cfg_driver); +RTE_PMD_REGISTER_VDEV (ifpga_rawdev_cfg, ifpga_cfg_driver, __LINE__);RTE_PMD_REGISTER_ALIAS (ifpga_rawdev_cfg, ifpga_cfg);RTE_PMD_REGISTER_PARAM_STRING (ifpga_rawdev_cfg, "ifpga=<string> "
drivers/raw/ntb/ntb.c +1 -1
@@ -1550,7 +1550,7 @@ static struct rte_pci_driver rte_ntb_pmd = { .remove = ntb_remove, }; -RTE_PMD_REGISTER_PCI (raw_ntb, rte_ntb_pmd); +RTE_PMD_REGISTER_PCI (raw_ntb, rte_ntb_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (raw_ntb, pci_id_ntb_map);RTE_PMD_REGISTER_KMOD_DEP (raw_ntb,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_LOG_REGISTER_DEFAULT (ntb_logtype,INFO );
drivers/raw/skeleton/skeleton_rawdev.c +1 -1
@@ -774,5 +774,5 @@ static struct rte_vdev_driver skeleton_pmd_drv = { .remove = skeleton_rawdev_remove }; -RTE_PMD_REGISTER_VDEV (SKELETON_PMD_RAWDEV_NAME , skeleton_pmd_drv); +RTE_PMD_REGISTER_VDEV (SKELETON_PMD_RAWDEV_NAME , skeleton_pmd_drv, __LINE__);RTE_LOG_REGISTER_DEFAULT (skeleton_pmd_logtype,INFO );
drivers/regex/cn9k/cn9k_regexdev.c +1 -1
@@ -930,5 +930,5 @@ static struct rte_pci_driver cn9k_regexdev_pmd = { }; -RTE_PMD_REGISTER_PCI (REGEXDEV_NAME_CN9K_PMD , cn9k_regexdev_pmd); +RTE_PMD_REGISTER_PCI (REGEXDEV_NAME_CN9K_PMD , cn9k_regexdev_pmd, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (REGEXDEV_NAME_CN9K_PMD , pci_id_ree_table);
drivers/regex/mlx5/mlx5_regex.c +1 -1
@@ -183,6 +183,6 @@ RTE_INIT(rte_mlx5_regex_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_regex_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_REGEX_DRIVER_NAME , mlx5_regex_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_REGEX_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/vdpa/ifc/ifcvf_vdpa.c +1 -1
@@ -1886,6 +1886,6 @@ static struct rte_pci_driver rte_ifcvf_vdpa = { .remove = ifcvf_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_ifcvf, rte_ifcvf_vdpa); +RTE_PMD_REGISTER_PCI (net_ifcvf, rte_ifcvf_vdpa, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_ifcvf, pci_id_ifcvf_map);RTE_PMD_REGISTER_KMOD_DEP (net_ifcvf,"* vfio-pci" );
drivers/vdpa/mlx5/mlx5_vdpa.c +1 -1
@@ -1003,6 +1003,6 @@ RTE_INIT(rte_mlx5_vdpa_init)mlx5_class_driver_register (&mlx5_vdpa_driver); } -RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_VDPA_DRIVER_NAME , mlx5_vdpa_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_VDPA_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/vdpa/sfc/sfc_vdpa.c +1 -1
@@ -358,7 +358,7 @@ static struct rte_pci_driver rte_sfc_vdpa = { .remove = sfc_vdpa_pci_remove, }; -RTE_PMD_REGISTER_PCI (net_sfc_vdpa, rte_sfc_vdpa); +RTE_PMD_REGISTER_PCI (net_sfc_vdpa, rte_sfc_vdpa, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);RTE_PMD_REGISTER_KMOD_DEP (net_sfc_vdpa,"* vfio-pci" );RTE_LOG_REGISTER_SUFFIX (sfc_vdpa_logtype_driver, driver,NOTICE );
lib/eal/include/rte_dev.h +5 -9
@@ -232,21 +232,18 @@ int rte_dev_remove(struct rte_device *dev);*/ typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const void *data); -#define RTE_PMD_EXPORT_NAME_ARRAY (n, idx) n##idx[] +#define RTE_PMD_COMPOST_NAME (n, idx) n##idx#define RTE_PMD_EXPORT_NAME (name, idx) \ -static const char RTE_PMD_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ -__rte_used = RTE_STR(name) +RTE_INCLUDE(const char, RTE_PMD_COMPOST_NAME(this_pmd_name, idx))[] = RTE_STR(name)#define DRV_EXP_TAG (name, tag) __##name##_##tag#define RTE_PMD_REGISTER_PCI_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, pci_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, pci_tbl_export))[] = RTE_STR(table)#define RTE_PMD_REGISTER_PARAM_STRING (name, str) \ -static const char DRV_EXP_TAG(name, param_string_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, param_string_export))[] = str/** * Advertise the list of kernel modules required to run this driver
@@ -270,8 +267,7 @@ __rte_used = str* - "* igb_uio | uio_pci_generic | vfio" */ #define RTE_PMD_REGISTER_KMOD_DEP (name, str) \ -static const char DRV_EXP_TAG(name, kmod_dep_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, kmod_dep_export))[] = str/** * Iteration context.
Signature · 1 line
2.49.0.vfs.0.0
v4 cover allow pmdinfo to be inserted and parsed using MSVC
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead. However, when __COUNTER__ was used directly from a header file, __LINE__ had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the __LINE__ could be passed from the .c file to the macro defined in the header (which was originally using __COUNTER__).
With this patchset commands like the one below provide the same JSON output as would be obtained on Linux.
python usertools\dpdk-pmdinfo.py build\app\dpdk-testpmd.exe
v4:
- limited the use of __LINE__ to the header files, reducing number of changes made in previous versions of this patchset.
v3:
- ge-pmdinfo-cfile.py: fixed archiver's syntax to extract object from library
- dpdk-pmdinfo.py: removed is_windows() and replaced with os.name == "nt"
v2:
- dpdk-pmdinfo.py: not importing elftools on Windows
- not requiring "pefile" Python module during build
- gen-pmdinfo-cfile.py: renamed "ar" to "archiver"
Andre Muezerie (4):
eal: add macro to embed information in binaries
buildtools: use macro to embed information in binaries
usertools: parse strings from PE images
drivers: use macro to embed information in binaries
buildtools/gen-pmdinfo-cfile.py | 24 +++++++-- buildtools/meson.build | 4 +- buildtools/pmdinfogen.py | 11 ++-- drivers/bus/auxiliary/bus_auxiliary_driver.h | 2 +- drivers/bus/cdx/bus_cdx_driver.h | 5 +- drivers/bus/dpaa/bus_dpaa_driver.h | 2 +- drivers/bus/fslmc/bus_fslmc_driver.h | 4 +- drivers/bus/ifpga/bus_ifpga_driver.h | 2 +- drivers/bus/pci/bus_pci_driver.h | 2 +- drivers/bus/platform/bus_platform_driver.h | 2 +- drivers/bus/uacce/bus_uacce_driver.h | 2 +- drivers/bus/vdev/bus_vdev_driver.h | 2 +- drivers/bus/vmbus/bus_vmbus_driver.h | 2 +- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 1 + drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 1 + drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 +++ lib/eal/include/rte_dev.h | 14 ++---- usertools/dpdk-pmdinfo.py | 53 ++++++++++++++++---- 28 files changed, 106 insertions(+), 53 deletions(-)
--
2.49.0.vfs.0.0
PATCH v4 1/4 eal: add macro to embed information in binaries
DPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
To assimilate these requirements/restrictions, macro RTE_INCLUDE is introduced in this patch.
--- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
lib/eal/common/eal_common_options.c +1 -1
@@ -135,7 +135,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;* Note: PLEASE DO NOT ALTER THIS without making a corresponding * change to usertools/dpdk-pmdinfo.py */ -static const char dpdk_solib_path[] __rte_used = +RTE_INCLUDE(const char, dpdk_solib_path)[] ="DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH ;TAILQ_HEAD (device_option_list, device_option);
lib/eal/include/rte_common.h +6 -0
@@ -231,6 +231,12 @@ typedef uint16_t unaligned_uint16_t;/** * Force symbol to be generated even if it appears to be unused. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_INCLUDE (type, name) __pragma(comment(linker, "/include:" RTE_STR(name))) type name +#else +#define RTE_INCLUDE (type, name) __attribute__((used)) type name +#endif +#ifdef RTE_TOOLCHAIN_MSVC #define __rte_used#else
Signature · 1 line
2.49.0.vfs.0.0
Re: [PATCH v4 1/4] eal: add macro to embed information in binaries
Quoted 40 lines · Andre Muezerie
DPDK uses GCC attribute "used" through macro
__rte_usedto indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
To assimilate these requirements/restrictions, macro
RTE_INCLUDEis introduced in this patch.Signed-off-by Andre Muezerie <[email protected]>--- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)lib/eal/common/eal_common_options.c +1
-1@@ -135,7 +135,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;* Note: PLEASE DO NOT ALTER THIS without making a corresponding * change to usertools/dpdk-pmdinfo.py */ -static const char dpdk_solib_path[] __rte_used = +RTE_INCLUDE(const char, dpdk_solib_path)[] ="DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH ;TAILQ_HEAD (device_option_list, device_option);lib/eal/include/rte_common.h +0
-0
lib/eal/include/rte_common.h typedef uint16_t unaligned_uint16_t; · line 237
Quoted 7 lines
lib/eal/include/rte_common.h +4
-0@@ -231,6 +231,12 @@ typedef uint16_t unaligned_uint16_t;/** * Force symbol to be generated even if it appears to be unused. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_INCLUDE (type, name) __pragma(comment(linker, "/include:" RTE_STR(name))) type name +#else +#define RTE_INCLUDE (type, name) __attribute__((used)) type name
Any reason we shouldn't also have "static" here, for the non-MSVC case?
As a general question, is this needed for any/many tasks other than putting in place strings? Rather than having a general include macro, I'm just wondering if we are better doing specific macros for the driver string, and then other-string use-cases.
/Bruce
Re: [PATCH v4 1/4] eal: add macro to embed information in binaries
Quoted 35 lines · Bruce Richardson
Quoted 34 lines · Andre Muezerie
DPDK uses GCC attribute "used" through macro
__rte_usedto indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
To assimilate these requirements/restrictions, macro
RTE_INCLUDEis introduced in this patch.Signed-off-by Andre Muezerie <[email protected]>--- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)lib/eal/common/eal_common_options.c +1
-1@@ -135,7 +135,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;* Note: PLEASE DO NOT ALTER THIS without making a corresponding * change to usertools/dpdk-pmdinfo.py */ -static const char dpdk_solib_path[] __rte_used = +RTE_INCLUDE(const char, dpdk_solib_path)[] ="DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH ;
Quoted 16 lines
lib/eal/include/rte_common.h typedef uint16_t unaligned_uint16_t; · line 237
Quoted 13 lines
lib/eal/common/eal_common_options.c +0
-0TAILQ_HEAD (device_option_list, device_option);lib/eal/include/rte_common.h +4
-0@@ -231,6 +231,12 @@ typedef uint16_t unaligned_uint16_t;/** * Force symbol to be generated even if it appears to be unused. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_INCLUDE (type, name) __pragma(comment(linker, "/include:" RTE_STR(name))) type name +#else +#define RTE_INCLUDE (type, name) __attribute__((used)) type nameAny reason we shouldn't also have "static" here, for the non-MSVC case?
The keyword "static" can't be used here with MSVC. It is nice to have the same source code for MSVC and non-MSVC, and I don't see a good reason to have "static"
here just for the non-MSVC case. To some extent it is even somewhat contradictory to have "static" and "__attribute__((used))" in the same line (hide it here but expose it there).
Let me know if you see a strong reason to have "static" just for the non-MSVC case.
Quoted 4 lines
As a general question, is this needed for any/many tasks other than putting in place strings? Rather than having a general include macro, I'm just wondering if we are better doing specific macros for the driver string, and then other-string use-cases.
There might be other use cases for RTE_INCLUDE, but for now it has only been used to put in place strings in drivers and common code
(like lib\eal\common\eal_common_options.c).
In most cases RTE_INCLUDE is not being called directly - it's called by other macros like the one below:
#define RTE_PMD_REGISTER_KMOD_DEP(name, str) \RTE_INCLUDE(const char, DRV_EXP_TAG(name, kmod_dep_export))[] = str
That being said, I don't see strong reason to prevent people from calling it directly.
Quoted 2 lines
/Bruce
PATCH v4 2/4 buildtools: use macro to embed information in binaries
In reply to Andre MuezerieThe archiver tool from the MSVC toolset is lib.exe. It has different parameters then it's GNU counterpart "ar".
buildtools\meson.build was updated to use lib.exe when MSVC compiler is used. This is to allow the code to be built without requiring GNU "ar" to be installed in that scenario.
Script gen-pmdinfo-cfile.py was updated to use the correct parameters when using lib.exe.
--- buildtools/gen-pmdinfo-cfile.py | 24 +++++++++++++++++++----- buildtools/meson.build | 4 +++- buildtools/pmdinfogen.py | 11 ++++++----- 3 files changed, 28 insertions(+), 11 deletions(-)
buildtools/gen-pmdinfo-cfile.py +19 -5
@@ -7,15 +7,29 @@ import sys import tempfile -_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv +_, tmp_root, archiver, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, - check=True).stdout.decode().splitlines(): + if archiver == "lib": + archiver_options = ["/LIST", "/NOLOGO"] + else: + archiver_options = ["t"] + for name in ( + subprocess.run( + [archiver] + archiver_options + [archive], + stdout=subprocess.PIPE, + check=True, + ) + .stdout.decode() + .splitlines() + ): if os.path.exists(name): paths.append(name) else: - subprocess.run([ar, "x", os.path.abspath(archive), name], - check=True, cwd=temp) + if archiver == "lib": + run_args = [archiver, f"/EXTRACT:{name}", os.path.abspath(archive)] + else: + run_args = [archiver, "x", os.path.abspath(archive), name] + subprocess.run(run_args, check=True, cwd=temp) paths.append(os.path.join(temp, name)) subprocess.run(pmdinfogen + paths + [output], check=True)
buildtools/meson.build +3 -1
@@ -37,7 +37,9 @@ install_data([ pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()] pmdinfogen = py3 + files('pmdinfogen.py') if host_machine.system() == 'windows' - if cc.get_id() == 'gcc' + if cc.get_id() == 'msvc' + pmdinfo += 'lib' + elif cc.get_id() == 'gcc' pmdinfo += 'ar' else pmdinfo += 'llvm-ar'
buildtools/pmdinfogen.py +6 -5
@@ -87,7 +87,7 @@ def get_value(self, offset, size): @property def string_value(self): value = self._symbol.get_value(0) - return coff.decode_asciiz(value) if value else '' + return coff.decode_asciiz(value) if value else "" class COFFImage:
@@ -192,7 +192,7 @@ def dump(self, file): dumped = json.dumps(self.__dict__) escaped = dumped.replace('"', '\\"') print( - 'const char %s_pmd_info[] __attribute__((used)) = "PMD_INFO_STRING= %s";' + 'RTE_INCLUDE(const char, %s_pmd_info)[] = "PMD_INFO_STRING= %s";' % (self.name, escaped), file=file, )
@@ -215,7 +215,7 @@ def parse_args(): parser = argparse.ArgumentParser() parser.add_argument("format", help="object file format, 'elf' or 'coff'") parser.add_argument( - "input", nargs='+', help="input object file path or '-' for stdin" + "input", nargs="+", help="input object file path or '-' for stdin" ) parser.add_argument("output", help="output C file path or '-' for stdout") return parser.parse_args()
@@ -252,13 +252,14 @@ def open_output(path): def write_header(output): output.write( - "static __attribute__((unused)) const char *generator = \"%s\";\n" % sys.argv[0] + "#include <rte_common.h>\n" + 'static __rte_unused const char *generator = "%s";\n' % sys.argv[0] ) def main(): args = parse_args() - if args.input.count('-') > 1: + if args.input.count("-") > 1: raise Exception("'-' input cannot be used multiple times") if args.format == "elf" and "ELFFile" not in globals(): raise Exception("elftools module not found")
Signature · 1 line
2.49.0.vfs.0.0
Re: [PATCH v4 2/4] buildtools: use macro to embed information in binaries
Hello Andre,
Quoted 37 lines · Andre Muezerie
The archiver tool from the MSVC toolset is lib.exe. It has different parameters then it's GNU counterpart "ar".
buildtools\meson.build was updated to use lib.exe when MSVC compiler is used. This is to allow the code to be built without requiring GNU "ar" to be installed in that scenario.
Script
gen-pmdinfo-cfile.pywas updated to use the correct parameters when using lib.exe.Signed-off-by Andre Muezerie <[email protected]>--- buildtools/gen-pmdinfo-cfile.py | 24 +++++++++++++++++++----- buildtools/meson.build | 4 +++- buildtools/pmdinfogen.py | 11 ++++++----- 3 files changed, 28 insertions(+), 11 deletions(-)buildtools/gen-pmdinfo-cfile.py +6
-3@@ -7,15 +7,29 @@ import sys import tempfile -_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv +_, tmp_root, archiver, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, - check=True).stdout.decode().splitlines(): + if archiver == "lib": + archiver_options = ["/LIST", "/NOLOGO"] + else: + archiver_options = ["t"] + for name in (
buildtools/gen-pmdinfo-cfile.py line 27
Quoted 10 lines
buildtools/gen-pmdinfo-cfile.py +8
-0+ subprocess.run( + [archiver] + archiver_options + [archive], + stdout=subprocess.PIPE, + check=True, + ) + .stdout.decode() + .splitlines() + ): if os.path.exists(name): paths.append(name)
Indent after the change seems strange.
And we need a rebase of this series in any case.
Please send a new revision.
Signature · 1 line
David Marchand
Re: [PATCH v4 2/4] buildtools: use macro to embed information in binaries
Quoted 54 lines · David Marchand
Hello Andre,
Quoted 37 lines · Andre Muezerie
The archiver tool from the MSVC toolset is lib.exe. It has different parameters then it's GNU counterpart "ar".
buildtools\meson.build was updated to use lib.exe when MSVC compiler is used. This is to allow the code to be built without requiring GNU "ar" to be installed in that scenario.
Script
gen-pmdinfo-cfile.pywas updated to use the correct parameters when using lib.exe.Signed-off-by Andre Muezerie <[email protected]>--- buildtools/gen-pmdinfo-cfile.py | 24 +++++++++++++++++++----- buildtools/meson.build | 4 +++- buildtools/pmdinfogen.py | 11 ++++++----- 3 files changed, 28 insertions(+), 11 deletions(-)buildtools/gen-pmdinfo-cfile.py +6
-3@@ -7,15 +7,29 @@ import sys import tempfile -_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv +_, tmp_root, archiver, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: paths = [] - for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, - check=True).stdout.decode().splitlines(): + if archiver == "lib": + archiver_options = ["/LIST", "/NOLOGO"] + else: + archiver_options = ["t"] + for name in (buildtools/gen-pmdinfo-cfile.py line 27
Quoted 10 lines
buildtools/gen-pmdinfo-cfile.py +8
-0+ subprocess.run( + [archiver] + archiver_options + [archive], + stdout=subprocess.PIPE, + check=True, + ) + .stdout.decode() + .splitlines() + ): if os.path.exists(name): paths.append(name)Indent after the change seems strange.
Quoted 3 lines
And we need a rebase of this series in any case.
Please send a new revision.
I rebased the code and formatted it using Ruff. I agree that the formatting looks substantially different than the original code and it takes a while to get used to it, but an argument could be made that the new formatting looks better.
Quoted 4 lines
Signature · 2 lines
-- David Marchand
PATCH v4 3/4 usertools: parse strings from PE images
In reply to Andre MuezerieScript usertools\dpdk-pmdinfo.py was enhanced to also be able to parse symbols from sections in PE images.
--- usertools/dpdk-pmdinfo.py | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-)
usertools/dpdk-pmdinfo.py +43 -10
@@ -37,8 +37,11 @@ from pathlib import Path from typing import Iterable, Iterator, List, Union -import elftools -from elftools.elf.elffile import ELFError, ELFFile +if os.name == "nt": + import pefile +else: + import elftools + from elftools.elf.elffile import ELFError, ELFFile # ----------------------------------------------------------------------------
@@ -114,18 +117,23 @@ def parse_pmdinfo(paths: Iterable[Path], search_plugins: bool) -> List[dict]: A list of DPDK drivers info dictionaries. """ binaries = set(paths) - for p in paths: - binaries.update(get_needed_libs(p)) - if search_plugins: - # cast to list to avoid errors with update while iterating - binaries.update(list(get_plugin_libs(binaries))) + + if os.name == "nt": + section_name = ".rdata" + else: + section_name = ".rodata" + for p in paths: + binaries.update(get_needed_libs(p)) + if search_plugins: + # cast to list to avoid errors with update while iterating + binaries.update(list(get_plugin_libs(binaries))) drivers = [] for b in binaries: logging.debug("analyzing %s", b) try: - for s in get_elf_strings(b, ".rodata", "PMD_INFO_STRING="): + for s in get_section_strings(b, section_name, "PMD_INFO_STRING="): try: info = json.loads(s) scrub_pci_ids(info)
@@ -214,7 +222,7 @@ def find_strings(buf: bytes, prefix: str) -> Iterator[str]: # end of string s = view[start:i].tobytes().decode("ascii") if s.startswith(prefix): - yield s[len(prefix):] + yield s[len(prefix) :] # There can be byte sequences where a non-printable byte # follows a printable one. Ignore that. start = None
@@ -233,7 +241,8 @@ def elftools_version(): return (int(match[1]), int(match[2])) -ELFTOOLS_VERSION = elftools_version() +if os.name != "nt": + ELFTOOLS_VERSION = elftools_version() def from_elftools(s: Union[bytes, str]) -> str:
@@ -269,6 +278,30 @@ def get_elf_strings(path: Path, section: str, prefix: str) -> Iterator[str]: yield from find_strings(sec.data(), prefix) +# ---------------------------------------------------------------------------- +def get_pe_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named PE section in a file. + """ + pe = pefile.PE(path) + for sec in pe.sections: + section_name = sec.Name.decode().strip("\x00") + if section_name != section: + continue + yield from find_strings(sec.get_data(), prefix) + + +# ---------------------------------------------------------------------------- +def get_section_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named section in an ELF or PE file. + """ + if os.name == "nt": + yield from get_pe_strings(path, section, prefix) + else: + yield from get_elf_strings(path, section, prefix) + + # ---------------------------------------------------------------------------- LDD_LIB_RE = re.compile( r"""
Signature · 1 line
2.49.0.vfs.0.0
PATCH v4 4/4 drivers: use macro to embed information in binaries
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead.
--- drivers/bus/auxiliary/bus_auxiliary_driver.h | 2 +- drivers/bus/cdx/bus_cdx_driver.h | 5 ++--- drivers/bus/dpaa/bus_dpaa_driver.h | 2 +- drivers/bus/fslmc/bus_fslmc_driver.h | 4 ++-- drivers/bus/ifpga/bus_ifpga_driver.h | 2 +- drivers/bus/pci/bus_pci_driver.h | 2 +- drivers/bus/platform/bus_platform_driver.h | 2 +- drivers/bus/uacce/bus_uacce_driver.h | 2 +- drivers/bus/vdev/bus_vdev_driver.h | 2 +- drivers/bus/vmbus/bus_vmbus_driver.h | 2 +- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 1 + drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 1 + drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- lib/eal/include/rte_dev.h | 14 +++++--------- 22 files changed, 28 insertions(+), 31 deletions(-)
drivers/bus/auxiliary/bus_auxiliary_driver.h +1 -1
@@ -168,7 +168,7 @@ void rte_auxiliary_register(struct rte_auxiliary_driver *driver); (auxiliary_drv).driver.name =RTE_STR (nm); \rte_auxiliary_register (&(auxiliary_drv)); \ } \ -RTE_PMD_EXPORT_NAME (nm, __COUNTER__) +RTE_PMD_EXPORT_NAME (nm, __LINE__)/** * Unregister an auxiliary driver.
drivers/bus/cdx/bus_cdx_driver.h +2 -3
@@ -35,8 +35,7 @@ struct rte_cdx_bus;#define RTE_CDX_ANY_ID (0xffff)#define RTE_PMD_REGISTER_CDX_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, cdx_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, cdx_tbl_export))[] = RTE_STR(table)/** Device needs resource mapping */ #define RTE_CDX_DRV_NEED_MAPPING 0x0001
@@ -153,7 +152,7 @@ void rte_cdx_register(struct rte_cdx_driver *driver); (cdx_drv).driver.name =RTE_STR (nm);\rte_cdx_register (&cdx_drv); \ } \ -RTE_PMD_EXPORT_NAME (nm, __COUNTER__) +RTE_PMD_EXPORT_NAME (nm, __LINE__)/** * Enables VFIO Interrupts for CDX bus devices.
drivers/bus/dpaa/bus_dpaa_driver.h +1 -1
@@ -245,7 +245,7 @@ RTE_INIT(dpaainitfn_ ##nm) \ (dpaa_drv).driver.name =RTE_STR (nm);\rte_dpaa_driver_register (&dpaa_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__) __rte_internalstruct fm_eth_port_cfg *dpaa_get_eth_port_cfg (int dev_id);
drivers/bus/fslmc/bus_fslmc_driver.h +2 -2
@@ -205,7 +205,7 @@ RTE_INIT(dpaa2initfn_ ##nm) \ (dpaa2_drv).driver.name =RTE_STR (nm);\rte_fslmc_driver_register (&dpaa2_drv); \ } \ -RTE_PMD_EXPORT_NAME (nm, __COUNTER__) +RTE_PMD_EXPORT_NAME (nm, __LINE__)/** * Register a DPAA2 MC Object driver.
@@ -236,7 +236,7 @@ RTE_INIT(dpaa2objinitfn_ ##nm) \ (dpaa2_obj).name =RTE_STR (nm);\rte_fslmc_object_register (&dpaa2_obj); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__) #ifdef __cplusplus }
drivers/bus/ifpga/bus_ifpga_driver.h +1 -1
@@ -154,7 +154,7 @@ RTE_INIT(afudrvinitfn_ ##afudrv)\ (afudrv).driver.alias = afudrvinit_ ## nm ## _alias;\ rte_ifpga_driver_register(&afudrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__)#define RTE_PMD_REGISTER_AFU_ALIAS (nm, alias)\ static const char *afudrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/pci/bus_pci_driver.h +1 -1
@@ -171,7 +171,7 @@ RTE_INIT(pciinitfn_ ##nm) \ (pci_drv).driver.name =RTE_STR (nm);\rte_pci_register (&pci_drv); \ } \ -RTE_PMD_EXPORT_NAME (nm, __COUNTER__) +RTE_PMD_EXPORT_NAME (nm, __LINE__)/** * Unregister a PCI driver.
drivers/bus/platform/bus_platform_driver.h +1 -1
@@ -138,7 +138,7 @@ RTE_INIT(pdrvinitfn_ ##nm) \ (platform_drv).driver.alias = pdrvinit_ ## nm ## _alias; \ rte_platform_register(&(platform_drv)); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__)/** Helper for setting platform driver alias. */ #define RTE_PMD_REGISTER_ALIAS (nm, alias) \
drivers/bus/uacce/bus_uacce_driver.h +1 -1
@@ -245,7 +245,7 @@ void rte_uacce_unregister(struct rte_uacce_driver *driver); (uacce_drv).driver.name =RTE_STR (nm);\rte_uacce_register (&uacce_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, __LINE__) #ifdef __cplusplus }
drivers/bus/vdev/bus_vdev_driver.h +1 -1
@@ -139,7 +139,7 @@ RTE_INIT(vdrvinitfn_ ##vdrv)\ (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\ rte_vdev_register(&vdrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__)#define RTE_PMD_REGISTER_ALIAS (nm, alias)\ static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/vmbus/bus_vmbus_driver.h +1 -1
@@ -97,7 +97,7 @@ void rte_vmbus_unregister(struct rte_vmbus_driver *driver); (vmbus_drv).driver.name =RTE_STR (nm); \rte_vmbus_register (&vmbus_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, __LINE__) #ifdef __cplusplus }
drivers/common/mlx5/mlx5_common.c +1 -1
@@ -1452,4 +1452,4 @@ mlx5_devx_uar_prepare(struct mlx5_common_device *cdev, struct mlx5_uar *uar)return 0 ; } -RTE_PMD_EXPORT_NAME (mlx5_common_driver, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_driver, __LINE__);
drivers/common/mlx5/mlx5_common_pci.c +1 -1
@@ -245,4 +245,4 @@ RTE_FINI(mlx5_common_pci_finish) } } -RTE_PMD_EXPORT_NAME (mlx5_common_pci, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_pci, __LINE__);
drivers/common/nitrox/nitrox_device.c +1 -0
@@ -144,5 +144,6 @@ static struct rte_pci_driver nitrox_pmd = { .remove = nitrox_pci_remove, }; +/* Blank line to get unique ID */ RTE_PMD_REGISTER_PCI (nitrox, nitrox_pmd);RTE_PMD_REGISTER_PCI_TABLE (nitrox, pci_id_nitrox_map);
drivers/compress/mlx5/mlx5_compress.c +1 -1
@@ -937,6 +937,6 @@ RTE_INIT(rte_mlx5_compress_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_compress_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_COMPRESS_DRIVER_NAME , mlx5_compress_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_COMPRESS_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/crypto/mlx5/mlx5_crypto.c +1 -1
@@ -514,6 +514,6 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(mlx5_cryptodev_driver, mlx5_drv, mlx5_crypto_driver_id); RTE_LOG_REGISTER_DEFAULT(mlx5_crypto_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_CRYPTO_DRIVER_NAME , mlx5_crypto_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_CRYPTO_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/event/octeontx/ssovf_evdev.c +1 -0
@@ -971,4 +971,5 @@ static struct rte_vdev_driver vdev_ssovf_pmd = { .remove = ssovf_vdev_remove }; +/* Blank line to get unique ID */ RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OCTEONTX_PMD , vdev_ssovf_pmd);
drivers/net/mlx4/mlx4.c +1 -1
@@ -1385,7 +1385,7 @@ RTE_INIT(rte_mlx4_pmd_init)rte_pci_register (&mlx4_driver); } -RTE_PMD_EXPORT_NAME (net_mlx4, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_mlx4, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_mlx4, mlx4_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_mlx4,"* ib_uverbs & mlx4_en & mlx4_core & mlx4_ib" );
drivers/net/mlx5/mlx5.c +1 -1
@@ -3819,6 +3819,6 @@ RTE_INIT(rte_mlx5_pmd_init)mlx5_class_driver_register (&mlx5_net_driver); } -RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_ETH_DRIVER_NAME , mlx5_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_ETH_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/net/virtio/virtio_pci_ethdev.c +1 -1
@@ -239,4 +239,4 @@ RTE_INIT(rte_virtio_net_pci_pmd_init)RTE_PMD_REGISTER_PCI_TABLE (net_virtio, pci_id_virtio_map);RTE_PMD_REGISTER_KMOD_DEP (net_virtio,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_EXPORT_NAME (net_virtio, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_virtio, __LINE__);
drivers/regex/mlx5/mlx5_regex.c +1 -1
@@ -183,6 +183,6 @@ RTE_INIT(rte_mlx5_regex_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_regex_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_REGEX_DRIVER_NAME , mlx5_regex_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_REGEX_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/vdpa/mlx5/mlx5_vdpa.c +1 -1
@@ -1003,6 +1003,6 @@ RTE_INIT(rte_mlx5_vdpa_init)mlx5_class_driver_register (&mlx5_vdpa_driver); } -RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_VDPA_DRIVER_NAME , mlx5_vdpa_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_VDPA_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
lib/eal/include/rte_dev.h +5 -9
@@ -232,21 +232,18 @@ int rte_dev_remove(struct rte_device *dev);*/ typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const void *data); -#define RTE_PMD_EXPORT_NAME_ARRAY (n, idx) n##idx[] +#define RTE_PMD_COMPOST_NAME (n, idx) n##idx#define RTE_PMD_EXPORT_NAME (name, idx) \ -static const char RTE_PMD_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ -__rte_used = RTE_STR(name) +RTE_INCLUDE(const char, RTE_PMD_COMPOST_NAME(this_pmd_name, idx))[] = RTE_STR(name)#define DRV_EXP_TAG (name, tag) __##name##_##tag#define RTE_PMD_REGISTER_PCI_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, pci_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, pci_tbl_export))[] = RTE_STR(table)#define RTE_PMD_REGISTER_PARAM_STRING (name, str) \ -static const char DRV_EXP_TAG(name, param_string_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, param_string_export))[] = str/** * Advertise the list of kernel modules required to run this driver
@@ -270,8 +267,7 @@ __rte_used = str* - "* igb_uio | uio_pci_generic | vfio" */ #define RTE_PMD_REGISTER_KMOD_DEP (name, str) \ -static const char DRV_EXP_TAG(name, kmod_dep_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, kmod_dep_export))[] = str/** * Iteration context.
Signature · 1 line
2.49.0.vfs.0.0
Quoted 81 lines · Andre Muezerie
DPDK uses GCC attribute "used" through macro
__rte_usedto indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro
RTE_INCLUDEis used in this patch to ensure these special variables make it to the final binaries.The elimination of "static" for some of these variables caused name clashes when
__COUNTER__predefined macro was used. As a workaround, predefined macro__LINE__was used instead. However, when__COUNTER__was used directly from a header file,__LINE__had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the__LINE__could be passed from the .c file to the macro defined in the header (which was originally using__COUNTER__).With this patchset commands like the one below provide the same JSON output as would be obtained on Linux.
python usertools\dpdk-pmdinfo.py build\app\dpdk-testpmd.exe
v4:
- limited the use of__LINE__to the header files, reducing number of changes made in previous versions of this patchset.v3:
-ge-pmdinfo-cfile.py: fixed archiver's syntax to extract object from library
-dpdk-pmdinfo.py: removedis_windows()and replaced with os.name == "nt"v2:
-dpdk-pmdinfo.py: not importing elftools on Windows
- not requiring "pefile" Python module during build
-gen-pmdinfo-cfile.py: renamed "ar" to "archiver"Andre Muezerie (4):
eal: add macro to embed information in binaries
buildtools: use macro to embed information in binaries
usertools: parse strings from PE images
drivers: use macro to embed information in binariesbuildtools/gen-pmdinfo-cfile.py | 24 +++++++-- buildtools/meson.build | 4 +- buildtools/pmdinfogen.py | 11 ++-- drivers/bus/auxiliary/bus_auxiliary_driver.h | 2 +- drivers/bus/cdx/bus_cdx_driver.h | 5 +- drivers/bus/dpaa/bus_dpaa_driver.h | 2 +- drivers/bus/fslmc/bus_fslmc_driver.h | 4 +- drivers/bus/ifpga/bus_ifpga_driver.h | 2 +- drivers/bus/pci/bus_pci_driver.h | 2 +- drivers/bus/platform/bus_platform_driver.h | 2 +- drivers/bus/uacce/bus_uacce_driver.h | 2 +- drivers/bus/vdev/bus_vdev_driver.h | 2 +- drivers/bus/vmbus/bus_vmbus_driver.h | 2 +- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 1 + drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 1 + drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 +++ lib/eal/include/rte_dev.h | 14 ++---- usertools/dpdk-pmdinfo.py | 53 ++++++++++++++++---- 28 files changed, 106 insertions(+), 53 deletions(-)
Quoted 2 lines
--
2.49.0.vfs.0.0
Would someone be able to review this series?
Thanks,
Andre Muezerie
Quoted 27 lines · Andre Muezerie
Quoted 25 lines · Andre Muezerie
DPDK uses GCC attribute "used" through macro
__rte_usedto indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro
RTE_INCLUDEis used in this patch to ensure these special variables make it to the final binaries.The elimination of "static" for some of these variables caused name clashes when
__COUNTER__predefined macro was used. As a workaround, predefined macro__LINE__was used instead. However, when__COUNTER__was used directly from a header file,__LINE__had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the__LINE__could be passed from the .c file to the macro defined in the header (which was originally using__COUNTER__).
Quoted 8 lines
Quoted 8 lines
With this patchset commands like the one below provide the same JSON output as would be obtained on Linux.
python usertools\dpdk-pmdinfo.py build\app\dpdk-testpmd.exe
v4:
- limited the use of__LINE__to the header files, reducing number of changes made in previous versions of this patchset.
Open question, since the submission of this series, __rte_used is used in the new symbol export macros.
It seems those macros are not affected by the problem you described (and fixed with RTE_INCLUDE).
Is it because the symbols are explicitly listed as exported?
Signature · 1 line
David Marchand
Quoted 38 lines · David Marchand
Quoted 27 lines · Andre Muezerie
Quoted 25 lines · Andre Muezerie
DPDK uses GCC attribute "used" through macro
__rte_usedto indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro
RTE_INCLUDEis used in this patch to ensure these special variables make it to the final binaries.The elimination of "static" for some of these variables caused name clashes when
__COUNTER__predefined macro was used. As a workaround, predefined macro__LINE__was used instead. However, when__COUNTER__was used directly from a header file,__LINE__had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the__LINE__could be passed from the .c file to the macro defined in the header (which was originally using__COUNTER__).Quoted 8 lines
Quoted 8 lines
With this patchset commands like the one below provide the same JSON output as would be obtained on Linux.
python usertools\dpdk-pmdinfo.py build\app\dpdk-testpmd.exe
v4:
- limited the use of__LINE__to the header files, reducing number of changes made in previous versions of this patchset.
Quoted 6 lines
Open question, since the submission of this series,
__rte_usedis used in the new symbol export macros.
It seems those macros are not affected by the problem you described (and fixed withRTE_INCLUDE).
Is it because the symbols are explicitly listed as exported?
Correct. When using MSVC, "__rte_used" is stripped away by the preprocessor and therefore has no effect. All required symbols need to be explicitly listed as exported, otherwise the linker will complain about symbols not found.
Quoted 3 lines
Signature · 2 lines
-- David Marchand
v5 cover allow pmdinfo to be inserted and parsed using MSVC
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead. However, when __COUNTER__ was used directly from a header file, __LINE__ had to be used from the .c files, otherwise it would also not result in a unique symbol. This required a parameter to be added to some macros so that the __LINE__ could be passed from the .c file to the macro defined in the header (which was originally using __COUNTER__).
With this patchset commands like the one below provide the same JSON output as would be obtained on Linux.
python usertools\dpdk-pmdinfo.py build\app\dpdk-testpmd.exe
v5:
- rebased
v4:
- limited the use of __LINE__ to the header files, reducing number of changes made in previous versions of this patchset.
v3:
- ge-pmdinfo-cfile.py: fixed archiver's syntax to extract object from library
- dpdk-pmdinfo.py: removed is_windows() and replaced with os.name == "nt"
v2:
- dpdk-pmdinfo.py: not importing elftools on Windows
- not requiring "pefile" Python module during build
- gen-pmdinfo-cfile.py: renamed "ar" to "archiver"
Andre Muezerie (4):
eal: add macro to embed information in binaries
buildtools: use macro to embed information in binaries
usertools: parse strings from PE images
drivers: use macro to embed information in binaries
buildtools/gen-pmdinfo-cfile.py | 25 +++++++-- buildtools/meson.build | 4 +- buildtools/pmdinfogen.py | 11 ++-- drivers/bus/auxiliary/bus_auxiliary_driver.h | 2 +- drivers/bus/cdx/bus_cdx_driver.h | 5 +- drivers/bus/dpaa/bus_dpaa_driver.h | 2 +- drivers/bus/fslmc/bus_fslmc_driver.h | 4 +- drivers/bus/ifpga/bus_ifpga_driver.h | 2 +- drivers/bus/pci/bus_pci_driver.h | 2 +- drivers/bus/platform/bus_platform_driver.h | 2 +- drivers/bus/uacce/bus_uacce_driver.h | 2 +- drivers/bus/vdev/bus_vdev_driver.h | 2 +- drivers/bus/vmbus/bus_vmbus_driver.h | 2 +- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 1 + drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 1 + drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 +++ lib/eal/include/rte_dev.h | 14 ++---- usertools/dpdk-pmdinfo.py | 53 ++++++++++++++++---- 28 files changed, 107 insertions(+), 53 deletions(-)
--
2.49.0.vfs.0.3
PATCH v5 1/4 eal: add macro to embed information in binaries
DPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
To assimilate these requirements/restrictions, macro RTE_INCLUDE is introduced in this patch.
--- lib/eal/common/eal_common_options.c | 2 +- lib/eal/include/rte_common.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
lib/eal/common/eal_common_options.c +1 -1
@@ -135,7 +135,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;* Note: PLEASE DO NOT ALTER THIS without making a corresponding * change to usertools/dpdk-pmdinfo.py */ -static const char dpdk_solib_path[] __rte_used = +RTE_INCLUDE(const char, dpdk_solib_path)[] ="DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH ;TAILQ_HEAD (device_option_list, device_option);
lib/eal/include/rte_common.h +6 -0
@@ -231,6 +231,12 @@ typedef uint16_t unaligned_uint16_t;/** * Force symbol to be generated even if it appears to be unused. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_INCLUDE (type, name) __pragma(comment(linker, "/include:" RTE_STR(name))) type name +#else +#define RTE_INCLUDE (type, name) __attribute__((used)) type name +#endif +#ifdef RTE_TOOLCHAIN_MSVC #define __rte_used#else
Signature · 1 line
2.49.0.vfs.0.3
PATCH v5 2/4 buildtools: use macro to embed information in binaries
In reply to Andre MuezerieThe archiver tool from the MSVC toolset is lib.exe. It has different parameters then it's GNU counterpart "ar".
buildtools\meson.build was updated to use lib.exe when MSVC compiler is used. This is to allow the code to be built without requiring GNU "ar" to be installed in that scenario.
Script gen-pmdinfo-cfile.py was updated to use the correct parameters when using lib.exe.
--- buildtools/gen-pmdinfo-cfile.py | 25 ++++++++++++++++++++----- buildtools/meson.build | 4 +++- buildtools/pmdinfogen.py | 11 ++++++----- 3 files changed, 29 insertions(+), 11 deletions(-)
buildtools/gen-pmdinfo-cfile.py +20 -5
@@ -6,16 +6,31 @@ import subprocess import sys -_, ar, tmp_dir, archive, output, *pmdinfogen = sys.argv +_, archiver, tmp_dir, archive, output, *pmdinfogen = sys.argv paths = [] -for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE, - check=True).stdout.decode().splitlines(): +if archiver == "lib": + archiver_options = ["/LIST", "/NOLOGO"] +else: + archiver_options = ["t"] + +for name in ( + subprocess.run( + [archiver] + archiver_options + [archive], + stdout=subprocess.PIPE, + check=True, + ) + .stdout.decode() + .splitlines() +): if os.path.exists(name): paths.append(name) else: if not os.path.exists(tmp_dir): os.makedirs(tmp_dir) - subprocess.run([ar, "x", os.path.abspath(archive), name], - check=True, cwd=tmp_dir) + if archiver == "lib": + run_args = [archiver, f"/EXTRACT:{name}", os.path.abspath(archive)] + else: + run_args = [archiver, "x", os.path.abspath(archive), name] + subprocess.run(run_args, check=True, cwd=tmp_dir) paths.append(os.path.join(tmp_dir, name)) subprocess.run(pmdinfogen + paths + [output], check=True)
buildtools/meson.build +3 -1
@@ -37,7 +37,9 @@ install_data([ pmdinfo = py3 + files('gen-pmdinfo-cfile.py') pmdinfogen = py3 + files('pmdinfogen.py') if host_machine.system() == 'windows' - if cc.get_id() == 'gcc' + if cc.get_id() == 'msvc' + pmdinfo += 'lib' + elif cc.get_id() == 'gcc' pmdinfo += 'ar' else pmdinfo += 'llvm-ar'
buildtools/pmdinfogen.py +6 -5
@@ -87,7 +87,7 @@ def get_value(self, offset, size): @property def string_value(self): value = self._symbol.get_value(0) - return coff.decode_asciiz(value) if value else '' + return coff.decode_asciiz(value) if value else "" class COFFImage:
@@ -192,7 +192,7 @@ def dump(self, file): dumped = json.dumps(self.__dict__) escaped = dumped.replace('"', '\\"') print( - 'const char %s_pmd_info[] __attribute__((used)) = "PMD_INFO_STRING= %s";' + 'RTE_INCLUDE(const char, %s_pmd_info)[] = "PMD_INFO_STRING= %s";' % (self.name, escaped), file=file, )
@@ -215,7 +215,7 @@ def parse_args(): parser = argparse.ArgumentParser() parser.add_argument("format", help="object file format, 'elf' or 'coff'") parser.add_argument( - "input", nargs='+', help="input object file path or '-' for stdin" + "input", nargs="+", help="input object file path or '-' for stdin" ) parser.add_argument("output", help="output C file path or '-' for stdout") return parser.parse_args()
@@ -252,13 +252,14 @@ def open_output(path): def write_header(output): output.write( - "static __attribute__((unused)) const char *generator = \"%s\";\n" % sys.argv[0] + "#include <rte_common.h>\n" + 'static __rte_unused const char *generator = "%s";\n' % sys.argv[0] ) def main(): args = parse_args() - if args.input.count('-') > 1: + if args.input.count("-") > 1: raise Exception("'-' input cannot be used multiple times") if args.format == "elf" and "ELFFile" not in globals(): raise Exception("elftools module not found")
Signature · 1 line
2.49.0.vfs.0.3
PATCH v5 3/4 usertools: parse strings from PE images
In reply to Andre MuezerieScript usertools\dpdk-pmdinfo.py was enhanced to also be able to parse symbols from sections in PE images.
--- usertools/dpdk-pmdinfo.py | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-)
usertools/dpdk-pmdinfo.py +43 -10
@@ -37,8 +37,11 @@ from pathlib import Path from typing import Iterable, Iterator, List, Union -import elftools -from elftools.elf.elffile import ELFError, ELFFile +if os.name == "nt": + import pefile +else: + import elftools + from elftools.elf.elffile import ELFError, ELFFile # ----------------------------------------------------------------------------
@@ -114,18 +117,23 @@ def parse_pmdinfo(paths: Iterable[Path], search_plugins: bool) -> List[dict]: A list of DPDK drivers info dictionaries. """ binaries = set(paths) - for p in paths: - binaries.update(get_needed_libs(p)) - if search_plugins: - # cast to list to avoid errors with update while iterating - binaries.update(list(get_plugin_libs(binaries))) + + if os.name == "nt": + section_name = ".rdata" + else: + section_name = ".rodata" + for p in paths: + binaries.update(get_needed_libs(p)) + if search_plugins: + # cast to list to avoid errors with update while iterating + binaries.update(list(get_plugin_libs(binaries))) drivers = [] for b in binaries: logging.debug("analyzing %s", b) try: - for s in get_elf_strings(b, ".rodata", "PMD_INFO_STRING="): + for s in get_section_strings(b, section_name, "PMD_INFO_STRING="): try: info = json.loads(s) scrub_pci_ids(info)
@@ -214,7 +222,7 @@ def find_strings(buf: bytes, prefix: str) -> Iterator[str]: # end of string s = view[start:i].tobytes().decode("ascii") if s.startswith(prefix): - yield s[len(prefix):] + yield s[len(prefix) :] # There can be byte sequences where a non-printable byte # follows a printable one. Ignore that. start = None
@@ -233,7 +241,8 @@ def elftools_version(): return (int(match[1]), int(match[2])) -ELFTOOLS_VERSION = elftools_version() +if os.name != "nt": + ELFTOOLS_VERSION = elftools_version() def from_elftools(s: Union[bytes, str]) -> str:
@@ -269,6 +278,30 @@ def get_elf_strings(path: Path, section: str, prefix: str) -> Iterator[str]: yield from find_strings(sec.data(), prefix) +# ---------------------------------------------------------------------------- +def get_pe_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named PE section in a file. + """ + pe = pefile.PE(path) + for sec in pe.sections: + section_name = sec.Name.decode().strip("\x00") + if section_name != section: + continue + yield from find_strings(sec.get_data(), prefix) + + +# ---------------------------------------------------------------------------- +def get_section_strings(path: Path, section: str, prefix: str) -> Iterator[str]: + """ + Extract strings from a named section in an ELF or PE file. + """ + if os.name == "nt": + yield from get_pe_strings(path, section, prefix) + else: + yield from get_elf_strings(path, section, prefix) + + # ---------------------------------------------------------------------------- LDD_LIB_RE = re.compile( r"""
Signature · 1 line
2.49.0.vfs.0.3
PATCH v5 4/4 drivers: use macro to embed information in binaries
In reply to Andre MuezerieDPDK uses GCC attribute "used" through macro __rte_used to indicate that a variable not referenced in the code should be assumed being used and therefore not be optimized away. This technique is used to embed information in the binaries, by having crafted information stored in them.
MSVC offers similar functionality, but it differs significantly: MSVC requires a pragma to be used to send a command to the linker telling it explicitly the name of the symbol that should be included (even if not referenced). As a side-effect, variables called out to be included cannot be static, otherwise their symbols are not "seen" by the linker. This restriction requires some DPDK code to be refactored.
Macro RTE_INCLUDE is used in this patch to ensure these special variables make it to the final binaries.
The elimination of "static" for some of these variables caused name clashes when __COUNTER__ predefined macro was used. As a workaround, predefined macro __LINE__ was used instead.
--- drivers/bus/auxiliary/bus_auxiliary_driver.h | 2 +- drivers/bus/cdx/bus_cdx_driver.h | 5 ++--- drivers/bus/dpaa/bus_dpaa_driver.h | 2 +- drivers/bus/fslmc/bus_fslmc_driver.h | 4 ++-- drivers/bus/ifpga/bus_ifpga_driver.h | 2 +- drivers/bus/pci/bus_pci_driver.h | 2 +- drivers/bus/platform/bus_platform_driver.h | 2 +- drivers/bus/uacce/bus_uacce_driver.h | 2 +- drivers/bus/vdev/bus_vdev_driver.h | 2 +- drivers/bus/vmbus/bus_vmbus_driver.h | 2 +- drivers/common/mlx5/mlx5_common.c | 2 +- drivers/common/mlx5/mlx5_common_pci.c | 2 +- drivers/common/nitrox/nitrox_device.c | 1 + drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/crypto/mlx5/mlx5_crypto.c | 2 +- drivers/event/octeontx/ssovf_evdev.c | 1 + drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/virtio/virtio_pci_ethdev.c | 2 +- drivers/regex/mlx5/mlx5_regex.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 2 +- lib/eal/include/rte_dev.h | 14 +++++--------- 22 files changed, 28 insertions(+), 31 deletions(-)
drivers/bus/auxiliary/bus_auxiliary_driver.h +1 -1
@@ -168,7 +168,7 @@ void rte_auxiliary_register(struct rte_auxiliary_driver *driver); (auxiliary_drv).driver.name =RTE_STR (nm); \rte_auxiliary_register (&(auxiliary_drv)); \ } \ -RTE_PMD_EXPORT_NAME (nm, __COUNTER__) +RTE_PMD_EXPORT_NAME (nm, __LINE__)/** * Unregister an auxiliary driver.
drivers/bus/cdx/bus_cdx_driver.h +2 -3
@@ -35,8 +35,7 @@ struct rte_cdx_bus;#define RTE_CDX_ANY_ID (0xffff)#define RTE_PMD_REGISTER_CDX_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, cdx_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, cdx_tbl_export))[] = RTE_STR(table)/** Device needs resource mapping */ #define RTE_CDX_DRV_NEED_MAPPING 0x0001
@@ -153,7 +152,7 @@ void rte_cdx_register(struct rte_cdx_driver *driver); (cdx_drv).driver.name =RTE_STR (nm);\rte_cdx_register (&cdx_drv); \ } \ -RTE_PMD_EXPORT_NAME (nm, __COUNTER__) +RTE_PMD_EXPORT_NAME (nm, __LINE__)/** * Enables VFIO Interrupts for CDX bus devices.
drivers/bus/dpaa/bus_dpaa_driver.h +1 -1
@@ -245,7 +245,7 @@ RTE_INIT(dpaainitfn_ ##nm) \ (dpaa_drv).driver.name =RTE_STR (nm);\rte_dpaa_driver_register (&dpaa_drv); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__) __rte_internalstruct fm_eth_port_cfg *dpaa_get_eth_port_cfg (int dev_id);
drivers/bus/fslmc/bus_fslmc_driver.h +2 -2
@@ -205,7 +205,7 @@ RTE_INIT(dpaa2initfn_ ##nm) \ (dpaa2_drv).driver.name =RTE_STR (nm);\rte_fslmc_driver_register (&dpaa2_drv); \ } \ -RTE_PMD_EXPORT_NAME (nm, __COUNTER__) +RTE_PMD_EXPORT_NAME (nm, __LINE__)/** * Register a DPAA2 MC Object driver.
@@ -236,7 +236,7 @@ RTE_INIT(dpaa2objinitfn_ ##nm) \ (dpaa2_obj).name =RTE_STR (nm);\rte_fslmc_object_register (&dpaa2_obj); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__) #ifdef __cplusplus }
drivers/bus/ifpga/bus_ifpga_driver.h +1 -1
@@ -154,7 +154,7 @@ RTE_INIT(afudrvinitfn_ ##afudrv)\ (afudrv).driver.alias = afudrvinit_ ## nm ## _alias;\ rte_ifpga_driver_register(&afudrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__)#define RTE_PMD_REGISTER_AFU_ALIAS (nm, alias)\ static const char *afudrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/pci/bus_pci_driver.h +1 -1
@@ -171,7 +171,7 @@ RTE_INIT(pciinitfn_ ##nm) \ (pci_drv).driver.name =RTE_STR (nm);\rte_pci_register (&pci_drv); \ } \ -RTE_PMD_EXPORT_NAME (nm, __COUNTER__) +RTE_PMD_EXPORT_NAME (nm, __LINE__)/** * Unregister a PCI driver.
drivers/bus/platform/bus_platform_driver.h +1 -1
@@ -138,7 +138,7 @@ RTE_INIT(pdrvinitfn_ ##nm) \ (platform_drv).driver.alias = pdrvinit_ ## nm ## _alias; \ rte_platform_register(&(platform_drv)); \ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__)/** Helper for setting platform driver alias. */ #define RTE_PMD_REGISTER_ALIAS (nm, alias) \
drivers/bus/uacce/bus_uacce_driver.h +1 -1
@@ -245,7 +245,7 @@ void rte_uacce_unregister(struct rte_uacce_driver *driver); (uacce_drv).driver.name =RTE_STR (nm);\rte_uacce_register (&uacce_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, __LINE__) #ifdef __cplusplus }
drivers/bus/vdev/bus_vdev_driver.h +1 -1
@@ -139,7 +139,7 @@ RTE_INIT(vdrvinitfn_ ##vdrv)\ (vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\ rte_vdev_register(&vdrv);\ } \ -RTE_PMD_EXPORT_NAME(nm, __COUNTER__) +RTE_PMD_EXPORT_NAME(nm, __LINE__)#define RTE_PMD_REGISTER_ALIAS (nm, alias)\ static const char *vdrvinit_ ## nm ## _alias = RTE_STR(alias)
drivers/bus/vmbus/bus_vmbus_driver.h +1 -1
@@ -101,7 +101,7 @@ void rte_vmbus_unregister(struct rte_vmbus_driver *driver); (vmbus_drv).driver.name =RTE_STR (nm); \rte_vmbus_register (&vmbus_drv); \ } \ - RTE_PMD_EXPORT_NAME(nm, __COUNTER__) + RTE_PMD_EXPORT_NAME(nm, __LINE__) #ifdef __cplusplus }
drivers/common/mlx5/mlx5_common.c +1 -1
@@ -1452,4 +1452,4 @@ mlx5_devx_uar_prepare(struct mlx5_common_device *cdev, struct mlx5_uar *uar)return 0 ; } -RTE_PMD_EXPORT_NAME (mlx5_common_driver, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_driver, __LINE__);
drivers/common/mlx5/mlx5_common_pci.c +1 -1
@@ -245,4 +245,4 @@ RTE_FINI(mlx5_common_pci_finish) } } -RTE_PMD_EXPORT_NAME (mlx5_common_pci, __COUNTER__); +RTE_PMD_EXPORT_NAME (mlx5_common_pci, __LINE__);
drivers/common/nitrox/nitrox_device.c +1 -0
@@ -144,5 +144,6 @@ static struct rte_pci_driver nitrox_pmd = { .remove = nitrox_pci_remove, }; +/* Blank line to get unique ID */ RTE_PMD_REGISTER_PCI (nitrox, nitrox_pmd);RTE_PMD_REGISTER_PCI_TABLE (nitrox, pci_id_nitrox_map);
drivers/compress/mlx5/mlx5_compress.c +1 -1
@@ -937,6 +937,6 @@ RTE_INIT(rte_mlx5_compress_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_compress_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_COMPRESS_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_COMPRESS_DRIVER_NAME , mlx5_compress_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_COMPRESS_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/crypto/mlx5/mlx5_crypto.c +1 -1
@@ -514,6 +514,6 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(mlx5_cryptodev_driver, mlx5_drv, mlx5_crypto_driver_id); RTE_LOG_REGISTER_DEFAULT(mlx5_crypto_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_CRYPTO_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_CRYPTO_DRIVER_NAME , mlx5_crypto_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_CRYPTO_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/event/octeontx/ssovf_evdev.c +1 -0
@@ -971,4 +971,5 @@ static struct rte_vdev_driver vdev_ssovf_pmd = { .remove = ssovf_vdev_remove }; +/* Blank line to get unique ID */ RTE_PMD_REGISTER_VDEV (EVENTDEV_NAME_OCTEONTX_PMD , vdev_ssovf_pmd);
drivers/net/mlx4/mlx4.c +1 -1
@@ -1385,7 +1385,7 @@ RTE_INIT(rte_mlx4_pmd_init)rte_pci_register (&mlx4_driver); } -RTE_PMD_EXPORT_NAME (net_mlx4, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_mlx4, __LINE__);RTE_PMD_REGISTER_PCI_TABLE (net_mlx4, mlx4_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (net_mlx4,"* ib_uverbs & mlx4_en & mlx4_core & mlx4_ib" );
drivers/net/mlx5/mlx5.c +1 -1
@@ -3819,6 +3819,6 @@ RTE_INIT(rte_mlx5_pmd_init)mlx5_class_driver_register (&mlx5_net_driver); } -RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_ETH_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_ETH_DRIVER_NAME , mlx5_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_ETH_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/net/virtio/virtio_pci_ethdev.c +1 -1
@@ -239,4 +239,4 @@ RTE_INIT(rte_virtio_net_pci_pmd_init)RTE_PMD_REGISTER_PCI_TABLE (net_virtio, pci_id_virtio_map);RTE_PMD_REGISTER_KMOD_DEP (net_virtio,"* igb_uio | uio_pci_generic | vfio-pci" ); -RTE_PMD_EXPORT_NAME (net_virtio, __COUNTER__); +RTE_PMD_EXPORT_NAME (net_virtio, __LINE__);
drivers/regex/mlx5/mlx5_regex.c +1 -1
@@ -183,6 +183,6 @@ RTE_INIT(rte_mlx5_regex_init) } RTE_LOG_REGISTER_DEFAULT(mlx5_regex_logtype, NOTICE) -RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_REGEX_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_REGEX_DRIVER_NAME , mlx5_regex_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_REGEX_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
drivers/vdpa/mlx5/mlx5_vdpa.c +1 -1
@@ -1003,6 +1003,6 @@ RTE_INIT(rte_mlx5_vdpa_init)mlx5_class_driver_register (&mlx5_vdpa_driver); } -RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __COUNTER__); +RTE_PMD_EXPORT_NAME (MLX5_VDPA_DRIVER_NAME , __LINE__);RTE_PMD_REGISTER_PCI_TABLE (MLX5_VDPA_DRIVER_NAME , mlx5_vdpa_pci_id_map);RTE_PMD_REGISTER_KMOD_DEP (MLX5_VDPA_DRIVER_NAME ,"* ib_uverbs & mlx5_core & mlx5_ib" );
lib/eal/include/rte_dev.h +5 -9
@@ -232,21 +232,18 @@ int rte_dev_remove(struct rte_device *dev);*/ typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const void *data); -#define RTE_PMD_EXPORT_NAME_ARRAY (n, idx) n##idx[] +#define RTE_PMD_COMPOST_NAME (n, idx) n##idx#define RTE_PMD_EXPORT_NAME (name, idx) \ -static const char RTE_PMD_EXPORT_NAME_ARRAY(this_pmd_name, idx) \ -__rte_used = RTE_STR(name) +RTE_INCLUDE(const char, RTE_PMD_COMPOST_NAME(this_pmd_name, idx))[] = RTE_STR(name)#define DRV_EXP_TAG (name, tag) __##name##_##tag#define RTE_PMD_REGISTER_PCI_TABLE (name, table) \ -static const char DRV_EXP_TAG(name, pci_tbl_export)[] __rte_used = \ -RTE_STR(table) +RTE_INCLUDE(const char, DRV_EXP_TAG(name, pci_tbl_export))[] = RTE_STR(table)#define RTE_PMD_REGISTER_PARAM_STRING (name, str) \ -static const char DRV_EXP_TAG(name, param_string_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, param_string_export))[] = str/** * Advertise the list of kernel modules required to run this driver
@@ -270,8 +267,7 @@ __rte_used = str* - "* igb_uio | uio_pci_generic | vfio" */ #define RTE_PMD_REGISTER_KMOD_DEP (name, str) \ -static const char DRV_EXP_TAG(name, kmod_dep_export)[] \ -__rte_used = str +RTE_INCLUDE(const char, DRV_EXP_TAG(name, kmod_dep_export))[] = str/** * Iteration context.
Signature · 1 line
2.49.0.vfs.0.3